From f03d84d954baedfc6fde4d8cdddd0e6a7b50b013 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 16:52:03 -0400 Subject: [PATCH 1/2] gridlock: init at unstable-2023-03-03 https://github.com/lf-/gridlock --- pkgs/tools/nix/gridlock/default.nix | 45 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/nix/gridlock/default.nix diff --git a/pkgs/tools/nix/gridlock/default.nix b/pkgs/tools/nix/gridlock/default.nix new file mode 100644 index 0000000000000..7e3bee28ebb71 --- /dev/null +++ b/pkgs/tools/nix/gridlock/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage { + pname = "gridlock"; + version = "unstable-2023-03-03"; + + outputs = [ "out" "nyarr" ]; + + src = fetchFromGitHub { + owner = "lf-"; + repo = "gridlock"; + rev = "15261abdb179e1d7e752772bf9db132b3ee343ea"; + hash = "sha256-rnPAEJH3TebBH6lqgVo7B+nNiArDIkGDnIZWcteFNEw="; + }; + + cargoHash = "sha256-EPs5vJ2RkVXKxrTRtbT/1FbvCT0KJtNuW2WKIUq7G0U="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + moveToOutput bin/nyarr $nyarr + ''; + + meta = with lib; { + description = "Nix compatible lockfile manager, without Nix"; + homepage = "https://github.com/lf-/gridlock"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3acd1fd63b1..7daee7599b9a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -587,6 +587,8 @@ with pkgs; gpick = callPackage ../tools/misc/gpick { }; + gridlock = callPackage ../tools/nix/gridlock { }; + hwatch = callPackage ../tools/misc/hwatch { }; hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; From f9bd3d9aba8835c79402bcddd6e28eb366e6c2e2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 16:54:52 -0400 Subject: [PATCH 2/2] nyarr: init at unstable-2023-03-03 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7daee7599b9a9..7f4b45079a11b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -588,6 +588,7 @@ with pkgs; gpick = callPackage ../tools/misc/gpick { }; gridlock = callPackage ../tools/nix/gridlock { }; + inherit (gridlock) nyarr; hwatch = callPackage ../tools/misc/hwatch { };