diff options
| author | Domen Kožar <domen@dev.si> | 2014-08-30 21:08:49 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-08-30 21:08:49 +0200 |
| commit | b8fca7b38c38fe28dc8bfe3d3e566581f296e03a (patch) | |
| tree | 19d9348ff04c61936b71868c3052b4deecb9e972 /pkgs | |
| parent | 33949a413c4f4ae773876ccba9036db8a694cae7 (diff) | |
| download | nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar.gz nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar.bz2 nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar.lz nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar.xz nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.tar.zst nixlib-b8fca7b38c38fe28dc8bfe3d3e566581f296e03a.zip | |
koji: factor python module into an standalone app
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/koji/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 19 |
3 files changed, 23 insertions, 19 deletions
diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix new file mode 100644 index 000000000000..7f03ed1625e8 --- /dev/null +++ b/pkgs/tools/package-management/koji/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages, python }: + +stdenv.mkDerivation rec { + name = "koji-1.8"; + + src = fetchurl { + url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; + sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; + }; + + propagatedBuildInputs = [ pythonPackages.pycurl python ]; + + makeFlags = "DESTDIR=$(out)"; + + postInstall = '' + cp -R $out/nix/store/*/* $out/ + rm -rf $out/nix + ''; + + meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d67650ebe59..3d3e462f82fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9123,6 +9123,8 @@ let inherit (gnome) libglade; }; + koji = callPackage ../tools/package-management/koji { }; + lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 551c3e458903..ec224fec54ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2260,25 +2260,6 @@ rec { }; }; - # TODO: this shouldn't use a buildPythonPackage - koji = buildPythonPackage (rec { - name = "koji-1.8"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - disabled = isPy3k; - - src = fetchurl { - url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; - sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; - doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - - }); - logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; |