colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging/nixpkgs-2022-10-14'

Browse Source
This commit is contained in:
colin
2022-10-13 22:16:06 -07:00
parent 130dd3f895 5b5187bd03
commit b25528ecd7
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@@ -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"
},

3
flake.nix
View File

@@ -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
})
];
}

14
nixpatches/list.nix
View File

@@ -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=";
# })
# freshrss: patchShebangs instead of specifying interpreter in the service
(fetchpatch {

2
pkgs/kaiteki/default.nix
View File

@@ -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";

4
pkgs/overlay.nix
View File

@@ -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 { };
})