diff --git a/flake.lock b/flake.lock index 5ea87c9d..3d65e0d5 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1668897543, - "narHash": "sha256-1bjvy5zi/6KDzhN3ihOUEA6y5FFEOf5xvIbf65RWIh0=", + "lastModified": 1670131242, + "narHash": "sha256-T/o1/3gffr010fsqgNshs1NJJjsnUYvQnUZgm6hilsY=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "25eec596116553112681d72ee4880107fc3957fa", + "rev": "5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669969257, - "narHash": "sha256-mOS13sK3v+kfgP+1Mh56ohiG8uVhLHAo7m/q9kqAehc=", + "lastModified": 1670751203, + "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b72b8b94cf0c012b0252a9100a636cad69696666", + "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", "type": "github" }, "original": { @@ -82,29 +82,13 @@ "type": "indirect" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1669513802, - "narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6649e08812f579581bfb4cada3ba01e30485c891", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1670009241, - "narHash": "sha256-MwpkQIvxgF0EWf0h9SQ1V2D1ZaPhelwZsc86uS3YXxo=", + "lastModified": 1670700605, + "narHash": "sha256-5dlpATkcyITpdtMflhltuD+A3RNpsVI1Mb+dtKkll6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7d1d5f742e6bb57dd2e3d7b433fb4010c7af22", + "rev": "7b9eeb856cbf976482fa8d1cb295ea03fb3e1277", "type": "github" }, "original": { @@ -113,6 +97,22 @@ "type": "indirect" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "86370507cb20c905800527539fc049a2bf09c667", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -129,14 +129,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1669714206, - "narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index cbcf7e59..7235f650 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -6,12 +6,6 @@ fetchpatch: [ sha256 = "sha256-Ne4hyHQDwBHUlWo8Z3QyRdmEv1rYGOjFGxSfOAcLUvQ="; }) - # aerc: substitute awk in filters - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/204322.diff"; - sha256 = "sha256-ngetBsBMiIaz43T7a2taULp1pNK2YkVGGW48ViDjS6A="; - }) - # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). # using local package defn until stabilized