From 9ea664b63c348a5855299250ec45f622c1404c5d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 23 Oct 2021 12:13:53 +0200 Subject: l coaxmetal.r: use nixos-unstable --- lass/1systems/coaxmetal/source.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lass/1systems/coaxmetal/source.nix (limited to 'lass/1systems/coaxmetal/source.nix') diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix new file mode 100644 index 000000000..0e2628b5b --- /dev/null +++ b/lass/1systems/coaxmetal/source.nix @@ -0,0 +1,4 @@ +{ lib, pkgs, ... }: +{ + nixpkgs.git.ref = lib.mkForce (lib.importJSON ../../../krebs/nixpkgs-unstable.json).rev; +} -- cgit v1.2.3 From d1a55f88766b72769e5f756f8b4724e13e1c6981 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 23 Oct 2021 19:03:02 +0200 Subject: l coaxmetal.r: build with unstable --- lass/1systems/coaxmetal/source.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'lass/1systems/coaxmetal/source.nix') diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix index 0e2628b5b..7f335ec05 100644 --- a/lass/1systems/coaxmetal/source.nix +++ b/lass/1systems/coaxmetal/source.nix @@ -1,4 +1,21 @@ -{ lib, pkgs, ... }: -{ - nixpkgs.git.ref = lib.mkForce (lib.importJSON ../../../krebs/nixpkgs-unstable.json).rev; +{ lib, pkgs, test, ... }: let + npkgs = lib.importJSON ../../../krebs/nixpkgs-unstable.json; +in { + nixpkgs = lib.mkForce (if test then { derivation = let + rev = npkgs.rev; + sha256 = npkgs.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 = npkgs.rev; + }); } -- cgit v1.2.3 From ee50871bd10676e26b280084417bcbc9963ffe70 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 24 Oct 2021 20:34:17 +0200 Subject: l coaxmetal.r: force only git.ref --- lass/1systems/coaxmetal/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lass/1systems/coaxmetal/source.nix') diff --git a/lass/1systems/coaxmetal/source.nix b/lass/1systems/coaxmetal/source.nix index 7f335ec05..abbf26c75 100644 --- a/lass/1systems/coaxmetal/source.nix +++ b/lass/1systems/coaxmetal/source.nix @@ -1,7 +1,7 @@ { lib, pkgs, test, ... }: let npkgs = lib.importJSON ../../../krebs/nixpkgs-unstable.json; in { - nixpkgs = lib.mkForce (if test then { derivation = let + nixpkgs = (if test then lib.mkForce ({ derivation = let rev = npkgs.rev; sha256 = npkgs.sha256; in '' @@ -15,7 +15,7 @@ in { rev = "${rev}"; sha256 = "${sha256}"; } - ''; } else { - git.ref = npkgs.rev; + ''; }) else { + git.ref = lib.mkForce npkgs.rev; }); } -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/f1200000.lock: No such file or directory (2)