dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixVersions.nix_2_19: drop (#354148)

Browse Source
This commit is contained in:
Jörg Thalheim 2024-11-27 22:03:02 +01:00 committed by GitHub
commit 8b173e8bb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/by-name/ni/nix-inspect/package.nix
View File

@ -9,12 +9,13 @@
meson, meson,
ninja, ninja,
stdenv, stdenv,
fetchpatch,
}: let }: let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bluskript"; owner = "bluskript";
repo = "nix-inspect"; repo = "nix-inspect";
rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e"; rev = "c55921e1d1cf980ff6351273fde6cedd5d8fa320";
hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8="; hash = "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=";
}; };
workerPackage = stdenv.mkDerivation { workerPackage = stdenv.mkDerivation {
@ -22,14 +23,24 @@
pname = "nix-inspect-worker"; pname = "nix-inspect-worker";
version = "0.1.2"; version = "0.1.2";
sourceRoot = "${src.name}/worker"; postPatch = ''
cd worker
'';
nativeBuildInputs = [meson ninja pkg-config]; 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 = [ buildInputs = [
boost boost
nlohmann_json nlohmann_json
nixVersions.nix_2_19.dev nixVersions.nix_2_24.dev
]; ];
mesonBuildType = "release"; mesonBuildType = "release";

1
pkgs/by-name/ni/nix-plugin-pijul/package.nix
View File

@ -74,7 +74,6 @@ in stdenv.mkDerivation (finalAttrs: {
latest = localRepoCheck nixVersions.latest; latest = localRepoCheck nixVersions.latest;
git = localRepoCheck nixVersions.git; git = localRepoCheck nixVersions.git;
nix_2_18 = localRepoCheck nixVersions.nix_2_18; nix_2_18 = localRepoCheck nixVersions.nix_2_18;
nix_2_19 = localRepoCheck nixVersions.nix_2_19;
}; };
meta = { meta = {

7
pkgs/tools/package-management/nix/default.nix
View File

@ -6,7 +6,6 @@
, libgit2 , libgit2
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, fetchpatch2 , fetchpatch2
, runCommand , runCommand
, buildPackages , buildPackages
@ -179,12 +178,6 @@ in lib.makeExtensible (self: ({
self_attribute_name = "nix_2_18"; 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 { nix_2_24 = common {
version = "2.24.10"; version = "2.24.10";
hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko="; hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";