diff --git a/pkgs/additional/nixpkgs/default.nix b/pkgs/additional/nixpkgs/default.nix index ac2dd1b46..64c8e2358 100644 --- a/pkgs/additional/nixpkgs/default.nix +++ b/pkgs/additional/nixpkgs/default.nix @@ -27,12 +27,12 @@ }: let lock = { - master.rev = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; - master.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; - staging.rev = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; - staging.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; - staging-next.rev = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; - staging-next.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; + master.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b"; + master.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk="; + staging.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b"; + staging.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk="; + staging-next.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b"; + staging-next.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk="; }; lock' = lock."${variant}"; unpatchedSrc = fetchzip { @@ -81,7 +81,7 @@ in src.overrideAttrs (base: { # attributes needed for update scripts pname = "nixpkgs"; - version = "24.05-unstable-2024-09-28"; + version = "24.05-unstable-2024-10-02"; passthru = (base.passthru or {}) // nixpkgs // { src = unpatchedSrc // { inherit (lock') rev; diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix index 9fa0d6bd8..9b0de50d3 100644 --- a/pkgs/additional/nixpkgs/list.nix +++ b/pkgs/additional/nixpkgs/list.nix @@ -45,12 +45,6 @@ in hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; }) - (fetchpatch' { - title = "picocom: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/345811"; - hash = "sha256-VVm5IZzx/GPKyYoPBNmKoVcp1xNSAvtYbdnmw9b/wEI="; - }) - (fetchpatch' { title = "libjxl: build plugins/loaders unconditionally"; prUrl = "https://github.com/NixOS/nixpkgs/pull/345306";