diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
| commit | d108b49168e25d87ac0dcdc707c6f830310543c5 (patch) | |
| tree | 1a51ee56a64ed1966a5920d4dde05c87989db6a0 /pkgs/tools/package-management | |
| parent | acedc516fe6a561ff740976db3c1836a0aae9616 (diff) | |
| parent | 6e9f6a63a2d4fd30676b5e88696d3bf6104e843f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 864c229b8803..33620bb51f17 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.5"; + version = "1.19.6"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; + sha256 = "0s1pyj7g8ign630biqq1ycjy8cw733fk1dgas9w59mav3wns3caf"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index c7a93a716731..334edb4a027a 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,4 +1,4 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 846e9bcfc12a..b019c7ef3772 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -102,6 +102,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; }
\ No newline at end of file |