alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #2914 from CSVdB/finegrainedEpochs

Browse source 
Made epochs more fine-grained
This commit is contained in:
Eelco Dolstra 2019-06-03 15:36:43 +02:00 committed by GitHub
parent 507c150034 d9a6a75ed2
commit 412684f9dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/flakes/design.md
View file

@ -96,7 +96,7 @@ module.
# The epoch may be used in the future to determine how Nix # The epoch may be used in the future to determine how Nix
# expressions inside this flake are to be parsed. # expressions inside this flake are to be parsed.
epoch = 2018; epoch = 201906;
# Some other metadata. # Some other metadata.
description = "A filesystem that fetches DWARF debug info from the Internet on demand"; description = "A filesystem that fetches DWARF debug info from the Internet on demand";
@ -164,7 +164,7 @@ Similarly, a minimal `flake.nix` for Nixpkgs:
{ {
name = "nixpkgs"; name = "nixpkgs";
epoch = 2018; epoch = 201906;
description = "A collection of packages for the Nix package manager"; description = "A collection of packages for the Nix package manager";

2
flake.nix
View file

@ -3,7 +3,7 @@
description = "The purely functional package manager"; description = "The purely functional package manager";
epoch = 2019; epoch = 201906;
inputs = [ "nixpkgs" ]; inputs = [ "nixpkgs" ];

2
src/libexpr/primops/flake.cc
View file

@ -312,7 +312,7 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef, bool impureIsAllowe
if (auto epoch = vInfo.attrs->get(sEpoch)) { if (auto epoch = vInfo.attrs->get(sEpoch)) {
flake.epoch = state.forceInt(*(**epoch).value, *(**epoch).pos); flake.epoch = state.forceInt(*(**epoch).value, *(**epoch).pos);
if (flake.epoch > 2019) if (flake.epoch > 201906)
throw Error("flake '%s' requires unsupported epoch %d; please upgrade Nix", flakeRef, flake.epoch); throw Error("flake '%s' requires unsupported epoch %d; please upgrade Nix", flakeRef, flake.epoch);
} else } else
throw Error("flake '%s' lacks attribute 'epoch'", flakeRef); throw Error("flake '%s' lacks attribute 'epoch'", flakeRef);

2
src/nix/flake-template.nix
View file

@ -3,7 +3,7 @@
description = "A flake for building Hello World"; description = "A flake for building Hello World";
epoch = 2019; epoch = 201906;
requires = [ "nixpkgs" ]; requires = [ "nixpkgs" ];

12
tests/flakes.sh
View file

@ -29,7 +29,7 @@ cat > $flake1Dir/flake.nix <<EOF
{ {
name = "flake1"; name = "flake1";
epoch = 2019; epoch = 201906;
description = "Bla bla"; description = "Bla bla";
@ -48,7 +48,7 @@ cat > $flake2Dir/flake.nix <<EOF
{ {
name = "flake2"; name = "flake2";
epoch = 2019; epoch = 201906;
inputs = [ "flake1" ]; inputs = [ "flake1" ];
@ -67,7 +67,7 @@ cat > $flake3Dir/flake.nix <<EOF
{ {
name = "flake3"; name = "flake3";
epoch = 2019; epoch = 201906;
inputs = [ "flake2" ]; inputs = [ "flake2" ];
@ -169,7 +169,7 @@ cat > $flake3Dir/flake.nix <<EOF
{ {
name = "flake3"; name = "flake3";
epoch = 2019; epoch = 201906;
inputs = [ "flake1" "flake2" ]; inputs = [ "flake1" "flake2" ];
@ -192,7 +192,7 @@ nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:sth
[[ ! (-z $(git -C $flake3Dir diff master)) ]] [[ ! (-z $(git -C $flake3Dir diff master)) ]]
# Unsupported epochs should be an error. # Unsupported epochs should be an error.
sed -i $flake3Dir/flake.nix -e s/2019/2030/ sed -i $flake3Dir/flake.nix -e s/201906/201909/
nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:sth 2>&1 | grep 'unsupported epoch' nix build -o $TEST_ROOT/result --flake-registry $registry $flake3Dir:sth 2>&1 | grep 'unsupported epoch'
# Test whether registry caching works. # Test whether registry caching works.
@ -219,7 +219,7 @@ cat > $flake3Dir/flake.nix <<EOF
{ {
name = "flake3"; name = "flake3";
epoch = 2019; epoch = 201906;
inputs = [ "flake1" "flake2" ]; inputs = [ "flake1" "flake2" ];