From b81cf59bd7d52903750c43befcc2c382175d03d5 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 14 Aug 2016 10:20:39 +0300 Subject: wine: 1.9.14 -> 1.9.16 Update wineUnstable and wineStaging --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 9a437971e426..92ed55be2de8 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.14"; + version = "1.9.16"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0b65j8lc2axyc7lpa5rjr7vbjz4y78gkd7hhmvhra78pmwf9dgkz"; + sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.44"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0582ylrvl7racpb0il3wmbivb2d7lh6n3mymh19yw94qzgifwqrw"; + sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; -- cgit 1.4.1 From 6842a24b21dcc49a5ed485f6ffde14e69e430adb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Aug 2016 12:37:20 +0200 Subject: Remove top-level pyqt4 See #11567. --- pkgs/applications/audio/picard/default.nix | 12 ++++++------ .../instant-messengers/pybitmessage/default.nix | 6 +++--- pkgs/applications/video/qarte/default.nix | 7 +++++-- pkgs/desktops/kde-4.14/applications/kate.nix | 4 ++-- pkgs/desktops/kde-4.14/kdebindings/pykde4.nix | 9 +++++---- pkgs/desktops/kde-4.14/kdeutils/print-manager.nix | 4 ++-- pkgs/development/python-modules/pyqt/4.x.nix | 5 ++++- pkgs/games/mnemosyne/default.nix | 4 +--- pkgs/misc/drivers/hplip/3.15.9.nix | 2 +- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/frescobaldi/default.nix | 2 +- pkgs/top-level/all-packages.nix | 19 +++++++------------ pkgs/top-level/python-packages.nix | 6 +++--- 13 files changed, 41 insertions(+), 41 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2373bbc549d5..046789119ec6 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonApplication, fetchurl, gettext +{ stdenv, pythonPackages, fetchurl, gettext , pkgconfig, libofa, ffmpeg, chromaprint -, pyqt4, mutagen, python-libdiscid }: -let version = "1.3.2"; in -buildPythonApplication { +let + version = "1.3.2"; +in pythonPackages.buildPythonApplication { name = "picard-${version}"; namePrefix = ""; @@ -20,10 +20,10 @@ buildPythonApplication { gettext ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPackages; [ pyqt4 mutagen - python-libdiscid + discid ]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 703447594edb..9675b5d5315a 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }: +{ stdenv, fetchFromGitHub, pythonPackages, openssl }: stdenv.mkDerivation rec { name = "pybitmessage-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; }; - buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ]; + buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ]; preConfigure = '' substituteInPlace Makefile \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/pybitmessage \ - --replace "exec python2" "exec ${python}/bin/python" \ + --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \ --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" wrapProgram $out/bin/pybitmessage \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index d4221e8f57eb..b7da48ef000c 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: +{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }: -stdenv.mkDerivation { +let + inherit (pythonPackages) python pyqt4; + sip = pythonPackages.sip_4_16; +in stdenv.mkDerivation { name = "qarte-2.4.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index 2440d73e7e8e..ddeb89063e50 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index 5a911d4b3ea3..48d457e10a7f 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,9 +1,10 @@ -{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, +{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies, polkit_qt4, boost, lndir, pkgconfig }: -let pydir = "lib/python${python.majorVersion}"; in - -kde { +let + inherit (pythonPackages) python pyqt4; + pydir = "lib/python${python.majorVersion}"; +in kde { patches = [ ./pykde4-gcc-5.patch ]; diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix index d12c261a728d..bc4938103b12 100644 --- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix +++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix @@ -1,5 +1,5 @@ { kde, kdelibs -, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }: +, pythonPackages, cups, pykde4, pycups, system-config-printer }: let s_c_p = system-config-printer.override { withGUI = false; }; in @@ -7,7 +7,7 @@ kde rec { buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython ] ++ pythonPath; - pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; + pythonPath = [ cups pythonPackages.pyqt4 pykde4 pycups s_c_p ]; # system-config-printer supplies some D-Bus policy that we need. propagatedUserEnvPkgs = [ s_c_p ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 746cc747d72d..ead5c4ffe9d2 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.pythonPath = []; + passthru = { + pythonPath = []; + qt = qt4; + }; meta = { description = "Python bindings for Qt"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index d4f90a906d80..0d419c08b006 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,12 +1,10 @@ { stdenv , fetchurl -, buildPythonApplication -, pyqt4 , pythonPackages }: let version = "2.3.2"; -in buildPythonApplication rec { +in pythonPackages.buildPythonApplication rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 5c989594b3bc..298cba88a9f1 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, polkit , bash, coreutils, utillinux -, qtSupport ? true, qt4, pyqt4 +, qtSupport ? true, qt4 , withPlugin ? false }: diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 32997f98b217..74204cd4e547 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , net_snmp, openssl, polkit , bash, coreutils, utillinux -, qtSupport ? true, qt4, pyqt4 +, qtSupport ? true, qt4 , withPlugin ? false }: diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 04370424abb7..84272992f2bb 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }: +{ stdenv, fetchurl, pythonPackages, lilypond}: pythonPackages.buildPythonApplication rec { name = "frescobaldi-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06721febaf19..0e59f1f222c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3220,9 +3220,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { - sip = pythonPackages.sip_4_16; - }; + qarte = callPackage ../applications/video/qarte { }; qnial = callPackage ../development/interpreters/qnial {}; @@ -10085,8 +10083,6 @@ in rhpl = pythonPackages.rhpl; - pyqt4 = pythonPackages.pyqt4; - pysideApiextractor = pythonPackages.pysideApiextractor; pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner; @@ -10930,7 +10926,9 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffadoFull = callPackage ../os-specific/linux/ffado { }; + ffadoFull = callPackage ../os-specific/linux/ffado { + inherit (pythonPackages) python pyqt4; + }; libffado = self.ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -13071,7 +13069,7 @@ in gksu = callPackage ../applications/misc/gksu { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython; + inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython; fftw = fftwFloat; }; @@ -14290,10 +14288,7 @@ in pianobooster = callPackage ../applications/audio/pianobooster { }; - picard = callPackage ../applications/audio/picard { - python-libdiscid = pythonPackages.discid; - mutagen = pythonPackages.mutagen; - }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { }; @@ -15539,7 +15534,7 @@ in angband = callPackage ../games/angband { }; anki = callPackage ../games/anki { - inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib; + inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; }; armagetronad = callPackage ../games/armagetronad { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c926ee97f622..8823d2ecac3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7744,7 +7744,7 @@ in modules // { sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; + propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/"; @@ -20376,11 +20376,11 @@ in modules // { src = pkgs.qscintilla.src; - buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 python ]; preConfigure = '' mkdir -p $out - lndir ${pkgs.pyqt4} $out + lndir ${self.pyqt4} $out cd Python ${python.executable} ./configure-old.py \ --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ -- cgit 1.4.1 From 670801a56ac15b1c23f0626833c3030a7490b616 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Aug 2016 10:58:44 -0400 Subject: long-shebang: 1.0.0 -> 1.0.1 --- pkgs/misc/long-shebang/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 17bf0e95feeb..5d59d778927a 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: let - version = "1.0.0"; + version = "1.0.1"; in stdenv.mkDerivation { name = "long-shebang-${version}"; src = fetchurl { - url = "https://github.com/shlevy/long-shebang/releases/download/v1.0.0/long-shebang-1.0.0.tar.xz"; - sha256 = "15f5rmihj3r53rmalix1bn1agybbzrc3g2a9xzjyd4v3vfd2vckr"; + url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; + sha256 = "0kj299f3a9zawi96fmw1iq6p6yg0pdm1wgmv61iw5w0zn9v4924b"; }; meta = { -- cgit 1.4.1 From 7069047f2ed6548910f3f2bff4a23946a363e860 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Aug 2016 12:33:50 -0400 Subject: long-shebang: 1.0.1 -> 1.1.0 --- pkgs/misc/long-shebang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 5d59d778927a..2aac5556e2f5 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: let - version = "1.0.1"; + version = "1.1.0"; in stdenv.mkDerivation { name = "long-shebang-${version}"; src = fetchurl { url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; - sha256 = "0kj299f3a9zawi96fmw1iq6p6yg0pdm1wgmv61iw5w0zn9v4924b"; + sha256 = "0rlyibf7pczjfsi91nl1n5vri2vqibmvyyy070jaw3wb0wjm565a"; }; meta = { -- cgit 1.4.1 From 526a8acb5797beb857e2eebfc319e68bff2914bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 13 Aug 2016 03:17:09 +0300 Subject: m33-linux: rename from m3d-linux, 2016-01-20 -> 2016-06-23 --- pkgs/misc/drivers/m33-linux/default.nix | 25 +++++++++++++++++++++++++ pkgs/misc/drivers/m3d-linux/default.nix | 25 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 pkgs/misc/drivers/m33-linux/default.nix delete mode 100644 pkgs/misc/drivers/m3d-linux/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix new file mode 100644 index 000000000000..492488f675f2 --- /dev/null +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "M33-Linux-2016-06-23"; + + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M3D-Linux"; + rev = "5c1b90c13d260771dac970b49fdc9f840fee5f4a"; + sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f"; + }; + + installPhase = '' + install -Dm755 m33-linux $out/bin/m33-linux + install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/donovan6000/M3D-Linux; + description = "A Linux program that can communicate with the Micro 3D printer"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/misc/drivers/m3d-linux/default.nix b/pkgs/misc/drivers/m3d-linux/default.nix deleted file mode 100644 index 0e970e30d589..000000000000 --- a/pkgs/misc/drivers/m3d-linux/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - name = "M3D-Linux-2016-01-20"; - - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M3D-Linux"; - rev = "d0bbb0379c52a88af55740a937edc92af162cdf6"; - sha256 = "0fwzb9mf04bw5wxabh3js7nir60kfq8iz7kcigw6c233aadwg03i"; - }; - - installPhase = '' - install -Dm755 m3d-linux $out/bin/m3d-linux - install -Dm755 90-m3d-local.rules $out/lib/udev/rules.d/90-m3d-local.rules - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; - description = "A Linux program that can communicate with the Micro 3D printer"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd458deb289e..0445975e7920 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,4 +111,5 @@ doNotDisplayTwice rec { xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 youtubeDL = youtube-dl; # added 2014-10-26 + m3d-linux = m33-linux; # added 2016-08-13 } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e516f832c258..2bc8c9e91b78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17229,7 +17229,7 @@ in lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - m3d-linux = callPackage ../misc/drivers/m3d-linux { }; + m33-linux = callPackage ../misc/drivers/m33-linux { }; mnemonicode = callPackage ../misc/mnemonicode { }; -- cgit 1.4.1