Skip to content

nixVersions.nix_2_19: drop #354148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 3 commits into from
Nov 27, 2024
Merged

nixVersions.nix_2_19: drop #354148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45e9407
nixVersions.nix_2_19: drop
Mic92 Nov 7, 2024
c2c2ac8
nix: drop unused fetchpatch
Mic92 Nov 7, 2024
6077aa2
nix-inspect: fix build with nix 2.24
Mic92 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions pkgs/by-name/ni/nix-inspect/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,38 @@
meson,
ninja,
stdenv,
fetchpatch,
}: let
src = fetchFromGitHub {
owner = "bluskript";
repo = "nix-inspect";
rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e";
hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=";
rev = "c55921e1d1cf980ff6351273fde6cedd5d8fa320";
hash = "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=";
};

workerPackage = stdenv.mkDerivation {
inherit src;

pname = "nix-inspect-worker";
version = "0.1.2";
sourceRoot = "${src.name}/worker";
postPatch = ''
cd worker
'';

nativeBuildInputs = [meson ninja pkg-config];

# TODO: Remove this patch when this pull request is merged and released: https://github.com/bluskript/nix-inspect/pull/18
patches = [
(fetchpatch {
url = "https://github.com/bluskript/nix-inspect/commit/e1e05883d42ce0c7029a3d69dce14ae9d057aae6.patch";
sha256 = "sha256-bHo+sRc9pICK0ccdiWLRNNvr8QjNCrlcwMvmUHznAtg=";
})
];

buildInputs = [
boost
nlohmann_json
nixVersions.nix_2_19.dev
nixVersions.nix_2_24.dev
];

mesonBuildType = "release";
Expand Down
1 change: 0 additions & 1 deletion pkgs/by-name/ni/nix-plugin-pijul/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ in stdenv.mkDerivation (finalAttrs: {
latest = localRepoCheck nixVersions.latest;
git = localRepoCheck nixVersions.git;
nix_2_18 = localRepoCheck nixVersions.nix_2_18;
nix_2_19 = localRepoCheck nixVersions.nix_2_19;
};

meta = {
Expand Down
7 changes: 0 additions & 7 deletions pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
, libgit2
, callPackage
, fetchFromGitHub
, fetchpatch
, fetchpatch2
, runCommand
, buildPackages
Expand Down Expand Up @@ -179,12 +178,6 @@ in lib.makeExtensible (self: ({
self_attribute_name = "nix_2_18";
};

nix_2_19 = common {
version = "2.19.7";
hash = "sha256-CkT1SNwRYYQdN2X4cTt1WX3YZfKZFWf7O1YTEo1APfc=";
self_attribute_name = "nix_2_19";
};

nix_2_24 = common {
version = "2.24.10";
hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";
Expand Down