diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
9 files changed, 14 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index b4b339edb5f7..21e869b7b01e 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -91,7 +91,6 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix index d98ad1d8cb79..e462202f6153 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix +++ b/nixpkgs/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.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "1pnq2gphdv0rkc317rnkdx2qv0cd7p3k4v5f0ys5rya2akkxx4wn"; + sha256 = "12z0sa7g79x46q2ybpy6i9rf1x4cnwajw8dsjzra2qhssyp8rp9c"; }; - cargoSha256 = "0y6swl5ngkd489g53c100gyjl1sp8vidl8j6zfcasw5lbkli3acs"; + cargoSha256 = "10nfa0pd4zhz36f9yx80qd0bbsmqdjk8r6656jyzh92ydncry1as"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix index df1bf794062f..6605d9de65ae 100644 --- a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation { description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 864c229b8803..33620bb51f17 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index d725692f4054..7590a37a8e36 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -167,10 +167,10 @@ in rec { }; nixStable = callPackage common rec { - name = "nix-2.2"; + name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; + sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh index c7a93a716731..334edb4a027a 100755 --- a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh +++ b/nixpkgs/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/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix +++ b/nixpkgs/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/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix index 846e9bcfc12a..b019c7ef3772 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index 5b7872200402..2e9f93177e45 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite -, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive +, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection vala_0_38 ] + buildInputs = [ glib polkit python gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize |