From f7dd925234eb26f91052352a0b181288b347f09b Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Thu, 11 Mar 2021 19:12:46 +0100 Subject: [PATCH] artiq-fast: do update nixpkgs.nix --- artiq-fast.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/artiq-fast.nix b/artiq-fast.nix index c27a8de..d861692 100644 --- a/artiq-fast.nix +++ b/artiq-fast.nix @@ -30,6 +30,22 @@ let EOF echo "{ stdenv, git, fetchgit }: \"$MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`$SUFFIX\"" > $out/pkgs/artiq-version.nix echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix + + REV=`git --git-dir ${}/.git rev-parse HEAD` + NIXPKGS_CLEAN=`mktemp -d` + cp -a ${}/. $NIXPKGS_CLEAN + chmod -R 755 $NIXPKGS_CLEAN/.git + chmod 755 $NIXPKGS_CLEAN + rm -rf $NIXPKGS_CLEAN/.git + HASH=`nix-hash --type sha256 --base32 $NIXPKGS_CLEAN` + cat > $out/pkgs/nixpkgs.nix << EOF + { fetchgit }: + import (fetchgit { + url = "https://github.com/nixos/nixpkgs.git"; + rev = "$REV"; + sha256 = "$HASH"; + }) + EOF ''; artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; }; artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });