diff --git a/flake.lock b/flake.lock index d82164ad..07d40c35 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index d363a3a8..b7507147 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -19,6 +19,13 @@ let // (if title != null then { name = title; } else {}) ); in [ + (fetchpatch' { + # merged 2023/09/21 + title = "resholve: fix oildev"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/256612"; + hash = "sha256-LmDReZTOQ8nvjmDNlWa8mzD6Ycnq4/Zlr08Kd+xSpzg="; + }) + # (fetchpatch' { # # fixes /mnt/servo-nfs mount failures # # 2023/09/21: doesn't apply @@ -58,12 +65,6 @@ in [ # hash = "sha256-D2fnB4eOvbew0tea7Y1LH7GQJF3Pch/9DLEChf/ZNxs="; # }) - (fetchpatch' { - title = "libkiwix: 12.0.0 -> 12.1.1"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/246700"; - hash = "sha256-hhPF0EXS3Ilj6gBJYAAA4JU3qZmE2VZhcLssBF5jpFQ="; - }) - # (fetchpatch' { # # XXX: doesn't cleanly apply; fetch `firefox-pmos-mobile` branch from my git instead # title = "firefox-pmos-mobile: init at -pmos-2.2.0";