summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/nixpkgs-unstable.json8
-rw-r--r--krebs/nixpkgs.json8
-rwxr-xr-xkrebs/update-nixpkgs.sh2
-rw-r--r--lass/krops.nix29
4 files changed, 32 insertions, 15 deletions
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index a30dffd71..ea44e0c04 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
- "date": "2023-06-05T20:59:20-06:00",
- "path": "/nix/store/6r3d9mpbl3px7y8y6wcwsg60bvish21w-nixpkgs",
- "sha256": "0gha78rczp5gbl6v39i2bm11kmi974akgqkj3hck5s2ri6abprsr",
+ "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
+ "date": "2023-06-17T03:03:56+03:00",
+ "path": "/nix/store/5g6mwq41hn17rxrrn7rpdaxk9ca5znnb-nixpkgs",
+ "sha256": "130w72blrj4f08qdj2y44abfkrwhmkk9nq9zrhb9abndnpv85001",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 5435dd9bd..bf8858cd9 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "d83945caa7624015f11b152bf5c6c4363ffe9f7c",
- "date": "2023-06-06T09:06:53+02:00",
- "path": "/nix/store/vzqz4lhcfjg5npn2fm7w3qpm7h0i5baz-nixpkgs",
- "sha256": "0l4axff9lqc6qq1dkm1dgdp2zv7165a42d9l2zmf4njnhm91f5w5",
+ "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+ "date": "2023-06-16T15:10:29+02:00",
+ "path": "/nix/store/q26lhs4mcd384gdljz4cnnx710f705m0-nixpkgs",
+ "sha256": "0bq722ick80qwg1k1zv1021b2x7mlwsxv10y999mh22gk7vdfmi7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/krebs/update-nixpkgs.sh b/krebs/update-nixpkgs.sh
index 97c069d86..465548f44 100755
--- a/krebs/update-nixpkgs.sh
+++ b/krebs/update-nixpkgs.sh
@@ -3,7 +3,7 @@ dir=$(dirname $0)
oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/')
nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \
--url https://github.com/NixOS/nixpkgs \
- --rev refs/heads/nixos-22.11' \
+ --rev refs/heads/nixos-23.05' \
> $dir/nixpkgs.json
newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/')
git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev"
diff --git a/lass/krops.nix b/lass/krops.nix
index c8a5b94b7..77164310c 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -5,16 +5,33 @@
pkgs
;
-
source = { test }: lib.evalSource ([
(krebs-source { test = test; })
{
nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
- nixpkgs-unstable.git = {
- url = "https://github.com/nixos/nixpkgs";
- ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
- shallow = true;
- };
+ nixpkgs = lib.mkForce (if test then {
+ derivation = let
+ rev = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
+ sha256 = (lib.importJSON ../krebs/nixpkgs-unstable.json).sha256;
+ in ''
+ with import (builtins.fetchTarball {
+ url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+ sha256 = "${sha256}";
+ }) {};
+ pkgs.fetchFromGitHub {
+ owner = "nixos";
+ repo = "nixpkgs";
+ rev = "${rev}";
+ sha256 = "${sha256}";
+ }
+ '';
+ } else {
+ git = {
+ ref = (lib.importJSON ./nixpkgs.json).rev;
+ url = https://github.com/NixOS/nixpkgs;
+ shallow = true;
+ };
+ });
secrets = if test then {
file = toString ./2configs/tests/dummy-secrets;
} else {