From 0d0eb44a354de2ff7823d089261b7070b6c33823 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 23 Jan 2014 14:44:21 +0100 Subject: [PATCH 01/99] drop myhasktags, current hackage version has everything my version had --- pkgs/misc/source-and-tags/default.nix | 9 +++++-- pkgs/tools/misc/myhasktags/default.nix | 37 -------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 2 -- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 pkgs/tools/misc/myhasktags/default.nix diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index ece31bbaa74f..981c01e2b4a7 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -56,8 +56,13 @@ args: with args; { tagCmd = " srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\" [ -z \"$srcs\" ] || { - ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs - sort tags > \$TAG_FILE + # without this creating tag files for lifted-base fails + export LC_ALL=en_US.UTF-8 + export LANG=en_US.UTF-8 + ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""} + + ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . + mv tags \$TAG_FILE }"; } ]; diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix deleted file mode 100644 index 62d4ee2579f0..000000000000 --- a/pkgs/tools/misc/myhasktags/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{fetchurl, stdenv, ghcPlain} : - -/* use case: - - packageOverrides = { - - haskellCollection = - let hp = haskellPackages; - install = [ hp.QuickCheck /* ... * /]; - in - misc.collection { - name = "my-haskell-packages-collection"; - list = install ++ (map (x : sourceWithTagsDerivation (sourceWithTagsFromDerivation (addHasktagsTaggingInfo x) )) - (lib.filter (x : builtins.hasAttr "src" x) install ) ); - }; - }; - -*/ - -stdenv.mkDerivation { - name = "hasktags-modified"; - version = "0.0"; # Haskell Platform 2009.0.0 - src = fetchurl { - url = http://mawercer.de/~nix/hasktags.hs; - sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c"; - }; - phases="buildPhase"; - buildPhase = '' - mkdir -p $out/bin - ghc --make $src -o $out/bin/hasktags-modified - ''; - buildInputs = [ ghcPlain ]; - - meta = { - description = "my patched version of hasktags. Should be merged into hasktags?"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f7de5e46735..701a37f25c39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10138,7 +10138,7 @@ let sourceAndTags = import ../misc/source-and-tags { inherit pkgs stdenv unzip lib ctags; - hasktags = haskellPackages.myhasktags; + hasktags = haskellPackages.hasktags; }; splix = callPackage ../misc/cups/drivers/splix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 798103153ece..bcd49cd6dddd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2719,8 +2719,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; - myhasktags = callPackage ../tools/misc/myhasktags {}; - packunused = callPackage ../development/tools/haskell/packunused {}; splot = callPackage ../development/tools/haskell/splot {}; From 69682777851bfc71f949d7b1e26da01fc8ebb82d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Jan 2014 23:28:20 +0100 Subject: [PATCH 02/99] maude: build with bison 2.x; version 3.x causes compiler errors --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05fec2521086..6ee74ee90e1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3109,7 +3109,9 @@ let lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { }; + maude = callPackage ../development/interpreters/maude { + bison = bison2; + }; octave = callPackage ../development/interpreters/octave { fltk = fltk13; From 97b519a515952be3ae09c32c36d3c02c7251da18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 00:07:05 +0100 Subject: [PATCH 03/99] add most basic README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000000..1fdbe4ba74b1 --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +Nixpkgs is a collection of packages for [Nix](hhttp://nixos.org/nix/) package +manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. + +* [NixOS installation instructions](http://nixos.org/nixos/manual/#idm139984689550080) +* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) +* [Manual (NixOS)](http://nixos.org/nixos/manual/) +* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) +* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) +* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) From b73b4bfd61051b4591e52b78be6befc04155a15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 00:08:00 +0100 Subject: [PATCH 04/99] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fdbe4ba74b1..4a220e28ba6c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Nixpkgs is a collection of packages for [Nix](hhttp://nixos.org/nix/) package +Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. * [NixOS installation instructions](http://nixos.org/nixos/manual/#idm139984689550080) From a86f119dfc25c308d0c92a76009eeb13fb43d27d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Jan 2014 22:34:19 +0100 Subject: [PATCH 05/99] haskell-either: disable the documentation build on GHC 7.4.x or earlier --- pkgs/development/libraries/haskell/either/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index cec991fab3f4..d6853f4cf4c2 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { monadControl MonadRandom mtl semigroupoids semigroups transformers transformersBase ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6"; meta = { homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; From a5b054e18a5c008c7dd809eda5fd1271b586ac8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 10:25:27 +0100 Subject: [PATCH 06/99] xfce4-screenshooter: add platforms.linux --- pkgs/desktops/xfce/applications/xfce4-screenshooter.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index c8916bf502cb..6e0d9d3e7e71 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; }; } From c4cb65187e97bb451210697c8ce6b1bd0f139cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 14:32:51 +0100 Subject: [PATCH 07/99] i3: 4.6 -> 4.7.2 --- pkgs/applications/window-managers/i3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index f6d2dc4cfe5e..ebdc7b143c37 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - libXcursor, coreutils, perl, pango }: + xcb-util-cursor, coreutils, perl, pango }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.6"; + version = "4.7.2"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm"; + sha256 = "14zkn5jgm0b7ablvxcxh9gdzq6mjdd6i1kl9dbmifl2a6rg5dr3g"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm - libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ]; patchPhase = '' patchShebangs . From 8a5c65abf4d4d25f840e82122ec2c75ff022006d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 14:33:02 +0100 Subject: [PATCH 08/99] mailpile: update dev version --- pkgs/applications/networking/mailreaders/mailpile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index d98b3b6be9d3..bc38defe06cd 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -5,8 +5,8 @@ buildPythonPackage rec { src = fetchgit { url = "https://github.com/pagekite/Mailpile.git"; - rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0"; - sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j"; + rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92"; + sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc"; }; propagatedBuildInputs = with pythonPackages; [ From f2d61667815e98eda7ee790f5ac3f7870afb86d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 24 Jan 2014 14:33:20 +0100 Subject: [PATCH 09/99] python-libarchive: 3.0.4-5 -> 3.1.2-1 --- 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 4bc9c54d719b..4a6681b9f554 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7846,12 +7846,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { libarchive = buildPythonPackage rec { - version = "3.0.4-5"; + version = "3.1.2-1"; name = "libarchive-${version}"; src = fetchurl { url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; - sha256 = "141yx9ym8gvybn67mw0lmgafzsd79rmd9l77lk0k6m2fzclqx1j5"; + sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; }; propagatedBuildInputs = [ pkgs.libarchive ]; From 13e13f279b61c35a744888196789187828c32295 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 24 Jan 2014 15:52:19 +0100 Subject: [PATCH 10/99] Do not assume a .rev attribute in available in src in maven-build.nix --- pkgs/build-support/release/maven-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 39f069cd57f0..6b47bb9cae90 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation ( rec { zip=$(ls target/*.zip| head -1) releaseName=$(basename $zip .zip) - releaseName="$releaseName-r${toString src.rev}" + releaseName="$releaseName-r${toString src.rev or "0"}" cp $zip $out/release/$releaseName.zip echo "$releaseName" > $out/nix-support/hydra-release-name From 7b743fcaab52d423ef2bd9ba95453d6ea55d2e07 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 19 Jan 2014 14:40:51 -0600 Subject: [PATCH 11/99] networkmanager: load modules required for PPTP --- nixos/modules/services/networking/networkmanager.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 40c20aae4ef0..0b079e3567a1 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -130,6 +130,8 @@ in { message = "You can not use networking.networkmanager with services.networking.wireless"; }]; + boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. + environment.etc = [ { source = ipUpScript; target = "NetworkManager/dispatcher.d/01nixos-ip-up"; From a17b090f990e288ddfc96116382526fe3c76543c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 24 Jan 2014 16:07:20 +0100 Subject: [PATCH 12/99] junit: Update to 4.11 --- .../libraries/java/junit/builder.sh | 6 ---- .../libraries/java/junit/default.nix | 33 ++++++++++++++----- 2 files changed, 25 insertions(+), 14 deletions(-) delete mode 100755 pkgs/development/libraries/java/junit/builder.sh diff --git a/pkgs/development/libraries/java/junit/builder.sh b/pkgs/development/libraries/java/junit/builder.sh deleted file mode 100755 index a76360ead1e8..000000000000 --- a/pkgs/development/libraries/java/junit/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -source $stdenv/setup - -$unzip/bin/unzip $src -mkdir -p $out -mv junit*/* $out diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index 7a6db1ad4b30..888365f789f7 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,17 +1,34 @@ -{stdenv, fetchurl, unzip} : +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "junit-4.8.2"; - builder = ./builder.sh; +let - src = fetchurl { - url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip; - sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6"; + junit = fetchurl { + url = http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar; + sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h"; }; - inherit unzip; + hamcrest = fetchurl { + url = http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; + sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"; + }; + +in + +stdenv.mkDerivation { + name = "junit-4.11"; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/share/java + ln -s ${junit} $out/share/java/junit.jar + ln -s ${hamcrest} $out/share/java/hamcrest-core.jar + ''; meta = { homepage = http://www.junit.org/; + description = "A framework for repeatable tests in Java"; + license = stdenv.lib.licenses.epl10; }; } From e07ce3314d4cea1d520d61ef939c17d794545c93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 24 Jan 2014 16:27:36 +0100 Subject: [PATCH 13/99] Fix some "meta.licenses" attributes --- pkgs/applications/networking/browsers/icecat-3/default.nix | 2 +- .../networking/browsers/mozilla-plugins/fribid/default.nix | 2 +- .../browsers/mozilla-plugins/mplayerplug-in/default.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/4.01.0.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/cairomm/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 2 +- pkgs/development/libraries/sbc/default.nix | 2 +- pkgs/development/libraries/zziplib/default.nix | 2 +- pkgs/development/ocaml-modules/menhir/default.nix | 2 +- pkgs/development/python-modules/setuptools/default.nix | 2 +- pkgs/development/tools/misc/autogen/default.nix | 2 +- pkgs/tools/compression/xz/default.nix | 2 +- pkgs/tools/networking/isync/default.nix | 2 +- pkgs/tools/networking/maildrop/default.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 84269a290e9a..ef2c69422b62 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { ''; homepage = http://www.gnu.org/software/gnuzilla/; - licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; + license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 66bd28424c0e..8cda5ad5762f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A browser plugin to manage Swedish BankID:s"; homepage = http://fribid.se; - licenses = [ "GPLv2" "MPLv1" ]; + license = [ "GPLv2" "MPLv1" ]; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 6ee1735f76c7..5b6b2176d47e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { meta = { description = "A browser plugin that uses mplayer to play digital media from websites"; homepage = http://mplayerplug-in.sourceforge.net/; - licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; + license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; }; } diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 9c0b3d1d1921..cffd7c3f54a4 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Objective Caml, the most popular variant of the Caml language"; longDescription = diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c719abc4abc7..f916f5a79233 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "OCaml, the most popular variant of the Caml language"; longDescription = diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index d7c14e031b35..8662db70c26c 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "OCaml, the most popular variant of the Caml language"; longDescription = diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index c11bb7536be1..79a7c8cd61f6 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "OCaml, the most popular variant of the Caml language"; longDescription = diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index df3e9e73af59..9c5fa3764bad 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; - licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; }; } diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 68ba7d1a9b26..6c73b17e6f4e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - licenses = [ "LGPLv2+" "MPLv1" ]; + license = [ "LGPLv2+" "MPLv1" ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index e47645737b16..f21abedc1f52 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - licenses = [ "LGPLv2+" "MPLv1" ]; + license = [ "LGPLv2+" "MPLv1" ]; }; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index ec19e381281d..42bdba7567c5 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; - licenses = [ "MPLv1.1" /* or */ "GPLv2+" ]; + license = [ "MPLv1.1" /* or */ "GPLv2+" ]; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 414f2a13dea1..06411c1f22a8 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.bluez.org/; - licenses = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 69e53d4e8f64..055a491f4601 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { zip/unzip tools. ''; - licenses = [ "LGPLv2+" "MPLv1.1" ]; + license = [ "LGPLv2+" "MPLv1.1" ]; homepage = http://zziplib.sourceforge.net/; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 249ddc1cf568..d5db6e9c7e0c 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { to OCaml code. Menhir was designed and implemented by François Pottier and Yann Régis-Gianas. ''; - licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; + license = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 8ddf0e9329f6..e0c3e7837b4c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - licenses = [ "PSF" "ZPL" ]; + license = [ "PSF" "ZPL" ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 308183cb6fc0..a26c1fdd1995 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -46,7 +46,7 @@ let version = "5.18"; in documentation of program options. ''; - licenses = ["GPLv3+" "LGPLv3+" ]; + license = ["GPLv3+" "LGPLv3+" ]; homepage = http://www.gnu.org/software/autogen/; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 6d59bd927cff..b644f46dff86 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { bzip2. ''; - licenses = [ "GPLv2+" "LGPLv2.1+" ]; + license = [ "GPLv2+" "LGPLv2.1+" ]; maintainers = with stdenv.lib.maintainers; [ sander ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 9587dfee613b..30ee63f257a4 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; - licenses = [ "GPLv2+" ]; + license = [ "GPLv2+" ]; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index b91282c9a2b4..991d75c66ae4 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; - licenses = [ "GPLv3" ]; + license = [ "GPLv3" ]; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3a84516cd370..8ebe7df35e76 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { message handling system. ''; - licenses = [ "LGPLv3+" /* libraries */ "GPLv3+" /* tools */ ]; + license = [ "LGPLv3+" /* libraries */ "GPLv3+" /* tools */ ]; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef2372b50125..6211b91053f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4368,7 +4368,7 @@ let self = _self // overrides; _self = with self; { Sigma/Foveon and Sony. ''; - licenses = [ "GPLv1+" /* or */ "Artistic" ]; + license = [ "GPLv1+" /* or */ "Artistic" ]; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; From 981cac8e1076ae68563d2ba872f6c1edb0258bb3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 02:29:14 +0100 Subject: [PATCH 14/99] openjdk: Hackery to ensure that tools.jar is found HotSpot uses the absolute path of libjvm.so to determine the java.home property (ignoring $JAVA_HOME), which is in turn used by ToolProvider.getSystemJavaCompiler() to load tools.jar. So we need to do some trickery to ensure that if java gets invoked from the jdk output (ratherthan the jre output), it finds libjvm.so in the jdk output. --- .../development/compilers/openjdk/default.nix | 19 ++++++++++++++----- .../compilers/openjdk/fix-java-home.patch | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/fix-java-home.patch diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 306337fac9c6..50f01f413720 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups -, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama -, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }: +, which, jdk, nettools, xorg +, fontconfig, cpio, cacert, perl, setJavaClassPath }: let @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ unzip procps ant which zip cpio nettools alsaLib - libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst + xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir fontconfig perl ]; @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk ''; - patches = [ ./cppflags-include-fix.patch ]; + patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ]; NIX_NO_SELF_RPATH = true; @@ -80,6 +81,9 @@ stdenv.mkDerivation rec { mv $out/lib/openjdk/include $out/include mv $out/lib/openjdk/man $out/share/man + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + # Remove some broken manpages. rm -rf $out/share/man/ja* @@ -88,10 +92,15 @@ stdenv.mkDerivation rec { # Move the JRE to a separate output. mv $out/lib/openjdk/jre $jre/lib/openjdk/ - ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + rm -rf $out/lib/openjdk/jre/bin + ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin # Remove duplicate binaries. for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i fi diff --git a/pkgs/development/compilers/openjdk/fix-java-home.patch b/pkgs/development/compilers/openjdk/fix-java-home.patch new file mode 100644 index 000000000000..5def344f1717 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home.patch @@ -0,0 +1,17 @@ +diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 +@@ -2358,12 +2358,10 @@ + CAST_FROM_FN_PTR(address, os::jvm_path), + dli_fname, sizeof(dli_fname), NULL); + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = realpath(dli_fname, buf); ++ snprintf(buf, buflen, "%s", dli_fname); + } +- if (rp == NULL) +- return; + + if (Arguments::created_by_gamma_launcher()) { + // Support for the gamma launcher. Typical value for buf is From 1b598da460db965c9c4d68b711a9b671b2c5f887 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 02:32:39 +0100 Subject: [PATCH 15/99] Drop unnecessary setting of java.home --- pkgs/development/interpreters/rascal/default.nix | 2 +- pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index d3eb98249892..6818a996d623 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { '' mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/rascal \ - --add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \ + --add-flags "-jar ${src}" \ ''; meta = { diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 19c664c2ea7e..0dfb634c5944 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -65,10 +65,6 @@ stdenv.mkDerivation { LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - if [ -e \$JAVA_HOME/lib/tools.jar ]; then - LOCALCLASSPATH="\$JAVA_HOME/lib/tools.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - fi - exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ From 458d0a92c9bc2339ff434fe651359a6c18888937 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 02:28:19 +0100 Subject: [PATCH 16/99] junixsocket: Add --- .../libraries/java/junixsocket/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/java/junixsocket/default.nix diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix new file mode 100644 index 000000000000..a23de5d98c62 --- /dev/null +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ant, jdk, junit }: + +stdenv.mkDerivation rec { + name = "junixsocket-1.3"; + + src = fetchurl { + url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2"; + sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym"; + }; + + buildInputs = [ ant jdk junit ]; + + preConfigure = + '' + sed -i 's|/usr/bin/||' build.xml + ''; + + buildPhase = "ant"; + + ANT_ARGS = + "-Dskip32=true -Dant.build.javac.source=1.6" + + stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true"; + + installPhase = + '' + mkdir -p $out/share/java $out/lib + cp -v dist/*.jar $out/share/java + cp -v lib-native/*.so lib-native/*.dylib $out/lib/ + ''; + + meta = { + description = "A Java/JNI library for using Unix Domain Sockets from Java"; + homepage = https://code.google.com/p/junixsocket/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ee74ee90e1f..929fd87e963c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5835,6 +5835,8 @@ let junit = callPackage ../development/libraries/java/junit { }; + junixsocket = callPackage ../development/libraries/java/junixsocket { }; + jzmq = callPackage ../development/libraries/java/jzmq { }; lucene = callPackage ../development/libraries/java/lucene { }; From 97352b1342acb10c525ddb8ca9e5aa15ec21b372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 24 Jan 2014 23:14:31 +0100 Subject: [PATCH 17/99] cgal: update from 3.9 to 4.3 (really) The previous version bump didn't actually do anything; it changed the version/url but didn't change the hash. For some reason the (new) URL returned the same old package with the same old hash (or so it seems). This time the package is really updated, as can be seen from the version number in $cgal/include/CGAL/version.h. This change unbreaks openscad. --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 0b65fcba0cb3..77c486350b84 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "4.3"; name = "cgal-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz"; - sha256 = "193vjhzlf7f2kw6dbg5yw8v0izdvmnrylqzqhw92vml7jjnr8494"; + url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz"; + sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc"; }; buildInputs = [cmake boost gmp mpfr ]; From c72ce740bc1ed4887a9ef5f1f31caeac50d2f8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 24 Jan 2014 23:21:54 +0100 Subject: [PATCH 18/99] cgal: expression cleanup --- pkgs/development/libraries/CGAL/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 77c486350b84..12273f845668 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,25 +1,24 @@ -{stdenv, fetchurl, cmake, boost, gmp, mpfr - }: +{ stdenv, fetchurl, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { version = "4.3"; + name = "cgal-${version}"; + src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz"; sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc"; }; - buildInputs = [cmake boost gmp mpfr ]; + buildInputs = [ cmake boost gmp mpfr ]; doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; homepage = "http://cgal.org/"; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+ + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; }; } - From 0121ee33d8134b849c4353984c8046e3550e6693 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Sat, 25 Jan 2014 10:28:27 +0100 Subject: [PATCH 19/99] Add the beep-1.3. --- pkgs/misc/beep/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/misc/beep/default.nix diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix new file mode 100644 index 000000000000..8f0830be1862 --- /dev/null +++ b/pkgs/misc/beep/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +# this package is working only as root +# in order to work as a non privileged user you would need to suid the bin + +stdenv.mkDerivation { + name = "beep-1.3"; + src = fetchurl { + url = http://www.johnath.com/beep/beep-1.3.tar.gz; + md5 = "49c340ceb95dbda3f97b2daafac7892a"; + }; + + makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + meta = { + description = "The advanced PC speaker beeper"; + homepage = http://www.johnath.com/beep/; + license = "GPLv2"; + }; +} From 47ac1f38cd6c3311749fdb2950b7741f321395f2 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Sat, 25 Jan 2014 10:28:54 +0100 Subject: [PATCH 20/99] Added beep to top-level. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 929fd87e963c..894605c5a639 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9947,6 +9947,8 @@ let auctex = callPackage ../tools/typesetting/tex/auctex { }; + beep = callPackage ../misc/beep { }; + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; From 5d3d6b37994f1e564eae00187d9440d85f92197c Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 25 Jan 2014 11:20:25 +0100 Subject: [PATCH 21/99] support -Q in nixos-rebuild --- nixos/modules/installer/tools/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 5c89394abceb..2a1c397553bb 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -40,7 +40,7 @@ while [ "$#" -gt 0 ]; do repair=1 extraBuildFlags+=("$i") ;; - --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair) + --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q) extraBuildFlags+=("$i") ;; --max-jobs|-j|--cores|-I) From 8ab1160079357ecf86cc920eb64f04fcfadef557 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 25 Jan 2014 10:30:06 +0000 Subject: [PATCH 22/99] pythonPackages.tarsnapper: New expression --- .../python-modules/tarsnapper-path.patch | 20 +++++++++ pkgs/top-level/python-packages.nix | 42 +++++++++++++------ 2 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/tarsnapper-path.patch diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch new file mode 100644 index 000000000000..337ad49f9715 --- /dev/null +++ b/pkgs/development/python-modules/tarsnapper-path.patch @@ -0,0 +1,20 @@ +diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py +index 737ac8d..52cc775 100644 +--- a/src/tarsnapper/script.py ++++ b/src/tarsnapper/script.py +@@ -48,7 +48,7 @@ class TarsnapBackend(object): + """ + ``arguments`` is a single list of strings. + """ +- call_with = ['tarsnap'] ++ call_with = ['@NIXTARSNAPPATH@'] + for option in self.options: + key = option[0] + pre = "-" if len(key) == 1 else "--" +@@ -499,4 +499,4 @@ def run(): + + + if __name__ == '__main__': +- run() +\ No newline at end of file ++ run() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a6681b9f554..5718572399f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1029,7 +1029,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz"; sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy"; }; - + propagatedBuildInputs = [ pyparsing modules.readline @@ -1871,7 +1871,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; md5 = "3a67683c578754cd8f23317db6d28ffd"; }; - + buildInputs = [ zope_interface zodb3 ]; meta = { @@ -1887,7 +1887,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip"; md5 = "36aa2c96dec4cfeea57f54da2b733eb9"; }; - + buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ]; meta = { @@ -1903,7 +1903,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz"; md5 = "476ef5b9004f6e2cb25c7da440bb53d0"; }; - + buildInputs = [ ]; meta = { @@ -1919,7 +1919,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; md5 = "22e88cc82cafbbe00274e7378434e5fe"; }; - + buildInputs = [ pyramid mock ]; propagatedBuildInputs = [ zodb3 zodburi ]; @@ -1936,7 +1936,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz"; md5 = "43800c7c894097a23140da58e3638c93"; }; - + buildInputs = [ pyramid transaction ]; propagatedBuildInputs = [ repoze_sendmail ]; @@ -1953,7 +1953,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz"; md5 = "81d15f1f03cc67d6f56f2091c594ef57"; }; - + buildInputs = [ transaction ]; meta = { @@ -1969,7 +1969,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2"; }; - + buildInputs = [ zodb3 mock ]; meta = { @@ -2215,7 +2215,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; django = django_1_6; - + django_1_6 = buildPythonPackage rec { name = "Django-${version}"; version = "1.6"; @@ -6239,7 +6239,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; # 4 failing tests - doCheck = false; + doCheck = false; buildInputs = [ nose modules.curses ]; @@ -6617,7 +6617,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz"; sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42"; }; - + propagatedBuildInputs = [ configshell_fb rtslib_fb @@ -6630,6 +6630,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + tarsnapper = buildPythonPackage rec { + name = "tarsnapper-0.2.1"; + + src = fetchgit { + url = https://github.com/miracle2k/tarsnapper.git; + rev = "620439bca68892f2ffaba1079a34b18496cc6596"; + }; + + propagatedBuildInputs = [ argparse pyyaml ]; + + patches = [ ../development/python-modules/tarsnapper-path.patch ]; + + preConfigure = '' + substituteInPlace src/tarsnapper/script.py \ + --replace '@NIXTARSNAPPATH@' '${pkgs.tarsnap}/bin/tarsnap' + ''; + }; + taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.22"; @@ -7073,7 +7091,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { webtest = buildPythonPackage rec { version = "2.0.11"; name = "webtest-${version}"; - + src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; md5 = "e51da21da8815cef07f543d8688effea"; From c3b4e87f253dbccfbff1246d17b92b1e8d3b45a7 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 25 Jan 2014 11:24:17 +0000 Subject: [PATCH 23/99] haskellPackages.ariadne: Fix dependencies to allow building --- .../haskell/haskell-names/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index ac1cf83ac5e9..c67f4ccb402f 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -25,4 +25,5 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; + doCheck = false; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 798103153ece..7aa857fa112e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -548,6 +548,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ariadne = callPackage ../development/libraries/haskell/ariadne { Cabal = self.Cabal_1_18_1_2; + haskellPackages = self.haskellPackages.override { + Cabal = self.Cabal_1_18_1_2; + }; + haskellNames = self.haskellNames.override { + Cabal = self.Cabal_1_18_1_2; + haskellPackages = self.haskellPackages.override { + Cabal = self.Cabal_1_18_1_2; + }; + }; }; arithmoi = callPackage ../development/libraries/haskell/arithmoi {}; @@ -613,7 +622,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; binary = null; # core package starting with GHC 7.4.x - binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; + binaryConduit = callPackage ../development/libraries/haskell/binary-conduit { + binary = self.binary_0_7_1_0; + }; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; @@ -1333,13 +1344,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {}; - hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; + hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; - hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; + hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; - hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; + hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; - hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; + hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; hoogle = callPackage ../development/libraries/haskell/hoogle {}; From 0ff30b792545c7aaa5450490a0457c8fb5c95580 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 25 Jan 2014 11:46:03 +0000 Subject: [PATCH 24/99] perlPackages.HTMLFormHandler: Upgrade to 0.40055 --- pkgs/top-level/perl-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6211b91053f5..a9f9638bb7ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3794,7 +3794,7 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; - }; + }; HeapFibonacci = buildPerlPackage { name = "Heap-Fibonacci-0.80"; @@ -3871,18 +3871,18 @@ let self = _self // overrides; _self = with self; { }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40025"; + name = "HTML-FormHandler-0.40055"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40025.tar.gz; - sha256 = "0fp8qcbkr19qn1859rpn3ca3b7w1jjyprwlj82dnvfi3b5jf8507"; + url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40055.tar.gz; + sha256 = "47e3cf69e2475cba86356eda340e6622df0525e2d0aa2343aef9f924f13d86cd"; }; buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ]; - propagatedBuildInputs = [ aliased ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir JSON HTMLTree Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass namespaceautoclean SubExporter SubName TryTiny ]; + propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; meta = { description = "HTML forms using Moose"; - license = "perl5"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; + license = "perl"; }; }; @@ -5724,7 +5724,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose MooseXTypes ]; - meta = { + meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; From ee26cdd3892b0d2d12eeb3378fd804e0cb0088d7 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 25 Jan 2014 11:56:02 +0000 Subject: [PATCH 25/99] perlPackages.LWPUserAgentMockable: Disable tests These tests need network connectivity, which isn't available in a chroot'ed environment (at least, it's not available on Hydra build machines). --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9f9638bb7ae..1a94eb562d4b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4829,6 +4829,10 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; + # Tests require network connectivity + # https://rt.cpan.org/Public/Bug/Display.html?id=63966 is the bug upstream, + # which doesn't look like it will get fixed anytime soon. + doCheck = false; }; LWPxParanoidAgent = buildPerlPackage rec { From 4d027a44f6223681f848400c17ca5055b7078189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 25 Jan 2014 13:13:51 +0100 Subject: [PATCH 26/99] openconnect: update from 5.01 to 5.02 (CVE-2013-7098) OpenConnect v5.02 - 2014-01-01: * Fix XML POST issues with authgroups by falling back to old style login. * Fix --cookie-on-stdin with cookies from ocserv. * Fix reconnection to wrong host after redirect. * Reduce limit of queued packets on DTLS socket, to fix VoIP latency. * Fix Solaris build breakage due to missing includes. * Include path in node. * Include supporting CA certificates from PKCS#11 tokens (with GnuTLS 3.2.7+). * Fix possible heap overflow if MTU is increased on reconnection (CVE-2013-7098). --- pkgs/tools/networking/openconnect.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix index 2cc52fe981b2..c523e0004d7f 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } : stdenv.mkDerivation rec { - name = "openconnect-5.01"; + name = "openconnect-5.02"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" ]; - sha256 = "1l90ks87iwmy7jprav11lhjr4n18ycy0d9fndspg50p9qd3jlvwi"; + sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4"; }; preConfigure = '' From 958d6636a7b5bf9e02521ea7342fd057f0328e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 25 Jan 2014 13:30:56 +0100 Subject: [PATCH 27/99] networkmanager: fix path to 'openconnect' binary Without this the openconnect VPN plugin doesn't work: NetworkManager[830]: VPN connection 'Foo VPN' failed to connect: 'Could not find openconnect binary.'. --- pkgs/tools/networking/network-manager/openconnect.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 94224fc63bd6..ff4c853512d6 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ - --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \ + --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" ''; From 07a3993e1454f8577ea8d782c98bcf878290b381 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 14:10:25 +0100 Subject: [PATCH 28/99] libreoffice: Fix path to Ant --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8aaf1839f92a..fd93bda4c96a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -225,7 +225,7 @@ stdenv.mkDerivation rec { "--disable-postgresql-sdbc" "--with-package-format=native" "--with-jdk-home=${jdk}" - "--with-ant-home=${ant}" + "--with-ant-home=${ant}/lib/ant" "--without-afms" "--without-fonts" "--without-myspell-dicts" From 83b354e4f98505f30ee7a9a5dccc3d8980c66c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Jan 2014 15:34:55 +0100 Subject: [PATCH 29/99] linuxHeaders: add meta, incl. platforms = linux; Noted by @mornfall. The built package has ~5 MB uncompressed, but just the Linux tarball has ~40 MB compressed... --- pkgs/os-specific/linux/kernel-headers/3.7.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel-headers/3.7.nix b/pkgs/os-specific/linux/kernel-headers/3.7.nix index 4371bf7df9c5..e6fbf9bb9bc1 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.7.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.7.nix @@ -62,4 +62,10 @@ stdenv.mkDerivation { ln -s asm $out/include/asm-x86 fi ''; + + meta = with stdenv.lib; { + description = "Header files and scripts for Linux kernel"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } From 3718a90806224ceed928d57026d835a28ee85064 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 25 Jan 2014 15:16:54 +0100 Subject: [PATCH 30/99] haskell bytestring-progress: Disable haddock to avoid a build failure. --- .../libraries/haskell/bytestring-progress/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix index c73932b3760a..f943f4cd7298 100644 --- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.3"; sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs"; buildDepends = [ terminalProgressBar time ]; + noHaddock = true; # fails to build with a parse error meta = { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; From 28f0ec654028cb9701b913f4b8c9a95ce3690dce Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 25 Jan 2014 16:18:09 +0100 Subject: [PATCH 31/99] linux-perf: Fix build (unportable shell hack broke). --- pkgs/os-specific/linux/kernel/perf.diff | 18 ++++++++++++++++++ pkgs/os-specific/linux/kernel/perf.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/perf.diff diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff new file mode 100644 index 000000000000..88d0381784fd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf.diff @@ -0,0 +1,18 @@ +--- perf/config/utilities.mak.orig 2014-01-25 14:55:32.573320370 +0000 ++++ perf/config/utilities.mak 2014-01-25 15:13:34.174337760 +0000 +@@ -186,9 +186,14 @@ + endif + TRY_CC_MSG=echo " CHK $(3)" 1>&2; + ++define newline ++ ++ ++endef ++ + try-cc = $(shell sh -c \ + 'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \ + $(TRY_CC_MSG) \ +- echo "$(1)" | \ ++ echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c | \ + $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \ + rm -f "$$TMP"') diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 3fb18a234729..0a92e39c153a 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile + patch -p1 < ${./perf.diff} [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; From 251fc454ba1419a19c64a893870c5980f7126022 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 25 Jan 2014 15:19:36 +0100 Subject: [PATCH 32/99] mpc: (mpd client) Update to 0.25. --- pkgs/applications/audio/mpc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index bd21550a64cf..ae6d9e0c7e60 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, mpd_clientlib }: stdenv.mkDerivation rec { - version = "0.23"; + version = "0.25"; name = "mpc-${version}"; src = fetchurl { - url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2"; - sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9"; + url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz"; + sha256 = "095gmik5vrnab5a1g92qiznn48w7499fr0gldp3s6xd26kvs9kvh"; }; buildInputs = [ mpd_clientlib ]; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} From e3fae16a298f3a7741c41df142245a75e6249365 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Tue, 31 Dec 2013 13:27:32 +0100 Subject: [PATCH 33/99] emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid). --- pkgs/applications/editors/emacs-24/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index c558b483e97b..6ecee37d21e1 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo -, withX ? !stdenv.isDarwin +, withX ? !stdenv.isDarwin, withGTK ? true }: assert (libXft != null) -> libpng != null; # probably a bug @@ -27,11 +27,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin cairo; configureFlags = - ( if withX then + ( if withX && withGTK then [ "--with-x-toolkit=gtk" "--with-xft"] + else (if withX then + [ "--with-x-toolkit=lucid" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ] ) + "--with-gif=no" "--with-tiff=no" ] ) ) # On NixOS, help Emacs find `crt*.o'. ++ stdenv.lib.optional (stdenv ? glibc) [ "--with-crt-dir=${stdenv.glibc}/lib" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdabce2debd6..69d0f47f460c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7571,7 +7571,7 @@ let emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features - libXaw = if stdenv.isDarwin then xlibs.libXaw else null; + libXaw = xlibs.libXaw; Xaw3d = null; gconf = null; librsvg = null; From ed5bd26574c43246920fdf814e997b86c7b50fff Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sun, 12 Jan 2014 13:22:58 +0100 Subject: [PATCH 34/99] STP: Simple Theorem Prover (a SMT solver for bitvectors & arrays). --- .../science/logic/stp/default.nix | 23 +++ .../science/logic/stp/fixbuild.diff | 45 ++++ .../science/logic/stp/fixrefs.diff | 192 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 262 insertions(+) create mode 100644 pkgs/applications/science/logic/stp/default.nix create mode 100644 pkgs/applications/science/logic/stp/fixbuild.diff create mode 100644 pkgs/applications/science/logic/stp/fixrefs.diff diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix new file mode 100644 index 000000000000..cfe96bc6983a --- /dev/null +++ b/pkgs/applications/science/logic/stp/default.nix @@ -0,0 +1,23 @@ +{stdenv, cmake, boost, bison, flex, fetchgit, perl, zlib}: +stdenv.mkDerivation rec { + version = "2014.01.07"; + name = "stp-${version}"; + src = fetchgit { + url = "git://github.com/stp/stp"; + rev = "3aa11620a823d617fc033d26aedae91853d18635"; + sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c"; + }; + buildInputs = [ cmake boost bison flex perl zlib ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + patchPhase = '' + sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt + patch -p1 < ${./fixbuild.diff} + patch -p1 < ${./fixrefs.diff} + ''; + meta = { + description = ''Simple Theorem Prover''; + maintainers = with stdenv.lib.maintainers; [mornfall]; + platforms = with stdenv.lib.platforms; linux; + license = with stdenv.lib.licenses; mit; + }; +} diff --git a/pkgs/applications/science/logic/stp/fixbuild.diff b/pkgs/applications/science/logic/stp/fixbuild.diff new file mode 100644 index 000000000000..01782cb4f40b --- /dev/null +++ b/pkgs/applications/science/logic/stp/fixbuild.diff @@ -0,0 +1,45 @@ +diff --git a/src/libstp/CMakeLists.txt b/src/libstp/CMakeLists.txt +index 83bd03a..9c0304b 100644 +--- a/src/libstp/CMakeLists.txt ++++ b/src/libstp/CMakeLists.txt +@@ -23,6 +23,15 @@ set(stp_lib_targets + printer + ) + ++include_directories(${CMAKE_SOURCE_DIR}/src/AST/) ++include_directories(${CMAKE_BINARY_DIR}/src/AST/) ++ ++add_library(globalstp OBJECT ++ ../main/Globals.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../main/GitSHA1.cpp ++) ++add_dependencies(globalstp ASTKind_header) ++ + # Create list of objects and gather list of + # associated public headers. + set(stp_lib_objects "") +@@ -31,6 +40,7 @@ foreach(target ${stp_lib_targets}) + list(APPEND stp_lib_objects $) + + get_target_property(TARGETS_PUBLIC_HEADERS ${target} PUBLIC_HEADER) ++ set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON) + if (EXISTS "${TARGETS_PUBLIC_HEADERS}") + list(APPEND stp_public_headers "${TARGETS_PUBLIC_HEADERS}") + message("Adding public header(s) ${TARGETS_PUBLIC_HEADERS} to target libstp") +diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt +index 0735137..73039f5 100644 +--- a/src/main/CMakeLists.txt ++++ b/src/main/CMakeLists.txt +@@ -3,12 +3,6 @@ include_directories(${CMAKE_BINARY_DIR}/src/AST/) + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" @ONLY) + +-add_library(globalstp OBJECT +- Globals.cpp +- ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp +-) +-add_dependencies(globalstp ASTKind_header) +- + # ----------------------------------------------------------------------------- + # Create binary + # ----------------------------------------------------------------------------- diff --git a/pkgs/applications/science/logic/stp/fixrefs.diff b/pkgs/applications/science/logic/stp/fixrefs.diff new file mode 100644 index 000000000000..60ad4949f076 --- /dev/null +++ b/pkgs/applications/science/logic/stp/fixrefs.diff @@ -0,0 +1,192 @@ +commit 53b6043e25b2eba264faab845077fbf6736cf22f +Author: Petr Rockai +Date: Tue Jan 7 13:30:07 2014 +0100 + + aig: Comment out unused functions with undefined references in them. + +diff --git a/src/extlib-abc/aig/aig/aigPart.c b/src/extlib-abc/aig/aig/aigPart.c +index a4cc116..5bd5f08 100644 +--- a/src/extlib-abc/aig/aig/aigPart.c ++++ b/src/extlib-abc/aig/aig/aigPart.c +@@ -869,6 +869,7 @@ Vec_Ptr_t * Aig_ManMiterPartitioned( Aig_Man_t * p1, Aig_Man_t * p2, int nPartSi + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize ) + { + extern int Cmd_CommandExecute( void * pAbc, char * sCommand ); +@@ -981,6 +982,7 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize ) + Aig_ManMarkValidChoices( pAig ); + return pAig; + } ++#endif + + + //////////////////////////////////////////////////////////////////////// +diff --git a/src/extlib-abc/aig/aig/aigShow.c b/src/extlib-abc/aig/aig/aigShow.c +index ae8fa8b..f04eedc 100644 +--- a/src/extlib-abc/aig/aig/aigShow.c ++++ b/src/extlib-abc/aig/aig/aigShow.c +@@ -326,6 +326,7 @@ void Aig_WriteDotAig( Aig_Man_t * pMan, char * pFileName, int fHaig, Vec_Ptr_t * + SeeAlso [] + + ***********************************************************************/ ++#if 0 + void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold ) + { + extern void Abc_ShowFile( char * FileNameDot ); +@@ -347,7 +348,7 @@ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold ) + // visualize the file + Abc_ShowFile( FileNameDot ); + } +- ++#endif + + //////////////////////////////////////////////////////////////////////// + /// END OF FILE /// +diff --git a/src/extlib-abc/aig/dar/darRefact.c b/src/extlib-abc/aig/dar/darRefact.c +index d744b4f..23fc3d5 100644 +--- a/src/extlib-abc/aig/dar/darRefact.c ++++ b/src/extlib-abc/aig/dar/darRefact.c +@@ -340,6 +340,7 @@ printf( "\n" ); + SeeAlso [] + + ***********************************************************************/ ++#if 0 + int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, int Required ) + { + Vec_Ptr_t * vCut; +@@ -428,6 +429,7 @@ int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, in + } + return p->GainBest; + } ++#endif + + /**Function************************************************************* + +@@ -461,6 +463,7 @@ int Dar_ObjCutLevelAchieved( Vec_Ptr_t * vCut, int nLevelMin ) + SeeAlso [] + + ***********************************************************************/ ++#if 0 + int Dar_ManRefactor( Aig_Man_t * pAig, Dar_RefPar_t * pPars ) + { + // Bar_Progress_t * pProgress; +@@ -583,6 +586,7 @@ p->timeOther = p->timeTotal - p->timeCuts - p->timeEval; + return 1; + + } ++#endif + + //////////////////////////////////////////////////////////////////////// + /// END OF FILE /// +diff --git a/src/extlib-abc/aig/dar/darScript.c b/src/extlib-abc/aig/dar/darScript.c +index e60df00..1b9c24f 100644 +--- a/src/extlib-abc/aig/dar/darScript.c ++++ b/src/extlib-abc/aig/dar/darScript.c +@@ -64,6 +64,7 @@ Aig_Man_t * Dar_ManRewriteDefault( Aig_Man_t * pAig ) + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) + //alias rwsat "st; rw -l; b -l; rw -l; rf -l" + { +@@ -108,7 +109,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) + + return pAig; + } +- ++#endif + + /**Function************************************************************* + +@@ -121,6 +122,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose ) + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) + //alias compress2 "b -l; rw -l; rwz -l; b -l; rwz -l; b -l" + { +@@ -180,6 +182,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i + + return pAig; + } ++#endif + + /**Function************************************************************* + +@@ -192,6 +195,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) + //alias compress2 "b -l; rw -l; rf -l; b -l; rw -l; rwz -l; b -l; rfz -l; rwz -l; b -l" + { +@@ -285,6 +289,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, + } + return pAig; + } ++#endif + + /**Function************************************************************* + +@@ -297,6 +302,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose ) + //alias resyn "b; rw; rwz; b; rwz; b" + //alias resyn2 "b; rw; rf; b; rw; rwz; b; rfz; rwz; b" +@@ -311,6 +317,7 @@ Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateL + Vec_PtrPush( vAigs, pAig ); + return vAigs; + } ++#endif + + /**Function************************************************************* + +diff --git a/src/extlib-abc/aig/kit/kitAig.c b/src/extlib-abc/aig/kit/kitAig.c +index de301f2..7e5df0f 100644 +--- a/src/extlib-abc/aig/kit/kitAig.c ++++ b/src/extlib-abc/aig/kit/kitAig.c +@@ -95,6 +95,7 @@ Aig_Obj_t * Kit_GraphToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, Kit_Graph_t + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * pTruth, int nVars, Vec_Int_t * vMemory ) + { + Aig_Obj_t * pObj; +@@ -113,6 +114,7 @@ Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * p + Kit_GraphFree( pGraph ); + return pObj; + } ++#endif + + //////////////////////////////////////////////////////////////////////// + /// END OF FILE /// +diff --git a/src/extlib-abc/aig/kit/kitGraph.c b/src/extlib-abc/aig/kit/kitGraph.c +index 39ef587..0485c66 100644 +--- a/src/extlib-abc/aig/kit/kitGraph.c ++++ b/src/extlib-abc/aig/kit/kitGraph.c +@@ -349,6 +349,7 @@ unsigned Kit_GraphToTruth( Kit_Graph_t * pGraph ) + SeeAlso [] + + ***********************************************************************/ ++#if 0 + Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemory ) + { + Kit_Graph_t * pGraph; +@@ -365,6 +366,7 @@ Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemor + pGraph = Kit_SopFactor( vMemory, RetValue, nVars, vMemory ); + return pGraph; + } ++#endif + + /**Function************************************************************* + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69d0f47f460c..e4edb661c2ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8711,6 +8711,8 @@ let stalonetray = callPackage ../applications/window-managers/stalonetray {}; + stp = callPackage ../applications/science/logic/stp {}; + stumpwm = lispPackages.stumpwm; sublime = callPackage ../applications/editors/sublime { }; From 66db1b3a646e73e15458da4ff98347d424454b88 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 27 Oct 2012 23:11:54 +0200 Subject: [PATCH 35/99] nixos: Add a dictd service. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/dictd.nix | 61 +++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/services/misc/dictd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 442edd8029de..aa4bada8b28b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -116,6 +116,7 @@ ./services/mail/spamassassin.nix ./services/misc/autofs.nix ./services/misc/cgminer.nix + ./services/misc/dictd.nix ./services/misc/disnix.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix new file mode 100644 index 000000000000..b84fbb3e1281 --- /dev/null +++ b/nixos/modules/services/misc/dictd.nix @@ -0,0 +1,61 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +{ + + ###### interface + + options = { + + services.dictd = { + + enable = mkOption { + default = false; + description = '' + Whether to enable the DICT.org dictionary server. + ''; + }; + + DBs = mkOption { + default = []; + # example = [ pkgs.dictDBs.nld2eng ]; + description = ''List of databases to make available.''; + }; + + }; + + }; + + + ###### implementation + + config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: { + name = x.name; + filename = x; } ) config.services.dictd.DBs; }; + in mkIf config.services.dictd.enable { + + # get the command line client on system path to make some use of the service + environment.systemPackages = [ pkgs.dict ]; + + users.extraUsers = singleton + { name = "dictd"; + group = "dictd"; + description = "DICT.org dictd server"; + home = "${dictdb}/share/dictd"; + }; + + users.extraGroups = singleton + { name = "dictd"; + }; + + jobs.dictd = + { description = "DICT.org Dictionary Server"; + startOn = "startup"; + environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; + daemonType = "fork"; + exec = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8"; + }; + }; + +} From fb4ff01e1a7ae20223e18413b93da451ecef652f Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 1 Jan 2014 20:10:04 +0100 Subject: [PATCH 36/99] perl-Devel-SizeMe: A module for dumping heap use and structure. --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a94eb562d4b..46ebabcbc4e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2170,6 +2170,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOCaptureOutput ]; }; + DevelSizeMe = buildPerlPackage { + name = "Devel-SizeMe-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TI/TIMB/Devel-SizeMe-0.19.tar.gz; + sha256 = "546e31ba83c0bf7cef37b38a462860461850473479d7d4ac6c0dadfb78d54717"; + }; + propagatedBuildInputs = [ DBDSQLite DBI DataDumperConcise HTMLParser JSONXS Moo ]; + meta = { + homepage = https://github.com/timbunce/devel-sizeme; + description = "Unknown"; + license = "perl"; + }; + }; + DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; From 853eaaa69ced11c79cdc2cadb7258d29fba8fb77 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sun, 12 Jan 2014 13:22:13 +0100 Subject: [PATCH 37/99] perl-Mojolicious: A real-time web framework. --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46ebabcbc4e5..9e609af514be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5294,6 +5294,19 @@ let self = _self // overrides; _self = with self; { }; }; + Mojolicious = buildPerlPackage { + name = "Mojolicious-4.63"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-4.63.tar.gz; + sha256 = "f20f77e86fc560dac1c958e765ed64242dcf6343939ed605b45f2bbe2596d5e9"; + }; + meta = { + homepage = http://mojolicio.us; + description = "Real-time web framework"; + license = "artistic_2"; + }; + }; + Moo = buildPerlPackage { name = "Moo-1.000007"; src = fetchurl { From 031c229cc04c7f6d8f83c33dbf75ff7be706bf07 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Fri, 16 Aug 2013 16:58:15 +0200 Subject: [PATCH 38/99] haskell: Add an atto-lisp package. --- .../libraries/haskell/atto-lisp/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/atto-lisp/default.nix diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix new file mode 100644 index 000000000000..f7a8edcc3c58 --- /dev/null +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -0,0 +1,17 @@ +{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, text }: + +cabal.mkDerivation (self: { + pname = "atto-lisp"; + version = "0.2.1.1"; + sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac"; + jailbreak = true; + buildDepends = [ + attoparsec blazeBuilder blazeTextual deepseq text + ]; + meta = { + homepage = "http://github.com/nominolo/atto-lisp"; + description = "Efficient parsing and serialisation of S-Expressions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a944892f7c11..081caf41d2a7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -580,6 +580,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x attempt = callPackage ../development/libraries/haskell/attempt {}; + attoLisp = callPackage ../development/libraries/haskell/atto-lisp {}; + attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.1.0.nix {}; attoparsec = self.attoparsec_0_10_4_0; From 4230c95d5682629291ff090f16a53ccea6af85e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:48:29 +0100 Subject: [PATCH 39/99] Re-generate some Haskell expressions with cabal2nix. --- pkgs/development/libraries/haskell/atto-lisp/default.nix | 2 +- .../libraries/haskell/bytestring-progress/default.nix | 2 +- pkgs/development/libraries/haskell/haskell-names/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index f7a8edcc3c58..b1873567691a 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "atto-lisp"; version = "0.2.1.1"; sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac"; - jailbreak = true; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; + jailbreak = true; meta = { homepage = "http://github.com/nominolo/atto-lisp"; description = "Efficient parsing and serialisation of S-Expressions"; diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix index f943f4cd7298..e9bb268b9fce 100644 --- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.3"; sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs"; buildDepends = [ terminalProgressBar time ]; - noHaddock = true; # fails to build with a parse error + noHaddock = true; meta = { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index c67f4ccb402f..4d5e8388ea23 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass uniplate utf8String ]; + doCheck = false; meta = { homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; @@ -25,5 +26,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - doCheck = false; }) From dd409f09d6b114a74c92221427574362d6098b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 25 Jan 2014 17:05:33 +0100 Subject: [PATCH 40/99] add ibus --- pkgs/development/libraries/ibus/default.nix | 37 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/ibus/default.nix diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix new file mode 100644 index 000000000000..6200196d403d --- /dev/null +++ b/pkgs/development/libraries/ibus/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig +, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }: + +stdenv.mkDerivation rec { + name = "ibus-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://ibus.googlecode.com/files/${name}.tar.gz"; + sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; + }; + + configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; + + buildInputs = [ + makeWrapper python glib wayland + intltool pkgconfig gnome3.gtk2 + gnome3.gtk3 dbus gnome3.dconf gnome3.gconf + libnotify isocodes gobjectIntrospection + ]; + + preBuild = "patchShebangs ./scripts"; + + postInstall = '' + #${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" + done + ''; + + meta = { + homepage = https://code.google.com/p/ibus/; + description = "Intelligent Input Bus for Linux / Unix OS"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4edb661c2ba..a36bb3f1295c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3563,6 +3563,8 @@ let hyenae = callPackage ../tools/networking/hyenae { }; + ibus = callPackage ../development/libraries/ibus { }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; From 3ee043da54292305a10c869a56606f5e44663556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 25 Jan 2014 17:54:28 +0100 Subject: [PATCH 41/99] pianobooster: patch to build with gcc4.7, wrap it so it finds libGL.so.1 Also add linux as a platform. Patches from: https://github.com/gbin/gbin-overlay/tree/master/media-sound/pianobooster --- .../audio/pianobooster/default.nix | 15 ++++++- .../pianobooster-0.6.4b-cmake-gcc4.7.patch | 11 +++++ .../pianobooster-0.6.4b-cmake.patch | 44 +++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch create mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index d5cdffbed952..67848cdc804b 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, qt4 }: +{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }: stdenv.mkDerivation rec { name = "pianobooster-${version}"; @@ -9,14 +9,25 @@ stdenv.mkDerivation rec { sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35"; }; + patches = [ + ./pianobooster-0.6.4b-cmake.patch + ./pianobooster-0.6.4b-cmake-gcc4.7.patch + ]; + preConfigure = "cd src"; - buildInputs = [ alsaLib cmake qt4 ]; + buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ]; + + postInstall = '' + wrapProgram $out/bin/pianobooster \ + --prefix LD_LIBRARY_PATH : ${mesa}/lib + ''; meta = with stdenv.lib; { description = "A MIDI file player that teaches you how to play the piano"; homepage = http://pianobooster.sourceforge.net; license = licenses.gpl3; + platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch new file mode 100644 index 000000000000..2b1b28c5a849 --- /dev/null +++ b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch @@ -0,0 +1,11 @@ +--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig 2013-04-06 10:48:02.469532914 -0700 ++++ pianobooster-src-0.6.4b/src/CMakeLists.txt 2013-04-06 10:48:12.989532445 -0700 +@@ -203,8 +203,6 @@ + ${PIANOBOOSTER_UI_HDRS} ) + ENDIF(WIN32) + +-SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows") +- + IF (USE_PCH) + ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h ) + ENDIF (USE_PCH) diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch new file mode 100644 index 000000000000..8cdd8738e2b3 --- /dev/null +++ b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch @@ -0,0 +1,44 @@ +--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig ++++ pianobooster-src-0.6.4b/src/CMakeLists.txt +@@ -2,12 +2,6 @@ + # for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug + SET(CMAKE_BUILD_TYPE Release) + SET(CMAKE_VERBOSE_MAKEFILE OFF) +-SET(USE_FLUIDSYNTH OFF) +- +-# The inplace directory is mainly for windows builds +-# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9) +-SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9) +- + + # Testing precompiled headers it does not work -- leave as OFF. + SET(USE_PCH OFF) +@@ -78,18 +72,7 @@ + ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH) + MESSAGE("Building using fluidsynth") + SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp ) +- +- IF(FLUIDSYNTH_INPLACE_DIR) +- INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/) +- IF(WIN32) +- LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a) +- ENDIF(WIN32) +- IF(UNIX) +- LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so) +- ENDIF(UNIX) +- ELSEIF(FLUIDSYNTH_INPLACE_DIR) +- LINK_LIBRARIES( fluidsynth) +- ENDIF(FLUIDSYNTH_INPLACE_DIR) ++ LINK_LIBRARIES(fluidsynth) + ENDIF(USE_FLUIDSYNTH) + + +@@ -214,8 +197,6 @@ + INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin) + #INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmidimon ) + +-INSTALL( FILES ../README.txt DESTINATION share/doc/pianobooster ) +- + INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps ) + + From 2953c39409cfebc6d71d07ebd362db424227baec Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 25 Jan 2014 17:49:00 +0100 Subject: [PATCH 42/99] photivo: Update. --- pkgs/applications/graphics/photivo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 257ee681db61..6e46188a3d00 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -2,12 +2,12 @@ lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: stdenv.mkDerivation rec { - name = "photivo-2013-05-20"; + name = "photivo-2014-01-25"; src = fetchhg { url = "http://code.google.com/p/photivo/"; - tag = "6256ff175312"; - sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc"; + tag = "d687864489da"; + sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h"; }; nativeBuildInputs = [ cmake pkgconfig ]; From cf7ee0337760aaee4ce17be28e43f40335865993 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 22 Jul 2013 14:06:32 +0200 Subject: [PATCH 43/99] photivo: Fix paths. --- pkgs/applications/graphics/photivo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 6e46188a3d00..7c9ff32ec77f 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -13,4 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; + patchPhase = '' # kinda icky + sed -e '/("@INSTALL@")/d' \ + -e s,@INSTALL@,$out/share/photivo, \ + -i Sources/ptSettings.cpp + ''; } From f03ca20916cdff74a680bc181d1cc21f23a2ce31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 25 Jan 2014 18:27:53 +0100 Subject: [PATCH 44/99] libreoffice: Fix path to the JDK --- pkgs/applications/office/libreoffice/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fd93bda4c96a..67cbd7996ffc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -54,7 +54,7 @@ let buildInputs = [ libtool pkgconfig libxml2 ]; }; - + # doesn't work with srcs versioning libmspub = stdenv.mkDerivation rec { version = "0.0.6"; @@ -66,8 +66,8 @@ let }; configureFlags = "--disable-werror"; - - buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ]; + + buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ]; }; # doesn't exist in srcs @@ -82,7 +82,7 @@ let configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost mdds pkgconfig ]; + buildInputs = [ boost mdds pkgconfig ]; }; fetchThirdParty = {name, md5}: fetchurl { @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { "--disable-kde" "--disable-postgresql-sdbc" "--with-package-format=native" - "--with-jdk-home=${jdk}" + "--with-jdk-home=${jdk}/lib/openjdk" "--with-ant-home=${ant}/lib/ant" "--without-afms" "--without-fonts" From 4a17e1be93155dfe697882bf1d34d97bef1f4c5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:54:47 +0100 Subject: [PATCH 45/99] youtubeDL: update from 2014.01.20 to 2014.01.23.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 917b54130b3e..1e8f9fd292dc 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.01.20"; + version = "2014.01.23.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1krqkq21pgzkfsw70b0fp7xpxsh1ipgr2bgkf1y30ckf9nkpp9ny"; + sha256 = "07nzwjw3m63w53fk2chmv4dpq71h4k0kx02x6hzsb28bc89v06nr"; }; buildInputs = [ python ]; From 5fefec39442dfae2a63fb66f9db7c1197222f0d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:55:01 +0100 Subject: [PATCH 46/99] pspp: update from 0.8.1 to 0.8.2 --- pkgs/applications/science/math/pssp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 587f41fe998b..0a9e0e4735d0 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "pspp-0.8.1"; + name = "pspp-0.8.2"; src = fetchurl { url = "mirror://gnu/pspp/${name}.tar.gz"; - sha256 = "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x"; + sha256 = "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr"; }; buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig From f6e18d1d434596268880f7ee65af536ab24fdf5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:55:12 +0100 Subject: [PATCH 47/99] popa3d: update from 1.0.2 to 1.0.3 --- pkgs/servers/mail/popa3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 25ac0d5f9e3d..39ad4383c3db 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "popa3d-1.0.2"; + name = "popa3d-1.0.3"; src = fetchurl { url = "http://www.openwall.com/popa3d/${name}.tar.gz"; - sha256 = "0zvspgnlrx4jhhkb5b1p280nsf9d558jijgpvwfyvdp4q4v460z7"; + sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03"; }; buildInputs = [ openssl ]; From 58f1520726bcb1f23fc9e6e82545b9468e9a3290 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:55:24 +0100 Subject: [PATCH 48/99] lxc: update from 1.0.0.beta1 to 1.0.0.beta2 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 01fd04e2ad6e..fd6bb9b0389f 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lxc-1.0.0.beta1"; + name = "lxc-1.0.0.beta2"; src = fetchurl { url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "1ee177c4d2ba5f9cb33c1b36f3c2160ca0b00c9fa527fc53a9c5868345306f03"; + sha256 = "0w38kxpqrhrgzd057yk8xzi4lx2vzvjkn6iysnj9zibw1bzb5rbk"; }; buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; From a8f8ac72a354235d8d185716c4ee49d65611fc45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:57:17 +0100 Subject: [PATCH 49/99] apparmor: build with bison 2.x; version 3.x causes compiler errors --- 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 a36bb3f1295c..460cf40f0a68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6373,6 +6373,7 @@ let apparmor = callPackage ../os-specific/linux/apparmor { inherit (perlPackages) LocaleGettext TermReadKey RpcXML; + bison = bison2; }; atop = callPackage ../os-specific/linux/atop { }; From b3fe70a5e8d241819a816f6da81fe87f47a7db31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:59:31 +0100 Subject: [PATCH 50/99] popa3d: disown this package --- pkgs/servers/mail/popa3d/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 39ad4383c3db..3dcfa3a22db2 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; - description = "tiny POP3 daemon with security as the primary goal"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + description = "Tiny POP3 daemon with security as the primary goal"; }; } From c9b581b5d4b337051901de41d19a947fec1d8ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Jan 2014 20:41:20 +0100 Subject: [PATCH 51/99] wayland: update 1.3.0 -> 1.4.0 --- pkgs/development/libraries/wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e9ad56bdbf16..58631e832170 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.3.0"; in +let version = "1.4.0"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f"; + sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; From ac07b3d37f430769f13bb6a2fa7203eec4c18d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Jan 2014 20:51:04 +0100 Subject: [PATCH 52/99] gtk3: bugfix update 3.10.5 -> .6 --- pkgs/development/libraries/gtk+/3.x.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index e3237f83b74b..651ac0d303b9 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -10,27 +10,27 @@ assert cupsSupport -> cups != null; let ver_maj = "3.10"; - ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor) + ver_min = "6"; in stdenv.mkDerivation rec { name = "gtk+-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; - sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i"; + sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ wayland libxkbcommon ]; + buildInputs = [ libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] ++ optional stdenv.isDarwin x11 - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; + ++ optional xineramaSupport libXinerama + ++ optional cupsSupport cups; postInstall = "rm -rf $out/share/gtk-doc"; From c1db67ea99037d6136f7394f6d265d2eec6c4a44 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 13 Jan 2014 22:47:17 +0100 Subject: [PATCH 53/99] harfbuzz: update from 0.9.24 to 0.9.25 I see no significant change in the changelog. (cherry picked from commit 29a878d1be84b2a15a928de93090b9edb067ac95) --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 4cee49bea517..c69a96795d20 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.24"; + name = "harfbuzz-0.9.25"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd"; + sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw"; }; configureFlags = [ From f5f802bca36ce735e4755da93db941b07d2f34be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Jan 2014 22:55:41 +0100 Subject: [PATCH 54/99] libusb1: name it libusbx, so it's more clear (cherry picked from commit b187d0e1bdfec635d4e7a3e00abb86b823e3dc27) --- pkgs/development/libraries/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index dfb8f1c54a16..3833e5bffa1a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ let version = "1.0.17"; in stdenv.mkDerivation rec { - name = "libusb-${version}"; + name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible src = fetchurl { url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2"; From e2a858379d194c63a8acdd700bfad6faa1e541ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 55/99] haskell-git-annex: update to version 5.20140116 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 28b64c118bae..cd25bbfdc6fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140108"; - sha256 = "17j1avmg66lda52p93689n4mas46rfbjdvss1rvmdh10cj7hg8jy"; + version = "5.20140116"; + sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2"; isLibrary = false; isExecutable = true; buildDepends = [ From ea288d47bd3dbbee3932e6555e1354c053a9611a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 56/99] haskell-Elm: update to version 0.11 --- pkgs/development/compilers/elm/elm.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 0f3c4d2ef643..00c5e2907c69 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,12 +1,14 @@ { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup -, cmdargs, filepath, HTF, indents, languageEcmascript, mtl, pandoc -, parsec, text, transformers, unionFind, unorderedContainers +, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript +, mtl, pandoc, parsec, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers +, unionFind, unorderedContainers }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.10.1"; - sha256 = "1y533vanhrxc14x304ig6q8ch6zih8yqgpfgw4h5vk5fpdmn09a2"; + version = "0.11"; + sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -14,7 +16,12 @@ cabal.mkDerivation (self: { indents languageEcmascript mtl pandoc parsec text transformers unionFind unorderedContainers ]; - testDepends = [ HTF ]; + testDepends = [ + aeson binary blazeHtml blazeMarkup cmdargs filemanip filepath HUnit + indents languageEcmascript mtl pandoc parsec QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 text + transformers unionFind unorderedContainers + ]; doCheck = false; meta = { homepage = "http://elm-lang.org"; From 2e648757a8f7a3371858b07f6b8de2ced35d394e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 57/99] haskell-Chart-cairo: update to version 1.2 --- pkgs/development/libraries/haskell/Chart-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index e28ff279083b..3b9e6fb4e33d 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.1"; - sha256 = "0pm8iwd83pn5ba0g3231zs7f39cdjr7n7k76cm642n4b0hf93fmb"; + version = "1.2"; + sha256 = "08aaf7yb2vry75g15md2012rnmyfrn7awwvba7c38d4h6vm95llg"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; From 20929da52cb41b7d2ca0b58ea4f0cf986f991b4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 58/99] haskell-Chart-gtk: update to version 1.2 --- pkgs/development/libraries/haskell/Chart-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 0c2534c4c3bc..a2e695a891da 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.1"; - sha256 = "1394h7jd8pk55396nz1xjisz4v7brqcf9fwdnw9g4q3x1b7dcgs8"; + version = "1.2"; + sha256 = "0qq72cf1m2gvcksa1jj5g9qi6b47pmpzh3grhs7kh3m7qyq0a56g"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; From 0cfd7ed72310c018ef1e019f11b0e95b002d666c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 59/99] haskell-Chart: update to version 1.2 --- pkgs/development/libraries/haskell/Chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 50459dfa0076..3b08c2d0e2ca 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.1"; - sha256 = "136s44mbhf3wmg85rr9qr0kv59lq1lfd3l58a5aijpv9vz1isf7p"; + version = "1.2"; + sha256 = "0cvp2j2hgsdk93f4rbd8y7s11hlr3zg15qkpxhd7p7sl2k6j2r5x"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; From 0a193cc5e13ded927df9cf5d97aad0ac326480ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 60/99] haskell-HTF: update to version 0.11.1.0 --- pkgs/development/libraries/haskell/HTF/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 7abdc9b4730a..ddcb8c0e3718 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTF"; - version = "0.11.0.1"; - sha256 = "0c4z76rsmdck60p7p2ypxx0d0r7k2vcb9viqp2yalyxzaaj7a9f5"; + version = "0.11.1.0"; + sha256 = "0prijzy852fkr8z58rhba6jvrb27b6lyz2jdgqb7r1jrnkhqmhpq"; isLibrary = true; isExecutable = true; buildDepends = [ From 6e0de1670926ec199da633e95635ede4361b465c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 61/99] haskell-JuicyPixels: update to version 3.1.3.1 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index d8d0ac69badd..9b34bc9672be 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.3"; - sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70"; + version = "3.1.3.1"; + sha256 = "03kbvm3y5di274gzz8sr24z9j27rdayx4kkbf5hfvl325ghidhx9"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From a1d67d59966bbcbc08d7383f55cf3380a3e42d10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 62/99] haskell-atomic-primops: update to version 0.5 --- .../libraries/haskell/atomic-primops/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index b542816f05b7..9f1c2eedc66a 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -1,10 +1,10 @@ -{ cabal, bitsAtomic, Cabal, primitive }: +{ cabal, Cabal, primitive }: cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.4"; - sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0"; - buildDepends = [ bitsAtomic Cabal primitive ]; + version = "0.5"; + sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i"; + buildDepends = [ Cabal primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; From 42dd05709cea2b58f4ddaf1056a5fcf2b5299a60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 63/99] haskell-atto-lisp: update to version 0.2.1.2 --- .../libraries/haskell/atto-lisp/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index b1873567691a..4f0bffa5020e 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -1,12 +1,17 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, text }: +{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit +, testFramework, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "atto-lisp"; - version = "0.2.1.1"; - sha256 = "089chx4g880fbs7gh1mcvfx2xgbqdi1dxdjax6vbw8xiqgw4pzac"; + version = "0.2.1.2"; + sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; + testDepends = [ + attoparsec HUnit testFramework testFrameworkHunit text + ]; jailbreak = true; meta = { homepage = "http://github.com/nominolo/atto-lisp"; From 3c3c2c642cabf3bf7b58c84ad58a505ad4d34cc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 64/99] haskell-blaze-html: update to version 0.7.0.0 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index fd9d364fbb49..ee1b686493ca 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.6.1.3"; - sha256 = "0hjyi3iv2770wicgfjipa901vk7mwr8kknfqvj3v9kzcvb4lq5aq"; + version = "0.7.0.0"; + sha256 = "1k8mxq3hmf2s7qab67jz3yaan7wdc4mn5sa00rw5zk4mjh722w86"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework From 2b039e3f2bf0f1c4cb402d12764dd5af7a34f71d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:41 +0100 Subject: [PATCH 65/99] haskell-blaze-markup: update to version 0.6.0.0 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 638a219cb833..904808b78c8f 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.5.2.1"; - sha256 = "1drq98q70jfbxsdf3b6n5ksr1pcy8h5cgjngg6h3kd6vww3vysdy"; + version = "0.6.0.0"; + sha256 = "1f54i570cqbyqkrsq4qd2bky88pdwg9lv84c6aaf2c21552dbvii"; buildDepends = [ blazeBuilder text ]; testDepends = [ blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit From 2eb23f599b1366aaeaee0eaa94dd7b17bb74ac97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 66/99] haskell-cassava: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/cassava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix index 0d4022062934..5127ca1c8e84 100644 --- a/pkgs/development/libraries/haskell/cassava/default.nix +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cassava"; - version = "0.3.0.0"; - sha256 = "0s297664if9zp2y441jihcrmdfgdicjgncyx0rpddlr789vkbs9s"; + version = "0.3.0.1"; + sha256 = "1lsbdhdz6hy6lfnhhp36mbjd9m0w8iv50sd9mj0dj9b4izgdav16"; buildDepends = [ attoparsec blazeBuilder deepseq text unorderedContainers vector ]; From aeb987d68c24442e04be409d00b6034ff600b024 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 67/99] haskell-cipher-aes128: update to version 0.6.4 --- pkgs/development/libraries/haskell/cipher-aes128/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix index 8bb093eb0f81..6bae5a99808d 100644 --- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes128/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes128"; - version = "0.6.2"; - sha256 = "0rj56p8rcnvk95jc4fx4pxv25yk85vfad7v0znsgzp2hpw4h4ihb"; + version = "0.6.4"; + sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; From a1364bb9b1ef7b67d74693279c8f57be992cdfdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 68/99] haskell-conduit: update to version 1.0.12 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 980791156071..0557fd36236d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.11.1"; - sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg"; + version = "1.0.12"; + sha256 = "025h1nbplq7v1qp74bg647q36n3d56kin700ws7vm922xmvcrjjm"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From a8e1a6d4d89352e6cf5c7590114ac18bc9d6da15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 69/99] haskell-digestive-functors-aeson: update to version 1.1.4 --- .../haskell/digestive-functors-aeson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 50ff8b005e44..02b7f35d3823 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,13 +1,13 @@ -{ cabal, aeson, aesonLens, digestiveFunctors, HUnit, lens, mtl +{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl , safe, tasty, tastyHunit, text, vector }: cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.3"; - sha256 = "0194yd2b9irm1gmk3d8awrsrmsr4lml63wr4vm8a92s7w3hdy0db"; + version = "1.1.4"; + sha256 = "1rca25zycmz4al5izq8j7h3cggvb4844g3gj3a1686yy38k5rfvn"; buildDepends = [ - aeson aesonLens digestiveFunctors lens safe text vector + aeson digestiveFunctors lens lensAeson safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl tasty tastyHunit text From f00962f10bcb99318c5790572736a27b7e60ae21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 70/99] haskell-digestive-functors-heist: update to version 0.8.4.1 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index f979926a42a9..418923c453bd 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.4.0"; - sha256 = "15n8piiqys010in8xp5iszjqsa2ndgk52adqgk2h6q3m5q0jkdb3"; + version = "0.8.4.1"; + sha256 = "03bbz5q3asn1iid13xjiv5hdpj5bgr0h9wwp29bnysiw4vrgjax0"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; From 312624f22384065e7195949eef7981ca21b20a62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 71/99] haskell-digestive-functors-snap: update to version 0.6.1.0 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 6b20ed6ae89e..4c678da12b9e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.6.0.1"; - sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7"; + version = "0.6.1.0"; + sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 1cf170a8067161cb878f88afdc0dd96bdc000800 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 72/99] haskell-digestive-functors: update to version 0.7.0.0 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 43f0c4337e74..4abea9429a5b 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.2.0"; - sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7"; + version = "0.7.0.0"; + sha256 = "1zn8vn6xcmp4w39b0k33bp7zsxvnn8g8p26mch4r8ng9ldcb2y8h"; buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit From 855b5adf2dd26e60c4fdb7304368783a2fc0338a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 73/99] haskell-github: update to version 0.7.4 --- pkgs/development/libraries/haskell/github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 9db0055922d8..0c1d0b3135d9 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.7.3"; - sha256 = "0cb7smydndigkcib4y8pbsycsqyzg45g5vrglyq1h245rd4j6s37"; + version = "0.7.4"; + sha256 = "1yalhixisjv1n9ihik3h6ya25f0066dd422nbpfysj9093hv3a5w"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure hashable HTTP httpConduit httpTypes network text time From ac1010b3ba63081282ae8c1bc9d6fe4a26f67f56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 74/99] haskell-hakyll: update to version 4.4.3.2 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index ace860bcd1cb..7dfac7b23dc9 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.3.1"; - sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a"; + version = "4.4.3.2"; + sha256 = "1n597q4pbdka7g06524j0zvjcjpv7fgf6mga1a0kfr012sf9cqz9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal - ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; From c18cc5d6e893cdf975bbf801c930c8444de79eb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 75/99] haskell-heist: update to version 0.13.0.6 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 9f0eb8981aeb..718f2088ff2c 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.5"; - sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj"; + version = "0.13.0.6"; + sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From 6a540116e63ebfe0167db1185d5d342a505ce4f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 76/99] haskell-hit: update to version 0.5.2 --- pkgs/development/libraries/haskell/hit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 9791478d3e81..fa74f1738b6c 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -1,17 +1,17 @@ -{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl -, parsec, QuickCheck, random, systemFileio, systemFilepath +{ cabal, attoparsec, bytedump, cryptohash, HUnit, mtl, parsec +, patience, QuickCheck, random, systemFileio, systemFilepath , testFramework, testFrameworkQuickcheck2, time, vector, zlib , zlibBindings }: cabal.mkDerivation (self: { pname = "hit"; - version = "0.5.0"; - sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx"; + version = "0.5.2"; + sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder cryptohash mtl parsec random systemFileio + attoparsec cryptohash mtl parsec patience random systemFileio systemFilepath time vector zlib zlibBindings ]; testDepends = [ From e7bc87c7d39e1fd032c5d4bdbf4427a68c3cb3d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 77/99] haskell-hjsmin: update to version 0.1.4.5 --- .../libraries/haskell/hjsmin/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 008c1766b947..b060d3c6efe4 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,12 +1,17 @@ -{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript, QuickCheck -, testFramework, testFrameworkHunit, text +{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript +, optparseApplicative, QuickCheck, testFramework +, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.4"; - sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048"; - buildDepends = [ blazeBuilder languageJavascript text ]; + version = "0.1.4.5"; + sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeBuilder languageJavascript optparseApplicative text + ]; testDepends = [ blazeBuilder Cabal HUnit languageJavascript QuickCheck testFramework testFrameworkHunit text From 1e610c88226d66f3f86abcd879261fb9395a7c1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 78/99] haskell-hoodle-builder: update to version 0.2.2.0 --- pkgs/development/libraries/haskell/hoodle-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix index d865de6ec9c1..2d7b60b6943a 100644 --- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "hoodle-builder"; - version = "0.2.2"; - sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq"; + version = "0.2.2.0"; + sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2"; buildDepends = [ blazeBuilder doubleConversion hoodleTypes lens strict ]; From 43e713b94ab5c7fed1564733274da70c3ad85fb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 79/99] haskell-mmorph: update to version 1.0.2 --- pkgs/development/libraries/haskell/mmorph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix index 702aca476fd0..b2c3212bb174 100644 --- a/pkgs/development/libraries/haskell/mmorph/default.nix +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mmorph"; - version = "1.0.1"; - sha256 = "15a4isvxb4my72hzndgfy66792r9fpkn9vnmr2fnv9d9vl058y14"; + version = "1.0.2"; + sha256 = "0d0nn5x7f3yyck10znqa13iihkshq04xgg1d9bn1nvl7kjzicjwh"; buildDepends = [ transformers ]; meta = { description = "Monad morphisms"; From 4ba8a711a2f677d7c092b22f6392bdddd1b491fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 80/99] haskell-monadcryptorandom: update to version 0.6 --- .../libraries/haskell/monadcryptorandom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index 60236eaad355..bd9261f901e8 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.5.3"; - sha256 = "1nmkya9mf9y6lhmbhamq2g09pfvfpmicrwab09mcy3ggljdnnfyg"; + version = "0.6"; + sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; From 20ef7553aa648d69b032bb06b98b85027233ae73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:42 +0100 Subject: [PATCH 81/99] haskell-network-conduit: update to version 1.0.1.1 --- .../development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index c0b8b9dd89e6..5dec259f5f5e 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "1.0.1"; - sha256 = "1argxj87a5rzza061lvvfmix2vrlz62dskj4pwlsq0d22dg8y332"; + version = "1.0.1.1"; + sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx"; buildDepends = [ conduit liftedBase monadControl network transformers ]; From 979c1bfe8934a8bb6791c62fdf9ade476176be00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 82/99] haskell-stm-conduit: update to version 2.2.1 --- .../libraries/haskell/stm-conduit/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 7e24db4476a4..f05396f8a6d0 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,19 +1,19 @@ -{ cabal, async, conduit, HUnit, liftedAsync, liftedBase -, monadControl, monadLoops, QuickCheck, resourcet, stm, stmChans -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, transformers +{ cabal, async, cereal, cerealConduit, conduit, HUnit, liftedAsync +, liftedBase, monadControl, monadLoops, QuickCheck, resourcet, stm +, stmChans, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers }: cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.2"; - sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66"; + version = "2.2.1"; + sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b"; buildDepends = [ - async conduit liftedAsync liftedBase monadControl monadLoops - resourcet stm stmChans transformers + async cereal cerealConduit conduit liftedAsync liftedBase + monadControl monadLoops resourcet stm stmChans transformers ]; testDepends = [ - conduit HUnit QuickCheck stm stmChans testFramework + conduit HUnit QuickCheck resourcet stm stmChans testFramework testFrameworkHunit testFrameworkQuickcheck2 transformers ]; meta = { From 5f2f85508a70ec37ac5591e0497c5371e2189e44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 83/99] haskell-tagsoup: update to version 0.13.1 --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 5dc83178be00..b51541d56f6b 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.13"; - sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1"; + version = "0.13.1"; + sha256 = "0p1mwyjk2bvpavjm1kgdjnahj0q4nhynix3653s0i0kvhw70450k"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; From 7bef7e8535855adc81fc82a80be32b4afc5075df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 84/99] haskell-tasty-rerun: update to version 1.1.0 --- pkgs/development/libraries/haskell/tasty-rerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index e932a7b9307f..0b2623c5f67b 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-rerun"; - version = "1.0.0"; - sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8"; + version = "1.1.0"; + sha256 = "0nizjmz9z41r1vzxzld760x6ga4lqycwfazhddk570w3x2dzm6p2"; buildDepends = [ mtl optparseApplicative reducers split stm tagged tasty transformers From 929bfebb1f7c2661ff10b7dc3ccb179ec927b2cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 85/99] haskell-wai-extra: update to version 2.0.3.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 78d802692545..451efd8a0a7d 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.3"; - sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5"; + version = "2.0.3.1"; + sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase From 336e599269ecc41ab300b3d4402ad2f610a5b93d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 86/99] haskell-websockets: update to version 0.8.1.2 --- pkgs/development/libraries/haskell/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index fa623cf60043..82a745b87256 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.1.1"; - sha256 = "0mgazf0s9sl53r5smidrfqcx7rq2v4kfm37f4f6mjrl656qxpbwd"; + version = "0.8.1.2"; + sha256 = "1xr44j3fcah3p5ic5s4rirb1ribq88m7ckmdfhwz5wy42sfiwv99"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text From 549f547358ec8137b4958cd7fa0feb54b3330c4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 87/99] haskell-xmlgen: update to version 0.6.2.1 --- pkgs/development/libraries/haskell/xmlgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix index f45b7b4a6a0e..6bc1a4b6f598 100644 --- a/pkgs/development/libraries/haskell/xmlgen/default.nix +++ b/pkgs/development/libraries/haskell/xmlgen/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "xmlgen"; - version = "0.6.2.0"; - sha256 = "0b6fyg6mlm068f2jjmil52az4hk144pryf1c0wr1gx6ddx9yzjy4"; + version = "0.6.2.1"; + sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh"; buildDepends = [ blazeBuilder mtl text ]; testDepends = [ filepath HUnit hxt QuickCheck text ]; meta = { From f5b46c33c1165e89ddba2d28ca28ae877e834064 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 88/99] haskell-xmlhtml: update to version 0.2.3.2 --- pkgs/development/libraries/haskell/xmlhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 83dbdb07f21b..659da9c8baac 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.3.1"; - sha256 = "138nryn68f58cvg971qw7vw0kprsw5g39j3fmf0bz83sg4g98nmd"; + version = "0.2.3.2"; + sha256 = "1djw9d0hff9ii0n1bgbjjsca9n0w7mxj3ivf9dslyr3kv3yb4013"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; From e508c74a15de44c3a2f0a0173a0ea3bcbe7e1821 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 89/99] haskell-yesod-form: update to version 1.3.4.4 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 35b55bde887a..1fb2e487e7ce 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4.3"; - sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408"; + version = "1.3.4.4"; + sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From 887ba81084aa714d0dd008e0b036f3aff7f1e4f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 16:52:43 +0100 Subject: [PATCH 90/99] haskell-yesod-platform: update to version 1.2.6.1 --- pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 0c9c31778cad..ee9fa20c8de3 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -32,8 +32,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.6"; - sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p"; + version = "1.2.6.1"; + sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder From 63482fc9b4db40385ae9f3c9eaf166509f24b152 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 18:52:13 +0100 Subject: [PATCH 91/99] haskell-blaze-html: jailbreak to fix test suite build --- pkgs/development/libraries/haskell/blaze-html/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index ee1b686493ca..bec48f8e44f7 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { blazeBuilder blazeMarkup HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + patchPhase = '' + sed -i -e 's|blaze-markup.*>=.*,|blaze-markup,|' blaze-html.cabal + ''; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; From 03f6a6989abe30a856f256364f7074049007125e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 19:03:32 +0100 Subject: [PATCH 92/99] haskell-blaze-svg: jailbreak to fix build with latest 'blaze-markup' --- pkgs/development/libraries/haskell/blaze-svg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index 7b3ec55dc577..b342b35dbe65 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.3.0"; sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f"; buildDepends = [ blazeMarkup mtl ]; + jailbreak = true; meta = { homepage = "https://github.com/deepakjois/blaze-svg"; description = "SVG combinator library"; From 4cb0ec470f043d016144767e56cc4291200474bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:44:18 +0100 Subject: [PATCH 93/99] haskell-highlighting-kate: jailbreak to fix build with latest 'blaze-html' --- pkgs/development/libraries/haskell/highlighting-kate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index f991bb585862..a2db6032675e 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal"; + jailbreak = true; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; From 06627cbfc4bdd3e1998922f7802441306a95ec28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:47:44 +0100 Subject: [PATCH 94/99] haskell-hledger-web: jailbreak to fix build with latest 'blaze-markup' --- pkgs/development/libraries/haskell/hledger-web/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 21dc845b1175..b547c8a60421 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -21,6 +21,9 @@ cabal.mkDerivation (self: { ]; testDepends = [ hspec yesod yesodTest ]; doCheck = false; + patchPhase = '' + sed -i -e 's|blaze-html.*0.7|blaze-html|' -e 's|blaze-markup.*0.7|blaze-markup|' hledger-web.cabal + ''; meta = { homepage = "http://hledger.org"; description = "A web interface for the hledger accounting tool"; From 83c6cc32336b99c53095b9e16c062ea1bc2fb2f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 20:48:53 +0100 Subject: [PATCH 95/99] haskell-happstack-server: jailbreak to fix build with latest 'blaze-html' --- .../development/libraries/haskell/happstack/happstack-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 88651c62b590..8b2bec395fc6 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ HUnit parsec zlib ]; doCheck = false; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; From b845171dd6f781facfec1d1953a5c047819f1e0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2014 21:38:43 +0100 Subject: [PATCH 96/99] haskell-hakyll: jailbreak to fix build with latest 'blaze-html' and 'pandoc-citeproc' --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 7dfac7b23dc9..22ad997b32a3 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -26,6 +26,10 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; + patchPhase = '' + sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \ + -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 2f51348f4d90d945be461064e13819eecad54ed4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 26 Jan 2014 00:05:35 +0100 Subject: [PATCH 97/99] haskell-patience: add version 0.1.1 --- .../libraries/haskell/patience/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/patience/default.nix diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix new file mode 100644 index 000000000000..0f65e3eceed5 --- /dev/null +++ b/pkgs/development/libraries/haskell/patience/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "patience"; + version = "0.1.1"; + sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm"; + meta = { + description = "Patience diff and longest increasing subsequence"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 081caf41d2a7..6115c4de6841 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1769,6 +1769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; + patience = callPackage ../development/libraries/haskell/patience {}; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; From 64c44fa508343d693e94c01eb01fba8d8cca7ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 Jan 2014 00:41:14 +0100 Subject: [PATCH 98/99] weston: fix build by updating (after wayland update) Also add dbus support, which seemed potentionally important to me. --- pkgs/applications/window-managers/weston/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 913235287ac5..4880029119eb 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev -, libjpeg, pam, autoconf, automake, libtool }: +, libjpeg, pam, autoconf, automake, libtool, dbus }: -let version = "1.3.1"; in +let version = "1.4.0"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p"; + sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl"; }; buildInputs = [ pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam + cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs ]; NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; From bf8b81f538020c68ec018cc3e5b682d828a64ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 Jan 2014 00:59:59 +0100 Subject: [PATCH 99/99] lyx: bugfix update 2.0.6 -> .7 --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index fd2e7c3ac426..1ea4f06c9273 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.6"; + version = "2.0.7"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "1llah9d9ymvdk8asmqslcwnicycxrwb27k8si184n5bfxvnjpjx5"; + sha256 = "0qp8xqmlafib4hispjgl1friln0w3s05mi20sjfzaxnl6jkvv5q5"; }; configureFlags = [