From 0397525876057b1e495c9fe2b69faabbf747eec8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 27 Mar 2018 21:15:24 +0200 Subject: [PATCH 1/8] commandergenius: 1822release -> 2.2.0 The `1822-release` build breaks on Hydra, some days ago the stable `2.2.0` release has been tagged on upstream. It required some new build inputs (zlib, curl, SDL2_mixer, python3) and some minor changes in the cmakeFlags and makeFlags for the build. See https://hydra.nixos.org/build/71818713/log See ticket #36453 and #31747 (cherry picked from commit d7894d022c8c515f1ee51ddb3554ca3af46d21f5) --- pkgs/games/commandergenius/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index f77dfe8ba945d..70413f0f941b6 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,19 +1,24 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, libGL, boost, cmake }: - +, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 +}: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "1822release"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; + sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; }; - buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" + export makeFlags="$makeFlags DESTDIR=$(out)" + ''; nativeBuildInputs = [ cmake pkgconfig ]; From 6c29a6c95d95c1ab0f1be8edee9731ad87253afa Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Thu, 22 Mar 2018 00:58:16 -0700 Subject: [PATCH 2/8] opendylan: 2013.1 -> 2016.1pre (cherry picked from commit 00823f016dbdcf0c813344d45ba0cb681321c5d3) --- pkgs/development/compilers/opendylan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 773ab9f473f1e..95f4dc5b215f1 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -2,18 +2,18 @@ {stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2013.2"; + name = "opendylan-2016.1pre"; src = fetchgit { url = https://github.com/dylan-lang/opendylan; - rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; - sha256 = "17jvhv0y63fj25ma05k70b7phcwgjyna5qkrirk48z3xapb8bknd"; + rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; + sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; }; buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper - ] ; + ]; preConfigure = if stdenv.system == "i686-linux" then '' mkdir -p $TMPDIR/mps From afee871189484e6ce325a3111bfdbb6de55bb83b Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Sat, 31 Mar 2018 17:22:27 +0200 Subject: [PATCH 3/8] openshift: 3.6.0 -> 3.9.0 (cherry picked from commit fbf29e5f554abcc1c34654fb8d11ccc4126a1f8a) --- .../networking/cluster/openshift/default.nix | 63 +++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fdc97733c7732..3f7e0650e0d56 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync +, iptables, coreutils, kerberos, clang +, components ? [ + "cmd/oc" + "cmd/openshift" + ] +}: + +with lib; let - version = "3.6.0"; + version = "3.9.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; -in buildGoPackage rec { + gitCommit = "191fece"; + # version is in vendor/k8s.io/kubernetes/pkg/version/base.go + k8sversion = "v1.9.1"; + k8sgitcommit = "a0ce1bc657"; +in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -14,40 +26,41 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r"; - }; + sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; +}; - buildInputs = [ which ]; + # go > 1.10 + # [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ]; + + outputs = [ "out" ]; - goPackagePath = null; patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' - cd go/src/origin-v${version}-src # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub - export OS_GIT_VERSION=v${version} - export OS_GIT_MAJOR=${versionMajor} - export OS_GIT_MINOR=${versionMinor} - make build + echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs + echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs + echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs + echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs + echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs + echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + export OS_VERSION_FILE="os-version-defs" + export CC=clang + make all WHAT='${concatStringsSep " " components}' ''; installPhase = '' - mkdir -p "$bin/bin" - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p "$out/bin" + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + ''; + + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = with stdenv.lib; { From 8f5b4e42edb3b8156126cdcb222e8b0ac2e363e5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 15:57:20 -0700 Subject: [PATCH 4/8] hpx: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/hpx/versions. These checks were done: - built on NixOS - ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py -h` got 0 exit code - ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py --help` got 0 exit code - found 1.1.0 with grep in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0 - found 1.1.0 in filename of file in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0 - directory tree listing: https://gist.github.com/377d8c673231332bb40acb55fed39e53 (cherry picked from commit e28170ccc8d23887fbdb2d8fd4cde99bac98d662) --- pkgs/development/libraries/hpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 6b08a0fd86f76..edb1dc01aa80b 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hpx-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "${version}"; - sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk"; + sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3"; }; buildInputs = [ boost hwloc gperftools ]; From a34a2d059932d67cd79f65af99e077c23dad517e Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Sun, 11 Feb 2018 14:15:28 +0100 Subject: [PATCH 5/8] graph-tool: 2.16 -> 2.26 - add ncurses: configure links against ncurses and fails otherwise configure: error: Could not link test program to Python. https://travis-ci.org/NixOS/nixpkgs/builds/48759067 The given hint (Maybe the main Python library has been installed in some non-standard library path) is misleading. The config.log reveals that the failure is due to missing ncurses link option - with-boost-libdir is need to find Boost::IOStreams/regex/etc. - expat/cgal are detected in /usr/lib when not specified explicitly - boost > boost159 is needed to have -lboost_python3 (and -lboost_python) - set pythonModule = Python; => inorder to be used in python.buildEnv { extraLibs = [..]; } tested on MacOSX and in a linux Docker container with: > nix-shell -I nixpkgs=. -p python2.pkgs.graph-tool > nix-shell -I nixpkgs=. -p python3.pkgs.graph-tool (cherry picked from commit a842f0e90577d2e715e5a55e3079698946b3f2b9) --- .../development/python-modules/graph-tool/2.x.x.nix | 13 +++++++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 99fe4b73cb981..b3ed1a8b6ec85 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; + pythonModule = python; + meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; homepage = http://graph-tool.skewed.de/; @@ -16,16 +18,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; + sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" + "--with-boost-libdir=${boost}/lib" + "--with-expat=${expat}" + "--with-cgal=${cgal}" "--enable-openmp" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ boost diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d464d8edfa4c9..d21699b143b4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7462,9 +7462,7 @@ in { }; }; - # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067 - graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet" - else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; grappelli_safe = buildPythonPackage rec { version = "0.3.13"; From 97aa2f367dd72f57889e41ebdf7a9faccb954337 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Mon, 12 Feb 2018 21:33:14 +0100 Subject: [PATCH 6/8] graph-tool: use buildPythonPackage with format = "other"; (cherry picked from commit 83dc28cae2982f6aaa507192a19aff3ef0ff2074) --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index b3ed1a8b6ec85..0b89303dd5ab1 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, +buildPythonPackage }: -stdenv.mkDerivation rec { +buildPythonPackage rec { + format = "other"; version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; - pythonModule = python; - meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; homepage = http://graph-tool.skewed.de/; From a74311f28ced2f31847391b3802475981bf4e590 Mon Sep 17 00:00:00 2001 From: rardiol Date: Wed, 21 Mar 2018 23:26:29 -0300 Subject: [PATCH 7/8] Renpy and pygame_sdl2 update - 6.99.14 (#33943) * pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14 * renpy: 6.99.12.4 -> 6.99.14 (cherry picked from commit f83cbf20292cfde64e2df49bf0bd84338749c49e) --- .../interpreters/renpy/default.nix | 34 ++++++++++++------- .../interpreters/renpy/launcherenv.patch | 14 ++++++++ .../python-modules/pygame_sdl2/default.nix | 30 +++++++++++----- 3 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/interpreters/renpy/launcherenv.patch diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 658c5aebe5cb8..da271db2ff0e2 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -5,31 +5,37 @@ with pythonPackages; -stdenv.mkDerivation { - name = "renpy-6.99.12.4"; +stdenv.mkDerivation rec { + name = "renpy-${version}"; + version = "6.99.14"; - meta = { + meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; homepage = http://renpy.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to - # build with the most recent pygame version, and fails to run with 1.9.1. - broken = true; + license = licenses.mit; + platforms = platforms.linux; }; src = fetchurl { - url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2"; - sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; + url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; + sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h"; }; + patches = [ + ./launcherenv.patch + ]; + + postPatch = '' + substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python cython wrapPython + python cython wrapPython tkinter SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib ]; - pythonPath = [ pygame_sdl2 ]; + pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib @@ -41,7 +47,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/renpy - cp -r renpy renpy.py $out/share/renpy + cp -vr * $out/share/renpy + rm -rf $out/share/renpy/module + python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module makeWrapper ${python}/bin/python $out/bin/renpy \ diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/pkgs/development/interpreters/renpy/launcherenv.patch new file mode 100644 index 0000000000000..85a6c6439b9c0 --- /dev/null +++ b/pkgs/development/interpreters/renpy/launcherenv.patch @@ -0,0 +1,14 @@ +# The launcher game starts projects in a separate python process +# with the -E flag, which prevents the nix set PYTHONPATH envvar +# from taking effect, preventing the loading of pygame_sdl2 +--- a/launcher/game/project.rpy ++++ b/launcher/game/project.rpy +@@ -239,7 +239,7 @@ + raise Exception("Python interpreter not found: %r", executables) + + # Put together the basic command line. +- cmd = [ executable, "-EO", sys.argv[0] ] ++ cmd = [ executable, "-O", sys.argv[0] ] + + cmd.append(self.path) + cmd.extend(args) diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index eab56f9f7ac07..08c266da6963a 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,18 +1,30 @@ -{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27 +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { pname = "pygame_sdl2"; - version = "6.99.10.1227"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "renpy"; - repo = "${pname}"; - rev = "renpy-${version}"; - sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1"; + version = "2.1.0"; + renpy_version = "6.99.14"; + name = "${pname}-${version}-${renpy_version}"; + + src = fetchurl { + url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; + sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9"; }; + # force rebuild of headers needed for install + prePatch = '' + rm -rf gen gen3 + ''; + + patches = [ + # fix for recent sdl2 + (fetchpatch { + url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch"; + sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr"; + }) + ]; + buildInputs = [ SDL2 SDL2_image SDL2_ttf SDL2_mixer cython libjpeg libpng From 2a9fdf9c8cc7fd9ba4dacaffe8a8a9442351d98b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:56:12 +0200 Subject: [PATCH 8/8] pythonPackages.pyechonest: Move to own file Also disable on Py3k due to syntax errors. (cherry picked from commit 85e3b5bd41ff691022b40669800b1a0127c25a0d) --- .../python-modules/pyechonest/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pyechonest/default.nix diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix new file mode 100644 index 0000000000000..6a2559710a902 --- /dev/null +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "pyechonest"; + version = "8.0.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d21699b143b4d..25746add17a04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1640,19 +1640,7 @@ in { py4j = callPackage ../development/python-modules/py4j { }; - pyechonest = self.buildPythonPackage rec { - name = "pyechonest-8.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyechonest/pyechonest-8.0.2.tar.gz"; - sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; - }; - - meta = { - description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; - homepage = https://github.com/echonest/pyechonest; - }; - }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; billiard = buildPythonPackage rec { name = "billiard-${version}";