colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 24.05-unstable-2024-09-08 -> 24.05-unstable-2024-09-10

Browse Source
This commit is contained in:
Colin
2024-09-10 23:24:05 +00:00
parent 1c3c7f599f
commit 33aaf8c458
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66"; master.rev = "e13336b5d073ace1b6846198129c99ada668176c";
master.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc="; master.sha256 = "sha256-FwE49521RJKiamg6BWFk1hxnvk1s1sZjJuJJPlgJH/4=";
staging.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66"; staging.rev = "e13336b5d073ace1b6846198129c99ada668176c";
staging.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc="; staging.sha256 = "sha256-FwE49521RJKiamg6BWFk1hxnvk1s1sZjJuJJPlgJH/4=";
staging-next.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66"; staging-next.rev = "e13336b5d073ace1b6846198129c99ada668176c";
staging-next.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc="; staging-next.sha256 = "sha256-FwE49521RJKiamg6BWFk1hxnvk1s1sZjJuJJPlgJH/4=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-09-08"; version = "24.05-unstable-2024-09-10";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

7
pkgs/additional/pyln-proto/default.nix
View File

@@ -14,13 +14,6 @@ stdenv.mkDerivation {
sourceRoot = "clightning-v${clightning.version}/contrib/pyln-proto"; sourceRoot = "clightning-v${clightning.version}/contrib/pyln-proto";
# package pins its dependencies too aggressively
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'coincurve = "^18"' 'coincurve = ">=18"' \
--replace-fail 'cryptography = "^41"' 'cryptography = ">=41"'
'';
nativeBuildInputs = [ nativeBuildInputs = [
python3.pkgs.poetry-core python3.pkgs.poetry-core
python3.pkgs.pypaBuildHook python3.pkgs.pypaBuildHook