From 8f040064f552fcd6e16bb728c067ecde3dfcae40 Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Thu, 10 Jan 2019 23:26:05 +0100 Subject: [PATCH 1/3] Modify release.nix --- release.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release.nix b/release.nix index 03e012e..22a9b4b 100644 --- a/release.nix +++ b/release.nix @@ -1,14 +1,17 @@ { projectSource ? builtins.fetchGit ./. -, nixpkgs ? import {} , officialRelease ? false }: +let + + pkgs = import { }; + +in + rec { - build = nixpkgs.lib.genAttrs [ "x86_64-linux" ] (system: - with import { inherit system; }; - - releaseTools.nixBuild { + build = pkgs.lib.genAttrs [ "x86_64-linux" ] (system: + pkgs.releaseTools.nixBuild { name = "gpr2-exercise01"; src = projectSource; doCheck = false; From d498d580fdaf220e3a3de4c57a40eca087c906be Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Thu, 10 Jan 2019 23:36:22 +0100 Subject: [PATCH 2/3] nixpkgs Parameter --- release.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 22a9b4b..318a606 100644 --- a/release.nix +++ b/release.nix @@ -1,10 +1,11 @@ { projectSource ? builtins.fetchGit ./. , officialRelease ? false +, nixpkgs ? import }: let - pkgs = import { }; + pkgs = nixpkgs { }; in From d25f5b8c1998219360a0db1615efcf97c838261f Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Thu, 10 Jan 2019 23:38:04 +0100 Subject: [PATCH 3/3] Modify release.nix --- release.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/release.nix b/release.nix index 318a606..e16368e 100644 --- a/release.nix +++ b/release.nix @@ -1,22 +1,13 @@ { projectSource ? builtins.fetchGit ./. , officialRelease ? false -, nixpkgs ? import +, nixpkgs ? import {} }: - -let - - pkgs = nixpkgs { }; - -in - rec { - - build = pkgs.lib.genAttrs [ "x86_64-linux" ] (system: - pkgs.releaseTools.nixBuild { + build = nixpkgs.lib.genAttrs [ "x86_64-linux" ] (system: + nixpkgs.releaseTools.nixBuild { name = "gpr2-exercise01"; src = projectSource; doCheck = false; } ); - } \ No newline at end of file