From bba7efc53566526f9cd300ea2d9a581d0fa8a0e3 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 24 Jan 2023 23:01:28 +0000 Subject: [PATCH 1/3] flake update: nixpkgs 2023-01-19 -> 2023-01-23; mobile-nixos, sops-nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77' (2022-12-04) → 'github:nixos/mobile-nixos/4d2093efa7efa00131d385fd9d11e54ce16bc57a' (2023-01-24) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/d7705c01ef0a39c8ef532d1033bace8845a07d35' (2023-01-19) → 'github:nixos/nixpkgs/1b1f50645af2a70dc93eae18bfd88d330bfbcf7f' (2023-01-23) • Updated input 'sops-nix': 'github:Mic92/sops-nix/e18eefd2b133a58309475298052c341c08470717' (2023-01-15) → 'github:Mic92/sops-nix/b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c' (2023-01-24) ``` --- flake.lock | 22 +++++++++++----------- nixpatches/list.nix | 14 -------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 2854e605..94395ae0 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1670131242, - "narHash": "sha256-T/o1/3gffr010fsqgNshs1NJJjsnUYvQnUZgm6hilsY=", + "lastModified": 1674593731, + "narHash": "sha256-RHJOhxqPKLxbLLabbj1IEuUQqO76TOTtmpxYyTtfDmU=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77", + "rev": "4d2093efa7efa00131d385fd9d11e54ce16bc57a", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-Xyzfg4qk1lXs816HicoC79jCCgeZJSZz6qvIruhO97c=", - "path": "/nix/store/4ilww2yw52yyii5vi1mf2g85zk4hxjrr-source/nixpatches", + "path": "/nix/store/xfmpgxwpxcxi7k59li4c27ik12nbd3wp-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/4ilww2yw52yyii5vi1mf2g85zk4hxjrr-source/nixpatches", + "path": "/nix/store/xfmpgxwpxcxi7k59li4c27ik12nbd3wp-source/nixpatches", "type": "path" } }, @@ -103,11 +103,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1674120619, - "narHash": "sha256-xLT1FQl7/jNPOEq5q/vmc3AExt1V9LtcjM+QY2+MUpA=", + "lastModified": 1674459583, + "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7705c01ef0a39c8ef532d1033bace8845a07d35", + "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1673752321, - "narHash": "sha256-EFfXY1ZHJq4FNaNQA9x0djtu/jiOhBbT0Xi+BT06cJw=", + "lastModified": 1674546403, + "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e18eefd2b133a58309475298052c341c08470717", + "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 98d35efd..34ceaeb0 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -13,20 +13,6 @@ sha256 = "sha256-t4sG+xLDaxbJ/mV5G18N4ag8EC3IXPgtN5FJGANh1Dc="; }) - # whalebird: 4.6.5 -> 4.7.4 - (fetchpatch { - # url = "https://git.uninsane.org/colin/nixpkgs/compare/master...pr.whalebird-4.7.4.diff"; - url = "https://git.uninsane.org/colin/nixpkgs/commit/f5c7c70dde720e990fa7e0748d1dc4764d6e4406.diff"; - sha256 = "sha256-L9Ie80loaP6yl5ZFnJ1b5WMDpvO1QFE8tbrW5HBauko="; - }) - - # phosh-mobile-settings 0.21.1 -> 0.23.1 - (fetchpatch { - # https://github.com/NixOS/nixpkgs/pull/211877 - url = "https://git.uninsane.org/colin/nixpkgs/commit/352e09d0413ff25139390a6077c7831271d09b8f.diff"; - hash = "sha256-yGsSquIRXapTiWQlLORFTyFEHE5XJfLcM3W/1AJIeL8="; - }) - # splatmoji: init at 1.2.0 (fetchpatch { # https://github.com/NixOS/nixpkgs/pull/211874 From 47db6f0dd497d8b501c0d4a5a24c83a1ea5adb49 Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 25 Jan 2023 00:16:37 +0000 Subject: [PATCH 2/3] unpin nheko --- overlays/pins.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/overlays/pins.nix b/overlays/pins.nix index 0d5d839a..e0bd3297 100644 --- a/overlays/pins.nix +++ b/overlays/pins.nix @@ -8,7 +8,8 @@ # XXX: when invoked outside our flake (e.g. via NIX_PATH) there is no `next.stable`, # so just forward the unstable packages. inherit (next.stable or prev) - # TODO(unpin): broken on 2023/01/14 via mtxclient dep, aarch64-only: + # broken on 2023/01/14 via mtxclient dep, aarch64-only: + # fixed on 2023/01/24? # error: builder for '/nix/store/gwidl0c9ksxjgx0dgwnjssix4ikq73v5-mtxclient-0.9.0.drv' failed with exit code 2; # last 10 log lines: # > make[2]: *** [CMakeFiles/matrix_client.dir/build.make:370: CMakeFiles/matrix_client.dir/lib/structs/events/encrypted.cpp.o] Error 1 @@ -28,7 +29,7 @@ # error: 1 dependencies of derivation '/nix/store/5qjxzhsw1jvh2d7jypbcam9409ivb472-user-environment.drv' failed to build # error: 1 dependencies of derivation '/nix/store/hrb3qpdbisqh0lzlyz1g9g4164khmqwn-etc.drv' failed to build # error: 1 dependencies of derivation '/nix/store/ny21xyicbgim5wy7ksg2hibd9gn7i01b-nixos-system-moby-23.05pre-git.drv' failed to build - nheko + # nheko # TODO(unpin): broken build on 2023/01/16. handbrake From f5eaa635a565312375a10d6ebacd0ddd3a3cc689 Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 25 Jan 2023 00:19:00 +0000 Subject: [PATCH 3/3] flake update: nixpkgs-stable 2023-01-15 -> 2023-01-22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/2f9fd351ec37f5d479556cd48be4ca340da59b8f' (2023-01-15) → 'github:nixos/nixpkgs/ab1254087f4cdf4af74b552d7fc95175d9bdbb49' (2023-01-22) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/7c65528c3f8462b902e09d1ccca23bb9034665c2' (2023-01-15) → 'github:NixOS/nixpkgs/918b760070bb8f48cb511300fcd7e02e13058a2e' (2023-01-22) ``` --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 94395ae0..a52d54ba 100644 --- a/flake.lock +++ b/flake.lock @@ -60,22 +60,22 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Xyzfg4qk1lXs816HicoC79jCCgeZJSZz6qvIruhO97c=", - "path": "/nix/store/xfmpgxwpxcxi7k59li4c27ik12nbd3wp-source/nixpatches", + "narHash": "sha256-P5BXhRIaKF6ze3am7CY//NFOJ4ihoys9h0ka9S15VV4=", + "path": "/nix/store/41f11k8hk1qjd440mavrybc7xgrcp9gj-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/xfmpgxwpxcxi7k59li4c27ik12nbd3wp-source/nixpatches", + "path": "/nix/store/41f11k8hk1qjd440mavrybc7xgrcp9gj-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1673740915, - "narHash": "sha256-MMH8zONfqahgHly3K8/A++X34800rajA/XgZ2DzNL/M=", + "lastModified": 1674352297, + "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c65528c3f8462b902e09d1ccca23bb9034665c2", + "rev": "918b760070bb8f48cb511300fcd7e02e13058a2e", "type": "github" }, "original": {