diff --git a/.envrc b/.envrc index b220fb7bf4c21632a193291e3bd006c1f0a7374c..d08d7245987afde5eeb7c839cf8e789f2ba12b5b 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,3 @@ #!/bin/sh -use flake -source venv/bin/activate +# use flake diff --git a/default.nix b/default.nix index 56ea97daa36cee3c4642ad4675abab617b1309dd..e5e7c75b41bbe05cd7511565410e628a774ec811 100644 --- a/default.nix +++ b/default.nix @@ -1,14 +1,11 @@ {pkgs ? import <nixpkgs> {}}: let py = pkgs.python3Packages; in - py.buildPythonApplication rec { + py.buildPythonApplication { pname = "remote-inria"; - version = "1.4.0"; + version = "1.5.0"; - src = pkgs.fetchPypi { - inherit pname version; - sha256 = "sha256-naL5CJxf4RQG5r5RXWxCki4NsJyaerPzwMsPhtrSPn0="; - }; + src = ./.; format = "pyproject"; diff --git a/flake.lock b/flake.lock index 5d62abf716c60210dfb4d148113f45623ab60121..79eeadc8e0c9227a9ad8df005e4b2a6fc484a2a9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1688590700, + "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 04424bebc9e1fa51d0a1157e8b6199530a3bd9d6..82796167f2b7c0b325fc84d17708c80e27aa54ae 100644 --- a/flake.nix +++ b/flake.nix @@ -48,9 +48,9 @@ }; }; - devShells.${system}.default = pkgs.mkShell { - buildInputs = [python]; - }; + # devShells.${system}.default = pkgs.mkShell { + # buildInputs = [python]; + # }; formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra; }; diff --git a/pyproject.toml b/pyproject.toml index 0d9788b364f9505fb12834822cefe1c1bfe7276e..45bb77f78158a24bb981055b739350054c8c2b08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "remote-inria" description = "Remote Inria: A CLI tool for remotely interacting with Inria computing resources." -version = "1.4.0" +version = "1.5.0" authors = [ { name = "GaƩtan Lepage", email = "gaetan.lepage@inria.fr" } ]