diff options
Diffstat (limited to 'pkgs/tools/package-management')
25 files changed, 35 insertions, 31 deletions
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index bcf96a50d36a..f161591c8f1d 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "apt-dater-${version}"; + pname = "apt-dater"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 46da85d97488..cbb4ad4591e9 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "apt-${version}"; + pname = "apt"; version = "1.4.6"; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 0f45084f3c05..938a762ba303 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { - name = "bunny-${version}"; + pname = "bunny"; version = "1.3"; src = fetchFromGitLab { diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index e45906688ada..5354fbb5e5ed 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cde-${version}"; + pname = "cde"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 158db426c615..60c77db44d82 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.8.1"; - name = "clib-${version}"; + pname = "clib"; src = fetchFromGitHub { rev = version; diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 0a0cae32dcf5..15a64ffd25e6 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { - name = "createrepo_c-${version}"; + pname = "createrepo_c"; version = "0.11.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index f13256d33bfb..11672e6d456d 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "dpkg-${version}"; + pname = "dpkg"; version = "1.19.7"; src = fetchurl { diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 4c03fc35dea4..8e8d30e4fccf 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gx-${version}"; + pname = "gx"; version = "0.14.1"; rev = "refs/tags/v${version}"; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 0ae0b8a19835..0a0793130d14 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -4,7 +4,7 @@ }: buildGoPackage rec { - name = "gx-go-${version}"; + pname = "gx-go"; version = "1.9.0"; rev = "refs/tags/v${version}"; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index ffa9f427dc2f..5049a90c7a7c 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { - name = "home-manager-${version}"; + pname = "home-manager"; version = "2019-06-25"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index c35550597a34..0c53c1bbbc91 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.9.2"; - name = "librepo-${version}"; + pname = "librepo"; src = fetchFromGitHub { owner = "rpm-software-management"; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 51a963497fa2..9804c0fa1851 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, go-bindata, lib }: buildGoPackage rec { - name = "morph-${version}"; + pname = "morph"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 41471b2c8a7a..3f307d38f029 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mynewt-newt-${version}"; + pname = "mynewt-newt"; version = "1.3.0"; goPackagePath = "mynewt.apache.org/newt"; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index 7c02d2d9a638..cd90e50d70eb 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; - name = "${pname}-${version}"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index efedb8b67da9..f5dfacf319bc 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper , runtimeShell }: let self = stdenv.mkDerivation rec { - name = "nix-pin-${version}"; + pname = "nix-pin"; version = "0.4.0"; src = fetchFromGitHub { owner = "timbertson"; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 96a283a8ea8a..f88820ffad9e 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -5,7 +5,6 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "nix-prefetch"; version = "0.1.0"; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index cd3a8507be14..1d2cad2e39e4 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -15,7 +15,7 @@ let additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ]; in stdenv.mkDerivation rec { - name = "nix-top-${version}"; + pname = "nix-top"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aa212d655f89..6e7aac706538 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -64,7 +64,12 @@ common = # https://github.com/NixOS/nixpkgs/issues/45462 if is20 then '' mkdir -p $out/lib - cp ${boost}/lib/libboost_context* $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + ''} '' else '' configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") ''; @@ -124,7 +129,8 @@ common = inherit fromGit; perl-bindings = if includesPerl then nix else stdenv.mkDerivation { - name = "nix-perl-${version}"; + pname = "nix-perl"; + inherit version; inherit src; @@ -181,12 +187,12 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre6779_324a5dc9"; + suffix = "pre6895_84de821"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "324a5dc92f8e50e6b637c5e67dea48c80be10837"; - sha256 = "1g8gbam585q4kx8ilbx23ip64jw0r829i374qy0l8kvr8mhvj55r"; + rev = "84de8210040580ce7189332b43038d52c56a9689"; + sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3"; }; fromGit = true; @@ -195,12 +201,12 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; - suffix = "pre20190712_aa82f8b"; + suffix = "pre20190830_04np4n6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; - hash = "sha256-MRY2CCjnTPSWIv0/aguZcg5U+DA+ODLKl9vjB/qXFpU="; + hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI="; }; fromGit = true; diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index ce31de9f65d3..f63fe868e011 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: buildGoPackage rec { - name = "nixops-dns-${version}"; + pname = "nixops-dns"; version = "1.0"; goDeps = ./deps.nix; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 804bbbdf8d71..b495577ef664 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -25,7 +25,7 @@ let }; in stdenv.mkDerivation rec { - name = "nixui-${version}"; + pname = "nixui"; inherit version src; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index e02c0a2c66ff..05f43cf29b1b 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.4.1"; - name = "opkg-${version}"; + pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 2e9f93177e45..a82f44008910 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,7 +8,7 @@ , enableSystemd ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { - name = "packagekit-${version}"; + pname = "packagekit"; version = "1.1.12"; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index f0f05a4c858e..987c834f505d 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -2,7 +2,7 @@ , qttools, packagekit }: stdenv.mkDerivation rec { - name = "packagekit-qt-${version}"; + pname = "packagekit-qt"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index d756b679bf3d..81e8152769b7 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -2,7 +2,7 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { - name = "pacman-${version}"; + pname = "pacman"; version = "5.1.3"; src = fetchurl { diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 55171e6d38f7..ae0259e65fcd 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "rpm-${version}"; + pname = "rpm"; version = "4.14.2.1"; src = fetchurl { |