diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-15 16:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 16:31:28 +0100 |
| commit | 8ff059ccb8937ccf3b122203802b4f9c2ce5a3d5 (patch) | |
| tree | d00fdfa8e37c7aed1300dfb30dc09e5d9858fb7d | |
| parent | 1bad692c433137755cf42059a6e7c53fdda8cff5 (diff) | |
| parent | 521b9c3d3607a20c2c4f18cab01924802397d15c (diff) | |
Merge pull request #272136 from onemoresuza/hare-json
hareThirdParty.hare-json: unstable-2023-09-21 -> unstable-2023-03-13
| -rw-r--r-- | pkgs/development/hare-third-party/hare-json/default.nix (renamed from pkgs/development/hare-packages/hare-json/default.nix) | 22 | ||||
| -rw-r--r-- | pkgs/top-level/hare-third-party.nix | 4 |
2 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/development/hare-packages/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix index d9afdeadf7f01..c7a71f342967e 100644 --- a/pkgs/development/hare-packages/hare-json/default.nix +++ b/pkgs/development/hare-third-party/hare-json/default.nix @@ -2,29 +2,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "hare-json"; - version = "unstable-2023-09-21"; + version = "unstable-2023-03-13"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-json"; - rev = "e24e5dceb8628ff569338e6c4fdba35a5017c5e2"; - hash = "sha256-7QRieokqXarKwLfZynS8Rum9JV9hcxod00BWAUwwliM="; + rev = "88256102a9fec62d494628e32cb406574e49e5e1"; + hash = "sha256-Sx+RBiLhR3ftP89AwinVlBg0u0HX4GVP7TLmuofgC9s="; }; nativeBuildInputs = [ hare ]; - configurePhase = '' - runHook preConfigure - - export HARECACHE="$NIX_BUILD_TOP/.harecache" - export BINOUT="$NIX_BUILD_TOP/.bin" - - makeFlagsArray+=( - PREFIX="${builtins.placeholder "out"}" - ) - - runHook postConfigure - ''; + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + ]; doCheck = true; diff --git a/pkgs/top-level/hare-third-party.nix b/pkgs/top-level/hare-third-party.nix index 73ffbc0ea7907..ac2dc254e50da 100644 --- a/pkgs/top-level/hare-third-party.nix +++ b/pkgs/top-level/hare-third-party.nix @@ -5,7 +5,7 @@ let inherit (self) callPackage; in { - hare-json = callPackage ../development/hare-packages/hare-json { }; - hare-compress = callPackage ../development/hare-third-party/hare-compress {}; + hare-compress = callPackage ../development/hare-third-party/hare-compress { }; + hare-json = callPackage ../development/hare-third-party/hare-json { }; }) |