nix: Cherry-pick #7473 for sqlite detailed message
This commit is contained in:
parent
e61cfd7ce9
commit
eec92af049
|
@ -5,6 +5,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
, fetchpatch2
|
||||||
, Security
|
, Security
|
||||||
|
|
||||||
, storeDir ? "/nix/store"
|
, storeDir ? "/nix/store"
|
||||||
|
@ -37,6 +38,14 @@ let
|
||||||
boehmgc = boehmgc-nix;
|
boehmgc = boehmgc-nix;
|
||||||
aws-sdk-cpp = aws-sdk-cpp-nix;
|
aws-sdk-cpp = aws-sdk-cpp-nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nix/pull/7473
|
||||||
|
patch-sqlite-exception = fetchpatch2 {
|
||||||
|
name = "nix-7473-sqlite-exception-add-message.patch";
|
||||||
|
url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch";
|
||||||
|
sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
|
||||||
|
};
|
||||||
|
|
||||||
in lib.makeExtensible (self: {
|
in lib.makeExtensible (self: {
|
||||||
nix_2_3 = (common rec {
|
nix_2_3 = (common rec {
|
||||||
version = "2.3.16";
|
version = "2.3.16";
|
||||||
|
@ -88,6 +97,7 @@ in lib.makeExtensible (self: {
|
||||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||||
})
|
})
|
||||||
|
patch-sqlite-exception
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -102,6 +112,7 @@ in lib.makeExtensible (self: {
|
||||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||||
})
|
})
|
||||||
|
patch-sqlite-exception
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -116,6 +127,7 @@ in lib.makeExtensible (self: {
|
||||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||||
})
|
})
|
||||||
|
patch-sqlite-exception
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -124,6 +136,7 @@ in lib.makeExtensible (self: {
|
||||||
sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI=";
|
sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI=";
|
||||||
patches = [
|
patches = [
|
||||||
./patches/flaky-tests.patch
|
./patches/flaky-tests.patch
|
||||||
|
patch-sqlite-exception
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue