aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-29 05:43:36 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-29 05:43:36 +0100
commita542de1164b0b2ddaa41aef13e7635b891913f86 (patch)
treeeceb927a73a677864247a97cf1539d4bebdb3300
parent3afed4fcd2cd4e4e8ca2979390fef202818be9db (diff)
downloadNix-a542de1164b0b2ddaa41aef13e7635b891913f86.tar.gz
Nix-a542de1164b0b2ddaa41aef13e7635b891913f86.tar.zst
Nix-a542de1164b0b2ddaa41aef13e7635b891913f86.zip
Make the use of nixpkgs more homogeneous for env
-rw-r--r--default.nix6
-rwxr-xr-xnixops/scripts/nixops_wrap2
-rwxr-xr-xscripts/make-env6
3 files changed, 11 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index eddefa9..e5fc5f4 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
1with import <immaeNixpkgsNext> {}; 1with import <nixpkgs> {};
2with import ./libs.nix { nixpkgs = import <immaeNixpkgsNext> {}; }; 2with import ./libs.nix { nixpkgs = import <nixpkgs> {}; };
3let 3let
4 mypkgs = {}; 4 mypkgs = {};
5 5
@@ -93,7 +93,7 @@ let
93 }; 93 };
94 }; 94 };
95 95
96 mypkgs.terminal-velocity = with python3Packages; buildPythonApplication rec { 96 mypkgs.terminal-velocity = with python36Packages; buildPythonApplication rec {
97 pname = "terminal-velocity-git"; 97 pname = "terminal-velocity-git";
98 version = "0.2.0"; 98 version = "0.2.0";
99 99
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 7cc409f..d6b66bd 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -28,6 +28,8 @@ for file in $files; do
28done 28done
29nixops set-args --argstr privateFiles "$TEMP" 29nixops set-args --argstr privateFiles "$TEMP"
30 30
31# This will automatically upgrade to latest version at each build
32# nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
31nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz" 33nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz"
32nixpkgsPrevious="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" 34nixpkgsPrevious="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz"
33nixpkgs="$nixpkgsNext" 35nixpkgs="$nixpkgsNext"
diff --git a/scripts/make-env b/scripts/make-env
index ec10865..4dd89b7 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,3 +1,9 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# This will automatically upgrade to latest version at each build
4# nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
5nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz"
6nixpkgsPrevious="$nixpkgsNext"
7nixpkgs="$nixpkgsNext"
8export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
3nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@" 9nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"