From 3665e02901759cb584b383306cbba867a25918ff Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 20 Jul 2012 20:11:04 +0200 Subject: [PATCH 0001/1018] python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} --- pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/development/interpreters/python/2.7/default.nix | 2 ++ pkgs/development/interpreters/python/wrapper.nix | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f87e1e3810f..6fa27c23525 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -60,6 +60,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 09860310541..7e28cdc1db7 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -74,6 +74,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index e8e343976bc..f4892f92b41 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' mkdir -p "$out/bin" - for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do + for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done ensureDir "$out/share" From e7c1aa52cc9594fa48622c2048ab69766f3f27d3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:11:02 +0200 Subject: [PATCH 0002/1018] python: rename eventually created easy_install.pth to pkg-specific file --- pkgs/development/python-modules/generic/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..4aa17d28b25 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -20,6 +20,15 @@ , installCommand ? '' easy_install --prefix="$out" . + + # A pth file might have been generated to load the package from + # within its own site-packages, rename this package not to + # collide with others. + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi '' , buildPhase ? "true" From 2c3ffeb79c9baabd36bcd24a054121c06f204026 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:11:17 +0200 Subject: [PATCH 0003/1018] python: remove colliding site.py* files --- pkgs/development/python-modules/generic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4aa17d28b25..3a6024e09a8 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -29,6 +29,11 @@ # move colliding easy_install.pth to specifically named one mv "$eapth" $(dirname "$eapth")/${name}.pth fi + + # Remove any site.py files generated by easy_install as these + # cause collisions. If pth files are to be processed a + # corresponding site.py needs to be included in the PYTHONPATH. + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* '' , buildPhase ? "true" From 5c564f26f09d313a127668ab6c77a8e9d254eaa4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:20:21 +0200 Subject: [PATCH 0004/1018] python: always unzip eggs installed into the store grepping and tagging are two use cases coming to mind --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..3c5b7186f74 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -19,7 +19,7 @@ , installCommand ? '' - easy_install --prefix="$out" . + easy_install --always-unzip --prefix="$out" . '' , buildPhase ? "true" @@ -47,8 +47,6 @@ python.stdenv.mkDerivation (attrs // { pythonPath = [ setuptools] ++ pythonPath; - # XXX: Should we run `easy_install --always-unzip'? It doesn't seem - # to have a noticeable impact on small scripts. installPhase = '' mkdir -p "$out/lib/${python.libPrefix}/site-packages" From a40da09b444ad00c46d952bc4b4ac9e5cd51c6f9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 01:55:50 +0200 Subject: [PATCH 0005/1018] python: create pth files for python build inputs (propagate/native or not) --- pkgs/development/python-modules/generic/default.nix | 11 ++++++++++- pkgs/development/python-modules/generic/wrap.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 3a6024e09a8..6e8794103bc 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -59,6 +59,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + buildInputStrings = map toString buildInputs; + pythonPath = [ setuptools] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem @@ -76,7 +78,7 @@ python.stdenv.mkDerivation (attrs // { postFixup = '' wrapPythonPrograms - + # If a user installs a Python package, she probably also wants its # dependencies in the user environment (since Python modules don't # have something like an RPATH, so the only way to find the @@ -84,5 +86,12 @@ python.stdenv.mkDerivation (attrs // { if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi + + createBuildInputsPth build-inputs "$buildInputStrings" + for inputsfile in propagated-build-inputs propagated-build-native-inputs; do + if test -e $out/nix-support/$inputsfile; then + createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" + fi + done ''; }) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 65f3229ca7c..7cc72849190 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -45,3 +45,15 @@ _addToPythonPath() { done fi } + +createBuildInputsPth() { + local category="$1" + local inputs="$2" + if [ foo"$inputs" != foo ]; then + for x in $inputs; do + if test -d "$x"/lib/@libPrefix@/site-packages; then + echo $x >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + fi + done + fi +} From f8d3671629441fd6b528a532e9d3356d8d21f168 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jul 2012 02:07:23 +0200 Subject: [PATCH 0006/1018] fix pth files --- pkgs/development/python-modules/generic/wrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 7cc72849190..71269945d6f 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -52,7 +52,8 @@ createBuildInputsPth() { if [ foo"$inputs" != foo ]; then for x in $inputs; do if test -d "$x"/lib/@libPrefix@/site-packages; then - echo $x >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + echo $x/lib/@libPrefix@/site-packages \ + >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth fi done fi From 30ffafb47d14fb905d0ca2345fe097903e9180e1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jul 2012 02:16:59 +0200 Subject: [PATCH 0007/1018] recursive pth loader --- .../recursive-pth-loader/default.nix | 20 ++++++++ .../recursive-pth-loader/sitecustomize.py | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/recursive-pth-loader/default.nix create mode 100644 pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix new file mode 100644 index 00000000000..3452c62e216 --- /dev/null +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -0,0 +1,20 @@ +{ stdenv, python }: + +stdenv.mkDerivation rec { + name = "resursive-pth-loader-1.0"; + + unpackPhase = "true"; + + buildInputs = [ python ]; + + installPhase = + '' + dst=$out/lib/${python.libPrefix}/site-packages + mkdir -p $dst + cat ${./sitecustomize.py} >> $dst/sitecustomize.py + ''; + + meta = { + description = "Enable recursive processing of pth files anywhere in sys.path"; + }; +} diff --git a/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py new file mode 100644 index 00000000000..057e779803c --- /dev/null +++ b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py @@ -0,0 +1,46 @@ +"""Recursively load pth files in site-packages of sys.path + +- iterate over sys.path +- check for pth in dirs that end in site-packages +- ignore import statements in pth files +- add dirs listed in pth files right after current sys.path element, + they will be processed in next iteration +""" + +import os +import site +import sys + + +for path_idx, sitedir in enumerate(sys.path): + # ignore non-site-packages + if not sitedir.endswith('site-packages'): + continue + + # find pth files + try: + names = os.listdir(sitedir) + except os.error: + continue + dotpth = os.extsep + "pth" + pths = [name for name in names if name.endswith(dotpth)] + + for pth in pths: + fullname = os.path.join(sitedir, pth) + try: + f = open(fullname, "rU") + except IOError: + continue + + with f: + for n, line in enumerate(f): + if line.startswith("#"): + continue + + if line.startswith(("import ", "import\t")): + continue + + line = line.rstrip() + dir, dircase = site.makepath(sitedir, line) + if not dircase in sys.path: + sys.path.insert(path_idx+1, dir) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8327ddaaae..f06a97aadc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13,6 +13,12 @@ let pythonPackages = python.modules // rec { }; + recursivePthLoader = import ../development/python-modules/recursive-pth-loader { + inherit (pkgs) stdenv; + inherit python; + }; + + setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; From 9322bee98823df6abcf989e6c0749711b30de56e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Nov 2012 13:01:44 +0100 Subject: [PATCH 0008/1018] Use systemd instead of udev, and don't use consolekit --- pkgs/desktops/kde-4.7/kde-workspace.nix | 4 ++-- pkgs/desktops/kde-4.8/kde-workspace.nix | 4 ++-- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/os-specific/linux/upower/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 ++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 8116f4bb6b5..1ece3f49076 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate -, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi , pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 31937d4f1d5..1a86eacb336 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi kactivities ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 88daab5ff92..788b6d6d32b 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext , gobjectIntrospection -, useSystemd ? false, systemd ? null }: +, useSystemd ? true, systemd }: let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2f870e5d999..6ae4c22f48a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils -, useSystemd ? false, systemd ? null +, useSystemd ? true, systemd }: assert stdenv.isLinux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f0918faff..749f3f24711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5095,12 +5095,11 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; - ### DEVELOPMENT / LIBRARIES / JAVA + ### DEVELOPMENT / LIBRARIES / JAVA atermjava = callPackage ../development/libraries/java/aterm { stdenv = overrideInStdenv stdenv [gnumake380]; - }; commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { }; @@ -5169,6 +5168,7 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; @@ -6241,7 +6241,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev173 = callPackage ../os-specific/linux/udev/173.nix { }; - udev = pkgs.udev173; + udev = pkgs.systemd; udisks = callPackage ../os-specific/linux/udisks { }; @@ -7667,7 +7667,9 @@ let dropbox = callPackage ../applications/networking/dropbox { }; - slim = callPackage ../applications/display-managers/slim { }; + slim = callPackage ../applications/display-managers/slim { + consolekit = null; + }; sndBase = builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; From b6c5b9806f6ae79652336a7cfb51fe0f03d0590a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 20 Nov 2012 14:06:10 -0800 Subject: [PATCH 0009/1018] add bash-4.2 patches 25 through 39 --- pkgs/shells/bash/bash-4.2-patches.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 8d2a74e95b0..57f4ef91863 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,4 +25,20 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") +(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") +(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") +(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") +(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") +(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") +(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") +(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") +(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") +(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") +(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") +(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") +(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") +(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") +(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") +(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") ] + From 311fe7e371b3aa8ce5577196c2f2fb900420d5d9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 20:15:26 +0200 Subject: [PATCH 0010/1018] cleanup of python packages --- pkgs/top-level/python-packages.nix | 57 ++++++++++++++++-------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f3d5244ab2..a8d4b7ab602 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -282,7 +282,7 @@ let pythonPackages = python.modules // rec { name = "bugz-0.9.3"; src = fetchgit { - url = "git://github.com/williamh/pybugz.git"; + url = "https://github.com/williamh/pybugz.git"; rev = "refs/tags/0.9.3"; }; @@ -1037,6 +1037,9 @@ let pythonPackages = python.modules // rec { preConfigure = "cp test/secrets.py-dist test/secrets.py"; + # tests fail as of 2012-07-21 + doCheck = false; + meta = { description = "A unified interface to many cloud providers"; homepage = http://incubator.apache.org/libcloud/; @@ -1480,7 +1483,7 @@ let pythonPackages = python.modules // rec { name = "optfunc-git"; src = pkgs.fetchgit { - url = "http://github.com/simonw/optfunc.git"; + url = "https://github.com/simonw/optfunc.git"; rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; }; @@ -2699,19 +2702,20 @@ let pythonPackages = python.modules // rec { }); - svneverever = buildPythonPackage rec { - name = "svneverever-778489a8"; + # XXX: ValueError: ZIP does not support timestamps before 1980 + # svneverever = buildPythonPackage rec { + # name = "svneverever-778489a8"; - src = pkgs.fetchgit { - url = git://git.goodpoint.de/svneverever.git; - rev = "778489a8c6f07825fb18c9da3892a781c3d659ac"; - sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6"; - }; + # src = pkgs.fetchgit { + # url = git://git.goodpoint.de/svneverever.git; + # rev = "778489a8c6f07825fb18c9da3892a781c3d659ac"; + # sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6"; + # }; - propagatedBuildInputs = [ pysvn argparse ]; + # propagatedBuildInputs = [ pysvn argparse ]; - doCheck = false; - }; + # doCheck = false; + # }; taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.8"; @@ -3134,22 +3138,23 @@ let pythonPackages = python.modules // rec { }; }; - hgsvn = buildPythonPackage rec { - name = "hgsvn-0.1.8"; - src = fetchurl rec { - name = "hgsvn-0.1.8.tar.gz"; - url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; - sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; - }; + # XXX: link broken + # hgsvn = buildPythonPackage rec { + # name = "hgsvn-0.1.8"; + # src = fetchurl rec { + # name = "hgsvn-0.1.8.tar.gz"; + # url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; + # sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; + # }; - buildInputs = [ pkgs.setuptools ]; - doCheck = false; + # buildInputs = [ pkgs.setuptools ]; + # doCheck = false; - meta = { - description = "HgSVN"; - homepage = http://pypi.python.org/pypi/hgsvn; - }; - }; + # meta = { + # description = "HgSVN"; + # homepage = http://pypi.python.org/pypi/hgsvn; + # }; + # }; cliapp = buildPythonPackage rec { name = "cliapp-1.20120929"; From a68f4f12a96ddd3997555edad9021ea359cf8892 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 21:43:39 +0200 Subject: [PATCH 0011/1018] more python cleanup, actually commenting for now Conflicts: pkgs/top-level/python-packages.nix --- pkgs/top-level/python-packages.nix | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8d4b7ab602..db5643427f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -278,23 +278,23 @@ let pythonPackages = python.modules // rec { }; - bugz = buildPythonPackage (rec { - name = "bugz-0.9.3"; + # bugz = buildPythonPackage (rec { + # name = "bugz-0.9.3"; - src = fetchgit { - url = "https://github.com/williamh/pybugz.git"; - rev = "refs/tags/0.9.3"; - }; + # src = fetchgit { + # url = "https://github.com/williamh/pybugz.git"; + # rev = "refs/tags/0.9.3"; + # }; - propagatedBuildInputs = [ argparse python.modules.ssl ]; + # propagatedBuildInputs = [ argparse python.modules.ssl ]; - doCheck = false; + # doCheck = false; - meta = { - homepage = http://www.liquidx.net/pybugz/; - description = "Command line interface for Bugzilla"; - }; - }); + # meta = { + # homepage = http://www.liquidx.net/pybugz/; + # description = "Command line interface for Bugzilla"; + # }; + # }); carrot = buildPythonPackage rec { @@ -1479,27 +1479,27 @@ let pythonPackages = python.modules // rec { }; }); - optfunc = buildPythonPackage ( rec { - name = "optfunc-git"; - - src = pkgs.fetchgit { - url = "https://github.com/simonw/optfunc.git"; - rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; - }; - - installCommand = '' - dest=$(toPythonPath $out)/optfunc - mkdir -p $dest - cp * $dest/ - ''; - - doCheck = false; - - meta = { - description = "A new experimental interface to optparse which works by introspecting a function definition"; - homepage = "http://simonwillison.net/2009/May/28/optfunc/"; - }; - }); + # optfunc = buildPythonPackage ( rec { + # name = "optfunc-git"; + # + # src = pkgs.fetchgit { + # url = "https://github.com/simonw/optfunc.git"; + # rev = "e3fa034a545ed94ac5a039cf5b170c7d0ee21b7b"; + # }; + # + # installCommand = '' + # dest=$(toPythonPath $out)/optfunc + # mkdir -p $dest + # cp * $dest/ + # ''; + # + # doCheck = false; + # + # meta = { + # description = "A new experimental interface to optparse which works by introspecting a function definition"; + # homepage = "http://simonwillison.net/2009/May/28/optfunc/"; + # }; + # }); ply = buildPythonPackage (rec { name = "ply-3.2"; @@ -3146,11 +3146,11 @@ let pythonPackages = python.modules // rec { # url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; # sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; # }; - + # # buildInputs = [ pkgs.setuptools ]; # doCheck = false; - - # meta = { + # + # meta = { # description = "HgSVN"; # homepage = http://pypi.python.org/pypi/hgsvn; # }; From 85a33507ea5c5f831d5bf0fcf961fa7de618215b Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 03:38:13 +0100 Subject: [PATCH 0012/1018] Add GROMACS v4.5.5 --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ++++++++++++++++++ .../molecular-dynamics/gromacs/default.nix | 2 ++ .../molecular-dynamics/gromacs/meta.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +++++++++++ 4 files changed, 70 insertions(+) create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/default.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix new file mode 100644 index 00000000000..0cb9b4c2c65 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix @@ -0,0 +1,26 @@ + +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + inherit meta; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix new file mode 100644 index 00000000000..ac5628bcdf8 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -0,0 +1,2 @@ + +import ./4.5.5.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix new file mode 100644 index 00000000000..fa6a041f719 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix @@ -0,0 +1,27 @@ + + + +meta = { + homepage = "www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: www.gromacs.org/About_Gromacs + ''; +}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede3e1eb175..97f3538d10d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8661,6 +8661,21 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + + ### SCIENCE/MOLECULAR-DYNAMICS + + gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = true; + fftw = fftwSinglePrec; + cmake = cmakeCurses; + }; + + gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = false; + fftw = fftw; + cmake = cmakeCurses; + }; + ### SCIENCE/LOGIC coq = callPackage ../applications/science/logic/coq { From 7bdcb521b27b460c3c1a8fac327bffae3f72be7a Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:29:17 +0100 Subject: [PATCH 0013/1018] Update based on comments to pull request --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ---------- .../molecular-dynamics/gromacs/default.nix | 49 ++++++++++++++++++- .../molecular-dynamics/gromacs/meta.nix | 27 ---------- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 50 insertions(+), 56 deletions(-) delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix deleted file mode 100644 index 0cb9b4c2c65..00000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix +++ /dev/null @@ -1,26 +0,0 @@ - -{ stdenv, fetchurl, cmake, - singlePrec ? true, - fftw -}: - - -let meta = import ./meta.nix; -in - -stdenv.mkDerivation { - name = "gromacs-4.5.5"; - - src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; - }; - - buildInputs = [cmake fftw]; - - cmakeFlags = '' - ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} - ''; - - inherit meta; -} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ac5628bcdf8..d6fe326a9d1 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,2 +1,49 @@ -import ./4.5.5.nix +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + meta = { + homepage = "http://www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: http://www.gromacs.org/About_Gromacs for details. + ''; + }; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix deleted file mode 100644 index fa6a041f719..00000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix +++ /dev/null @@ -1,27 +0,0 @@ - - - -meta = { - homepage = "www.gromacs.org"; - licence = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; - longDescription = '' - GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems - with hundreds to millions of particles. - - It is primarily designed for biochemical molecules like - proteins, lipids and nucleic acids that have a lot of - complicated bonded interactions, but since GROMACS is - extremely fast at calculating the nonbonded interactions (that - usually dominate simulations) many groups are also using it - for research on non-biological systems, e.g. polymers. - - GROMACS supports all the usual algorithms you expect from a - modern molecular dynamics implementation, (check the online - reference or manual for details), but there are also quite a - few features that make it stand out from the competition. - - See: www.gromacs.org/About_Gromacs - ''; -}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dc5c8776e..342b7e7af9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8668,11 +8668,11 @@ let cmake = cmakeCurses; }; - gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = false; fftw = fftw; cmake = cmakeCurses; - }; + }); ### SCIENCE/LOGIC From cba15c96f6813c6c15961236602619fab67ca1ed Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:45:19 +0100 Subject: [PATCH 0014/1018] fix skipped indentation --- .../applications/science/molecular-dynamics/gromacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d6fe326a9d1..ea4855e26d7 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: http://www.gromacs.org/About_Gromacs for details. ''; }; } From 06c522f7391df7ea8e8707f1f15af18300d287a1 Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:46:49 +0100 Subject: [PATCH 0015/1018] remove reference to meta.nix --- .../science/molecular-dynamics/gromacs/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ea4855e26d7..c687fd5908c 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -5,9 +5,6 @@ }: -let meta = import ./meta.nix; -in - stdenv.mkDerivation { name = "gromacs-4.5.5"; From fa1c8fef2ff3a887ce6f89691a80dce200122009 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 15:54:55 +0100 Subject: [PATCH 0016/1018] move pth rename and site.py removal to buildPhase This leaves the installCommand to be only easy_install and makes it easy again to overwrite this. --- .../python-modules/generic/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6e8794103bc..4989bd44773 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -20,20 +20,6 @@ , installCommand ? '' easy_install --prefix="$out" . - - # A pth file might have been generated to load the package from - # within its own site-packages, rename this package not to - # collide with others. - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth - if [ -e "$eapth" ]; then - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${name}.pth - fi - - # Remove any site.py files generated by easy_install as these - # cause collisions. If pth files are to be processed a - # corresponding site.py needs to be included in the PYTHONPATH. - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* '' , buildPhase ? "true" @@ -72,6 +58,20 @@ python.stdenv.mkDerivation (attrs // { export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" ${installCommand} + # A pth file might have been generated to load the package from + # within its own site-packages, rename this package not to + # collide with others. + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + # Remove any site.py files generated by easy_install as these + # cause collisions. If pth files are to be processed a + # corresponding site.py needs to be included in the PYTHONPATH. + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + ${postInstall} ''; From 224251d104723871fe6cc07149b57b0ac97c3ee4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 17:27:12 +0100 Subject: [PATCH 0017/1018] python-offline-distutils --- .../offline-distutils/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/offline-distutils/default.nix diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix new file mode 100644 index 00000000000..2ed41b08bb7 --- /dev/null +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -0,0 +1,21 @@ +# Used during module installation to prevent easy_install and python +# setup.py install/test from downloading + +{ stdenv, python }: + +stdenv.mkDerivation { + name = "python-offline-distutils-${python.version}"; + + buildInputs = [ python ]; + + unpackPhase = "true"; + installPhase = '' + dst="$out/lib/${python.libPrefix}" + ensureDir $dst/distutils + ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ + cat < $dst/distutils/distutils.cfg +[easy_install] +allow-hosts = None +EOF + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 761f63d4be6..318ce39022e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,6 +18,10 @@ let pythonPackages = python.modules // rec { inherit python wrapPython; }; + offlineDistutils = import ../development/python-modules/offline-distutils { + inherit (pkgs) stdenv; + inherit python; + }; ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; From ad8a4c73fa487deb2a1f2d4814f50acb8a647f5e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 17:27:55 +0100 Subject: [PATCH 0018/1018] use offline-disutils in buildPythonPackage --- pkgs/development/python-modules/generic/builder.sh | 10 ++++++++++ pkgs/development/python-modules/generic/default.nix | 4 +++- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/generic/builder.sh diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh new file mode 100644 index 00000000000..52b66aaf6a6 --- /dev/null +++ b/pkgs/development/python-modules/generic/builder.sh @@ -0,0 +1,10 @@ +source $stdenv/setup + +# do not allow distutils to make downloads, whatever install command is used +export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" +export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" + +# enable pth files for dependencies +export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + +genericBuild diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..394bfcbc7cd 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib }: +{ python, setuptools, wrapPython, lib, offlineDistutils }: { name, namePrefix ? "python-" @@ -45,6 +45,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + builder = ./builder.sh + pythonPath = [ setuptools] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 318ce39022e..cc8aea98cf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools; + inherit python wrapPython setuptools offlineDistutils; }; From 337d16368a926b3c27259dc5f21d7bf3a9b32556 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 17:38:31 +0100 Subject: [PATCH 0019/1018] fix builder in python-module --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 394bfcbc7cd..e7f98f94d00 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -45,7 +45,7 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - builder = ./builder.sh + builder = ./builder.sh; pythonPath = [ setuptools] ++ pythonPath; From ccb5d0fc19729a0b25cd550086320e76e6b1da69 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 18:33:03 +0100 Subject: [PATCH 0020/1018] fix python module builder --- pkgs/development/python-modules/generic/builder.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh index 52b66aaf6a6..43ad139fe74 100644 --- a/pkgs/development/python-modules/generic/builder.sh +++ b/pkgs/development/python-modules/generic/builder.sh @@ -1,10 +1,6 @@ source $stdenv/setup # do not allow distutils to make downloads, whatever install command is used -export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" -# enable pth files for dependencies -export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - genericBuild From bdccb5417bc50831ded45d0a7d56729caae0c828 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Nov 2012 18:33:03 +0100 Subject: [PATCH 0021/1018] fix python module builder --- pkgs/development/python-modules/generic/builder.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh index 52b66aaf6a6..43ad139fe74 100644 --- a/pkgs/development/python-modules/generic/builder.sh +++ b/pkgs/development/python-modules/generic/builder.sh @@ -1,10 +1,6 @@ source $stdenv/setup # do not allow distutils to make downloads, whatever install command is used -export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" -# enable pth files for dependencies -export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - genericBuild From ef51f327fe3fcc78055ae700e077ae67d86704f2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 23 Nov 2012 19:59:19 +0100 Subject: [PATCH 0022/1018] nxml-mode: remove from release as well --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 3201afb44a0..4098086c2f7 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -217,6 +217,5 @@ with (import ./release-lib.nix); ecb = linux; emacsw3m = linux; emms = linux; - nxml = all; }; } )) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b09deca1350..98de86369c5 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -346,7 +346,6 @@ with (import ./release-lib.nix); ecb = linux; emacsw3m = linux; emms = linux; - nxml = all; }; emacs23Packages = emacs22Packages // { From 0dc8926b06bfc433417811edd28e472bf18d4814 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Fri, 23 Nov 2012 22:31:51 +0300 Subject: [PATCH 0023/1018] applications/networking/instant-messengers/mcabber: Updated to 0.10.1. --- .../instant-messengers/mcabber/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index dd5a3dc8b9e..cae0213c6be 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: stdenv.mkDerivation { - name = "mcabber-0.9.9"; + name = "mcabber-0.10.1"; src = fetchurl { - url = http://mirror.mcabber.com/files/mcabber-0.9.9.tar.bz2; - sha256 = "2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1"; + url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2"; + sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; }; - meta = { homepage = "http://mirror.mcabber.com/"; + meta = { homepage = "http://mcabber.com/"; description = "Small Jabber console client"; }; - buildInputs = [openssl ncurses pkgconfig glib]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth]; configureFlags = "--with-openssl=${openssl}"; } From 0bf71add7818e885a0cbf93f3b853a7a57a57d56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 21:31:23 +0100 Subject: [PATCH 0024/1018] sane-backends: update snapshot to version: 1.0.22.git20121123 --- pkgs/misc/sane-backends/snapshot.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix index 636ae37ec05..8b74db5df44 100644 --- a/pkgs/misc/sane-backends/snapshot.nix +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null -, gt68xxFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: let - firmware = gt68xxFirmware {inherit fetchurl;}; + firmware = gt68xxFirmware { inherit fetchurl; }; in -assert hotplugSupport -> stdenv.system == "i686-linux"; +assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.22.git201111204"; - + name = "sane-backends-1.0.22.git20121123"; + src = fetchurl { - url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz; - sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47"; + url = "http://www.sane-project.org/snapshots/sane-backends-git20121123.tar.gz"; + sha256 = "d13a8c9e85af52f7be2e45c70cb93a76ec04b76e7fc983809e7d70389b6e7ae5"; }; - + udevSupport = hotplugSupport; buildInputs = if libusb != null then [libusb] else []; @@ -26,7 +25,7 @@ stdenv.mkDerivation { ''; preInstall = - if gt68xxFirmware != null then + if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name else ""; From 6287f78dcff446228e2e8ed874fe64d9ddfc8855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 22:18:36 +0100 Subject: [PATCH 0025/1018] gocr: update to version 0.49 --- pkgs/applications/graphics/gocr/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4b2ebceda47..ec0f9ef835c 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,14 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gocr-0.44"; + name = "gocr-0.49"; src = fetchurl { - url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; - sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0"; + url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; meta = { + homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 0a6914a1ffdcde487460f54508409384d09c340a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 22:22:52 +0100 Subject: [PATCH 0026/1018] gocr: fix path to 'wish' in gocr.tcl --- pkgs/applications/graphics/gocr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index ec0f9ef835c..0e8f860c510 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, tk }: stdenv.mkDerivation rec { name = "gocr-0.49"; @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; + postInstall = '' + sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl + ''; + meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; From 3667144395e8f3e1a1acd47b5c5af5859bcb3ff5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 23:20:55 +0100 Subject: [PATCH 0027/1018] xsane: build with snapshot version of the sane backends The last release of that code is ancient. Not sure what these SANE guys are doing. Anyway, the current Git snapshot works just fine for me. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6876ff61f..d0e862c5f40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9067,6 +9067,7 @@ let xsane = callPackage ../misc/xsane { libpng = libpng12; + saneBackends = saneBackendsSnapshot; }; yafc = callPackage ../applications/networking/yafc { }; From 4199b9e80a0cbdfba039e4fa311035e6bbdeb8ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 23:21:15 +0100 Subject: [PATCH 0028/1018] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0e862c5f40..2a720049848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6563,7 +6563,7 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - abcde = callPackage ../applications/audio/abcde { + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; }; From 74d963c69a6d5f3f1f969bc477046d1342eea0b3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 24 Nov 2012 22:32:47 +0100 Subject: [PATCH 0029/1018] offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh Conflicts: pkgs/development/python-modules/generic/default.nix --- pkgs/development/python-modules/generic/builder.sh | 6 ------ pkgs/development/python-modules/generic/default.nix | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 pkgs/development/python-modules/generic/builder.sh diff --git a/pkgs/development/python-modules/generic/builder.sh b/pkgs/development/python-modules/generic/builder.sh deleted file mode 100644 index 43ad139fe74..00000000000 --- a/pkgs/development/python-modules/generic/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -# do not allow distutils to make downloads, whatever install command is used -export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" - -genericBuild diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index e7f98f94d00..b5889b36f13 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -32,6 +32,7 @@ python setup.py test runHook postCheck '' +, configurePhase ? "true" , postInstall ? "" @@ -45,7 +46,12 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - builder = ./builder.sh; + buildInputStrings = map toString buildInputs; + + configurePhase = '' + export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" + ${configurePhase} + ''; pythonPath = [ setuptools] ++ pythonPath; From 9208fb1edb490a4b4385665446bac42b1de69779 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 24 Nov 2012 23:24:22 +0100 Subject: [PATCH 0030/1018] fix mercurial -extra PYTHONPATH +setuptools - PYTHONPATH is already set correctly - setuptools is needed to see docutils --- pkgs/applications/version-management/mercurial/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 486bebc2531..afbfc1c8935 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python, makeWrapper, docutils, setuptools, unzip , guiSupport ? false, tk ? null, curses }: let @@ -15,9 +15,7 @@ stdenv.mkDerivation { inherit python; # pass it so that the same version can be used in hg2git pythonPackages = [ curses ]; - buildInputs = [ python makeWrapper docutils unzip ]; - - PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages"; + buildInputs = [ python makeWrapper docutils setuptools unzip ]; makeFlags = "PREFIX=$(out)"; From d50712e376c2b01a6c2771f19206a11e7e8715ca Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 25 Nov 2012 13:00:12 +0100 Subject: [PATCH 0031/1018] Add despotify --- .../libraries/despotify/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/despotify/default.nix diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix new file mode 100644 index 00000000000..13732d34e09 --- /dev/null +++ b/pkgs/development/libraries/despotify/default.nix @@ -0,0 +1,34 @@ +{ + stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, + libtool, ncurses, glibc +}: + +stdenv.mkDerivation rec { + + name = "despotify"; + + src = fetchsvn { + url = "https://despotify.svn.sourceforge.net/svnroot/despotify"; + rev = "521"; + }; + + buildInputs = [ + openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc + ]; + + configurePhase = "cd src"; + + installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install"; + + meta = { + description = "Open source Spotify client and library"; + longDescription = '' + despotify is a open source implementation of the Spotify API. This + package provides both a library and a few already quite useful, + proof-of-concept clients. + ''; + homepage = "http://despotify.se"; + license = stdenv.lib.licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a720049848..30f6d5ab1a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -614,6 +614,8 @@ let desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; + despotify = callPackage ../development/libraries/despotify { }; + dev86 = callPackage ../development/compilers/dev86 { /* Using GNU Make 3.82 leads to this: make[4]: *** No rule to make target `__ldivmod.o)' From ee6f7e294eaa5c907e57a7c9079d8008645d0de3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:55:54 +0100 Subject: [PATCH 0032/1018] zathura: Update to 0.2.1 (also update plugins to latest) --- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/default.nix | 2 +- pkgs/applications/misc/zathura/djvu/default.nix | 4 ++-- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++-- pkgs/applications/misc/zathura/ps/default.nix | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 2fa36b33eb0..73db728b1a6 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.2"; + name = "girara-0.1.4"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 0c58965fc19..6c3ff038c74 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.2.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef"; + sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790"; }; buildInputs = [ pkgconfig gtk girara gettext ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index b5ba4f9ada7..5ed445b6984 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -13,7 +13,7 @@ rec { zathuraWrapper = stdenv.mkDerivation rec { - name = "zathura-0.1.2"; + name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ zathura_pdf_poppler diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c4656e73236..bddb3471bfe 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.1.1"; + name = "zathura-djvu-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172"; + sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 17e00b4e622..e0fcb0573a4 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - name = "zathura-pdf-poppler-0.1.1"; + name = "zathura-pdf-poppler-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7"; + sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ae9aeee7715..7f70eb952e1 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.1.0"; + name = "zathura-ps-0.2.0"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789"; + sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414"; }; buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; From b47b2e4f0b98172891f2fedc3234b3952eb7018d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:57:58 +0100 Subject: [PATCH 0033/1018] notmuch: sha256 was wrong --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c518f0430ff..9d7126452c9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9"; + sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; From d9e097875c89a0fe958e85806ccfa1a660a386e0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:58:25 +0100 Subject: [PATCH 0034/1018] pythonPackages.flake8: Update to 1.6.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b864737d163..cfccd5b803e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.5"; + name = "flake8-1.6.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "525be5c7fcaf85f6819c77752cb2ee72"; + md5 = "abfdbb25d37c28e9da05f1b5c3596d1a"; }; doCheck = false; From 61d6ab05c506fd5b74ec1ed924ea11ab8d38204e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:59:38 +0100 Subject: [PATCH 0035/1018] boost: wrong unpacking command --- pkgs/development/libraries/boost/1.52-headers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix index b89273fdd30..72a4b419f2d 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost ''; meta = { From fdf3ff7a21c5d0b5c45bc889ea1d3a33f9b48c7b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 19:20:06 +0100 Subject: [PATCH 0036/1018] pythonPackages.turses: update to 0.2.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfccd5b803e..ddd25ad03b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2774,11 +2774,11 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.8"; + name = "turses-0.2.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "fbbc0ca93324535bcafa8434395caded8047e40c25d7a4004806415dd6ca023f"; + sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ]; From f8f54dc8d358963deaf1521f68d2c3d01fb6d664 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:57:49 +0400 Subject: [PATCH 0037/1018] Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way --- .../upstream-updater/update-walker.sh | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index ce0e1403f2e..78c61dd2b82 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -3,6 +3,7 @@ own_dir="$(cd "$(dirname "$0")"; pwd)" CURRENT_URL= +NEED_TO_CHOOSE_URL=1 url () { CURRENT_URL="$1" @@ -45,12 +46,14 @@ matching_links () { link () { CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked by: $*" echo "URL: $CURRENT_URL" >&2 } version_link () { CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked version by: $*" echo "URL: $CURRENT_URL" >&2 } @@ -86,6 +89,23 @@ ensure_target () { [ -z "$CURRENT_TARGET" ] && target default.nix } +ensure_name () { + [ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")" + echo "Resulting name: $CURRENT_NAME" +} + +ensure_choice () { + [ -n "NEED_TO_CHOOSE_URL" ] && { + version_link '[.]tar[.]([^./])+$' + unset NEED_TO_CHOOSE_URL + } + [ -z "$CURRENT_URL" ] && { + echo "Error: empty CURRENT_URL" + echo "Error: empty CURRENT_URL" >&2 + exit 1 + } +} + hash () { CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")" } @@ -183,9 +203,11 @@ do_overwrite () { process_config () { CONFIG_DIR="$(directory_of "$1")" - source "$CONFIG_DIR/$(basename "$1")" BEGIN_EXPRESSION='# Generated upstream information'; + source "$CONFIG_DIR/$(basename "$1")" + ensure_name retrieve_version + ensure_choice ensure_version ensure_target update_found && do_overwrite "$CURRENT_TARGET" From 7333c01dbab997ba1fbedcf48e394e597383e64d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:58:04 +0400 Subject: [PATCH 0038/1018] Update Compiz --- .../window-managers/compiz/bcop.nix | 17 ------ .../window-managers/compiz/ccsm.nix | 31 ---------- .../window-managers/compiz/config-python.nix | 20 ------- .../window-managers/compiz/core.nix | 40 ------------- .../window-managers/compiz/default.nix | 51 ++++++++++++++++ .../window-managers/compiz/default.upstream | 1 + .../compiz/gdk-deprecated.patch | 14 ----- .../compiz/libcompizconfig.nix | 22 ------- .../compiz/plugindir-core.patch | 39 ------------- .../compiz/plugindir-libcompizconfig.patch | 39 ------------- .../window-managers/compiz/plugins-extra.nix | 30 ---------- .../window-managers/compiz/plugins-main.nix | 22 ------- .../compiz/wallpaper-maxpect.patch | 58 ------------------- .../tools/misc/intltool/default.nix | 30 ++++++++++ .../tools/misc/intltool/default.upstream | 1 + pkgs/top-level/all-packages.nix | 18 ++---- 16 files changed, 88 insertions(+), 345 deletions(-) delete mode 100644 pkgs/applications/window-managers/compiz/bcop.nix delete mode 100644 pkgs/applications/window-managers/compiz/ccsm.nix delete mode 100644 pkgs/applications/window-managers/compiz/config-python.nix delete mode 100644 pkgs/applications/window-managers/compiz/core.nix create mode 100644 pkgs/applications/window-managers/compiz/default.nix create mode 100644 pkgs/applications/window-managers/compiz/default.upstream delete mode 100644 pkgs/applications/window-managers/compiz/gdk-deprecated.patch delete mode 100644 pkgs/applications/window-managers/compiz/libcompizconfig.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-core.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugins-extra.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugins-main.nix delete mode 100644 pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch create mode 100644 pkgs/development/tools/misc/intltool/default.nix create mode 100644 pkgs/development/tools/misc/intltool/default.upstream diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix deleted file mode 100644 index 254393d4c7f..00000000000 --- a/pkgs/applications/window-managers/compiz/bcop.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxslt }: - -stdenv.mkDerivation rec { - name = "compiz-bcop-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; - sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; - }; - - buildInputs = [ pkgconfig libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Code generator for Compiz plugins"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix deleted file mode 100644 index 0406a170d19..00000000000 --- a/pkgs/applications/window-managers/compiz/ccsm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, intltool, gtk -, python, pygtk, pygobject, pycairo, compizconfig_python }: - -stdenv.mkDerivation rec { - name = "ccsm-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; - sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; - }; - - buildInputs = [ makeWrapper python intltool gtk ]; - - buildPhase = "python setup.py build --prefix=$out"; - - pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; - - installPhase = - '' - python setup.py install --prefix=$out - - wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ - "$(toPythonPath "$pythonDeps $out")" - ''; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz settings manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix deleted file mode 100644 index 4de7fb41a48..00000000000 --- a/pkgs/applications/window-managers/compiz/config-python.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib -, python, pyrex }: - -stdenv.mkDerivation rec { - name = "compizconfig-python-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; - sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; - }; - - buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; - - NIX_LDFLAGS = "-lcompizconfig"; - - meta = { - homepage = http://www.compiz.org/; - description = "Python interface to the Compiz configuration"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix deleted file mode 100644 index d4a5b79b7fb..00000000000 --- a/pkgs/applications/window-managers/compiz/core.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt -, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: - -let version = "0.8.6"; in - -stdenv.mkDerivation { - name = "compiz-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; - sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; - }; - - patches = - [ # Allow the path to the Compiz plugin library and metadata - # directories to be overriden through $COMPIZ_PLUGINDIR and - # $COMPIZ_METADATADIR, respectively. - ./plugindir-core.patch - - # Fix compilation with recent GTK versions. - ./gdk-deprecated.patch - ]; - - buildInputs = - [ intltool pkgconfig libpng glib - gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 - ]; - - propagatedBuildInputs = - [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender - xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama - libstartup_notification mesa libxml2 libxslt - ]; - - meta = { - homepage = http://www.compiz.org/; - description = "A compositing window manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix new file mode 100644 index 00000000000..63a1894f9b6 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, cmake, pkgconfig +, libXrender, renderproto, gtk, libwnck, pango, cairo +, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm +, libstartup_notification, libpthreadstubs, libxcb, intltool +, ORBit2, libXau +, dbus, dbus_glib, librsvg, mesa +, libXdmcp, libnotify, python +, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus +, xdg_utils +, gettext, boost, pyrex +}: +let + s = # Generated upstream information + rec { + baseName="compiz"; + version="0.9.8.6"; + name="compiz-0.9.8.6"; + hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; + sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + }; + buildInputs = [cmake pkgconfig + libXrender renderproto gtk libwnck pango cairo + GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification + libpthreadstubs libxcb intltool + ORBit2 libXau + dbus dbus_glib librsvg mesa + libXdmcp libnotify python + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus + xdg_utils + gettext boost pyrex + ]; + in +stdenv.mkDerivation rec { + inherit (s) name version; + src = fetchurl { + inherit (s) url sha256; + }; + inherit buildInputs; + + NIX_CFLAGS_COMPILE=" -Wno-error "; + + meta = { + description = "Compoziting window manager"; + homepage = "http://launchpad.net/compiz/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + inherit (s) version; + }; +} diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream new file mode 100644 index 00000000000..b7fc98bd126 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.upstream @@ -0,0 +1 @@ +url https://launchpad.net/compiz/+download diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch deleted file mode 100644 index d80a5514ee9..00000000000 --- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 -@@ -31,10 +31,6 @@ - #include - #include - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- - #ifndef GTK_DISABLE_DEPRECATED - #define GTK_DISABLE_DEPRECATED - #endif diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix deleted file mode 100644 index 51d459e7a36..00000000000 --- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: - -stdenv.mkDerivation rec { - name = "libcompizconfig-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; - sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; - }; - - patches = - [ # See ./core.nix. - ./plugindir-libcompizconfig.patch - ]; - - buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz configuration library"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch deleted file mode 100644 index 5a242e66088..00000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-core.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c ---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 -@@ -146,7 +146,7 @@ - compAddMetadataFromFile (CompMetadata *metadata, - const char *file) - { -- char *home; -+ char *home, *metadatadir; - Bool status = FALSE; - - home = getenv ("HOME"); -@@ -163,7 +163,10 @@ - } - } - -- status |= addMetadataFromFilename (metadata, METADATADIR, file); -+ metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ status |= addMetadataFromFilename (metadata, metadatadir, file); - if (!status) - { - compLogMessage ("core", CompLogLevelWarn, -diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c ---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 -@@ -579,7 +579,10 @@ - } - } - -- status = (*loaderLoadPlugin) (p, PLUGINDIR, name); -+ plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ -+ status = (*loaderLoadPlugin) (p, plugindir, name); - if (status) - return p; - diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch deleted file mode 100644 index 207816a3c51..00000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp ---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 -+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 -@@ -3004,7 +3004,10 @@ - } - } - -- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ loadPluginFromXMLFile (context, xmlName, metadatadir); - free (xmlName); - } - -@@ -3031,7 +3034,10 @@ - free (homeplugins); - } - } -- loadPluginsFromXMLFiles (context, (char *)METADATADIR); -+ -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ loadPluginsFromXMLFiles (context, metadatadir); - - if (home && strlen (home)) - { -@@ -3043,7 +3049,10 @@ - free (homeplugins); - } - } -- loadPluginsFromName (context, (char *)PLUGINDIR); -+ -+ char *plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ loadPluginsFromName (context, plugindir); - } - - static void diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix deleted file mode 100644 index 8852ebd474e..00000000000 --- a/pkgs/applications/window-managers/compiz/plugins-extra.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-extra-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; - }; - - patches = - [ # Support scaling wallpapers to the maximum size while still - # respecting the aspect ratio. - ./wallpaper-maxpect.patch - ]; - - NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Extra plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix deleted file mode 100644 index ea1c01e7414..00000000000 --- a/pkgs/applications/window-managers/compiz/plugins-main.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-main-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; - }; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Main plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch deleted file mode 100644 index 8130dff1dba..00000000000 --- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in ---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 -+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 -@@ -24,7 +24,7 @@ - <_long>Image position. - int - 0 -- 4 -+ 5 - - 0 - <_name>Scale and Crop -@@ -45,6 +45,10 @@ - 4 - <_name>Center Tiled - -+ -+ 5 -+ <_name>Centered Maxpect -+ - -