From 5b5187bd03fcd13b15a994799a739083a09d0aa0 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 13 Oct 2022 21:41:02 -0700 Subject: [PATCH] flake update: nixpkgs 2022-10-09 -> 2022-10-13, others MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/0bf9b6da8c4d0ee31c3e988c99893de4da7df74a' (2022-10-10) → 'github:nixos/mobile-nixos/e4b6f680b2a4f29f087a7c1299c11499d1a367b6' (2022-10-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/34c5293a71ffdb2fe054eb5288adc1882c1eb0b1' (2022-10-09) → 'github:NixOS/nixpkgs/ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7' (2022-10-13) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/e179d1e57ad07f1294dcc29ad5283b214a6ae21e' (2022-10-10) → 'github:NixOS/nixpkgs/e06bd4b64bbfda91d74f13cb5eca89485d47528f' (2022-10-12) • Updated input 'uninsane': 'git+https://git.uninsane.org/colin/uninsane?ref=refs%2fheads%2fmaster&rev=25df079540cb669fb5e735631fe03a4d113d1c73' (2022-10-11) → 'git+https://git.uninsane.org/colin/uninsane?ref=refs%2fheads%2fmaster&rev=70e7d8e94a6240a5ce976bbc514e0979b7178190' (2022-10-14) ``` --- flake.lock | 26 +++++++++++++------------- flake.nix | 3 ++- nixpatches/list.nix | 14 ++++++++------ pkgs/kaiteki/default.nix | 2 +- pkgs/overlay.nix | 4 ++-- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 805c3aec..431e2182 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1665363107, - "narHash": "sha256-Am7j/83uBAZudIhHuoNNO2Hyr7LegWxyL6JJBhjrm4g=", + "lastModified": 1665711470, + "narHash": "sha256-9cjKbTkxyWjswVExtIpglpvlR+iDY9/DWmXpZyzk5cY=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "0bf9b6da8c4d0ee31c3e988c99893de4da7df74a", + "rev": "e4b6f680b2a4f29f087a7c1299c11499d1a367b6", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1665643254, + "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1665401932, - "narHash": "sha256-mgLxYh21/0h7S/QS8U/QS+zLwlSRiiFOfPkOxLZnPgk=", + "lastModified": 1665613119, + "narHash": "sha256-VTutbv5YKeBGWou6ladtgfx11h6et+Wlkdyh4jPJ3p0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e179d1e57ad07f1294dcc29ad5283b214a6ae21e", + "rev": "e06bd4b64bbfda91d74f13cb5eca89485d47528f", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1665497310, - "narHash": "sha256-4g76zB5vmQUTsrQau6F51MlncLKNaFTxHLTR8O7Mbkk=", + "lastModified": 1665718569, + "narHash": "sha256-STLuWLwTLK82uJEA94aTNS+FvtyUmM7LbEXZBvBvr3g=", "ref": "refs/heads/master", - "rev": "25df079540cb669fb5e735631fe03a4d113d1c73", - "revCount": 156, + "rev": "70e7d8e94a6240a5ce976bbc514e0979b7178190", + "revCount": 159, "type": "git", "url": "https://git.uninsane.org/colin/uninsane" }, diff --git a/flake.nix b/flake.nix index 54d488ae..ef7e9757 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,8 @@ cross = (nixpkgsFor local target) // (customPackagesFor local target); stable = import nixpkgs-stable { system = target; }; # pinned packages: - electrum = stable.electrum; + electrum = stable.electrum; # 2022-10-10: build break + sequoia = stable.sequoia; # 2022-10-13: build break }) ]; } diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 8f86cad0..00821a10 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -6,12 +6,14 @@ fetchpatch: [ sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig="; }) - # kaiteki: init at 2022-09-03 - (fetchpatch { - url = "https://git.uninsane.org/colin/nixpkgs/commit/e2c7f5f4870fcb0e5405e9001b39a64c516852d4.diff"; - # url = "https://github.com/NixOS/nixpkgs/pull/193169.diff"; - sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q="; - }) + # # kaiteki: init at 2022-09-03 + # vendorHash changes too frequently (might not be reproducible). + # using local package defn until stabilized + # (fetchpatch { + # url = "https://git.uninsane.org/colin/nixpkgs/commit/e2c7f5f4870fcb0e5405e9001b39a64c516852d4.diff"; + # # url = "https://github.com/NixOS/nixpkgs/pull/193169.diff"; + # sha256 = "sha256-UWnfS+stVpUZ3Sfaym9XtVBlwvHWJVMaW7cYIcf3M5Q="; + # }) # Fix mk flutter app # closed (not merged). updates fluffychat 1.2.0 -> 1.6.1, but unstable hashing diff --git a/pkgs/kaiteki/default.nix b/pkgs/kaiteki/default.nix index c9e68dea..c473ca2f 100644 --- a/pkgs/kaiteki/default.nix +++ b/pkgs/kaiteki/default.nix @@ -10,7 +10,7 @@ flutter.mkFlutterApp rec { pname = "kaiteki"; version = "unstable-2022-09-03"; - vendorHash = "sha256-IlsMoJjgB/fWI5QxSnnFSChVWFMnMGUD4QJdDUuTE+Q="; + vendorHash = "sha256-CXEaQeXEY5PYpcoqmPcRfcyaFsEDZ8bq1pgApmjyp0c="; src = fetchFromGitHub { owner = "Kaiteki-Fedi"; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index af4aa9e5..4be3701f 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -38,8 +38,8 @@ ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { pkgs = prev; }; #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED - # kaiteki = prev.callPackage ./kaiteki { }; - kaiteki = prev.kaiteki; + kaiteki = prev.callPackage ./kaiteki { }; + # kaiteki = prev.kaiteki; # TODO: upstream, or delete nabla nabla = prev.callPackage ./nabla { }; })