diff --git a/flake.lock b/flake.lock index 945e4a33..381ef56a 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1666573922, - "narHash": "sha256-CqB8Y5HajptSFE8Em990dcYZIHJWBiO9zd1us4Mzx8M=", + "lastModified": 1667160126, + "narHash": "sha256-YRgxMHdvMuLsuXCaKs5YNMD6NKgvcATSjfi9YkUOOLk=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "1351091d2537040454fa232d8b94e745ab0eb5a3", + "rev": "da56c338a2b00c868697b75bdbd388f60d50c820", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666447894, - "narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=", + "lastModified": 1667050928, + "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6", + "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", "type": "github" }, "original": { @@ -84,11 +84,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1666488099, - "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9115594149ebcb409a42e303bec4956814a8419", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1666401273, - "narHash": "sha256-AG3MoIjcWwz1SPjJ2nymWu4NmeVj9P40OpB1lsmxFtg=", + "lastModified": 1667125965, + "narHash": "sha256-z/OLvPwIhwdN9J+ED/0rPz/Wh/0sPuvczURwsiEENSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3933d8bb9120573c0d8d49dc5e890cb211681490", + "rev": "26eb67abc9a7370a51fcb86ece18eaf19ae9207f", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1666843362, - "narHash": "sha256-xn2bW9/MT0u8Ptlk+f323p46Q/ktZkzMp7oj5SlYDxU=", + "lastModified": 1667016180, + "narHash": "sha256-aOyT8yG49cGqHVzQFbl+XgJ7p83yHpAAfaHDtQCVdJ4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "43d3a363c126968db46585b88b8eb97dd32634ad", + "rev": "5fb3c4733c00a7e7be69877d057f6760d85cecb8", "type": "gitlab" }, "original": { @@ -149,11 +149,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1666499473, - "narHash": "sha256-q1eFnBFL0kHgcnUPeKagw3BfbE/5sMJNGL2E2AR+a2M=", + "lastModified": 1667102919, + "narHash": "sha256-DP5j4TwXe96eZf0PLgYSj1Hdyt7SPUoQ003iNBQSKpQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1b5f9512a265f0c9687dbff47893180f777f4809", + "rev": "448ec3e7eb7c7e4563cc2471db748a71baaf9698", "type": "github" }, "original": { @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1665758541, - "narHash": "sha256-ibR8bPwHlDjavri5cNVnoo5FmFk1IfNMmQXxat5biqs=", + "lastModified": 1666870107, + "narHash": "sha256-b9eXZxSwhzdJI5uQgfrMhu4SY2POrPkinUg7F5gQVYo=", "ref": "refs/heads/master", - "rev": "4ad1801f6cecd678bbeae5dfe5933448dd7b3360", - "revCount": 163, + "rev": "80c6ec95bd430e29d231cf745f19279bb76fb382", + "revCount": 164, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/nixpatches/list.nix b/nixpatches/list.nix index c6549878..787f3f85 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -6,13 +6,6 @@ fetchpatch: [ sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig="; }) - # freshrss: fix ExecStart path - (fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/197731.diff"; - # url = "http://git.uninsane.org/colin/nixpkgs/commit/e4235c60b71bec66fe8f811cdbdd229bcf98915f.diff"; - sha256 = "sha256-SL7tddw0YZWzZ+JhosoTyBuEahEJEjMuV4WEBCg9OM0="; - }) - # # kaiteki: init at 2022-09-03 # vendorHash changes too frequently (might not be reproducible). @@ -23,17 +16,6 @@ fetchpatch: [ # sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q="; # }) - # nautilus: look for the gtk4 FileChooser settings instead of the gtk4 one - (fetchpatch { - # original version (include the patch in nixpkgs) - # url = "https://git.uninsane.org/colin/nixpkgs/commit/4636a04c1c4982a0e71ae77d3aa6f52d1a3170f1.diff"; - # sha256 = "sha256-XKfXStdcveYuk58rlORVJOv0a9Q5aRj1bYT5k79rL0g="; - - # v2 (fetchpatch from upstream PR) - # url = "https://git.uninsane.org/colin/nixpkgs/commit/730a802808c549220144e4e62aa419bb07c5ae29.diff"; - url = "https://github.com/NixOS/nixpkgs/pull/195985.diff"; - sha256 = "sha256-PJsjFEqqtNZ5QqXx6pVFAactEIJ7r658KL7g7cDR148="; - }) # Fix mk flutter app # closed (not merged). updates fluffychat 1.2.0 -> 1.6.1, but unstable hashing @@ -48,6 +30,7 @@ fetchpatch: [ ./02-rpi4-uboot.patch # TODO: upstream + # maybe convert this patch to add a `targetUrlExpr` instead of doing the `escapeShellArgs` hack ./07-duplicity-rich-url.patch # enable aarch64 support for flutter's dart package