diff options
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/cargo-tree/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/package-management/pacman/default.nix | 4 |
3 files changed, 33 insertions, 18 deletions
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index e509ab2f59bb..d98ad1d8cb79 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.22.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "1knxykw1pbqxs4inijd3y797kf1zp4ansmnbwfqxyjlkgss0spdq"; + sha256 = "1pnq2gphdv0rkc317rnkdx2qv0cd7p3k4v5f0ys5rya2akkxx4wn"; }; - cargoSha256 = "0w1psr7j5r8ng3njkjiva738czlhnf9drprisbc8szkfhzc3rgaw"; + cargoSha256 = "0y6swl5ngkd489g53c100gyjl1sp8vidl8j6zfcasw5lbkli3acs"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2777fbcc9035..d725692f4054 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline -, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns -, busybox-sandbox-shell +{ lib, fetchurl, fetchFromGitHub, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp -, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp +, boehmgc }: let - sh = busybox-sandbox-shell; - - common = { name, suffix ? "", src, includesPerl ? false, fromGit ? false }: - let nix = stdenv.mkDerivation rec { +common = + { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz + , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline + , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns + , busybox-sandbox-shell + , storeDir + , stateDir + , confDir + , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp + , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp + + , name, suffix ? "", src, includesPerl ? false, fromGit ? false + + }: + let + sh = busybox-sandbox-shell; + nix = stdenv.mkDerivation rec { inherit name src; version = lib.getVersion name; @@ -144,7 +153,7 @@ in rec { nix = nixStable; - nix1 = common rec { + nix1 = callPackage common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; @@ -153,17 +162,21 @@ in rec { # Nix1 has the perl bindings by default, so no need to build the manually. includesPerl = true; + + inherit storeDir stateDir confDir boehmgc; }; - nixStable = common rec { + nixStable = callPackage common rec { name = "nix-2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; }; + + inherit storeDir stateDir confDir boehmgc; }; - nixUnstable = lib.lowPrio (common rec { + nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; suffix = "pre6631_e58a7144"; src = fetchFromGitHub { @@ -173,6 +186,8 @@ in rec { sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802"; }; fromGit = true; + + inherit storeDir stateDir confDir boehmgc; }); } diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index b0b288b276a8..d756b679bf3d 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "pacman-${version}"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz"; - sha256 = "19fr60h0ffxzjxmlmhrfcq8447l0bkxnh64fwjagqn133d3dgd5x"; + sha256 = "108xp6dhvp02jnzskhgzjmp9jvrxhhkffvmpvs3rrif7vj47xd76"; }; configureFlags = [ |