From 29b2aec2338b6375c12d89f63a530ebc5e6406b2 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sat, 2 Nov 2013 14:10:23 +0000 Subject: [PATCH 001/399] wget darwin: disable Test-iri-disabled.px This test fails on MacOS X. The failure has something to do with the tests expecting filesystems to accept/store filenames as bytes. On the HFS+ filesystem, however, filenames are Unicode characters (Normalisation Form D). This wget ticket appears to be relevant http://savannah.gnu.org/bugs/index.php?27541 The maintainer does not seem to think that this test failure represents a problem in practice: http://article.gmane.org/gmane.comp.web.wget.general/8988 But this patch should be revisited/removed if this aspect of wget is ever addressed in the future. NB: I'm also a bit concerned/confused that none of the tests mentioned in that message seem to fail, so I'm not 100% sure if this is the relevant issue. --- pkgs/tools/networking/wget/default.nix | 2 ++ pkgs/tools/networking/wget/iri-test.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/wget/iri-test.patch diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3e3b74dfe902..5ae85adbec7e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch new file mode 100644 index 000000000000..c1f798ce3726 --- /dev/null +++ b/pkgs/tools/networking/wget/iri-test.patch @@ -0,0 +1,12 @@ +diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px +--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 ++++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 +@@ -48,7 +48,7 @@ + 'Test-idn-robots-utf8.px', + 'Test-iri.px', + 'Test-iri-percent.px', +- 'Test-iri-disabled.px', ++ #'Test-iri-disabled.px', + 'Test-iri-forced-remote.px', + 'Test-iri-list.px', + 'Test-k.px', From 774a0b4a009b6c96ee5f51fff69d477c9101fa10 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:44:11 +0000 Subject: [PATCH 002/399] sdlmame: update to latest version --- pkgs/games/sdlmame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 645312dd54e9..acc724490181 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -3,17 +3,17 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - version = "0.150.u0-1"; + version = "0.151.u0-1"; name = "sdlmame-${version}"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "ftp://ftp.archlinux.org/community/os/x86_64/${name}-x86_64.pkg.tar.xz"; - sha256 = "0393xnzrzq53szmicn96lvapm66wmlykdxaa1n7smx8a0mcz0kah"; + sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9"; } else fetchurl { url = "ftp://ftp.archlinux.org/community/os/i686/${name}-i686.pkg.tar.xz"; - sha256 = "0js67w2szd0qs7ycgxb3bbmcdziv1fywyd9ihra2f6bq5rhcs2jp"; + sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7"; }; buildPhase = '' From 311a25648b4d2f9b938d0e6d862c4a6114305fe2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:57:40 +0000 Subject: [PATCH 003/399] mpd: update to latest version --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 238176aadff9..67a11e01651a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.17.4"; + name = "mpd-0.18.3"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3"; + url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; + sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh"; }; buildInputs = [ pkgconfig glib ] From d6800031572a616962a8bc9f50e6b6616be6de21 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 01:40:17 +0000 Subject: [PATCH 004/399] awesome: add which to build inputs (for awesome-client) --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 61f2145ff33c..d29aec9976f0 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua +{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils}: +, docbook_xml_dtd_45, libxslt, coreutils, which }: let version = "3.4.13"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as From 3203c7177c3e75aeea4f85cef607c78e6479a8c2 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 13:09:30 +0000 Subject: [PATCH 005/399] haskellPackages.webRoutesBoomerang: new expression --- .../haskell/web-routes-boomerang/default.nix | 14 +++++++++++ .../libraries/haskell/web-routes/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/haskell/web-routes-boomerang/default.nix create mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix new file mode 100644 index 000000000000..602d95f45df5 --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -0,0 +1,14 @@ +{ cabal, boomerang, mtl, parsec, text, webRoutes }: + +cabal.mkDerivation (self: { + pname = "web-routes-boomerang"; + version = "0.28.0"; + sha256 = "1xp8p0fkwirrpssb9lnxl7fmlmrql28r2ywaa99gw9cdqxifzbbl"; + buildDepends = [ boomerang mtl parsec text webRoutes ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix new file mode 100644 index 000000000000..ce767e7b5f5b --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -0,0 +1,23 @@ +{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck +, split, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String +}: + +cabal.mkDerivation (self: { + pname = "web-routes"; + version = "0.27.3"; + sha256 = "06a3b88gzbn7dr7hff2fjy1q7sxc479ha4g1wqsbjrb2ajrp376q"; + buildDepends = [ + blazeBuilder httpTypes mtl parsec split text utf8String + ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 22257a81f951..9d78706f721c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2250,6 +2250,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; WebBitsHtml = self.WebBitsHtml_1_0_2; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; + + webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; + CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprint = callPackage ../development/libraries/haskell/wl-pprint {}; From a8e31672284c2f894290fba5ff9e1aa6fd7c3a08 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:20:29 +0100 Subject: [PATCH 006/399] LuaJIT: New package Just-in-time compiler for lua 5.1 with strong focus on performance. Uses the same API as lua 5.1 which makes it extremely easy to integrate. --- .../interpreters/luajit/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/interpreters/luajit/default.nix diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix new file mode 100644 index 000000000000..f4a8e3169275 --- /dev/null +++ b/pkgs/development/interpreters/luajit/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation rec{ + version = "2.0.2"; + name = "LuaJIT-${version}"; + + src = fetchurl { + url="http://luajit.org/download/LuaJIT-2.0.2.tar.gz"; + sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; + }; + + installPhase = '' + mkdir -p $out + make install PREFIX=$out + ''; + + meta = { + description= "Just-in-time compiler and interpreter for lua 5.1."; + homepage = http://luajit.org; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b0aaed6f1f..aab9415294d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3174,6 +3174,8 @@ let lua = lua5; }; + luajit = callPackage ../development/interpreters/luajit {}; + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { }; From 49bf24649144edd7c356c0c79ee38cf54fba791c Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:41:33 +0100 Subject: [PATCH 007/399] Minifix: didn't use the name variable in the package. --- pkgs/development/interpreters/luajit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f4a8e3169275..e5e3aed8d124 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec{ name = "LuaJIT-${version}"; src = fetchurl { - url="http://luajit.org/download/LuaJIT-2.0.2.tar.gz"; + url="http://luajit.org/download/${name}.tar.gz"; sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; }; From fe547ab1007cebde95758b6956f248818f96efbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Nov 2013 19:29:06 +0100 Subject: [PATCH 008/399] python-robotframework: new package Robot Framework is a generic test automation framework for acceptance testing and acceptance test-driven development (ATDD). http://robotframework.org/ --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6a6e1e60768..156bbc46faa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5494,6 +5494,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + + robotframework = buildPythonPackage rec { + version = "2.8.1"; + name = "robotframework-${version}"; + + src = fetchurl { + url = "https://robotframework.googlecode.com/files/${name}.tar.gz"; + sha256 = "04zwjri1j5py3fpbhy1xlc18bhbmdm2gbd58fwa2jnhmrha5dgnw"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Generic test automation framework"; + homepage = http://robotframework.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; From d4b3a7d68571a347719c9c9423833ea1fedbc418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Nov 2013 21:33:34 +0100 Subject: [PATCH 009/399] robotframework-ride: new package Robot Framework RIDE is a light-weight and intuitive editor for Robot Framework test case files. (It's more like an IDE.) --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 156bbc46faa0..75dd2bc12f0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5517,6 +5517,44 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + robotframework-ride = buildPythonPackage rec { + version = "1.2.2"; + name = "robotframework-ride-${version}"; + + src = fetchurl { + url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + sha256 = "1yfvl0hdjjkwk90w3f3i23dxxk3yiyv4pbvnp4l7yd6cmxsia8f3"; + }; + + propagatedBuildInputs = [ pygments wxPython modules.sqlite3 ]; + + # Stop copying (read-only) permission bits from the nix store into $HOME, + # because that leads to this: + # IOError: [Errno 13] Permission denied: '/home/bfo/.robotframework/ride/settings.cfg' + postPatch = '' + sed -i "s|shutil\.copy(|shutil.copyfile(|" src/robotide/preferences/settings.py + ''; + + # ride_postinstall.py checks that needed deps are installed and creates a + # desktop shortcut. We don't really need it and it clutters up bin/ so + # remove it. + postInstall = '' + rm -f "$out/bin/ride_postinstall.py" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Light-weight and intuitive editor for Robot Framework test case files"; + homepage = https://code.google.com/p/robotframework-ride/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; From f13bcf6463b98d79a6d419850facc3c9187424a1 Mon Sep 17 00:00:00 2001 From: Tom Ridge Date: Sat, 16 Nov 2013 02:52:36 +0200 Subject: [PATCH 010/399] HOL: update to k.8 --- .../science/logic/hol/default.nix | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 2e1647b6c71d..52a3129fec0a 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, - experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: let pname = "hol4"; @@ -16,18 +15,9 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz fontconfig liberation_ttf]; + buildInputs = [polyml graphviz]; buildCommand = '' - - mkdir chroot-fontconfig - cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf - sed -e 's@@@' -i chroot-fontconfig/fonts.conf - echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf - echo "" >> chroot-fontconfig/fonts.conf - - export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf - mkdir -p "$out/src" cd "$out/src" @@ -38,19 +28,16 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - for f in tools/buildutils.sml help/src-sml/DOT; - do - substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" - done + substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" #sed -ie "/compute/,999 d" tools/build-sequence # for testing poly < tools/smart-configure.sml - + bin/build ${kernelFlag} -symlink mkdir -p "$out/bin" - ln -st $out/bin "$out/src/${holsubdir}/bin/"* + ln -st $out/bin $out/src/${holsubdir}/bin/* # ln -s $out/src/hol4.${version}/bin $out/bin ''; From 6c32416a31c3cc1dd7069ec12d4bcd1f6e1159c9 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 16 Nov 2013 03:43:38 +0200 Subject: [PATCH 011/399] Fix HOL documentation build --- .../science/logic/hol/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 52a3129fec0a..dc8e975ce1d1 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, + experimentalKernel ? true}: let pname = "hol4"; @@ -15,9 +16,18 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz]; + buildInputs = [polyml graphviz fontconfig liberation_ttf]; buildCommand = '' + + mkdir chroot-fontconfig + cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf + sed -e 's@@@' -i chroot-fontconfig/fonts.conf + echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf + echo "" >> chroot-fontconfig/fonts.conf + + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf + mkdir -p "$out/src" cd "$out/src" @@ -28,7 +38,10 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" + for f in tools/buildutils.sml help/src-sml/DOT; + do + substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" + done #sed -ie "/compute/,999 d" tools/build-sequence # for testing From 17fd8d562755611e9dab408f37ebd6cd51189f61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Nov 2013 12:33:39 +0100 Subject: [PATCH 012/399] haskell-system-posix-redirect: update to version 1.1.0.1 --- .../libraries/haskell/system-posix-redirect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix index b8a65e41fd8e..b0ccd4b4d848 100644 --- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "system-posix-redirect"; - version = "1.1"; - sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr"; + version = "1.1.0.1"; + sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk"; meta = { - description = "A toy module that allows you to temporarily redirect a program's stdout"; + description = "A toy module to temporarily redirect a program's stdout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 188834603a306fd70be497feaa83c94e145e1fdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Nov 2013 12:33:40 +0100 Subject: [PATCH 013/399] haskell-shake: update to version 0.10.9 --- .../libraries/haskell/shake/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index ef7a6d699050..5f7640320f65 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,11 +1,11 @@ -{ cabal, binary, deepseq, filepath, hashable, random, time -, transformers, unorderedContainers, utf8String +{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random +, time, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.8"; - sha256 = "15r392b18nis9p0ys95kbj79hki19wid2gyrpy0z9zm2l5d1m3ya"; + version = "0.10.9"; + sha256 = "08czcf0pkchq558kjkfpz7vf5pn1dbqk8mb9fnivnphy963sf6sr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,12 +13,11 @@ cabal.mkDerivation (self: { unorderedContainers utf8String ]; testDepends = [ - binary deepseq filepath hashable random time transformers - unorderedContainers utf8String + binary deepseq filepath hashable QuickCheck random time + transformers unorderedContainers utf8String ]; - doCheck = false; meta = { - homepage = "http://community.haskell.org/~ndm/shake/"; + homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 9cfc81b749affa9dccacc93b5545f8d73cf447eb Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:06:30 +0200 Subject: [PATCH 014/399] clang: Build with gcc 4.7 for better libstdc++. --- 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 aab9415294d0..56b66872749e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2226,7 +2226,7 @@ let clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { stdenv = if stdenv.isDarwin then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; + else stdenvAdapters.overrideGCC stdenv gcc47; }; clang = wrapClang clangUnwrapped; From 52abed95cad887838e75c3531b6fbb785dd0ef59 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:05:53 +0200 Subject: [PATCH 015/399] all-packages: Add a self-hosted variant of clang. --- pkgs/top-level/all-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b66872749e..d6ba3eba9874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,8 +2231,26 @@ let clang = wrapClang clangUnwrapped; + libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; }; + clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { + stdenv = libcxxStdenv; + llvm = libcxxLLVM; + }); + + clangWrapSelf = build: (import ../build-support/clang-wrapper) { + clang = build; + stdenv = clangStdenv; + libc = glibc; + binutils = binutils_gold; + shell = bash; + inherit libcxx coreutils zlib; + nativeTools = false; + nativeLibc = false; + }; + #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); clean = callPackage ../development/compilers/clean { }; From 2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:04:31 +0200 Subject: [PATCH 016/399] clang: Do not try to build clang-tblgen in LLVM's build path. --- pkgs/development/compilers/llvm/clang-tablegen-dir.patch | 9 +++++++++ pkgs/development/compilers/llvm/clang.nix | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/clang-tablegen-dir.patch diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch new file mode 100644 index 000000000000..de6a468b239f --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch @@ -0,0 +1,9 @@ +--- a/utils/TableGen/CMakeLists.txt (revision 190146) ++++ b/utils/TableGen/CMakeLists.txt (working copy) +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS Support) ++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + + add_tablegen(clang-tblgen CLANG + ClangASTNodesEmitter.cpp + diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index df58591973e6..8c178c9ce037 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake libxml2 python ]; - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + patches = [ ./clang-tablegen-dir.patch ] ++ + stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" From e3f2e2e10b8cf2065800358a90ef04ea41e708eb Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:03:26 +0200 Subject: [PATCH 017/399] libcxx: Update to 190100 and build with libc++abi. --- pkgs/development/libraries/libc++/default.nix | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index bed953119151..1d4ef158113a 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,19 +1,43 @@ -{ stdenv, fetchsvn, cmake }: +{ stdenv, fetchsvn, cmake, libunwind }: -let rev = "165151"; in +let rev = "190100"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libc++-pre${rev}"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; inherit rev; - sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz"; + sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03"; + }; + + cxxabi = fetchsvn { + url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk"; + inherit rev; + sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp"; }; buildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + preConfigure = '' + sed -i 's/;cxa_demangle.h//' CMakeLists.txt + cp -R ${cxxabi} cxxabi + chmod u+w -R cxxabi # umm + (export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include"; + export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + cd cxxabi/lib + sed -e s,-lstdc++,, -i buildit # do not link to libstdc++! + ./buildit + mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib + cd $out/lib + ln -s libc++abi.so.1.0 libc++abi.so + ln -s libc++abi.so.1.0 libc++abi.so.1) + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include" + "-DLIBCXX_CXX_ABI=libcxxabi" ]; + buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make''; enableParallelBuilding = true; From 7c3f07f97c476111e36469a72fe91eb87942d2ac Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:02:50 +0200 Subject: [PATCH 018/399] clang-wrapper: Guard against LD_LIBRARY_PATH. --- pkgs/build-support/clang-wrapper/clang-wrapper.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 2052d2c2eb4c..4f710856868b 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -134,6 +134,12 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then source "$NIX_CLANG_WRAPPER_EXEC_HOOK" fi +# We nuke LD_LIBRARY_PATH here, because clang dynamically links to LLVM. +# Unfortunately, when such clang is used to build LLVM again, it can get in +# trouble temporarily binding to the build-directory versions of the libraries +# (the buildsystem sets LD_LIBRARY_PATH). That is very undesirable and can +# cause mysterious failures. +LD_LIBRARY_PATH= # Call the real `clang'. Filter out warnings from stderr about unused # `-B' flags, since they confuse some programs. Deep bash magic to From dde70f937826f5a3545a6e52eed8303740237abf Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:02:32 +0200 Subject: [PATCH 019/399] clang-wrapper: Optionally use libc++ instead of libstdc++. --- pkgs/build-support/clang-wrapper/builder.sh | 3 +++ pkgs/build-support/clang-wrapper/clang-wrapper.sh | 5 ++++- pkgs/build-support/clang-wrapper/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index 9f1542e04113..3f90b9d32bd0 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -58,11 +58,14 @@ fi doSubstitute() { local src=$1 local dst=$2 + local uselibcxx= + if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi # Can't use substitute() here, because replace may not have been # built yet (in the bootstrap). sed \ -e "s^@out@^$out^g" \ -e "s^@shell@^$shell^g" \ + -e "s^@libcxx@^$uselibcxx^g" \ -e "s^@clang@^$clang^g" \ -e "s^@clangProg@^$clangProg^g" \ -e "s^@binutils@^$binutils^g" \ diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 4f710856868b..84067844cad8 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -52,7 +52,6 @@ if test "$nonFlagArgs" = "0"; then dontLink=1 fi - # Optionally filter out paths not refering to the store. params=("$@") if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then @@ -79,6 +78,10 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then params=("${rest[@]}") fi +if test -n "@libcxx@"; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" + NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -lc++abi" +fi # Add the flags for the C compiler proper. extraAfter=($NIX_CFLAGS_COMPILE) diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 9f560d0d2fba..1b2a02fa86a4 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -7,7 +7,7 @@ { name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" , clang ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" -, zlib ? null +, zlib ? null, libcxx ? null }: assert nativeTools -> nativePrefix != ""; @@ -33,7 +33,7 @@ stdenv.mkDerivation { utils = ./utils.sh; addFlags = ./add-flags; - inherit nativeTools nativeLibc nativePrefix clang clangVersion; + inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; gcc = clang.gcc; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; From e0171ef0267c13e4a9d8888013a08b6ae0d19406 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 15 Nov 2013 21:56:45 +0100 Subject: [PATCH 020/399] systemd: Change services.logind.extraConfig type to types.lines --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7c6807340fd3..a21280414342 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -518,7 +518,7 @@ in services.logind.extraConfig = mkOption { default = ""; - type = types.str; + type = types.lines; example = "HandleLidSwitch=ignore"; description = '' Extra config options for systemd-logind. See man logind.conf for From 36a05c7b1583e4611fa824e1c05d94462dcbc3c2 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 15 Nov 2013 19:49:01 +0100 Subject: [PATCH 021/399] systemd: Add systemd.extraConfig option for /etc/systemd/system.conf --- nixos/modules/system/boot/systemd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a21280414342..8895f9bf727f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -486,6 +486,16 @@ in ''; }; + systemd.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultLimitCORE=infinity"; + description = '' + Extra config options for systemd. See man systemd-system.conf for + available options. + ''; + }; + services.journald.console = mkOption { default = ""; type = types.str; @@ -555,6 +565,7 @@ in environment.etc."systemd/system.conf".text = '' [Manager] + ${config.systemd.extraConfig} ''; environment.etc."systemd/journald.conf".text = From d8b0c942a1ec2101e0b74044aea01c9b281dce03 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 12 Nov 2013 15:37:49 +0400 Subject: [PATCH 022/399] xfce: enable tumbler the thumbnail manager (close #1206) --- .../services/x11/desktop-managers/xfce.nix | 1 + pkgs/desktops/xfce/core/tumbler.nix | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 8199829ef90f..d20010c70a61 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -72,6 +72,7 @@ in pkgs.xfce.thunar_volman pkgs.xfce.gvfs pkgs.xfce.xfce4_appfinder + pkgs.xfce.tumbler ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 1e7c3c5127e7..06902792624e 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype, +libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; @@ -11,11 +12,24 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf ]; + buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype + poppler libgsf bzip2]; + + configureFlags = [ + # Needs gst-tag + # "--enable-gstreamer-thumbnailer" + + # Needs libffmpegthumbnailer + # "--enable-ffmpeg-thumbnailer" + + "--enable-odf-thumbnailer" + "--enable-poppler-thumbnailer" + ]; meta = { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; + platforms = stdenv.lib.platforms.linux; license = "GPLv2"; }; } From db3abf1c45e4fbb1b41f6666d0b954249202c9c2 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:50:59 +0100 Subject: [PATCH 023/399] nanomsg: new package Socket library built in C but provides bindings in many languages. Highly efficient and easy to use. [@bjornfor: whitespace fixes, quote shell variables and add meta.platforms] --- .../development/libraries/nanomsg/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/nanomsg/default.nix diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix new file mode 100644 index 000000000000..8bf7ccbfcfa6 --- /dev/null +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.2-alpha"; + name = "nanomsg-${version}"; + + src = fetchurl { + url = "http://download.nanomsg.org/${name}.tar.gz"; + sha256 = "0bgjj1x1a991pckw4nm5bkmbibjsf74y0ns23fpk4jj5dwarhm3d"; + }; + + installPhase = '' + mkdir -p "$out" + make install PREFIX="$out" + ''; + + meta = with stdenv.lib; { + description= "Socket library that provides several common communication patterns"; + homepage = http://nanomsg.org/; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6ba3eba9874..9a4a085ead35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5257,6 +5257,8 @@ let mythes = callPackage ../development/libraries/mythes { }; + nanomsg = callPackage ../development/libraries/nanomsg { }; + ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) { inherit fetchurl; unicode = system != "i686-cygwin"; From 0eeb78d74c470b2d781ca46427e2614ae4313da5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 13 Nov 2013 05:58:15 -0600 Subject: [PATCH 024/399] nvidia: Update to version 331.20 We no longer need the patches applied for the previous version so they are removed. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++----- ...vidia-drivers-linux-3.11-incremental.patch | 25 ------------------- .../linux/nvidia-x11/version-test.patch | 19 -------------- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/version-test.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f9239bb5fba1..02eb65123d80 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - versionNumber = "319.60"; + versionNumber = "331.20"; in @@ -19,20 +19,16 @@ stdenv.mkDerivation { builder = ./builder.sh; - patches = - [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch; - src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0kjidkwd2b5aik74663mxk3ffq4a3fmaybq2aq1lcbfhvvh49j6j"; + sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0fhrxcfsw2jaycnz9gr04c9w585wydx8kpm6rjjbw19wkf8hlq3z"; + sha256 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch deleted file mode 100644 index bb6fad932e3c..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 -From: Lukas Elsner -Date: Wed, 17 Jul 2013 01:16:04 +0200 -Subject: [PATCH] replace num_physpages with totalram_pages - ---- - kernel/nv-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h -index 4e5ed89..46c51ec 100644 ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) - #endif - - #if !defined(NV_VMWARE) --#define NV_NUM_PHYSPAGES num_physpages -+#define NV_NUM_PHYSPAGES totalram_pages - #define NV_GET_CURRENT_PROCESS() current->tgid - #define NV_IN_ATOMIC() in_atomic() - #define NV_LOCAL_BH_DISABLE() local_bh_disable() --- -1.8.3.2 - diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch deleted file mode 100644 index 9b6908ee5c0a..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/version-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh ---- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430 -+++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430 -@@ -1699,11 +1699,13 @@ - # kernel older than 2.6.6, that's all we require to - # build the module. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \ -+ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \ -+ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi From ee5d4614716db137fcc2088d913c58f8f68126bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 23:23:04 +0100 Subject: [PATCH 025/399] Date::Manip: Update to 6.41 --- pkgs/top-level/perl-packages.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fff03c8b51a..05a6aec35a22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1925,10 +1925,14 @@ rec { }; DateManip = buildPerlPackage { - name = "DateManip-5.54"; + name = "Date-Manip-6.41"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz; - sha256 = "0ap2jgqx7yvjsyph9zsvadsih41cj991j3jwgz5261sq7q74y7xn"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.41.tar.gz; + sha256 = "f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09"; + }; + propagatedBuildInputs = [ TestInter ]; + meta = { + description = "Date manipulation routines"; }; }; @@ -8600,6 +8604,18 @@ rec { }; }; + TestInter = buildPerlPackage { + name = "Test-Inter-1.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.05.tar.gz; + sha256 = "bda95ef503f1c1b39a5cd1ea686d18a67a63b56a8eb458f0614fc2acc51f7988"; + }; + meta = { + description = "Framework for more readable interactive test scripts"; + license = "perl"; + }; + }; + TextMarkdown = buildPerlPackage rec { name = "Text-Markdown-1.0.26"; src = fetchurl { From 359e2e3addff559f711ab62b47511cf83a725c8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Nov 2013 16:56:15 +0100 Subject: [PATCH 026/399] gnucash: Enable support for Finance::Quote --- pkgs/applications/office/gnucash/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index eddaf8f33e7c..b399c80ebff9 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl +, libgsf, libart_lgpl, perlPackages }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -21,23 +21,31 @@ stdenv.mkDerivation rec { pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' - sed -i $out/bin/update-gnucash-gconf \ + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' - for prog in "$out/bin/"* + + for prog in $(echo "$out/bin/"*) do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl