diff options
Diffstat (limited to 'pkgs/tools/package-management')
8 files changed, 30 insertions, 32 deletions
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index ad351914cb3b..78ab51bfaacf 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.18.4"; + version = "1.18.7"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1nh6y6xvnq6f4qd6y3dx9m77sxjg4qk1z1j5pwayg348d0w292gy"; + sha256 = "0yxqv7b5a1qhhas9dzxr5gwj22jqxisrwzvrmwms8l67dlx6vqxc"; }; postPatch = '' diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index aa109ab80fe3..6c5cb467a8fb 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -18,7 +18,7 @@ let mkPrefetchScript = tool: src: deps: wrapArgs="$wrapArgs --prefix PATH : $dep/bin" done wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" - wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash + wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash wrapArgs="$wrapArgs --set HOME : /homeless-shelter" wrapProgram $out/bin/$name $wrapArgs ''; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index e8670770c5f4..8dfc9e6333eb 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -14,18 +14,17 @@ stdenv.mkDerivation { buildInputs = [ nix readline ]; - buildPhase = "true"; + dontBuild = true; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; + installPhase = '' + mkdir -p $out/bin + $CXX -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix \ + -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ + -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" + ''; meta = { homepage = https://github.com/edolstra/nix-repl; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 332576a9873c..3a20fdc0fac3 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -15,21 +15,20 @@ stdenv.mkDerivation rec { buildInputs = [ perl nix ] ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); - buildPhase = "true"; + dontBuild = false; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/libexec/nix-serve - cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi - - mkdir -p $out/bin - cat > $out/bin/nix-serve <<EOF - #! ${stdenv.shell} - PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" - EOF - chmod +x $out/bin/nix-serve - ''; + installPhase = '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve <<EOF + #! ${stdenv.shell} + PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" + EOF + chmod +x $out/bin/nix-serve + ''; meta = { homepage = https://github.com/edolstra/nix-serve; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 895704ec6464..d66ce319aca7 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "nox-${version}"; - version = "0.0.2"; + version = "0.0.3"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz"; - sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral"; + sha256 = "0bbd8nyvxwwz56qp82h3bln960bmpy2lczxr00h2jva1gpz5a964"; }; buildInputs = [ pythonPackages.pbr ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index bc57dd7c80f3..bdd02e58cbb6 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - sha256 = "0sn38b80c6jx9d9r329ji9bg4m4gj6gnl04rv8fkmincj61qf7ag"; + sha256 = "1i6an483vmm6y39szr2alq5vf6kfxhk3j5ca79qrshcj9jjlhcs8"; url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 0bc92314e02c..1a7c24e2c38a 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; meta = with stdenv.lib; { - maintainers = [ maintainers.iElectric ]; + maintainers = [ maintainers.domenkozar ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index d9cf24f6e519..c0a4f7f693d5 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here - substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable} + substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; |