From 649b4a6b993a931dc00d55c9bda87de52bc39565 Mon Sep 17 00:00:00 2001
From: Stephan Maka <sm@m-labs.hk>
Date: Mon, 8 Mar 2021 01:26:44 +0100
Subject: [PATCH] artiq-fast: pin nixpkgs, use in
 artiq-board-generated+artiq-full

attempt at gitea issue #31
---
 artiq-board-generated/default.nix |  4 ++--
 artiq-fast/default.nix            |  2 +-
 artiq-fast/pkgs/nixpkgs.nix       |  7 +++++++
 artiq-full.nix                    | 15 ++++++++-------
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 artiq-fast/pkgs/nixpkgs.nix

diff --git a/artiq-board-generated/default.nix b/artiq-board-generated/default.nix
index 467c7b3..96aa7f1 100644
--- a/artiq-board-generated/default.nix
+++ b/artiq-board-generated/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? import <artiq-fast/pkgs/nixpkgs.nix> { inherit (import <nixpkgs> {}) fetchgit; } {}
 , artiq-fast ? <artiq-fast>
 }:
 
@@ -22,7 +22,7 @@ let
     echo -n $HASH > $out/sinara-hash.txt
 
     cat > $out/default.nix << EOF
-    { pkgs ? import <nixpkgs> {}
+    { pkgs ? import ./fast/pkgs/nixpkgs.git { inherit (import <nixpkgs> {}) fetchgit; }
     }:
 
     let
diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 5dce39c..7a09900 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {}}:
+{ pkgs ? import ./pkgs/nixpkgs.nix { inherit (import <nixpkgs> {}) fetchgit; } {}}:
 with pkgs;
 let
   artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0";
diff --git a/artiq-fast/pkgs/nixpkgs.nix b/artiq-fast/pkgs/nixpkgs.nix
new file mode 100644
index 0000000..1883f37
--- /dev/null
+++ b/artiq-fast/pkgs/nixpkgs.nix
@@ -0,0 +1,7 @@
+{ fetchgit }:
+import (fetchgit {
+  url = "https://github.com/nixos/nixpkgs.git";
+  # nixos-21.09 as of 2021-03-08
+  rev = "1c7f02b0b9f115ccbc122ce39ae99debc1af857a";
+  sha256 = "14sichs3hyg4ybcacvzglw97lg747y1ls5lsazv0n5yxv5w06l3d";
+})
diff --git a/artiq-full.nix b/artiq-full.nix
index 57b44cf..b1cecaa 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -1,5 +1,10 @@
-{ pkgs ? import <nixpkgs> {}
-, a6p ? <a6p>
+{ a6p ? <a6p>
+, artiq-fast ? (
+    if a6p
+    then <artiq-board-generated/fast>
+    else <artiq-fast>
+  )
+, pkgs ? import (artiq-fast + "/pkgs/nixpkgs.nix") { inherit (import <nixpkgs> {}) fetchgit; } {}
 }:
 
 let
@@ -13,10 +18,6 @@ let
       sha256 = sinaraSystemsHash;
     }
     else <sinaraSystemsSrc>;
-  artiq-fast =
-    if a6p
-    then <artiq-board-generated/fast>
-    else <artiq-fast>;
   artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
     inherit (pkgs) stdenv git fetchgit;
   };
@@ -74,7 +75,7 @@ let
         HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
       ''}
     cat > $out/default.nix << EOF
-    { pkgs ? import <nixpkgs> {}}:
+    { pkgs ? import ./fast/pkgs/nixpkgs.nix { inherit (import <nixpkgs> {}) fetchgit; } {} }:
 
     let
       artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };