aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/package-management
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
-rw-r--r--nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix28
-rw-r--r--nixpkgs/pkgs/tools/package-management/clib/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/package-management/home-manager/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/package-management/nix-du/default.nix9
-rw-r--r--nixpkgs/pkgs/tools/package-management/nix/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/package-management/pacman/default.nix10
6 files changed, 48 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
new file mode 100644
index 00000000000..45422f613d0
--- /dev/null
+++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-audit";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "RustSec";
+ repo = "cargo-audit";
+ rev = "v${version}";
+ sha256 = "0j556dh0lf2l8nq7pfl5bbypgsvp00fh6ckms9wr4dgb8xvpf2r1";
+ };
+
+ cargoSha256 = "0200x0bdllq7mpxmp7ly5jarpkc3gpg22gxq8qvdbnmyd39b7wx0";
+
+ buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
+ nativeBuildInputs = [ pkg-config ];
+
+ # The tests require network access which is not available in sandboxed Nix builds.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Audit Cargo.lock files for crates with security vulnerabilities";
+ homepage = "https://rustsec.org";
+ license = with licenses; [ mit asl20 ];
+ maintainers = with maintainers; [ basvandijk ];
+ platforms = platforms.all;
+ };
+}
diff --git a/nixpkgs/pkgs/tools/package-management/clib/default.nix b/nixpkgs/pkgs/tools/package-management/clib/default.nix
index 60c77db44d8..eb8f5ef186f 100644
--- a/nixpkgs/pkgs/tools/package-management/clib/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
- version = "1.8.1";
+ version = "1.11.2";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
- sha256 = "1kl8amlw0106jsvv71a7nifhff1jdvgsrxr7l7hfr75i506q8976";
+ sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz";
};
hardeningDisable = [ "fortify" ];
diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
index e1ae6bc88b8..90c7ae8ba34 100644
--- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "home-manager";
- version = "2019-09-04";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "rycee";
repo = "home-manager";
- rev = "1923ac3358cbd2d75352c2db2178314eb4623818";
- sha256 = "1xdsz62sjh8j3p8jfz449gv9vl01adk3qdyjvbpgi7y5c09ymwg7";
+ rev = "3f4563018010e2ad180d99d9cd876187e2905cee";
+ sha256 = "1bj7i9yslynhbmn4w5ilm7554zn8pgd0npvy2b0z8n98hlc2d30c";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
index 870e6ce67b9..74543cef83b 100644
--- a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
rustPlatform.buildRustPackage rec {
pname = "nix-du";
- version = "unstable-2019-07-15";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nix-du";
- rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e";
- sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic";
+ rev = "v${version}";
+ sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq";
};
- cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v";
+ cargoSha256 = "18kb4car5nzch3vpl6z1499silhs3fyn8c6xj3rzk94mm2m9srg4";
+ verifyCargoDeps = true;
doCheck = true;
checkInputs = [ graphviz ];
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 518c1baad5a..269d7261536 100644
--- a/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -174,10 +174,10 @@ in rec {
};
nixStable = callPackage common (rec {
- name = "nix-2.3";
+ name = "nix-2.3.1";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "b1d1b4d87390941fc64b19776f1ed9e3871231d38f5a1f295dd13925acd3a98d";
+ sha256 = "bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix
index 81e8152769b..9fd0ea05510 100644
--- a/nixpkgs/pkgs/tools/package-management/pacman/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
-zlib, bzip2, lzma }:
+zlib, bzip2, lzma, curl, runtimeShell }:
stdenv.mkDerivation rec {
pname = "pacman";
@@ -10,15 +10,21 @@ stdenv.mkDerivation rec {
sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76";
};
+ enableParallelBuilding = true;
+
configureFlags = [
# trying to build docs fails with a2x errors, unable to fix through asciidoc
"--disable-doc"
+ "--sysconfdir=/etc"
"--localstatedir=/var"
+ "--with-scriptlet-shell=${runtimeShell}"
];
+ installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
+
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
+ buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ];
postFixup = ''
substituteInPlace $out/bin/repo-add \