diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-05 13:13:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 13:13:21 +0200 |
commit | e50c67ad7eefa8e77436fbd0366b69638b1c8713 (patch) | |
tree | 0b5038414bb6f38e649f9eb53133d2fb2eca6c72 /pkgs/servers | |
parent | df77ecc99d0ee7555bc6353e6eef592409d5d855 (diff) | |
parent | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (diff) | |
download | nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.gz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.bz2 nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.lz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.xz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.zst nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.zip |
Merge pull request #83618 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/amqp/qpid-cpp/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/gpsd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/headphones/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/hyp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sickbeard/sickrage.nix | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 02c2e03d90fa..4eb56ee4ae20 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: let - name = "qpid-cpp-${version}"; + pname = "qpid-cpp"; + name = "${pname}-${version}"; version = "1.39.0"; src = fetchurl { @@ -20,7 +21,7 @@ let }; qpid-cpp = stdenv.mkDerivation { - inherit src meta name; + inherit src meta pname version; nativeBuildInputs = [ cmake ]; buildInputs = [ boost libuuid ruby python2 ]; @@ -46,7 +47,7 @@ let }; python-frontend = buildPythonPackage { - inherit name meta src; + inherit pname version meta src; sourceRoot = "${name}/management/python"; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 8ea060a82552..e5dcb3e28e45 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc + scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc python2Packages.python python2Packages.wrapPython ]; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index aab651d5a4a5..7259104d145f 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { - name = "headphones-${version}"; + pname = "headphones"; version = "0.5.19"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 3a1eb50f05be..c34959f9d047 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "hyp-server-${version}"; + pname = "hyp-server"; version = "1.2.0"; - src = fetchurl { - url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; + src = python3Packages.fetchPypi { + inherit pname version; sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; }; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index b4b6334c13f5..e3d277ba5afb 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ boost curl diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index cbde11e3dc0c..1a187dffd23e 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { - name = "sickrage-${version}"; + pname = "sickrage"; version = "v2018.07.21-1"; src = fetchFromGitHub { |