diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-12-01 16:36:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-12-01 21:07:33 +0100 |
| commit | 74276caf194ac9a1398cf164ec6604c3730f75a2 (patch) | |
| tree | 406627d2d083c8dae1cdd8d3403f571f533ad516 /pkgs | |
| parent | be020a25826be05518214061fa5396ed101ceb94 (diff) | |
| download | nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar.gz nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar.bz2 nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar.lz nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar.xz nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.tar.zst nixlib-74276caf194ac9a1398cf164ec6604c3730f75a2.zip | |
koji -> pythonPackages.koji
koji is both a library and an application. It is used in Nixpkgs primarily as a library and therefore I move it.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/koji/default.nix (renamed from pkgs/tools/package-management/koji/default.nix) | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 7d2022ee91bb..262ea74d4a34 100644 --- a/pkgs/tools/package-management/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchurl, mkPythonDerivation, pycurl }: -let - pythonEnv = python2.withPackages(ps : [ps.pycurl]); -in stdenv.mkDerivation rec { +mkPythonDerivation rec { name = "koji-1.8"; src = fetchurl { @@ -10,11 +8,12 @@ in stdenv.mkDerivation rec { sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; }; - propagatedBuildInputs = [ pythonEnv ]; + propagatedBuildInputs = [ pycurl ]; makeFlags = "DESTDIR=$(out)"; postInstall = '' + mv $out/usr/* $out/ cp -R $out/nix/store/*/* $out/ rm -rf $out/nix ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad0b6c80319..69790130efc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13575,8 +13575,6 @@ in stdenv = overrideCC stdenv gcc49; }; - koji = callPackage ../tools/package-management/koji { }; - konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { }; krita = qt5.callPackage ../applications/graphics/krita { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd6e74c6a64b..8eaa75fb69d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13338,7 +13338,9 @@ in { homepage = "https://github.com/twisted/klein"; license = licenses.mit; }; - }; + }; + + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { name = "kombu-${version}"; |