diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/tools/misc/lorri | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/lorri')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/lorri/default.nix | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/tools/misc/lorri/default.nix b/nixpkgs/pkgs/tools/misc/lorri/default.nix index 951cb8b5caa9..9635b6b42385 100644 --- a/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -1,37 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , pkgs +, rustPackages , fetchFromGitHub , rustPlatform - # Updater script -, runtimeShell , writers - # Tests , nixosTests - # Apple dependencies , CoreServices , Security }: let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.2"; - gitRev = "43a260c221d5dac4a44fd82271736c8444474eec"; - sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n"; - cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4"; + version = "1.3.1"; + gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e"; + sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f"; + cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; inherit version; - meta = with lib; { - description = "Your project's nix-env"; - homepage = "https://github.com/target/lorri"; - license = licenses.asl20; - maintainers = with maintainers; [ grahamc Profpatsch ]; - }; - src = fetchFromGitHub { - owner = "target"; + owner = "nix-community"; repo = pname; rev = gitRev; inherit sha256; @@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec { doCheck = false; BUILD_REV_COUNT = src.revCount or 1; - RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {}; + RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; - nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; - buildInputs = - lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ rustPackages.rustfmt ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' @@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; + + meta = with lib; { + description = "Your project's nix-env"; + homepage = "https://github.com/target/lorri"; + license = licenses.asl20; + maintainers = with maintainers; [ grahamc Profpatsch ]; + }; }) |