diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-24 19:58:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-24 19:58:07 +0100 |
commit | 7a13e5a7df6e28d0b1eb69836ccd531d756dafe8 (patch) | |
tree | 7ad3ab6c1a7c2befab4e8a95fa52d4f55e955f4d /pkgs/development/libraries | |
parent | 35f5912db57a5102377d9687c69c6c7b0753979e (diff) | |
parent | d99378654f97e7f62393514b36886c0b14d04e99 (diff) |
Merge remote-tracking branch 'upstream/python-unstable' into HEAD
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/kmsxx/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3f9ae113f8491..076f43b71f365 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -125,7 +125,7 @@ in stdenv.mkDerivation { name = "boost-${version}"; - inherit src patches; + inherit src patches version; meta = { homepage = http://boost.org/; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 490732c38025a..8be8eb7135726 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: stdenv.mkDerivation rec { - name = "kmsxx-2017-10-10"; + pname = "kmsxx"; + version = "2017-10-10"; + name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index bcc0b30f12770..2f9130938734c 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -10,7 +10,9 @@ assert pythonSupport -> libxml2.pythonSupport; with stdenv.lib; stdenv.mkDerivation rec { - name = "libxslt-1.1.29"; + pname = "libxslt"; + version = "1.1.29"; + name = pname + "-" + version; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; |