diff --git a/flake.lock b/flake.lock index 0adc98488..ac0a377bf 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1693663421, - "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e56990880811a451abd32515698c712788be5720", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index dcd1a5d99..672ba1a91 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -27,12 +27,6 @@ in [ # hash = "sha256-e38Z7sO7xDQHzE9UOfbptc6vJuONE5eP9JFp2Nzx53E="; # }) - (fetchpatch' { - title = "nixos/update-users-groups: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/251850"; - hash = "sha256-uqx9sJ1zkwys9Ur35iXY3gZKVb52wlnBGkhBB5sc6WQ="; - }) - # (fetchpatch' { # # TODO: check back in on this around 2023-10-01 # title = "libkiwix: 12.0.0 -> 12.1.0"; @@ -254,8 +248,8 @@ in [ (fetchpatch' { title = "gthumb: make the webservices feature be optional"; prUrl = "https://github.com/NixOS/nixpkgs/pull/240602"; - saneCommit = "50767d5746fd80657e997b43fc5d82ba0c2c2447"; - hash = "sha256-lXuLHdSPhWol9X5QX4cxnZqoVGUWEQTCZLmosvLX+WY="; + saneCommit = "e83130f2770c314b2a482e1792b010da66cdd5de"; + hash = "sha256-aQjjm4uP3RaAkKykTNFmnrf2fyY2FcwKerRprlO2cnQ="; }) (fetchpatch' {