From 8fb68289c6facefb84e25cf8cfc4f338a30a9224 Mon Sep 17 00:00:00 2001 From: Ben Doyle <benjamin.peter.doyle@gmail.com> Date: Thu, 13 Mar 2014 13:15:28 -0400 Subject: [PATCH 001/248] newsbeuter: Update from 2.7 to 2.8 --- .../networking/feedreaders/newsbeuter/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index 029a6f8e6339..e5f18f72cedc 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses +{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-2.7"; + name = "newsbeuter-2.8"; src = fetchurl { url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; - sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6"; + sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8"; + }; buildInputs # use gettext instead of libintlOrEmpty so we have access to the msgfmt # command - = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ] + = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ] ++ libiconvOrEmpty ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' - sed -i -e 104,108d config.sh + sed -i -e 110,114d config.sh sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl export LDFLAGS=-lncursesw ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4603179fafc5..5740ab4b3347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10512,7 +10512,7 @@ let desktopName = "Vimb"; }; - VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; + # VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { From 3cbd1cd7957b0c0c0e98197cc053d59a4a2ea409 Mon Sep 17 00:00:00 2001 From: Ben Doyle <benjamin.peter.doyle@gmail.com> Date: Thu, 13 Mar 2014 16:48:34 -0400 Subject: [PATCH 002/248] newsbeuter: bump development version to latest master --- .../applications/networking/feedreaders/newsbeuter/dev.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index 17e97d92b897..4390360ff9e8 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -2,11 +2,12 @@ , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-dev-20131118"; + name = "newsbeuter-dev-20140309"; src = fetchgit { url = "https://github.com/akrennmair/newsbeuter.git"; - rev = "18b73f7d44a99a698d4878fe7d226f55842132c2"; + rev = "1427bdb0705806368db39576a9b803df82fa0415"; + sha256 = "b29a304a46bf56b439d0d35ea586f7fd0fbf1a5565dca95de76e774885d8b64b"; }; buildInputs @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' - sed -i -e 104,108d config.sh + sed -i -e 110,114d config.sh sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl export LDFLAGS=-lncursesw ''; From ac3de98f079e5b48c85f5b4b85b6bb447ebe3567 Mon Sep 17 00:00:00 2001 From: Anders Claesson <akc@akc.is> Date: Sat, 15 Mar 2014 22:12:38 +0000 Subject: [PATCH 003/248] Add sloane -- a command line interface to OEIS. --- lib/maintainers.nix | 1 + .../science/math/sloane/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/applications/science/math/sloane/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8d6c613fd0f8..c2dd5dd266a3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -5,6 +5,7 @@ alphabetically sorted. */ aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; + akc = "Anders Claesson <akc@akc.is>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix new file mode 100644 index 000000000000..1e318bd8a79f --- /dev/null +++ b/pkgs/applications/science/math/sloane/default.nix @@ -0,0 +1,21 @@ +{ cabal, ansiTerminal, cmdargs, HTTP, terminalSize, url }: + +cabal.mkDerivation (self: { + pname = "sloane"; + version = "1.6"; + sha256 = "0my3j53bda3s8zxnm6is1align4k082wwsfg2y1i75js5z9kwmzy"; + isLibrary = false; + isExecutable = true; + buildDepends = [ ansiTerminal cmdargs HTTP terminalSize url ]; + postInstall = '' + mkdir -p $out/share/man/man1 + cp sloane.1 $out/share/man/man1/ + ''; + meta = { + homepage = "http://github.com/akc/sloane"; + description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ akc ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d23471ffdd48..2e7765c0b7b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2842,6 +2842,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x nc-indicators = callPackage ../applications/misc/nc-indicators {}; + sloane = callPackage ../applications/science/math/sloane {}; + taffybar = callPackage ../applications/misc/taffybar {}; yi = callPackage ../applications/editors/yi/yi.nix {}; From 2560f2e78b3fe32c03813ed56d666459c90f06cb Mon Sep 17 00:00:00 2001 From: Austin Seipp <aseipp@pobox.com> Date: Fri, 21 Mar 2014 04:08:59 -0500 Subject: [PATCH 004/248] fsharp: 3.0 -> 3.1, and attempt to fix build Hopefully this fix will appease hydra - the distributed autogen.sh script is annoying. Signed-off-by: Austin Seipp <aseipp@pobox.com> --- pkgs/development/compilers/fsharp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 37516fabaab2..8cc283bc3f14 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.0"; + version = "3.1"; src = fetchgit { url = "https://github.com/fsharp/fsharp"; - rev = "refs/heads/fsharp_30"; - sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f"; + rev = "refs/heads/fsharp_31"; + sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; - configurePhase = "./autogen.sh --prefix $out"; + configurePhase = '' + substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh" + ./autogen.sh --prefix $out + ''; # Make sure the executables use the right mono binary, # and set up some symlinks for backwards compatibility. From af6c571a7e6784526bd97587bf900d2546acf6e9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas <rob.vermaas@gmail.com> Date: Fri, 21 Mar 2014 14:55:42 +0100 Subject: [PATCH 005/248] Increase size of GCE image. Use disk.raw as name inside tar.gz, as this is compulsory. --- .../modules/virtualisation/google-compute-image.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 634932ff0077..1439c26b071c 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -1,7 +1,9 @@ { config, pkgs, ... }: with pkgs.lib; - +let + diskSize = "200G"; +in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; @@ -12,7 +14,7 @@ with pkgs.lib; '' mkdir $out diskImage=$out/$diskImageBase - truncate $diskImage --size 10G + truncate $diskImage --size ${diskSize} mv closure xchg/ ''; @@ -20,8 +22,9 @@ with pkgs.lib; '' PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin pushd $out - tar -Szcf $diskImageBase.tar.gz $diskImageBase - rm $out/$diskImageBase + mv $diskImageBase disk.raw + tar -Szcf $diskImageBase.tar.gz disk.raw + rm $out/disk.raw popd ''; diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; @@ -32,7 +35,7 @@ with pkgs.lib; '' # Create partition table ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G + ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} ${pkgs.parted}/sbin/parted /dev/vda print . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR From 5115636037f182b5d9cb5a2d668ee675838e91dd Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Fri, 21 Mar 2014 16:02:03 +0200 Subject: [PATCH 006/248] bluez5: update from 5.12 to 5.16 --- pkgs/os-specific/linux/bluez/bluez5.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 4938f7f44706..ffa91e951a8d 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.12"; + name = "bluez-5.16"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm"; + sha256 = "0qxivd64az3qziw82axj2ksilllxq4fnb6fdrnlxr6d74550kmf8"; }; pythonPath = with pythonPackages; @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bluez.org/; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; description = "Bluetooth support for Linux"; platforms = platforms.linux; }; From 020d3b299c7fe8694409b92b9d29e96abf7aad10 Mon Sep 17 00:00:00 2001 From: Rob Vermaas <rob.vermaas@gmail.com> Date: Fri, 21 Mar 2014 15:17:49 +0100 Subject: [PATCH 007/248] Make the GCE image use 100G as disk size (maximum). --- nixos/modules/virtualisation/google-compute-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 1439c26b071c..5fca115b819c 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -2,7 +2,7 @@ with pkgs.lib; let - diskSize = "200G"; + diskSize = "100G"; in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; From 00cfc70b107a70f11370a2bd3f05bdeb5545172b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Fri, 21 Mar 2014 15:38:18 +0100 Subject: [PATCH 008/248] linux: update to 3.12.14 and 3.10.33 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 748611ab1b5f..4c6e01271fbd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.31"; + version = "3.10.33"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m"; + sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index d276de69446a..e2ec7295a5f0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.13"; + version = "3.12.14"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "08r4k64v0nkr0dnmir3n3x7f4i83akl3ahx9cl7rbj29zc4ninmd"; + sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx"; }; features.iwlwifi = true; From 9db587bf7dff8190afd004dcc597a06a34e52c39 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Fri, 21 Mar 2014 05:23:54 +0100 Subject: [PATCH 009/248] grsecurity: Update stable and test patches stable: 3.0-3.2.55-201403172027 -> 3.0-3.2.55-201403202347 test: 3.0-3.13.6-201403172032 -> 3.0-3.13.6-201403202349 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d7c9e1265981..a41290168fe0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -75,8 +75,8 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403172027.patch; - sha256 = "1ik8xa9xgy9ghlb66rz04rdj64c8914vpv847zld7zhhih90lfm8"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403202347.patch; + sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 @@ -86,8 +86,8 @@ rec { grsecurity_3_0_3_13_6 = { name = "grsecurity-3.0-3.13.6"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403172032.patch; - sha256 = "18gr6r11gv015y6nb2zvv3z8kb4zv9gadhlcdii6il0c2y4bsrsb"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch; + sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 From f63d2dba0ab6b095d37b2ffa397b229fa09b9286 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Fri, 21 Mar 2014 15:42:58 +0100 Subject: [PATCH 010/248] pax-utils: Update from 0.7 -> 0.8.1 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 8d58873d5c12..83f0dc1e82d2 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.7"; + version = "0.8.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s"; + sha256 = "1fgm70s52x48dxjihs0rcwmpfsi2dxbjzcilxy9fzg0i39dz4kw4"; }; makeFlags = [ From d33544129f513a6beaa979ec11a2ce27d31baea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Wed, 19 Mar 2014 16:40:07 +0100 Subject: [PATCH 011/248] easyrsa: symlink correct openssl config --- pkgs/tools/networking/easyrsa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index bb59bb5b165e..e49c32aac704 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { # Make sane defaults and patch default config vars postInstall = '' + cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf for prog in $(find "$out/share/easy-rsa" -executable -type f); do makeWrapper "$prog" "$out/bin/$(basename $prog)" \ --set EASY_RSA "$out/share/easy-rsa" \ From 917498001fb49c82c3bf0dfd533a40f3b4dbc6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Fri, 21 Mar 2014 18:01:18 +0100 Subject: [PATCH 012/248] almir: correctly set PYTHONPATH --- nixos/modules/services/backup/almir.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix index d5bc932c6b96..8fdcdd6c7be8 100644 --- a/nixos/modules/services/backup/almir.nix +++ b/nixos/modules/services/backup/almir.nix @@ -154,7 +154,8 @@ in { description = "Almir web app"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.pythonPackages.almir ]; - serviceConfig.ExecStart = "${pkgs.pythonPackages.almir}/bin/pserve ${productionini}"; + environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}"; }; environment.systemPackages = [ pkgs.pythonPackages.almir ]; From d7bd83d0ae2ba1fccca8029593db3c06d882a3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Fri, 21 Mar 2014 18:02:06 +0100 Subject: [PATCH 013/248] shotwell: 0.15.1 -> 0.18 --- pkgs/applications/graphics/shotwell/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2cb86a3f1e66..2a3ed77609fb 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -18,12 +18,12 @@ let buildInputs = [ pkgconfig glib libsoup ]; }; in stdenv.mkDerivation rec { - version = "0.15.1"; + version = "0.18.0"; name = "shotwell-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/0.15/${name}.tar.xz"; - sha256 = "12qbqba226q9wb0m31xx8w0m968sr1n18qa4mbz75wblhwws0j7b"; + url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz"; + sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; @@ -37,14 +37,14 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share" ''; buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - makeWrapper ]; + makeWrapper gnome_doc_utils ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; From 584d6969439432fb8ff802ee81dc9b2e4a9e8e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si> Date: Fri, 21 Mar 2014 18:08:07 +0100 Subject: [PATCH 014/248] ike: also specify lib64 libs --- pkgs/applications/ike/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index 7bba42152e8c..d595cb60da8c 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" done ''; From 774d179790d5e062bfa2e6322d6d6d751ceed2b7 Mon Sep 17 00:00:00 2001 From: Jacob Hinkle <jacob.hinkle@gmail.com> Date: Fri, 21 Mar 2014 12:07:56 -0600 Subject: [PATCH 015/248] Started default.nix for slrn. Not finding slang --- .../networking/newsreaders/slrn/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/slrn/default.nix diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix new file mode 100644 index 000000000000..3a4a7d65c848 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgs +, slang +}: + +let version = "1.0.1"; in + +stdenv.mkDerivation { + name = "slrn-${version}"; + + src = fetchurl { + url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz"; + sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; + }; + + nativeBuildInputs = [ slang ]; + + meta = { + description = "The slrn (S-Lang read news) newsreader"; + homepage = http://slrn.sourceforge.net/index.html; + license = pkgs.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb5dd9b490e4..10df9bbd9862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8905,6 +8905,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { From 715b90f784ca6e753bd78116dffddaf7a5a6b326 Mon Sep 17 00:00:00 2001 From: Jacob Hinkle <jacob.hinkle@gmail.com> Date: Fri, 21 Mar 2014 14:32:21 -0600 Subject: [PATCH 016/248] Update default.nix to use ncurses and patch hardcoded paths --- .../networking/newsreaders/slrn/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 3a4a7d65c848..e079e9d9a9f9 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgs -, slang +{ stdenv, fetchurl, pkgs, +slang, ncurses }: let version = "1.0.1"; in @@ -12,7 +12,16 @@ stdenv.mkDerivation { sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; }; - nativeBuildInputs = [ slang ]; + preConfigure = '' + sed -i -e "s|-ltermcap|-lncurses|" configure + sed -i autoconf/Makefile.in src/Makefile.in \ + -e "s|/bin/cp|cp|" \ + -e "s|/bin/rm|rm|" + ''; + + configureFlags = "--with-slang=${slang}"; + + buildInputs = [ slang ncurses ]; meta = { description = "The slrn (S-Lang read news) newsreader"; From f7498e5a7ee46e8f8d17450397ef2dd129e2c9a5 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@gmail.com> Date: Sat, 22 Mar 2014 01:12:48 -0300 Subject: [PATCH 017/248] Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. --- lib/maintainers.nix | 1 + pkgs/applications/video/aegisub/default.nix | 7 ++++++- pkgs/applications/video/mpv/default.nix | 3 ++- pkgs/applications/virtualization/8086tiny/default.nix | 3 ++- pkgs/applications/virtualization/bochs/default.nix | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8d6c613fd0f8..07414a9ad3aa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -9,6 +9,7 @@ all = "Nix Committers <nix-commits@lists.science.uu.nl>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; + AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; antono = "Antono Vasiljev <self@antono.info>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index cbbb23b04a05..fa17fb5ffd2c 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -53,7 +53,12 @@ stdenv.mkDerivation rec { built-in real-time video preview. ''; homepage = http://www.aegisub.org/; - license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares + license = stdenv.lib.licenses.bsd3; + # The Aegisub sources are itself BSD/ISC, + # but they are linked against GPL'd softwares + # - so the resulting program will be GPL + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index a20dc0cf590e..2ffefa35898f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -118,7 +118,8 @@ stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; homepage = "http://mpv.io"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 0b4ff90e4095..ca93a1bfd7c6 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; homepage = http://www.megalith.co.uk/8086tiny/index.html; - license = "MIT"; + license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 6b8cf5dc0356..7b49bb8220da 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation rec { Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. ''; homepage = http://bochs.sourceforge.net/; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } From 357f61b3fade629fa264f93126df2777005d43a3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:42:52 +0100 Subject: [PATCH 018/248] haskell-HaRe: update to version 0.7.1.5 --- pkgs/development/tools/haskell/HaRe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 6c128c25073e..a5d6794f318d 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.4"; - sha256 = "000vdvm38a3d3jpjg3cgsfl11w8jzvl0haqz78fy3zblqlndxy1m"; + version = "0.7.1.5"; + sha256 = "1xfgvqhnlpmfljad790sdjyqlq684751i7bdfw1wvbzmw7gdyafc"; isLibrary = true; isExecutable = true; buildDepends = [ From b722d4f3ffcb73f3c9fe647175d763b26e303bdf Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:24 +0100 Subject: [PATCH 019/248] haskell-testing-feat: add version 0.4.0.1 --- .../libraries/haskell/testing-feat/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/testing-feat/default.nix diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix new file mode 100644 index 000000000000..5e6a8177d1a1 --- /dev/null +++ b/pkgs/development/libraries/haskell/testing-feat/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, QuickCheck, tagshare }: + +cabal.mkDerivation (self: { + pname = "testing-feat"; + version = "0.4.0.1"; + sha256 = "1fqp5k8kwnn7qqggyy5scsxmkvd1pibc5sfs7v1myrp0azkc25cp"; + buildDepends = [ mtl QuickCheck tagshare ]; + meta = { + description = "Functional Enumeration of Algebraic Types"; + 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 247d8649ed62..d3094af7687b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2407,6 +2407,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testingFeat = callPackage ../development/libraries/haskell/testing-feat {}; + texmath = callPackage ../development/libraries/haskell/texmath {}; text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; From ac40eeb9b341d74f0818c73d6a77e4b240eea9f5 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:32 +0100 Subject: [PATCH 020/248] haskell-tagshare: add version 0.0 --- .../libraries/haskell/tagshare/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tagshare/default.nix diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix new file mode 100644 index 000000000000..be56d518121b --- /dev/null +++ b/pkgs/development/libraries/haskell/tagshare/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "tagshare"; + version = "0.0"; + sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj"; + buildDepends = [ mtl ]; + meta = { + description = "TagShare - explicit sharing with tags"; + 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 d3094af7687b..88fe001a0cfb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2357,6 +2357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tagged = callPackage ../development/libraries/haskell/tagged {}; + tagshare = callPackage ../development/libraries/haskell/tagshare {}; + tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; From a18d18a4246524924f4b25b74648bbf13427b4c3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:41 +0100 Subject: [PATCH 021/248] haskell-cryptohash-conduit: add version 0.1.0 --- .../haskell/cryptohash-conduit/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cryptohash-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix new file mode 100644 index 000000000000..501edf03ae09 --- /dev/null +++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, conduit, cryptohash, transformers }: + +cabal.mkDerivation (self: { + pname = "cryptohash-conduit"; + version = "0.1.0"; + sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w"; + buildDepends = [ conduit cryptohash transformers ]; + meta = { + homepage = "http://github.com/vincenthz/hs-cryptohash-conduit"; + description = "cryptohash conduit"; + 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 88fe001a0cfb..4fdc5058f5f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -860,6 +860,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptohashConduit = callPackage ../development/libraries/haskell/cryptohash-conduit {}; + cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {}; cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; From a88067e6da4059b5532537dd4732ab3b81326727 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:50 +0100 Subject: [PATCH 022/248] haskell-dlist-instances: add version 0.1 --- .../libraries/haskell/dlist-instances/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dlist-instances/default.nix diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix new file mode 100644 index 000000000000..d168c4b35831 --- /dev/null +++ b/pkgs/development/libraries/haskell/dlist-instances/default.nix @@ -0,0 +1,14 @@ +{ cabal, dlist, semigroups }: + +cabal.mkDerivation (self: { + pname = "dlist-instances"; + version = "0.1"; + sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615"; + buildDepends = [ dlist semigroups ]; + meta = { + homepage = "https://github.com/gregwebs/dlist-instances"; + description = "Difference lists instances"; + 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 4fdc5058f5f6..15ba3d011616 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -990,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dlist = callPackage ../development/libraries/haskell/dlist {}; + dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {}; + dns = callPackage ../development/libraries/haskell/dns {}; doctest = callPackage ../development/libraries/haskell/doctest {}; From f4f93bf701e4e01fe64ad02634d5cb9b5808eeb6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:56 +0100 Subject: [PATCH 023/248] haskell-Glob: update to version 0.7.4 --- pkgs/development/libraries/haskell/Glob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 80c0eaa44ab9..d6f07e9168dc 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Glob"; - version = "0.7.3"; - sha256 = "0yl0wxbd03dv0hfr2aqwm9f3xnhjkdicymqv3nmhjjslqq3a59zd"; + version = "0.7.4"; + sha256 = "00f6xznqh27vbr8rggsrdphqsq1cvv931pa06b1grs7w01dcmw8s"; buildDepends = [ dlist filepath transformers ]; meta = { homepage = "http://iki.fi/matti.niemenmaa/glob/"; From a802d4ef14bc59c4fa78e30827f615fde6330706 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:44:58 +0100 Subject: [PATCH 024/248] haskell-HaXml: update to version 1.24.1 --- pkgs/development/libraries/haskell/HaXml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index b490cf75d96c..996437cbeac2 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaXml"; - version = "1.24"; - sha256 = "18kvavqa84k2121ppxngn39fjz4w63chngb3255w1fhdz13v3ydn"; + version = "1.24.1"; + sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az"; isLibrary = true; isExecutable = true; buildDepends = [ filepath polyparse random ]; From a9738e5cd1ca34e3e13b88073189c49ab0d48f4b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:00 +0100 Subject: [PATCH 025/248] haskell-arithmoi: update to version 0.4.0.4 --- pkgs/development/libraries/haskell/arithmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index 181937fdd807..082745fadf07 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "arithmoi"; - version = "0.4.0.3"; - sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc"; + version = "0.4.0.4"; + sha256 = "1v8qn0gjvlds6ljm9sfzzi5w3gsf7x63z0r7hcs1rvn0n3acwz6y"; buildDepends = [ mtl random ]; meta = { homepage = "https://bitbucket.org/dafis/arithmoi"; From 053391eba5e42ba34680df9e7a0fefdfdcf0d0a5 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:01 +0100 Subject: [PATCH 026/248] haskell-conduit-combinators: update to version 0.2.1 --- .../haskell/conduit-combinators/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 5d1fa791c694..0c9ccbd8f35f 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,19 +1,20 @@ { cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable -, primitive, silently, systemFileio, systemFilepath, text -, transformers, transformersBase, vector +, mwcRandom, primitive, silently, systemFileio, systemFilepath +, text, transformers, transformersBase, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.0.1"; - sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r"; + version = "0.2.1"; + sha256 = "0v3b9wiziyynk00fk07nwrk3c032wyr0adrwlkjl89ma1ix220sv"; buildDepends = [ - chunkedData conduit monoTraversable primitive systemFileio - systemFilepath text transformers transformersBase vector + chunkedData conduit monoTraversable mwcRandom primitive + systemFileio systemFilepath text transformers transformersBase + vector void ]; testDepends = [ - basicPrelude chunkedData hspec monoTraversable silently text - transformers vector + basicPrelude chunkedData hspec monoTraversable mwcRandom silently + text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; From c9de5a7000c9a5941ad3f70a301738458a6ef1bc Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:03 +0100 Subject: [PATCH 027/248] haskell-css-text: update to version 0.1.2.1 --- pkgs/development/libraries/haskell/css-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 2cb78af7ba9c..9ab9b9f5d2da 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "css-text"; - version = "0.1.2.0.1"; - sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp"; + version = "0.1.2.1"; + sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw"; buildDepends = [ attoparsec text ]; testDepends = [ attoparsec hspec QuickCheck text ]; meta = { From 833f782e7ff5fbb001fbec999e55b47ffb6a0fb4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:05 +0100 Subject: [PATCH 028/248] haskell-diagrams-cairo: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c38346d189bc..421859dbdaa9 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.1"; - sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf"; + version = "1.1.0.1"; + sha256 = "04s3z3j3xqx4q4chdysip2ngjbw4k7gd12s5zlbvx88d3jg0bcrs"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative split statestack From e658482fcc2bbf70867f4f49604d795ab94c4588 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:07 +0100 Subject: [PATCH 029/248] haskell-diagrams-lib: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 323856554268..d8180bfbda49 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.1.0.1"; - sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7"; + version = "1.1.0.2"; + sha256 = "1kfzf9cjb74vpfdjargjy8hg0rdhvry96f9ysmya3j7ws8lqrwdh"; buildDepends = [ active colour dataDefaultClass diagramsCore filepath fingertree hashable intervals lens MemoTrie monoidExtras optparseApplicative From b4fa83f5fbe819d5d6b0c2058dcb73be64a88377 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:09 +0100 Subject: [PATCH 030/248] haskell-diagrams-postscript: update to version 1.0.2.1 --- pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index a7f85f98b093..ebd7294de3d5 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.0.2"; - sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx"; + version = "1.0.2.1"; + sha256 = "0c3svrkv2wyls1mb75gzv9nfjy0vgfw4bshd6q6z036jn75q9y0r"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace From 99537a00cc87e97a7c6fdbed8acdae9477615083 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:11 +0100 Subject: [PATCH 031/248] haskell-dlist: update to version 0.7 --- pkgs/development/libraries/haskell/dlist/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 547ea9f8a478..f87e7e2d7589 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,9 +1,10 @@ -{ cabal, Cabal, QuickCheck }: +{ cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { pname = "dlist"; - version = "0.6.0.1"; - sha256 = "08q8dsczh59a0ii3nqk6yqz70msd0pndjjcg9dzq8iyknbbqbi45"; + version = "0.7"; + sha256 = "1abbym3afm77xkgcrv3d9nl4wn69m7m3gxahdcvkg1ir1sm2pkyi"; + buildDepends = [ deepseq ]; testDepends = [ Cabal QuickCheck ]; meta = { homepage = "https://github.com/spl/dlist"; From 79d51a59c14ec90d41dbe96c0b3f109bcc223525 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:12 +0100 Subject: [PATCH 032/248] haskell-dsp: update to version 0.2.3 --- pkgs/development/libraries/haskell/dsp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix index c1315a238174..c16a6888b6b7 100644 --- a/pkgs/development/libraries/haskell/dsp/default.nix +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -2,8 +2,10 @@ cabal.mkDerivation (self: { pname = "dsp"; - version = "0.2.2"; - sha256 = "0vb71z8iky3xl40b9d79z7krq960ykcgn3y8lks3wzgiabbh2d89"; + version = "0.2.3"; + sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v"; + isLibrary = true; + isExecutable = true; buildDepends = [ random ]; meta = { homepage = "http://www.haskell.org/haskellwiki/DSP"; From 30117ea592f92ffe2e63abdd86416c03fc6cdaf6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:14 +0100 Subject: [PATCH 033/248] haskell-fay: update to version 0.19.1.1 --- pkgs/development/libraries/haskell/fay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d945298d228a..ec5f0a48b871 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.19.1"; - sha256 = "05h4jmwy1wzgps1an1df5b4gic91xlm884mv6nqnazvpbnn23d5b"; + version = "0.19.1.1"; + sha256 = "1jjv7l4x1bxr4whhcn4vh4b3ac4wfnb6l322jmdj60nh9sj8dzpf"; isLibrary = true; isExecutable = true; buildDepends = [ From 3d1e229413cc1796cb862e7e52f3170ec5c3bfe1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:16 +0100 Subject: [PATCH 034/248] haskell-gnuplot: update to version 0.5.2.2 --- pkgs/development/libraries/haskell/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix index 14655677c6f5..f835410dbbd9 100644 --- a/pkgs/development/libraries/haskell/gnuplot/default.nix +++ b/pkgs/development/libraries/haskell/gnuplot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gnuplot"; - version = "0.5.2.1"; - sha256 = "1bzj7z803mxyxfv2123swvdv78gh5dbrf8ldc6iziry3fz5q8nb1"; + version = "0.5.2.2"; + sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av"; isLibrary = true; isExecutable = true; buildDepends = [ From a1e3866a165108ad08de4b5046c733aa4aa2c9bf Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:18 +0100 Subject: [PATCH 035/248] haskell-heist: update to version 0.13.1 --- 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 718f2088ff2c..77ebf3fd9af1 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.6"; - sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9"; + version = "0.13.1"; + sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From 891a497aa1cd917c70bb57ea8eff256c8c62c6c7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:20 +0100 Subject: [PATCH 036/248] haskell-http-reverse-proxy: update to version 0.3.1.1 --- .../libraries/haskell/http-reverse-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 3605425436e4..1e1b0117a2f9 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1"; - sha256 = "1xayhjrs6nm7gm5xc6z6vhzi9iq5czdvpywamkncivjsxjlc50b8"; + version = "0.3.1.1"; + sha256 = "02aksdkwhdxzc4kk7j3npbiqpm9px3yva0375mk1b1f2g552g5jj"; buildDepends = [ async basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass httpClient httpTypes liftedBase monadControl From 17b59a84c35063cc9aac3ad56521509c57d5c1b1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:22 +0100 Subject: [PATCH 037/248] haskell-language-ecmascript: update to version 0.16 --- .../libraries/haskell/language-ecmascript/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 77165ef104d1..79404ffbcf0a 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -1,14 +1,15 @@ { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec , QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, uniplate, wlPprint +, testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint }: cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.4"; - sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7"; + version = "0.16"; + sha256 = "1gz0089llxfmq9v2j5hp85h7w2vw50sgbl6dcd7i0s8m5zd3dmqg"; buildDepends = [ - dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint + dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate + wlPprint ]; testDepends = [ dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck From c358085c417cc069e63866fd896d0703a770239f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:23 +0100 Subject: [PATCH 038/248] haskell-mono-traversable: update to version 0.4.0.3 --- .../haskell/mono-traversable/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 5119863500dd..a1de3e9ad16b 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,15 +1,16 @@ -{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids -, semigroups, text, transformers, unorderedContainers, vector -, vectorAlgorithms, vectorInstances +{ cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec +, QuickCheck, semigroupoids, semigroups, text, transformers +, unorderedContainers, vector, vectorAlgorithms, vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.4.0.1"; - sha256 = "049skbjwz49c9qz2nys2hn6pc4gqn1a91b5kl9z6hjs9fnaic6ng"; + version = "0.4.0.3"; + sha256 = "04g2ihk4n71zrz09si2k8j46y53i5vllps9xizgs0bmikmrgh29f"; buildDepends = [ - comonad hashable semigroupoids semigroups text transformers - unorderedContainers vector vectorAlgorithms vectorInstances + comonad dlist dlistInstances hashable semigroupoids semigroups text + transformers unorderedContainers vector vectorAlgorithms + vectorInstances ]; testDepends = [ foldl hspec QuickCheck semigroups text transformers From 912492268030120986f4d9a2f0d3264d6efdc1f0 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:29 +0100 Subject: [PATCH 039/248] haskell-pipes-attoparsec: update to version 0.5.0 --- .../libraries/haskell/pipes-attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 7204286671e1..d886d17478ba 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.4.0.1"; - sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf"; + version = "0.5.0"; + sha256 = "1xpqna850lxawx0m84lzaxwrwfw4vccr7jjf199ir7bmwwhqlr5h"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text From a727d1480be80f01cd6ef0734359f69b9c74940d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:31 +0100 Subject: [PATCH 040/248] haskell-recaptcha: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/recaptcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 37fb26208f48..0d7b9d709c6c 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "recaptcha"; - version = "0.1"; - sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144"; + version = "0.1.0.1"; + sha256 = "0mk2vdvm5jz8jh8xc4alsly8c9msfis0drbgg89rck1y387z2njz"; buildDepends = [ HTTP network xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; From 0ed61e69f1ee036ecc3e84a71667c168159d9f93 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:33 +0100 Subject: [PATCH 041/248] haskell-resourcet: update to version 0.4.10.1 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 913e77483e44..cb5543147524 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.10"; - sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; + version = "0.4.10.1"; + sha256 = "05skxqxhbmsyjn72w1c9n924d865wxadfsxlavk0nmbd7ygmnazb"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; From 68cd345c344947f588b928dc6232ecd10f771f64 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:34 +0100 Subject: [PATCH 042/248] haskell-scotty: update to version 0.7.0 --- pkgs/development/libraries/haskell/scotty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index e51c2a7a64c0..69a3aae56969 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.2"; - sha256 = "0szki6wcmhj20kxhmgidgf930xwhiq03qrk8m0x8aklcjzkhvy69"; + version = "0.7.0"; + sha256 = "0j08zjm8ndkpq5mrmh6rj6zc733irf7kyikw8nww754r40y6kps2"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp From 6b5721c2b6fbe51d68b7a3f573306137fd759822 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:36 +0100 Subject: [PATCH 043/248] haskell-wai-app-static: update to version 2.0.0.4 --- .../haskell/wai-app-static/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 412fd3f16e6c..009ae99daa80 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,19 +1,19 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed -, filepath, hspec, httpDate, httpTypes, mimeTypes, network -, systemFileio, systemFilepath, text, time, transformers -, unixCompat, unorderedContainers, wai, waiTest, zlib +, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath +, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio +, systemFilepath, text, time, transformers, unixCompat +, unorderedContainers, wai, waiTest, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.3"; - sha256 = "0anbmp6wjk1qba1skr08fkm5y9lm58kfghzcgzgx8hrid7w85fb7"; + version = "2.0.0.4"; + sha256 = "1dk1s2q8w2rvknknw54ja2jhm1nayp8zpyis1zhgnl4yjgwr5kld"; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath - httpDate httpTypes mimeTypes systemFileio systemFilepath text time - transformers unixCompat unorderedContainers wai zlib + base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable + cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes + mimeTypes systemFileio systemFilepath text time transformers + unixCompat unorderedContainers wai zlib ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers From f3568bf38d326d6cd5c0e26e1a7e49cc95d06c77 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:38 +0100 Subject: [PATCH 044/248] haskell-wai-extra: update to version 2.1.0.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 50e4d983d755..73f3ed78e97b 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.1.0"; - sha256 = "14aj1c6i58jyg79y516sa2l39y4i7az3l5lp6fkxkgqgzl5dxs6c"; + version = "2.1.0.1"; + sha256 = "1vdizcxpq6brbzv790978nz05cwzxxhna1alk8phrc4igab04y1j"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase From b3ad12f4ff5c780cb7cb8a93f065b16e697443fc Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:40 +0100 Subject: [PATCH 045/248] haskell-warp: update to version 2.1.1.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 7ebc7af36270..dd03b1463c68 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.1"; - sha256 = "1nldm0pq1q5m91mhss4h23dxdqwqmvfdmcpq5grc1rqjb88mgm25"; + version = "2.1.1.2"; + sha256 = "1kiwarlfw8m04fapnihbr2n6diysi1snwvpvdya5hz555c5flda9"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile From a226e09297b71507ba224f1617041fc232dfd6bb Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:42 +0100 Subject: [PATCH 046/248] haskell-yesod-bin: update to version 1.2.7.2 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 50071e8cffe3..611b140619ee 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.7.1"; - sha256 = "1lbnn7lzgpw0xsbnlax41q5hqb1bv9irmncgjvv18y8mpf5zcncs"; + version = "1.2.7.2"; + sha256 = "13mn0b144a4cfwlpq25r72a4ffngjgfdzk8rd5yk37mcsqn7yagy"; isLibrary = false; isExecutable = true; buildDepends = [ From dac3a2292766ff18ee391c901fcf32c76cd70b01 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:44 +0100 Subject: [PATCH 047/248] haskell-yesod-core: update to version 1.2.8 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index bd1116267fa1..acd4fc97ba8f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.7"; - sha256 = "1gkpx0d7hyvn45254aj40iy4k0bf3kkrvmxnw3q1mvqc3k1kdxqn"; + version = "1.2.8"; + sha256 = "1zxi5dg3ym6byaif7z6jy8cri4mc8yxf12f42dsal0ls1nmqlk6s"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From 8cb764ea6a353643505e323dc85de5fbb5269889 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:45 +0100 Subject: [PATCH 048/248] haskell-yesod-form: update to version 1.3.8 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index a42e0a50bc40..2f58cbb64087 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network +, byteable, dataDefault, emailValidate, hamlet, hspec, network , persistent, resourcet, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.7"; - sha256 = "01fv3c5db702nm9dk5ynvn5mf9vc4a1rkjn31zlw260jlgqy4vsn"; + version = "1.3.8"; + sha256 = "0cdpdgclhasdmynp9fhf9yhl33nwh71bmg344x51xkp5347w614b"; buildDepends = [ - aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi + aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet shakespeareCss shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent From cb52531d53b69c66cd31df4c12042eec9050c116 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:45:47 +0100 Subject: [PATCH 049/248] haskell-yesod-static: update to version 1.2.2.2 --- .../libraries/haskell/yesod-static/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 757367b73935..7059e178bb61 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,5 +1,5 @@ -{ cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohashCryptoapi, dataDefault, fileEmbed, filepath, hjsmin +{ cabal, base64Bytestring, byteable, conduit, cryptohash +, cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin , hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet , shakespeareCss, systemFileio, systemFilepath, text, transformers , unixCompat, unorderedContainers, wai, waiAppStatic, waiTest @@ -8,17 +8,17 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.2.1"; - sha256 = "1dsr3gv6hf42islw2018y4yajvkd9j627fkdlz45309cyjns55jg"; + version = "1.2.2.2"; + sha256 = "156qqd2v3z7wv75jsfscs9cvbg1cl1riqcrhycrqcmapjprr2r12"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi + base64Bytestring byteable conduit cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes processConduit resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi + base64Bytestring byteable conduit cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit mimeTypes processConduit resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai From 1b6b1b8f87fe91e403963d3d1ad8dee41886cd7f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:47:09 +0100 Subject: [PATCH 050/248] haskell-llvm-general-pure: update to version 3.4.2.1 --- .../haskell/llvm-general-pure/{3.4.1.0.nix => 3.4.2.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.1.0.nix => 3.4.2.1.nix} (86%) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix similarity index 86% rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix index 200d8d00b446..460de2de5d42 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "llvm-general-pure"; - version = "3.4.1.0"; - sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q"; + version = "3.4.2.1"; + sha256 = "0wdx8zk1r7s3chryvwpm8hc73xvhklbmxd998zpvimv4ywil2f67"; buildDepends = [ mtl parsec setenv transformers ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15ba3d011616..0226294ced1f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1641,8 +1641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmGeneral = self.llvmGeneral_3_4_1_0; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; - llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_1_0; + llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4_2_1; lrucache = callPackage ../development/libraries/haskell/lrucache {}; From 763bdd7ed51a0609b6fdf98f47f598a9b5a762c4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 11:47:30 +0100 Subject: [PATCH 051/248] haskell-llvm-general: update to version 3.4.2.1 --- .../haskell/llvm-general/{3.4.1.0.nix => 3.4.2.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/llvm-general/{3.4.1.0.nix => 3.4.2.1.nix} (88%) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix similarity index 88% rename from pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix rename to pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix index b86a65618cd2..a219f227575d 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.4.1.0"; - sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp"; + version = "3.4.2.1"; + sha256 = "0967pijv6x5l80igdcp1nza6ix32i8s8z3hzmp6qa9nx25sqviw1"; buildDepends = [ llvmGeneralPure mtl parsec setenv transformers utf8String ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0226294ced1f..f5cae5fe2983 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1635,10 +1635,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; - llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix { + llvmGeneral_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.1.nix { llvmConfig = pkgs.llvm; }; - llvmGeneral = self.llvmGeneral_3_4_1_0; + llvmGeneral = self.llvmGeneral_3_4_2_1; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {}; From 9f5bc8901988282ff0d29297c2045ad7a9bfa199 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 16:51:53 +0100 Subject: [PATCH 052/248] haskell-diagrams: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index cddc5dbadcf9..6159270379e2 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "1.1"; - sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr"; + version = "1.1.0.1"; + sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; From 0d62f71006c25bb1ee35ad924215ec9f29765d38 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 16:51:55 +0100 Subject: [PATCH 053/248] haskell-snap: update to version 0.13.2.3 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 3a656d65b33a..e12138d08be3 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.2"; - sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm"; + version = "0.13.2.3"; + sha256 = "14v48b47d4yhm05c1x66lil8h9vvjjwab6vgawlfpxsz2yn3sfaa"; isLibrary = true; isExecutable = true; buildDepends = [ From a65a5058981c64e46844c0adc4124fea5b901490 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 19 Mar 2014 16:54:36 +0100 Subject: [PATCH 054/248] haskell-optparse-applicative: update to version 0.8.0.1 --- .../haskell/optparse-applicative/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 6f7ef601d61a..da681b324a71 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,14 +1,16 @@ -{ cabal, HUnit, testFramework, testFrameworkHunit +{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 , testFrameworkThPrime, transformers }: cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.7.0.2"; - sha256 = "1pq620236x8fch9nkq4g4vganbzksnwj8z1bb80c2mwvf6sbg5ci"; - buildDepends = [ transformers ]; + version = "0.8.0.1"; + sha256 = "19k7jw9hrns5i8dr67jxadaqnj0cmn991hl00fwymg4awv34p1w3"; + buildDepends = [ ansiWlPprint transformers ]; testDepends = [ - HUnit testFramework testFrameworkHunit testFrameworkThPrime + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkThPrime ]; jailbreak = true; meta = { From 12c201bc6ad5ff927e9b1c383324ac2656caa47c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:22:14 +0100 Subject: [PATCH 055/248] haskell-hjsmin: jailbreak to fix build with recent versions of optparse-applicative --- pkgs/development/libraries/haskell/hjsmin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index b060d3c6efe4..eeed299af74b 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { blazeBuilder Cabal HUnit languageJavascript QuickCheck testFramework testFrameworkHunit text ]; + jailbreak = true; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; From 9b135f83727ea0f19d56d042d7c27d5d6622d16c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:31:54 +0100 Subject: [PATCH 056/248] haskell-tf-random: add version 0.4 --- .../libraries/haskell/tf-random/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tf-random/default.nix diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix new file mode 100644 index 000000000000..3ff0b2d9b844 --- /dev/null +++ b/pkgs/development/libraries/haskell/tf-random/default.nix @@ -0,0 +1,13 @@ +{ cabal, primitive, random, time }: + +cabal.mkDerivation (self: { + pname = "tf-random"; + version = "0.4"; + sha256 = "0yi7699zswpsn9a39ccqkyd0117sppjnqggclnhs1wm7ql1glc27"; + buildDepends = [ primitive random time ]; + meta = { + description = "High-quality splittable pseudorandom number generator"; + 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 f5cae5fe2983..fc59708a3a7a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2433,6 +2433,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; From 34ed797ecf212ce8ccded33e076c7af6f86708fc Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:32:08 +0100 Subject: [PATCH 057/248] haskell-QuickCheck: add version 2.7 --- .../libraries/haskell/QuickCheck/2.7.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.7.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.nix new file mode 100644 index 000000000000..4c3847a65f93 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.nix @@ -0,0 +1,16 @@ +{ cabal, random, testFramework, tfRandom }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.7"; + sha256 = "0l7qijcwbf81wdizsv7qzmm73dsjbldm2sx305cqs6bmnynbl508"; + buildDepends = [ random tfRandom ]; + testDepends = [ testFramework ]; + meta = { + homepage = "http://code.haskell.org/QuickCheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc59708a3a7a..da5c9daddf06 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2048,6 +2048,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; + QuickCheck_2_7 = callPackage ../development/libraries/haskell/QuickCheck/2.7.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; From 5fd7fac97163c023cb848cca6ffa8b5c9350a567 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:26 +0100 Subject: [PATCH 058/248] haskell-conduit: update to version 1.0.16 --- 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 c5fe6d9d379d..a65fb81633fa 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.15.1"; - sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv"; + version = "1.0.16"; + sha256 = "12baxqgbs5wd6w024yrbv47lp320lgacrsb527r7xvbgffji3lbq"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void From d5aa5b0e8bfd5fb31bbb5951cf7c6bf53d3573ac Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:28 +0100 Subject: [PATCH 059/248] haskell-diagrams-cairo: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 421859dbdaa9..bd09b67196b6 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.1.0.1"; - sha256 = "04s3z3j3xqx4q4chdysip2ngjbw4k7gd12s5zlbvx88d3jg0bcrs"; + version = "1.1.0.2"; + sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative split statestack From 24683a43535e4af5110448f5436352840875a8f0 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:30 +0100 Subject: [PATCH 060/248] haskell-diagrams-contrib: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 34dcb3745e35..f2a654302b62 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.1.1"; - sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna"; + version = "1.1.1.2"; + sha256 = "09dfnvriih4lkici34bj9nvww245hzl95crldblwyjwi2c8qcy69"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From de50656b244bad7790e7baf9373f4b72c664d2d9 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:31 +0100 Subject: [PATCH 061/248] haskell-diagrams-core: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 3a3f74d4c272..3529faaf6afe 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.1"; - sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v"; + version = "1.1.0.1"; + sha256 = "1jr827cd3qa631glwc9h247w0wnrx84gj2iwxj18b4y78d0ajz69"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From 844e01577d6d686cde2a05d849e409d125e556fa Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:33 +0100 Subject: [PATCH 062/248] haskell-diagrams-lib: update to version 1.1.0.3 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index d8180bfbda49..c8c8bf5434da 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.1.0.2"; - sha256 = "1kfzf9cjb74vpfdjargjy8hg0rdhvry96f9ysmya3j7ws8lqrwdh"; + version = "1.1.0.3"; + sha256 = "1g4kcmpqsnb25yqvd6yv026znp7s5jhnqg1nvfxcaq0zz84w9ckh"; buildDepends = [ active colour dataDefaultClass diagramsCore filepath fingertree hashable intervals lens MemoTrie monoidExtras optparseApplicative From 1df4fcb8047c2fdf5c3d0e29573b4c2bbbbc74e3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:35 +0100 Subject: [PATCH 063/248] haskell-diagrams-postscript: update to version 1.0.2.2 --- pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index ebd7294de3d5..9716177ede5c 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.0.2.1"; - sha256 = "0c3svrkv2wyls1mb75gzv9nfjy0vgfw4bshd6q6z036jn75q9y0r"; + version = "1.0.2.2"; + sha256 = "00xzzx6dvraa8gbk3agqvrmxjnpvq4hik7kahidw4k37hxyyvwm3"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace From 911373dbdbc8702431f428e01bb0cd8d79bbf383 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:37 +0100 Subject: [PATCH 064/248] haskell-diagrams-svg: update to version 1.0.2.1 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index cc5795c80a18..663a6287c623 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.0.2"; - sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1"; + version = "1.0.2.1"; + sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507"; buildDepends = [ blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable lens monoidExtras mtl split time vectorSpace From 96d7bc61adbf4708951e93af7fef6750272e1513 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:39 +0100 Subject: [PATCH 065/248] haskell-exceptions: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/exceptions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index 0665694212b6..a206b7c186ec 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "exceptions"; - version = "0.3.3"; - sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l"; + version = "0.3.3.1"; + sha256 = "091frx3hmx7lq10z7f8q98pz0sa1lj23i7z4z98gh1980r525fah"; buildDepends = [ mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; - license = "unknown"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; From 0135fe7b1a885dd7ab676c1a80d3e88e39c6ac3f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:40 +0100 Subject: [PATCH 066/248] haskell-force-layout: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index b57abc40e200..a336c2a7e2bb 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.2"; - sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7"; + version = "0.3.0.3"; + sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; From 08fed7fab54328402112b78ecd70e513becf7360 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:42 +0100 Subject: [PATCH 067/248] haskell-ghcjs-dom: update to version 0.0.6 --- pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 58ad2765f6b0..d42c4c84bf1d 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -1,10 +1,10 @@ -{ cabal, glib, gtk3, mtl, transformers, webkitgtk3 }: +{ cabal, ghcjsBase, mtl }: cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.4"; - sha256 = "1a3dv2l3s3aifcpivmnv308k2a1kb7r4x0z9gi83wc4xr9a8f08w"; - buildDepends = [ glib gtk3 mtl transformers webkitgtk3 ]; + version = "0.0.6"; + sha256 = "0c27mf5cjvw5q4lwbmi245q4y09b61y5s6hxsfzgdn4lhfbvdma6"; + buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; license = self.stdenv.lib.licenses.mit; From 85505d75a0b9e1ea530ce451c2d6d83bfdfa0403 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:44 +0100 Subject: [PATCH 068/248] haskell-http-client: update to version 0.2.2.3 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index ff21e12bb432..87a48bbdd398 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.2.2"; - sha256 = "1pn38vqbb8ff3gmwkzb8a2fika2rdymnlglpi3q7yn0jsvxl5xli"; + version = "0.2.2.3"; + sha256 = "0li4mfw5lm0y0m3l3r7cbmhbch7ap9n2067jqw1l0qjm8s74nqkh"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq failure httpTypes network publicsuffixlist From 19ac8eb7a0fdb954c6d061dcbbbe95fbdeaa0c2a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:46 +0100 Subject: [PATCH 069/248] haskell-lens: update to version 4.1 --- .../libraries/haskell/lens/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 57f84955be3a..427cf681d2e9 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,22 +1,23 @@ { cabal, aeson, bifunctors, comonad, contravariant, deepseq -, distributive, doctest, exceptions, filepath, genericDeriving -, hashable, hlint, HUnit, mtl, nats, parallel, primitive -, profunctors, QuickCheck, reflection, scientific, semigroupoids -, semigroups, simpleReflect, split, tagged, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh -, text, transformers, transformersCompat, unorderedContainers -, utf8String, vector, void, zlib +, distributive, doctest, exceptions, filepath, free +, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel +, primitive, profunctors, QuickCheck, reflection, scientific +, semigroupoids, semigroups, simpleReflect, split, tagged +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, testFrameworkTh, text, transformers, transformersCompat +, unorderedContainers, utf8String, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.0.7"; - sha256 = "0n4xw182yamgaplyshbhyjw9i7n6rvaszr4011mdbd6yvprl5v29"; + version = "4.1"; + sha256 = "0fsl2cydmkj2k49z3cgv6hfgrlkmx7zsy0ikp4k5jn2kp3hs77dw"; buildDepends = [ aeson bifunctors comonad contravariant distributive exceptions - filepath hashable mtl parallel primitive profunctors reflection - scientific semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers utf8String vector void zlib + filepath free hashable mtl parallel primitive profunctors + reflection scientific semigroupoids semigroups split tagged text + transformers transformersCompat unorderedContainers utf8String + vector void zlib ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats From afb614ad316bedb70cc79bb2ee5a748f0d0a4d99 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:49 +0100 Subject: [PATCH 070/248] haskell-scotty: update to version 0.7.1 --- pkgs/development/libraries/haskell/scotty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 69a3aae56969..278a26d1536e 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.7.0"; - sha256 = "0j08zjm8ndkpq5mrmh6rj6zc733irf7kyikw8nww754r40y6kps2"; + version = "0.7.1"; + sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp From c2cd1abedb4780001612029d5fbdca4485bfe563 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:53 +0100 Subject: [PATCH 071/248] haskell-wai-middleware-static: update to version 0.4.0.3 --- .../libraries/haskell/wai-middleware-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index e496d5266db3..005305d77092 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.4.0.2"; - sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf"; + version = "0.4.0.3"; + sha256 = "0nvzdj04g10bcay6x4y5l7gxx38gs3ns0izair8n1j1awrp8px07"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { From e738b7ae83fc194250d72103baf1fbe64ddfa654 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:55 +0100 Subject: [PATCH 072/248] haskell-warp: update to version 2.1.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index dd03b1463c68..d08f8d6e5450 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.1.2"; - sha256 = "1kiwarlfw8m04fapnihbr2n6diysi1snwvpvdya5hz555c5flda9"; + version = "2.1.2"; + sha256 = "15630g8qzshn2620qsdki1nwr4bkapqz0k2bls0yxyblvw0fn9cf"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile From a5e408dbf841976e2408ba90187b9f532d96923b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:38:56 +0100 Subject: [PATCH 073/248] haskell-HaRe: update to version 0.7.1.6 --- pkgs/development/tools/haskell/HaRe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index a5d6794f318d..883be6a8d411 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.5"; - sha256 = "1xfgvqhnlpmfljad790sdjyqlq684751i7bdfw1wvbzmw7gdyafc"; + version = "0.7.1.6"; + sha256 = "1nj70f7ki6wxvjm5ra83xr2yymfsakb5kg2q1dl54hvxsd0wqcw7"; isLibrary = true; isExecutable = true; buildDepends = [ From 56259ddd897ee8a12ca9f34e50a200b35dbcde38 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:40:27 +0100 Subject: [PATCH 074/248] haskell-llvm-general-pure: update to version 3.4.2.2 --- .../haskell/llvm-general-pure/{3.4.2.1.nix => 3.4.2.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.2.1.nix => 3.4.2.2.nix} (86%) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix similarity index 86% rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix index 460de2de5d42..bfa0ed43d0e2 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.1.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "llvm-general-pure"; - version = "3.4.2.1"; - sha256 = "0wdx8zk1r7s3chryvwpm8hc73xvhklbmxd998zpvimv4ywil2f67"; + version = "3.4.2.2"; + sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8"; buildDepends = [ mtl parsec setenv transformers ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index da5c9daddf06..a6dc0087f016 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1641,8 +1641,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmGeneral = self.llvmGeneral_3_4_2_1; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; - llvmGeneralPure_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.1.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_2_1; + llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4_2_2; lrucache = callPackage ../development/libraries/haskell/lrucache {}; From 19c328d28f7d3eb2648f0ede7a97b4062ce04ad1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 09:40:38 +0100 Subject: [PATCH 075/248] haskell-llvm-general: update to version 3.4.2.2 --- .../haskell/llvm-general/{3.4.2.1.nix => 3.4.2.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/llvm-general/{3.4.2.1.nix => 3.4.2.2.nix} (88%) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix similarity index 88% rename from pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix rename to pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix index a219f227575d..43a346ebf191 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.1.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.4.2.1"; - sha256 = "0967pijv6x5l80igdcp1nza6ix32i8s8z3hzmp6qa9nx25sqviw1"; + version = "3.4.2.2"; + sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a"; buildDepends = [ llvmGeneralPure mtl parsec setenv transformers utf8String ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6dc0087f016..9d0cbf4c07bc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1635,10 +1635,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; - llvmGeneral_3_4_2_1 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.1.nix { + llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix { llvmConfig = pkgs.llvm; }; - llvmGeneral = self.llvmGeneral_3_4_2_1; + llvmGeneral = self.llvmGeneral_3_4_2_2; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {}; From 3aa6b99d8389c8981e2133540696626c256a0bf1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 13:18:11 +0100 Subject: [PATCH 076/248] haskell-snap: jailbreak some more to support lens 4.1 or later --- pkgs/development/libraries/haskell/snap/snap.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index e12138d08be3..a0c4e4db5a13 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -20,6 +20,9 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; + patchPhase = '' + sed -i -r -e 's|lens +>= 3.7.6.*&& < 4.1|lens >= 3.7.6|' snap.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From cd5fd2f6c806eb69a66c877b45c4f4aebca622cc Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:00 +0100 Subject: [PATCH 077/248] haskell-classy-prelude: update to version 0.8.1 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index abc0841c58e2..51da644cec95 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.0.1"; - sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r"; + version = "0.8.1"; + sha256 = "04rgsw656vjzaibargw5ibzagy74mlsd25wpw6hn1phz8qkgls4l"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers From 4fed76e19af8aaa88e29c33f529d49b532bf320a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:01 +0100 Subject: [PATCH 078/248] haskell-conduit-combinators: update to version 0.2.2 --- .../libraries/haskell/conduit-combinators/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 0c9ccbd8f35f..a2ac0dd95495 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,16 +1,16 @@ { cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable , mwcRandom, primitive, silently, systemFileio, systemFilepath -, text, transformers, transformersBase, vector, void +, text, transformers, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.1"; - sha256 = "0v3b9wiziyynk00fk07nwrk3c032wyr0adrwlkjl89ma1ix220sv"; + version = "0.2.2"; + sha256 = "0b196srw2vbs46zz2m3mb1cbw7pza8q429r5b280bw6vby9h6jbr"; buildDepends = [ chunkedData conduit monoTraversable mwcRandom primitive systemFileio systemFilepath text transformers transformersBase - vector void + unixCompat vector void ]; testDepends = [ basicPrelude chunkedData hspec monoTraversable mwcRandom silently From e964dbf4d409691a32c99cdc991780503704b237 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:03 +0100 Subject: [PATCH 079/248] haskell-dbmigrations: update to version 0.7 --- pkgs/development/libraries/haskell/dbmigrations/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index 78c5d82f0fd9..008cb04f2fa3 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -12,11 +12,11 @@ cabal.mkDerivation (self: { configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl random text time yamlLight ]; + jailbreak = true; meta = { description = "An implementation of relational database \"migrations\""; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - jailbreak = true; }) From 1386b4cee1794642b66de57126727a5539ed4c59 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:04 +0100 Subject: [PATCH 080/248] haskell-derive: update to version 2.5.14 --- pkgs/development/libraries/haskell/derive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 0873e65d9daa..42ca82f4ac19 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.13"; - sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci"; + version = "2.5.14"; + sha256 = "1fihcd8l4z8d6rad8h39pg5gdb75h895c2xld9574fwp3bm0zl0c"; isLibrary = true; isExecutable = true; buildDepends = [ From 161d5a20773c14c07da11994294fa7c7ce24e8a2 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:05 +0100 Subject: [PATCH 081/248] haskell-filesystem-conduit: update to version 1.0.0.2 --- .../libraries/haskell/filesystem-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index f1a0554e380c..3d7a1300b58a 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "1.0.0.1"; - sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw"; + version = "1.0.0.2"; + sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Use system-filepath data types with conduits"; + description = "Use system-filepath data types with conduits. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From 94a591deedc0de733a832df3d2e0c6d9e62c37fe Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:06 +0100 Subject: [PATCH 082/248] haskell-html-conduit: update to version 1.1.0.2 --- .../libraries/haskell/html-conduit/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 3f7b2ad507ac..bff7c352175d 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,15 +1,14 @@ -{ cabal, conduit, filesystemConduit, hspec, HUnit, resourcet -, systemFilepath, tagstreamConduit, text, transformers, xmlConduit -, xmlTypes +{ cabal, conduit, hspec, HUnit, resourcet, systemFilepath +, tagstreamConduit, text, transformers, xmlConduit, xmlTypes }: cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0.1"; - sha256 = "0v3zlassakc34i7kzajx63s1rxn516xv7lrib0a4kn4cdlqn7kxs"; + version = "1.1.0.2"; + sha256 = "12a5hb9sf4sd11sjhwwp84k8whkxs7hqfyni2hi247fii2ldkfax"; buildDepends = [ - conduit filesystemConduit resourcet systemFilepath tagstreamConduit - text transformers xmlConduit xmlTypes + conduit resourcet systemFilepath tagstreamConduit text transformers + xmlConduit xmlTypes ]; testDepends = [ hspec HUnit xmlConduit ]; meta = { From fd8e133b42fecf5bad434014034efe0c2ac49497 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:08 +0100 Subject: [PATCH 083/248] haskell-list-tries: update to version 0.5.2 --- pkgs/development/libraries/haskell/list-tries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix index 4eb91c67a476..a7d2a963e0de 100644 --- a/pkgs/development/libraries/haskell/list-tries/default.nix +++ b/pkgs/development/libraries/haskell/list-tries/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "list-tries"; - version = "0.5.1"; - sha256 = "15lbq41rikj5vm9gfgjxz98pamnib4dcs48fr2vm9r3s3fikd2kz"; + version = "0.5.2"; + sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; isLibrary = true; isExecutable = true; buildDepends = [ binary dlist ]; From bd9e4c352a00e3845d8c182a69f9a3719c63f754 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:09 +0100 Subject: [PATCH 084/248] haskell-snap: update to version 0.13.2.4 --- pkgs/development/libraries/haskell/snap/snap.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index a0c4e4db5a13..3d361a69b874 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.3"; - sha256 = "14v48b47d4yhm05c1x66lil8h9vvjjwab6vgawlfpxsz2yn3sfaa"; + version = "0.13.2.4"; + sha256 = "1806nd6gzih66c9gg2iz3dxr4qcd4jkgamz8pv9x3zkk7n5jqga0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; - patchPhase = '' - sed -i -r -e 's|lens +>= 3.7.6.*&& < 4.1|lens >= 3.7.6|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 048824a55bc498dde844ee6a75a47d1e35f31f29 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:10 +0100 Subject: [PATCH 085/248] haskell-tasty-quickcheck: update to version 0.8.0.3 --- .../libraries/haskell/tasty-quickcheck/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 86ee3437cbb2..ee8483595092 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, random, tagged, tasty }: +{ cabal, QuickCheck, tagged, tasty }: cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8"; - sha256 = "10d7chqrlp1fjphnkiykxd22g4mfp69kmihd705sxb0y0mrdfh8x"; - buildDepends = [ QuickCheck random tagged tasty ]; + version = "0.8.0.3"; + sha256 = "0dng415dsdg86rliwmz5hpn2111cn0x494c0vmdmzv5qgvx5naf6"; + buildDepends = [ QuickCheck tagged tasty ]; meta = { description = "QuickCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; From 0da6b352fe10cefb4adf666760099804ca86e54b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:11 +0100 Subject: [PATCH 086/248] haskell-unix-process-conduit: update to version 0.2.2.3 --- .../libraries/haskell/unix-process-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index a52f9fe04fb6..73343bf307bc 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2.2"; - sha256 = "0an4lwwkzr902r0rxa35i9kdm5cpgdfmg5m06zsxzbck3mry7871"; + version = "0.2.2.3"; + sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { homepage = "https://github.com/snoyberg/conduit"; - description = "Run processes on Unix systems, with a conduit interface"; + description = "Run processes on Unix systems, with a conduit interface (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From 4a6d30c2e7e572da14acf5cdd9d23494126a41b7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:12 +0100 Subject: [PATCH 087/248] haskell-wai-test: update to version 2.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 1d7b184d6dfd..5e3a666726a8 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, cookie, hspec, httpTypes, HUnit, network, text +, conduit, cookie, deepseq, hspec, httpTypes, network, text , transformers, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.0.2"; - sha256 = "0085whb8jav2zasmgi8z62anm6i509lc2w0988vqlcrds7rrknc8"; + version = "2.0.1"; + sha256 = "0c803l3cz5bjf60l97sy1isxhnmbpzr5x39yhnck28r0vykycnrj"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie - httpTypes HUnit network text transformers wai + deepseq httpTypes network text transformers wai ]; testDepends = [ hspec wai ]; meta = { From d063b8f6ceb40adbdeac83fd3f59a795f6919317 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:14 +0100 Subject: [PATCH 088/248] haskell-yaml: update to version 0.8.8 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 35106292f85e..e9a9c075c328 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.7.2"; - sha256 = "00dmmws0gmp9fb2ha6z055ix7jlsiry24bwhkl226b680gi9a84d"; + version = "0.8.8"; + sha256 = "0fv56x40ici6hx2dfy85fg7zy213mn82h84czhj4xbvjszg8wycw"; isLibrary = true; isExecutable = true; buildDepends = [ From cf29fe8205884784b029505b4b17453cae1dcd08 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:15 +0100 Subject: [PATCH 089/248] haskell-yesod-bin: update to version 1.2.7.3 --- .../libraries/haskell/yesod-bin/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 611b140619ee..e939b1e4ee72 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,26 +1,26 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefaultClass, fileEmbed, filepath, filesystemConduit -, fsnotify, ghcPaths, httpConduit, httpReverseProxy, httpTypes -, liftedBase, network, networkConduit, optparseApplicative, parsec -, projectTemplate, resourcet, shakespeare, shakespeareCss -, shakespeareJs, shakespeareText, split, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unorderedContainers, wai, warp, yaml, zlib +, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths +, httpConduit, httpReverseProxy, httpTypes, liftedBase, network +, networkConduit, optparseApplicative, parsec, projectTemplate +, resourcet, shakespeare, shakespeareCss, shakespeareJs +, shakespeareText, split, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unorderedContainers, wai, warp +, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.7.2"; - sha256 = "13mn0b144a4cfwlpq25r72a4ffngjgfdzk8rd5yk37mcsqn7yagy"; + version = "1.2.7.3"; + sha256 = "05kbfnkigk4p1vjw0h1pkp7jfczjq99vgrsaz45faajadnhffnpz"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base64Bytestring blazeBuilder Cabal conduit - dataDefaultClass fileEmbed filepath filesystemConduit fsnotify - ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network - networkConduit optparseApplicative parsec projectTemplate resourcet - shakespeare shakespeareCss shakespeareJs shakespeareText split - systemFileio systemFilepath tar text time transformers unixCompat + dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit + httpReverseProxy httpTypes liftedBase network networkConduit + optparseApplicative parsec projectTemplate resourcet shakespeare + shakespeareCss shakespeareJs shakespeareText split systemFileio + systemFilepath tar text time transformers unixCompat unorderedContainers wai warp yaml zlib ]; meta = { From 7176a84eb0aafa1cd8e6c60df6d93e3f7d334fb6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:16 +0100 Subject: [PATCH 090/248] haskell-yesod-core: update to version 1.2.9 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index acd4fc97ba8f..2c3d378257f5 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.8"; - sha256 = "1zxi5dg3ym6byaif7z6jy8cri4mc8yxf12f42dsal0ls1nmqlk6s"; + version = "1.2.9"; + sha256 = "0qd9x2pca2nx7yqz9whlvb0rjgf1zf9vw19j6z0p149yddgrrcyq"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From a1615dedf6b5d49bd032a98d2cae272d9c9f2275 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 20:55:17 +0100 Subject: [PATCH 091/248] haskell-yesod-test: update to version 1.2.1.1 --- .../libraries/haskell/yesod-test/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index c4ad5b29acdc..38a319a87456 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,19 +1,18 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit -, monadControl, network, persistent, poolConduit, text, time -, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore -, yesodForm +, monadControl, network, persistent, text, time, transformers, wai +, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.1"; - sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr"; + version = "1.2.1.1"; + sha256 = "0rbavw67cfqyav6xakacag0sd0gixbz3sls06px6q6pnpzk9q9d4"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent poolConduit text time transformers wai waiTest - xmlConduit xmlTypes yesodCore + persistent text time transformers wai waiTest xmlConduit xmlTypes + yesodCore ]; testDepends = [ hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm From d225486c0b889311adda13be133f1245b4dc5d0d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 22:25:32 +0100 Subject: [PATCH 092/248] haskell-tasty-quickcheck: require QuickCheck 2.7 or later --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d0cbf4c07bc..b8521e3a7fac 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2378,7 +2378,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; - tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { + QuickCheck = self.Quickcheck2; + }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; From 6eae14cc26a2b2836133a5e70c89de9b950b6d9d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 22:26:13 +0100 Subject: [PATCH 093/248] haskell-hspec-meta: update to version 1.9.0 --- .../development/libraries/haskell/hspec-meta/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 1b9cbd089781..28edba11cac2 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,16 +1,17 @@ { cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit -, QuickCheck, quickcheckIo, random, setenv, time, transformers +, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +, transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.8.3"; - sha256 = "12d254snnv8i1qqybsp6yzbqdxjf1wx8d29ja3lazb3kx12qwawd"; + version = "1.9.0"; + sha256 = "1jvx748aay8ln23p382y03gk6hc19f3z62za4326i0d3cyapfqdv"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv time transformers + quickcheckIo random setenv tfRandom time transformers ]; doCheck = false; meta = { From 500ea1c6f3b11114f121bff2b6b241597a3b6702 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 20 Mar 2014 22:26:14 +0100 Subject: [PATCH 094/248] haskell-hspec: update to version 1.9.0 --- pkgs/development/libraries/haskell/hspec/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 984a046f5017..0c41ab471f8d 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,22 +1,22 @@ { cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, time, transformers +, random, setenv, silently, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.8.3"; - sha256 = "0k5l8r54nc0q5x3czdfxkwa606qnli3a6qm2xd3r5yl5bnz6hzh8"; + version = "1.9.0"; + sha256 = "01nwxx63l9cl1smld7pwm59k6shs865iiy1jqwi97lkhzhy9cvhl"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv time transformers + quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time - transformers + hspecMeta HUnit QuickCheck quickcheckIo random setenv silently + tfRandom time transformers ]; doCheck = false; meta = { From 638d238d95538c6aed5603e97a5538b89c01d42b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 10:46:09 +0100 Subject: [PATCH 095/248] haskell-tasty-quickcheck: require QuickCheck 2.7 or later some more --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b8521e3a7fac..1efbe70594c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2379,7 +2379,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { - QuickCheck = self.Quickcheck2; + QuickCheck = self.QuickCheck_2_7; }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; From f62b4c6251c8b00df75f2ccccd96b9ec82ddd983 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 11:10:44 +0100 Subject: [PATCH 096/248] haskell-hspec: require QuickCheck 2.7 or later --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1efbe70594c4..05ec0c816a17 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1451,7 +1451,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; - hspec = callPackage ../development/libraries/haskell/hspec {}; + hspec = callPackage ../development/libraries/haskell/hspec { + QuickCheck = self.QuickCheck_2_7; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; }; + }; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; From 9f5063a7a48b2ab0ea77b3da947039a12a1fb7e3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:41:47 +0100 Subject: [PATCH 097/248] haskell-hspec-meta: require QuickCheck 2.7 or later --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 05ec0c816a17..592f33bec0c5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1460,7 +1460,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; - hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { + QuickCheck = self.QuickCheck_2_7; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; }; + }; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; From fa62ab13deb5a7ee27ff5873b9f8675d2692ca69 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:45:49 +0100 Subject: [PATCH 098/248] haskell-git-annex: update to version 5.20140320 --- .../git-and-tools/git-annex/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 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 49129e6b8ce7..d64230aa50dd 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 @@ -1,4 +1,4 @@ -{ cabal, aeson, async, blazeBuilder, bloomfilter, bup +{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet @@ -7,31 +7,31 @@ , MonadCatchIOTransformers, monadControl, mtl, network , networkConduit, networkInfo, networkMulticast , networkProtocolXmpp, openssh, optparseApplicative, perl -, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm -, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time -, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp -, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault +, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem +, SHA, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text +, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger +, warp, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault , yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140306"; - sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9"; + version = "5.20140320"; + sha256 = "0jhg5nbvdsiaprpj4h57fpfskhx0nqva4yx6krfd90i9gwgkm8l5"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson async blazeBuilder bloomfilter caseInsensitive clientsession - cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns - editDistance extensibleExceptions feed filepath gnutls hamlet - hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse - json liftedBase MissingH MonadCatchIOTransformers monadControl mtl - network networkConduit networkInfo networkMulticast - networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa - SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun - text time transformers unixCompat utf8String uuid wai waiLogger - warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm - yesodStatic + aeson async blazeBuilder bloomfilter byteable caseInsensitive + clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus + dlist dns editDistance extensibleExceptions feed filepath gnutls + hamlet hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes + IfElse json liftedBase MissingH MonadCatchIOTransformers + monadControl mtl network networkConduit networkInfo + networkMulticast networkProtocolXmpp optparseApplicative QuickCheck + random regexTdfa SafeSemaphore securemem SHA stm tasty tastyHunit + tastyQuickcheck tastyRerun text time transformers unixCompat + utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 From 2ca5022f6208ea01a2d74399e8eb29933198023d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:46:53 +0100 Subject: [PATCH 099/248] haskell-base64-conduit: update to version 1.0.0.1 --- .../libraries/haskell/base64-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 3a2d044de64d..0fa5a02d5a5c 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -3,15 +3,15 @@ cabal.mkDerivation (self: { pname = "base64-conduit"; - version = "1.0.0"; - sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; + version = "1.0.0.1"; + sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9"; buildDepends = [ base64Bytestring conduit ]; testDepends = [ base64Bytestring conduit hspec QuickCheck transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Base64-encode and decode streams of bytes"; + description = "Base64-encode and decode streams of bytes. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 0ecfcfc073594dcf6b3f33e2fd0b110232029cbb Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:46:58 +0100 Subject: [PATCH 100/248] haskell-chunked-data: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/chunked-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix index 95b52d50b4d8..2705aee7aabd 100644 --- a/pkgs/development/libraries/haskell/chunked-data/default.nix +++ b/pkgs/development/libraries/haskell/chunked-data/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "chunked-data"; - version = "0.1.0.0"; - sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l"; + version = "0.1.0.1"; + sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r"; buildDepends = [ blazeBuilder monoTraversable semigroups systemFilepath text transformers vector From 60358214278fd647c9e1fe2fb4692e963794e0de Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:46:59 +0100 Subject: [PATCH 101/248] haskell-classy-prelude: update to version 0.8.1.1 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 51da644cec95..99fa5a138b8a 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.1"; - sha256 = "04rgsw656vjzaibargw5ibzagy74mlsd25wpw6hn1phz8qkgls4l"; + version = "0.8.1.1"; + sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers From 3ec9395ff287ae92daf32080c883f1acc42b4bcb Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:01 +0100 Subject: [PATCH 102/248] haskell-conduit-combinators: update to version 0.2.3 --- .../haskell/conduit-combinators/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index a2ac0dd95495..4799a0f63f5c 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,20 +1,21 @@ -{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable -, mwcRandom, primitive, silently, systemFileio, systemFilepath -, text, transformers, transformersBase, unixCompat, vector, void +{ cabal, base16Bytestring, base64Bytestring, basicPrelude +, chunkedData, conduit, hspec, monoTraversable, mwcRandom +, primitive, silently, systemFileio, systemFilepath, text +, transformers, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.2"; - sha256 = "0b196srw2vbs46zz2m3mb1cbw7pza8q429r5b280bw6vby9h6jbr"; + version = "0.2.3"; + sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr"; buildDepends = [ - chunkedData conduit monoTraversable mwcRandom primitive - systemFileio systemFilepath text transformers transformersBase - unixCompat vector void + base16Bytestring base64Bytestring chunkedData conduit + monoTraversable mwcRandom primitive systemFileio systemFilepath + text transformers transformersBase unixCompat vector void ]; testDepends = [ - basicPrelude chunkedData hspec monoTraversable mwcRandom silently - text transformers vector + base16Bytestring base64Bytestring basicPrelude chunkedData hspec + monoTraversable mwcRandom silently text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; From 1fb0dfdb5210b934e3799d8884383dda473ee85c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:02 +0100 Subject: [PATCH 103/248] haskell-conduit: update to version 1.0.17 --- 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 a65fb81633fa..da3853748e02 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.16"; - sha256 = "12baxqgbs5wd6w024yrbv47lp320lgacrsb527r7xvbgffji3lbq"; + version = "1.0.17"; + sha256 = "0skshic2glx0sfy75skj8b4iip62zha51pgnnx5hsswhx8j2whcw"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void From 5270fd003b995d837cdd50013c94679a66362f69 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:03 +0100 Subject: [PATCH 104/248] haskell-errors: update to version 1.4.6 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 5e55f3a6d59c..7207bfbb1858 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.5"; - sha256 = "16m4psk1150319bd2hrswpp2h90l1hhh7w13arfhy4ylh8vscm4q"; + version = "1.4.6"; + sha256 = "1h8va76rhvs76ljdccxbmb659qk1slzkal118m85bw6lpy5wv6fi"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { From 6337e79a7c618c0b4a25c5ae05bc97eaa4cfabef Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:04 +0100 Subject: [PATCH 105/248] haskell-foldl: update to version 1.0.3 --- pkgs/development/libraries/haskell/foldl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 3b1c61574f0e..926c2a812a0b 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -1,10 +1,10 @@ -{ cabal, primitive, text, vector }: +{ cabal, primitive, text, transformers, vector }: cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.2"; - sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84"; - buildDepends = [ primitive text vector ]; + version = "1.0.3"; + sha256 = "0jl50bh7k8wp0nz0s0sb2zwh92yrgsm2l6szib41g7zq34mwamn9"; + buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; license = self.stdenv.lib.licenses.bsd3; From fefc4a93b7147e370012cec0c7ea7fd616625634 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:05 +0100 Subject: [PATCH 106/248] haskell-hjsmin: update to version 0.1.4.6 --- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index eeed299af74b..563372fa451b 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.5"; - sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74"; + version = "0.1.4.6"; + sha256 = "0z0wzgwm66ckq9h756s7srfyiv2jia9779yi86cn1zgzr8dwspvr"; isLibrary = true; isExecutable = true; buildDepends = [ From 61f395a760fb1373e8195667764f689053b1056e Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:09 +0100 Subject: [PATCH 107/248] haskell-wai-app-static: update to version 2.0.0.5 --- .../haskell/wai-app-static/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 009ae99daa80..fec4d410c22e 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,19 +1,22 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, byteable, cryptohash, cryptohashConduit, fileEmbed, filepath -, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio -, systemFilepath, text, time, transformers, unixCompat -, unorderedContainers, wai, waiTest, zlib +, byteable, cmdargs, cryptohash, cryptohashConduit, fileEmbed +, filepath, hspec, httpDate, httpTypes, mimeTypes, network +, systemFileio, systemFilepath, text, time, transformers +, unixCompat, unorderedContainers, wai, waiExtra, waiTest, warp +, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.4"; - sha256 = "1dk1s2q8w2rvknknw54ja2jhm1nayp8zpyis1zhgnl4yjgwr5kld"; + version = "2.0.0.5"; + sha256 = "0f18wwk0xrzbn9d6krjdcm71cyxl1pzzi5xqwzzc9xnq595m75wa"; + isLibrary = true; + isExecutable = true; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable - cryptohash cryptohashConduit fileEmbed filepath httpDate httpTypes - mimeTypes systemFileio systemFilepath text time transformers - unixCompat unorderedContainers wai zlib + cmdargs cryptohash cryptohashConduit fileEmbed filepath httpDate + httpTypes mimeTypes systemFileio systemFilepath text time + transformers unixCompat unorderedContainers wai waiExtra warp zlib ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers From fd1283ed1d1b61629e4d3231ff062ddf6b440be0 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:11 +0100 Subject: [PATCH 108/248] haskell-wai-extra: update to version 2.1.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 73f3ed78e97b..df13922601c2 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.1.0.1"; - sha256 = "1vdizcxpq6brbzv790978nz05cwzxxhna1alk8phrc4igab04y1j"; + version = "2.1.1"; + sha256 = "1bsc9sjmp9hspdif4f81iqjkcaflv6b7rd42g62qj790a4b70igf"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase From 065584ffdb249fe686d5784764213453ab26d17e Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:12 +0100 Subject: [PATCH 109/248] haskell-yesod-persistent: update to version 1.2.2.2 --- .../libraries/haskell/yesod-persistent/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 42b55bcee6a6..a96db23f9527 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent -, persistentSqlite, persistentTemplate, poolConduit, resourcet -, text, transformers, waiTest, yesodCore +{ cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite +, persistentTemplate, resourcePool, resourcet, text, transformers +, waiTest, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.2.1"; - sha256 = "0vihd94yh4xipvz193p2fd1sqlbwdj0619l21gpdy307sng50kjn"; + version = "1.2.2.2"; + sha256 = "112wr85k8a7ah1m5s8b9h1dm3hbglckdhngp12d67rccrr4mmgjq"; buildDepends = [ - blazeBuilder conduit liftedBase persistent persistentTemplate - poolConduit resourcet transformers yesodCore + blazeBuilder conduit persistent persistentTemplate resourcePool + resourcet transformers yesodCore ]; testDepends = [ blazeBuilder conduit hspec persistent persistentSqlite text waiTest From 441dca211e4158c5136f3669e567b4361d516df6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:20 +0100 Subject: [PATCH 110/248] haskell-yi-contrib: update to version 0.7.2 --- pkgs/applications/editors/yi/yi-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index 0ed6e8778622..6dd75301187e 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yi-contrib"; - version = "0.7.1"; - sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li"; + version = "0.7.2"; + sha256 = "074cq1y0pp66r2fqqszd8w2pws8jbfwq9g39w3rsgjnw83058fr8"; buildDepends = [ dataAccessor filepath mtl split yi ]; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; From cc8c69890bb3eda24ab80a0901897aafaa4a78b4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:21 +0100 Subject: [PATCH 111/248] haskell-yi: update to version 0.7.2 --- pkgs/applications/editors/yi/yi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index b504af149045..b358f5488dcd 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yi"; - version = "0.7.1"; - sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly"; + version = "0.7.2"; + sha256 = "0g0hvr4zqcrmdl6mbdmrfxd5m51fhkhslvl9piwq83g2wirxqbvm"; isLibrary = true; isExecutable = true; buildDepends = [ From 170a359904015655b6e4cf380dcc7f38cad72f7a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:22 +0100 Subject: [PATCH 112/248] haskell-persistent: update to version 1.3.0.4 --- pkgs/development/libraries/haskell/persistent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 1a61e5f76a0a..a3faace8d490 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml , blazeMarkup, conduit, hspec, liftedBase, monadControl -, monadLogger, pathPieces, poolConduit, resourcet, scientific +, monadLogger, pathPieces, resourcePool, resourcet, scientific , silently, sqlite, text, time, transformers, transformersBase , unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "1.3.0.3"; - sha256 = "0p9h43wvm1l9va6s6p71y6r5ifgvbqz8ypc86pmzbphq6712jnsl"; + version = "1.3.0.4"; + sha256 = "09p7nf6dnjz83qp7invkmzcr55zglm0y54p8pb1y6acjpnw3glkl"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit - liftedBase monadControl monadLogger pathPieces poolConduit + liftedBase monadControl monadLogger pathPieces resourcePool resourcet scientific silently text time transformers transformersBase unorderedContainers vector ]; From 2d4e2dcca44a64a605187408f6658e1b2ad06586 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:23 +0100 Subject: [PATCH 113/248] haskell-shake: update to version 0.11.4 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f7505c62fc19..3e769f5e6015 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.11.3"; - sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl"; + version = "0.11.4"; + sha256 = "0gkj7zdy500zf58yscr5fq1ghj0kb3hywcv97r1xmi6ydccgf4ni"; isLibrary = true; isExecutable = true; buildDepends = [ From b1ad3e9dee40a2c91d70728d67d11372fc927e84 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 18:47:24 +0100 Subject: [PATCH 114/248] haskell-singletons: update to version 0.10.0 --- .../libraries/haskell/singletons/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index 48f12cd88258..e233dc60cc0e 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -1,10 +1,13 @@ -{ cabal, mtl, syb, thDesugar }: +{ cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden +, thDesugar +}: cabal.mkDerivation (self: { pname = "singletons"; - version = "0.9.3"; - sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4"; - buildDepends = [ mtl syb thDesugar ]; + version = "0.10.0"; + sha256 = "14vnkw9ihrs3xg3lhb3wkyfz59lsaz4c3iqh3hqy7x9gmifgggwr"; + buildDepends = [ mtl thDesugar ]; + testDepends = [ Cabal constraints filepath tasty tastyGolden ]; noHaddock = true; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; From 9443e618ffc05ac67b436d8fe71fa82dad951aa5 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Fri, 21 Mar 2014 22:59:31 +0100 Subject: [PATCH 115/248] haskell-conduit: disable test suite to work around https://github.com/snoyberg/conduit/issues/142 --- pkgs/development/libraries/haskell/conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index da3853748e02..b2a3ec9804bf 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { testDepends = [ hspec mtl QuickCheck resourcet text transformers void ]; + doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; From bf653a2a0579a4b46b27ff4341eb80ed226b1d27 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 08:53:58 +0100 Subject: [PATCH 116/248] git-annex: Crypto build input (propagated by hS3) needs to be compiled with QuickCheck 2.7 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 592f33bec0c5..5e26f04d4608 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2906,7 +2906,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; cabalInstall = self.cabalInstall_1_18_0_3; - gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { + hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7; }; }; + }; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; From ceb7673bf04ba4123e2b10a6fae09411052a0bbb Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:01:42 +0100 Subject: [PATCH 117/248] Fix broken references to 'maintainers' attribute set. --- pkgs/applications/video/aegisub/default.nix | 16 ++++++++-------- pkgs/applications/video/mpv/default.nix | 6 +++--- .../virtualization/8086tiny/default.nix | 10 +++++----- .../virtualization/bochs/default.nix | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index fa17fb5ffd2c..9bbc7c9e7395 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -5,7 +5,7 @@ , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , spellChecking ? true, hunspell ? null -, automationSupport ? true, lua ? null +, automationSupport ? true, lua ? null , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null , pulseaudioSupport ? true, pulseaudio ? null @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { ; NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm"; - - preConfigure = "cd aegisub"; - + + preConfigure = "cd aegisub"; + postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub"; - + meta = { description = "An advanced subtitle editor"; longDescription = '' @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { built-in real-time video preview. ''; homepage = http://www.aegisub.org/; - license = stdenv.lib.licenses.bsd3; - # The Aegisub sources are itself BSD/ISC, + license = stdenv.lib.licenses.bsd3; + # The Aegisub sources are itself BSD/ISC, # but they are linked against GPL'd softwares # - so the resulting program will be GPL - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2ffefa35898f..f059472aa9b6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -46,7 +46,7 @@ assert cacaSupport -> libcaca != null; # but by purity reasons it should be avoided; thanks the-kenny to point it out! # Now, it will just download and package Waf, mimetizing bootstrap.py behaviour -let +let waf = fetchurl { url = https://waf.googlecode.com/files/waf-1.7.13; sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873"; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { python3 ${waf} install # Maybe not needed, but it doesn't hurt anyway: a standard font mkdir -p $out/share/mpv - ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf ''; meta = { @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://mpv.io"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index ca93a1bfd7c6..1ad9203b94cc 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { version = "1.20"; src = fetchurl { - url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; }; - + buildInputs = with stdenv.lib; - optionals localBios [ nasm ] + optionals localBios [ nasm ] ++ optionals sdlSupport [ SDL ]; builder = ./builder.sh; @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { description = "An open-source 8086 emulator"; longDescription = '' 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. - + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; homepage = http://www.megalith.co.uk/8086tiny/index.html; license = stdenv.lib.licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 7b49bb8220da..75afcb41f808 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; }; - + buildInputs = with stdenv.lib; [ libX11 mesa ] ++ optionals sdlSupport [ SDL ] @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ optionals curlSupport [ curl ]; configureFlags = '' - --with-x11 + --with-x11 --with-term=${if termSupport then "yes" else "no"} --with-sdl=${if sdlSupport then "yes" else "no"} --with-svga=no @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { --enable-plugins=no --enable-disasm --enable-debugger - --enable-ne2000 - --enable-e1000 - --enable-sb16 - --enable-voodoo - --enable-usb + --enable-ne2000 + --enable-e1000 + --enable-sb16 + --enable-voodoo + --enable-usb --enable-pnic ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bochs.sourceforge.net/; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } From 451bc020e1b7027ba65399f560e26e72ade73647 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sat, 22 Mar 2014 06:20:36 -0400 Subject: [PATCH 118/248] Add libsystemd-journal haskell package --- .../haskell/libsystemd-journal/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libsystemd-journal/default.nix diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix new file mode 100644 index 000000000000..b30b0714d1fd --- /dev/null +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -0,0 +1,21 @@ +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +, transformers, uniplate, unixBytestring, unorderedContainers, uuid +, vector +}: + +cabal.mkDerivation (self: { + pname = "libsystemd-journal"; + version = "1.1.0"; + sha256 = "0zdql5y40d0d044mwbsr3xxmfzgnnp02a36wbbslxmrm5c3w1qi2"; + buildDepends = [ + hashable hsyslog pipes pipesSafe text transformers uniplate + unixBytestring unorderedContainers uuid vector + ]; + extraLibraries = [ systemd-journal ]; + meta = { + homepage = "http://github.com/ocharles/libsystemd-journal"; + description = "Haskell bindings to libsystemd-journal"; + 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 5e26f04d4608..9bd485417dbc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1620,6 +1620,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { + systemd-journal = pkgs.systemd; + }; + libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; liftedAsync = callPackage ../development/libraries/haskell/lifted-async {}; From 3f2b74bf088cedc20d54314b32c6a0699adb0c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com> Date: Thu, 13 Mar 2014 16:24:15 +0100 Subject: [PATCH 119/248] new expression: gvolicon --- lib/maintainers.nix | 1 + pkgs/tools/audio/gvolicon/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/audio/gvolicon/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e92177ded4b3..8acfdcf809de 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; bbenoist = "Baptist BENOIST <return_0@live.com>"; + bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; bjg = "Brian Gough <bjg@gnu.org>"; bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>"; bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>"; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix new file mode 100644 index 000000000000..311e420c6a31 --- /dev/null +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -0,0 +1,27 @@ +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation { + name = "gvolicon"; + src = fetchgit { + url = "https://github.com/Unia/gvolicon"; + rev = "26343415de836e0b05aa0b480c0c69cc2ed9e419"; + sha256 = "68858840a45b5f74803e85116c6219f805d6d944c00354662889549910856cdd"; + }; + + buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; + propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + installPhase = '' + make install PREFIX=$out + wrapProgram "$out/bin/gvolicon" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gvolicon:$XDG_ICON_DIRS" + ''; + + meta = { + description = "A simple and lightweight volume icon that sits in your system tray."; + homepage = "https://github.com/Unia/gvolicon"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + maintainer = stdenv.lib.maintainers.bennofs; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4603179fafc5..6a9159a6dfb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1144,6 +1144,8 @@ let inherit openssl gmp nettools iproute; }; + gvolicon = callPackage ../tools/audio/gvolicon {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; From 9111ce6be281a72751d18e1d664b52f12cef19c4 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi <moezzia@gmail.com> Date: Sat, 22 Mar 2014 13:34:28 +0100 Subject: [PATCH 120/248] pcsclite: $out was misspelled $(out) was evaluated to an empty string and hence pcscd didn't startup: configfile.l:234:tok_error() tok_error: invalid value line ... --- pkgs/tools/security/pcsclite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index d069c183842a..7f13ffc8db5f 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location configureFlags = [ "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--enable-confdir=$(out)/etc" + "--with-systemdsystemunitdir=$out/etc/systemd/system" + "--enable-confdir=$out/etc" ]; buildInputs = [ udev dbus_libs perl ]; From 941682efba9524e4d9ef5e111f5b708a5beb68eb Mon Sep 17 00:00:00 2001 From: Jacob Hinkle <jacob.hinkle@gmail.com> Date: Sat, 22 Mar 2014 06:58:31 -0600 Subject: [PATCH 121/248] Remove pkgs from slrn. Use stdenv.lib instead --- pkgs/applications/networking/newsreaders/slrn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e079e9d9a9f9..c933460af43b 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, +{ stdenv, fetchurl, slang, ncurses }: @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - license = pkgs.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; } From 3cb4ddb3d5d8b1d0e2fc96e986cd6afc30d83ec8 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:30:13 +0100 Subject: [PATCH 122/248] haskell-QuickCheck: update to version 2.7.1 --- .../haskell/QuickCheck/{2.7.nix => 2.7.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/development/libraries/haskell/QuickCheck/{2.7.nix => 2.7.1.nix} (84%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix similarity index 84% rename from pkgs/development/libraries/haskell/QuickCheck/2.7.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix index 4c3847a65f93..6d449871e010 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.7"; - sha256 = "0l7qijcwbf81wdizsv7qzmm73dsjbldm2sx305cqs6bmnynbl508"; + version = "2.7.1"; + sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21"; buildDepends = [ random tfRandom ]; testDepends = [ testFramework ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9bd485417dbc..cf846778087d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1452,8 +1452,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; hspec = callPackage ../development/libraries/haskell/hspec { - QuickCheck = self.QuickCheck_2_7; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; }; + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; }; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; @@ -1461,8 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { - QuickCheck = self.QuickCheck_2_7; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7; }; + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; }; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -2058,7 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7 = callPackage ../development/libraries/haskell/QuickCheck/2.7.nix {}; + QuickCheck_2_7_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; @@ -2389,7 +2389,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { - QuickCheck = self.QuickCheck_2_7; + QuickCheck = self.QuickCheck_2_7_1; }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; @@ -2911,7 +2911,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_3; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { - hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7; }; }; + hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; }; }; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; From 70f6b1e50608964194849b8600355ec6af307d0f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:30:40 +0100 Subject: [PATCH 123/248] haskell-QuickCheck: jailbreak to that the test suite for 2.7.1 accepts its own library --- pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix index 6d449871e010..85829093c34f 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix @@ -6,6 +6,9 @@ cabal.mkDerivation (self: { sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21"; buildDepends = [ random tfRandom ]; testDepends = [ testFramework ]; + patchPhase = '' + sed -i -e 's|QuickCheck == .*,|QuickCheck,|' QuickCheck.cabal + ''; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; From 65e3713630e322644a5a3c8f26cbe5577a505206 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:32:03 +0100 Subject: [PATCH 124/248] haskell-tls: update to version 1.2.3 --- .../haskell/tls/{1.2.2.nix => 1.2.3.nix} | 15 ++++++++------- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) rename pkgs/development/libraries/haskell/tls/{1.2.2.nix => 1.2.3.nix} (63%) diff --git a/pkgs/development/libraries/haskell/tls/1.2.2.nix b/pkgs/development/libraries/haskell/tls/1.2.3.nix similarity index 63% rename from pkgs/development/libraries/haskell/tls/1.2.2.nix rename to pkgs/development/libraries/haskell/tls/1.2.3.nix index 638299d4a426..5906413796db 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.2.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.3.nix @@ -1,5 +1,5 @@ -{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4 -, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey +{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes +, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey , cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network , QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 , x509Store, x509Validation @@ -7,12 +7,13 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.2"; - sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp"; + version = "1.2.3"; + sha256 = "0vv81z5m223b90zzfp5dk376fh8yngyd8h9anrxjrqb4f3bycaxg"; buildDepends = [ - asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash - cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom - dataDefaultClass mtl network x509 x509Store x509Validation + asn1Encoding asn1Types byteable cereal cipherAes cipherRc4 + cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandom dataDefaultClass mtl network x509 x509Store + x509Validation ]; testDepends = [ cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cf846778087d..16405f53da67 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2479,8 +2479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {}; - tls = self.tls_1_2_2; + tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {}; + tls = self.tls_1_2_3; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; From c30f45dbdc6c7f99dbc3421f84bd9630c8ee2390 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:32:26 +0100 Subject: [PATCH 125/248] haskell-filepath: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/filepath/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index 0cd65bb1905e..7a2b9e75e7f9 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck, random }: cabal.mkDerivation (self: { pname = "filepath"; - version = "1.3.0.1"; - sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p"; + version = "1.3.0.2"; + sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2"; + testDepends = [ QuickCheck random ]; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; From e2193175cdc1c2731ec5d4e858a6d2ef55f651a1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:32:27 +0100 Subject: [PATCH 126/248] haskell-vty: update to version 4.7.5 --- pkgs/development/libraries/haskell/vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 3bcadc78a978..8a8ed40adb44 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.3"; - sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + version = "4.7.5"; + sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr"; isLibrary = true; isExecutable = true; buildDepends = [ From 9fdacd0d6dff2bd93db0273e9afcf1c36e7b1414 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:34:52 +0100 Subject: [PATCH 127/248] haskell-wx: update to version 0.90.1.0 --- pkgs/development/libraries/haskell/wxHaskell/wx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index dc030f68059a..a0f775365190 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.90.0.1"; - sha256 = "116vlpssjcyzil99xmz3azc2vl97iban3gdpxd593q5gi24l838m"; + version = "0.90.1.0"; + sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; From 9761a0c49ad2bec22976b6087b877012310d1f28 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:34:53 +0100 Subject: [PATCH 128/248] haskell-wxc: update to version 0.90.1.0 --- pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index d95b07121af1..2435edb31b1a 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,14 +2,10 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.0.4"; - sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6"; + version = "0.90.1.0"; + sha256 = "1j318pxn6wqjwhz5rinb8az1bkhasgm9rhb3l36dlbzwcc4p0a2a"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - postInstall = '' - cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so - ''; - patches = [ ./fix-bogus-pointer-assignment.patch ]; noHaddock = true; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; From 33a55a58c14c5628d734925f78ff47e8b1281bbf Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:34:54 +0100 Subject: [PATCH 129/248] haskell-wxcore: update to version 0.90.1.0 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 5dde5e8fc3f6..37d8c24a21ca 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,13 +4,10 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.0.3"; - sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; + version = "0.90.1.0"; + sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - patchPhase = '' - sed -i -e 's|containers >=.*|containers|' wxcore.cabal - ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; From 02e8e7021bfb38eba60fabbed08195b0f0f79fc2 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:34:55 +0100 Subject: [PATCH 130/248] haskell-wxdirect: update to version 0.90.1.0 --- .../libraries/haskell/wxHaskell/wxdirect.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 08512c206255..3b67ec103dfe 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,15 +1,12 @@ -{ cabal, parsec, strict, time }: +{ cabal, filepath, parsec, strict, time }: cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.90.0.1"; - sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3"; + version = "0.90.1.0"; + sha256 = "06r8z4css7md35rcbi805407dcabcrb1knif9f7445aphwzgadr0"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec strict time ]; - patchPhase = '' - sed -i -e 's|containers >=.*|containers|' wxdirect.cabal - ''; + buildDepends = [ filepath parsec strict time ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; From fffe521344de1718d419a4c047fd5b10fc4e984a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:35:23 +0100 Subject: [PATCH 131/248] haskell-wxHaskell: drop obsolete patch --- .../wxHaskell/fix-bogus-pointer-assignment.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch diff --git a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch deleted file mode 100644 index 38551d24d43f..000000000000 --- a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp ---- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 12:12:17.000000000 +0200 -+++ wxc-0.90.0.4/src/cpp/eljpen.cpp 2013-01-07 12:09:50.296417007 +0100 -@@ -156,7 +156,7 @@ - EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref) - { - #if defined(__WXGTK__) -- *_ref = NULL; -+ _ref = NULL; - #else - *_ref = *(((wxPen*)self)->GetStipple()); - #endif -Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig From ec8e5b99fc24ad78e7b55f2570a0cb15875b0360 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:44:19 +0100 Subject: [PATCH 132/248] ghc-7.4.2: fix build on recent versions of Darwin --- pkgs/development/compilers/ghc/7.4.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index d1acb3d09b9e..497a59e17fa5 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; From e54ae8cce1dc6e75b506da50e9219e033794d618 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:44:27 +0100 Subject: [PATCH 133/248] ghc-7.8.1: fix build on recent versions of Darwin --- pkgs/development/compilers/ghc/7.8.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.1.nix index c9ca6fd8719b..f58ca9cc1fc2 100644 --- a/pkgs/development/compilers/ghc/7.8.1.nix +++ b/pkgs/development/compilers/ghc/7.8.1.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; From 5c3be05e90dcf70720c8d922149de5dd87d5ef50 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 10:44:35 +0100 Subject: [PATCH 134/248] ghc-HEAD: fix build on recent versions of Darwin --- pkgs/development/compilers/ghc/head.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 7f5ec0985b9a..cc220eb7b1c2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; From 1bc1ddcda0d7dec6d9fea739651903fecc705d71 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 12:28:31 +0100 Subject: [PATCH 135/248] haskell-unix-time: fix test suite in shared library build https://github.com/kazu-yamamoto/unix-time/issues/20 --- pkgs/development/libraries/haskell/unix-time/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 0ca4ea5f5c24..e329c1ef4067 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm"; testDepends = [ doctest hspec QuickCheck time ]; + configureFlags = self.stdenv.lib.optionalString self.enableSharedLibraries "--ghc-option=-fPIC"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; From 9a107da470b4f8cc671dd69602363e074bfde377 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sat, 22 Mar 2014 13:05:35 +0100 Subject: [PATCH 136/248] wxHaskell: touch files after extracting the tarball to fix broken timestamps --- pkgs/development/libraries/haskell/wxHaskell/wx.nix | 1 + pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 1 + pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 1 + pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index a0f775365190..90bfdc5ca0a3 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.90.1.0"; sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9"; buildDepends = [ stm wxcore ]; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 2435edb31b1a..7a9f05c6b624 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 37d8c24a21ca..3ee5d9e2cdb7 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 3b67ec103dfe..0f379401b35e 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath parsec strict time ]; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; From e48ae6a0794c5fbcfb5cdfcac31a1c23ee4548d7 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@gmail.com> Date: Sat, 22 Mar 2014 14:30:45 -0300 Subject: [PATCH 137/248] A minor fix to maintainers field for some packages (aegisub,mpv,8086tiny and bochs) --- pkgs/applications/video/aegisub/default.nix | 2 +- pkgs/applications/video/mpv/default.nix | 2 +- pkgs/applications/virtualization/8086tiny/default.nix | 4 +++- pkgs/applications/virtualization/bochs/default.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index fa17fb5ffd2c..af3f6f79942a 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # The Aegisub sources are itself BSD/ISC, # but they are linked against GPL'd softwares # - so the resulting program will be GPL - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2ffefa35898f..693f367a1692 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://mpv.io"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index ca93a1bfd7c6..1802ed74db91 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.megalith.co.uk/8086tiny/index.html; license = stdenv.lib.licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } + +# TODO: add support for a locally made BIOS \ No newline at end of file diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 7b49bb8220da..eaa7a4ad0542 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bochs.sourceforge.net/; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } From bc025bf63265530e40591eeeb05e5ecae1a2a4b2 Mon Sep 17 00:00:00 2001 From: Ben Doyle <benjamin.peter.doyle@gmail.com> Date: Sat, 22 Mar 2014 17:54:39 -0400 Subject: [PATCH 138/248] Fix mistaken change to top level packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5740ab4b3347..4603179fafc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10512,7 +10512,7 @@ let desktopName = "Vimb"; }; - # VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; + VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; # Wine cannot be built in 64-bit; use a 32-bit build instead. wineStable = callPackage_i686 ../misc/emulators/wine/stable.nix { From ed7f95be88a507ab646a21081a6b7c8d5032a0a8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway <emery@vfemail.net> Date: Sat, 22 Mar 2014 21:21:24 -0400 Subject: [PATCH 139/248] ncdc: initial expression http://dev.yorhel.nl/ncdc --- .../networking/p2p/ncdc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/networking/p2p/ncdc/default.nix diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix new file mode 100644 index 000000000000..a06185ed2ae3 --- /dev/null +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: + +stdenv.mkDerivation rec { + name = "ncdc-${version}"; + version = "1.19"; + + src = fetchurl { + url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz"; + sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"; + }; + + buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ]; + + meta = { + description = "modern and lightweight direct connect client with a friendly ncurses interface"; + homepage = http://dev.yorhel.nl/ncdc; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10df9bbd9862..9f80fea68aa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8676,6 +8676,8 @@ let ncdu = callPackage ../tools/misc/ncdu { }; + ncdc = callPackage ../applications/networking/p2p/ncdc { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; From d30644136001176b2f6ee94bb8ec947b02841461 Mon Sep 17 00:00:00 2001 From: Emery Hemingway <emery@vfemail.net> Date: Sat, 22 Mar 2014 21:47:37 -0400 Subject: [PATCH 140/248] f2fs-tools: initial expression --- pkgs/tools/filesystems/f2fs-tools/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/filesystems/f2fs-tools/default.nix diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix new file mode 100644 index 000000000000..72f417ff10ba --- /dev/null +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libuuid }: + +stdenv.mkDerivation rec { + name = "f2fs-tools-${version}"; + version = "1.3.0"; + + src = fetchgit { + url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git; + rev = "refs/tags/v${version}"; + sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig libuuid ]; + + preConfigure = '' + sed -i '/AC_SUBST/d' configure.ac + autoreconf --install + ''; + + meta = { + homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; + description = "Userland tools for the f2fs filesystem"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10df9bbd9862..031f334c7dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -920,6 +920,8 @@ let expect = callPackage ../tools/misc/expect { }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; + fabric = pythonPackages.fabric; fail2ban = callPackage ../tools/security/fail2ban { }; From e7172cad9aec8cec889eee3a0c21476b7b88c521 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sat, 22 Mar 2014 22:40:14 -0400 Subject: [PATCH 141/248] haskell-postgresql-simple: bump --- .../libraries/haskell/postgresql-simple/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index d1be8d1d896c..56c4a5965e15 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder -, blazeTextual, cryptohash, HUnit, postgresqlLibpq, text, time -, transformers, uuid, vector +, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq +, scientific, text, time, transformers, uuid, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.0.2"; - sha256 = "0gx9jmmzv6aaa6z88i3j51f5hp153dbwzw3x7jx329c5pjp536g9"; + version = "0.4.2.0"; + sha256 = "0g31a7s2h9d6f3igvrddbr357sk4vabvg88mmvb194pps66y8zzn"; buildDepends = [ - aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text - time transformers uuid vector + aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq + scientific text time transformers uuid vector ]; testDepends = [ aeson base16Bytestring cryptohash HUnit text time vector From ae8a8b5deb305e2e8884d9f34a91a7ab28b62b1b Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sat, 22 Mar 2014 22:40:35 -0400 Subject: [PATCH 142/248] Add buildLocalCabal helper function --- pkgs/top-level/haskell-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 16405f53da67..5b39974c3158 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2893,6 +2893,25 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; + # Build a cabal package given a local .cabal file + buildLocalCabal = src: name: let + cabalExpr = pkgs.stdenv.mkDerivation { + name = "${name}.nix"; + + LANG = "en_US.UTF-8"; + + LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + + buildCommand = '' + ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ + | grep -v FILTERME | sed \ + -e 's/licenses.proprietary/licenses.unfree/' \ + -e 's/{ cabal/{ cabal, src/' \ + -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;/' > $out + ''; + }; + in callPackage cabalExpr { inherit src; }; + cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {}; From 7c2d00aefdf48415aecfecc1962097b7ba28d743 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin <jakahudoklin@gmail.com> Date: Sun, 23 Mar 2014 10:03:28 +0000 Subject: [PATCH 143/248] build-support: Add writeTextDir This `writeTextFile` based helper function is especially usefull for writing a bunch of configuration files to root of the output folder --- pkgs/build-support/trivial-builders.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5ae2e7b4fc9b..c08a6c3a265f 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -33,6 +33,7 @@ rec { # Shorthands for `writeTextFile'. writeText = name: text: writeTextFile {inherit name text;}; + writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; writeScript = name: text: writeTextFile {inherit name text; executable = true;}; writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; From a7070743a30d608f93be859ffc87de6354ba97b5 Mon Sep 17 00:00:00 2001 From: Alexei Robyn <shados@shados.net> Date: Sun, 23 Mar 2014 20:49:09 +1100 Subject: [PATCH 144/248] Openbox: Added wrapping for XDG_DATA_DIRS Fixes issue with Openbox failing to start due to not finding its default theme --- pkgs/applications/window-managers/openbox/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 487a8a5b387a..56a5f0e3e2ce 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libxml2, libXinerama, libXcursor, libXau, libXrandr -, imlib2, pango, libstartup_notification }: +, imlib2, pango, libstartup_notification, makeWrapper}: stdenv.mkDerivation rec { name = "openbox-3.5.2"; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { pkgconfig libxml2 libXinerama libXcursor libXau libXrandr imlib2 pango libstartup_notification + makeWrapper ]; src = fetchurl { @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj"; }; + # Openbox needs XDG_DATA_DIRS set or it can't find its default theme + postInstall = '' + wrapProgram "$out/bin/openbox" --prefix XDG_DATA_DIRS : "$out/share" + wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" + wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" + wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" + ''; + meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; From e91daf327d5b8dec070601cd22aebb5083dfe9e7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway <emery@vfemail.net> Date: Sun, 23 Mar 2014 11:22:57 -0400 Subject: [PATCH 145/248] electrum: initial expression Electrum is a Bitcoin thin-wallet. https://electrum.org --- pkgs/applications/misc/electrum/default.nix | 32 +++++++++++++++++++ .../python-modules/ecdsa/default.nix | 18 +++++++++++ .../python-modules/slowaes/default.nix | 16 ++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 4 files changed, 72 insertions(+) create mode 100644 pkgs/applications/misc/electrum/default.nix create mode 100644 pkgs/development/python-modules/ecdsa/default.nix create mode 100644 pkgs/development/python-modules/slowaes/default.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix new file mode 100644 index 000000000000..c35a2c7ff821 --- /dev/null +++ b/pkgs/applications/misc/electrum/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pythonPackages, slowaes, ecdsa, pyqt4 }: + +pythonPackages.buildPythonPackage rec { + name = "electrum-${version}"; + version = "1.9.8"; + + src = fetchurl { + url = "https://download.electrum.org/Electrum-${version}.tar.gz"; + sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff"; + }; + + buildInputs = [ slowaes ecdsa ]; + + propagatedBuildInputs = [ + slowaes + ecdsa + pyqt4 + ]; + + postPatch = '' + mkdir -p $out/share + sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + ''; + + meta = { + description = "Bitcoin thin-wallet"; + long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; + homepage = "https://electrum.org"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ "emery@vfemail.net" ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix new file mode 100644 index 000000000000..f668f3c6ac3b --- /dev/null +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, buildPythonPackage, openssl }: + +buildPythonPackage rec { + name = "ecdsa-0.11"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz"; + sha256 = "134mbq5xsvx54k9xm7zrizvh9imxmcz1w9mhyfr99p4i7wcnqfwf"; + }; + + buildInputs = [ openssl ]; + + meta = { + homepage = "http://github.com/warner/python-ecdsa"; + description = "pure-python ECDSA signature/verification"; + license = stdenv.lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix new file mode 100644 index 000000000000..ef793d7e1208 --- /dev/null +++ b/pkgs/development/python-modules/slowaes/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "slowaes-0.1a1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; + sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; + }; + + meta = { + homepage = "http://code.google.com/p/slowaes/"; + description = "AES implemented in pure python"; + license = stdenv.lib.licenses.apache; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f1543fc83d..95109679e8be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6157,6 +6157,8 @@ let bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + ecdsa = callPackage ../development/python-modules/ecdsa { }; + numeric = callPackage ../development/python-modules/numeric { }; pil = pythonPackages.pil; @@ -6215,6 +6217,8 @@ let setuptools = pythonPackages.setuptools; + slowaes = callPackage ../development/python-modules/slowaes { }; + wxPython = pythonPackages.wxPython; wxPython28 = pythonPackages.wxPython28; @@ -7765,6 +7769,8 @@ let ekho = callPackage ../applications/audio/ekho { }; + electrum = callPackage ../applications/misc/electrum { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; From 0c79b762718ff6e4e810e0b27eded5104d871e03 Mon Sep 17 00:00:00 2001 From: AndersonTorres <torres.anderson.85@gmail.com> Date: Sun, 23 Mar 2014 13:17:34 -0300 Subject: [PATCH 146/248] Aspell dictionaries update: Portuguese (pt_PT) and Brazilian (pt_BR) --- .../libraries/aspell/dictionaries.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 6500e602e854..79a75708c169 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -140,12 +140,21 @@ in { }; }; - pt = buildDict { - shortName = "pt-0.50-1"; + pt_BR = buildDict { + shortName = "pt_BR-20090702"; + fullName = "Brazilian Portuguese"; + src = fetchurl { + url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2; + sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; + }; + }; + + pt_PT = buildDict { + shortName = "pt_PT-20070510"; fullName = "Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2; - sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy"; + url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2; + sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; }; From 6c9ecc1573113b12140bbebd3f3a85503548955f Mon Sep 17 00:00:00 2001 From: Matej Cotman <cotman.matej@gmail.com> Date: Sun, 23 Mar 2014 17:27:55 +0100 Subject: [PATCH 147/248] mplayer: add option config.mplayer.vdpauSupport --- 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 24f1543fc83d..c1cff95649a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8585,6 +8585,7 @@ let mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; + vdpauSupport = config.mplayer.vdpauSupport or false; }; mplayer2 = callPackage ../applications/video/mplayer2 { }; From 6f44ffc61c1274f79fa30f2a20b87cc932c8b6c9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin <jakahudoklin@gmail.com> Date: Sun, 23 Mar 2014 18:03:31 +0100 Subject: [PATCH 148/248] transmission-remote-gtk: fix missing schema for gtk3 FileChooser --- .../networking/p2p/transmission-remote-gtk/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 3c1cfe518363..5403f6e31561 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }: +{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }: stdenv.mkDerivation rec { @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz"; }; - buildInputs = [ pkgconfig intltool gtk3 json_glib curl ]; + buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ]; + + postInstall = '' + wrapProgram "$out/bin/transmission-remote-gtk" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" + ''; meta = { description = "GTK remote control for the Transmission BitTorrent client"; From 13bc37ed3e730ed2e98d60694ccdfc15cbc57447 Mon Sep 17 00:00:00 2001 From: Matej Cotman <cotman.matej@gmail.com> Date: Sun, 23 Mar 2014 17:24:12 +0100 Subject: [PATCH 149/248] vlc: ncurses support (close #2012) --- pkgs/applications/video/vlc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3df447fad626..de2615d8334c 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { [ "--enable-alsa" "--with-kde-solid=$out/share/apps/solid/actions" "--enable-dc1394" + "--enable-ncurses" ]; preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure''; From c173ddb70e24348af4297ca240285ddcf3b92ea9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Sun, 23 Mar 2014 15:48:33 +0100 Subject: [PATCH 150/248] python-3.3: Add support for lzma --- pkgs/development/interpreters/python/3.3/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 33b67a10f19b..d744fa9672f1 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -3,6 +3,7 @@ , db , gdbm , libX11, xproto +, lzma , ncurses , openssl , readline @@ -20,7 +21,7 @@ let version = "${majorVersion}.5"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { From 842ae7674b660b52f69963d957c4cf2904a749fd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Sun, 23 Mar 2014 21:19:56 +0100 Subject: [PATCH 151/248] python-3.4: Add support for lzma --- pkgs/development/interpreters/python/3.4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 3725586f3f4c..0b8774463245 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -3,6 +3,7 @@ , db , gdbm , libX11, xproto +, lzma , ncurses , openssl , readline @@ -21,7 +22,7 @@ let fullVersion = "${version}"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto + zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { From 4c5d093ae07324b9daea7a9fb9fbf0b3c77a936a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sun, 23 Mar 2014 22:30:48 +0100 Subject: [PATCH 152/248] esniper: add patch to fix unrecognized e-bay log-in page --- pkgs/applications/networking/esniper/default.nix | 3 ++- .../networking/esniper/fix-ebay-login.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/esniper/fix-ebay-login.patch diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 50a2764d375c..ee263245218f 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { buildInputs = [ openssl curl ]; # Add support for CURL_CA_BUNDLE variable. - patches = [ ./find-ca-bundle.patch ]; + # Fix <http://sourceforge.net/p/esniper/bugs/648/>. + patches = [ ./find-ca-bundle.patch ./fix-ebay-login.patch ]; postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ diff --git a/pkgs/applications/networking/esniper/fix-ebay-login.patch b/pkgs/applications/networking/esniper/fix-ebay-login.patch new file mode 100644 index 000000000000..07d0a577a08c --- /dev/null +++ b/pkgs/applications/networking/esniper/fix-ebay-login.patch @@ -0,0 +1,13 @@ +--- esniper-orig/auction.c 2014-03-23 22:28:46.684289574 +0100 ++++ esniper/auction.c 2014-03-23 22:24:00.540568653 +0100 +@@ -424,7 +424,9 @@ + if ((pp->srcId && !strcmp(pp->srcId, "SignInAlertSupressor"))|| + (pp->pageName && + (!strncasecmp(pp->pageName, "MyeBay", 6) || +- !strncasecmp(pp->pageName, "My eBay", 7)) ++ !strncasecmp(pp->pageName, "My eBay", 7) || ++ !strncasecmp(pp->pageName, "Watch list", 10) || ++ !strncasecmp(pp->pageName, "User Agreement", 10)) + )) + loginTime = time(NULL); + else if (pp->pageName && From a18eb2daa0134ea0edd38a94ee61c9c21796c226 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 24 Mar 2014 00:16:42 -0400 Subject: [PATCH 153/248] Fix tarball --- pkgs/development/python-modules/slowaes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix index ef793d7e1208..e45ffdfb2e17 100644 --- a/pkgs/development/python-modules/slowaes/default.nix +++ b/pkgs/development/python-modules/slowaes/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = { homepage = "http://code.google.com/p/slowaes/"; description = "AES implemented in pure python"; - license = stdenv.lib.licenses.apache; + license = stdenv.lib.licenses.asl20; }; -} \ No newline at end of file +} From b5c39bfada812a7a50457e376f8c71605c4114c7 Mon Sep 17 00:00:00 2001 From: Austin Seipp <aseipp@pobox.com> Date: Mon, 24 Mar 2014 00:07:55 -0500 Subject: [PATCH 154/248] ssdeep: remove Darwin from Hydra platforms for now Signed-off-by: Austin Seipp <aseipp@pobox.com> --- pkgs/tools/security/ssdeep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 66fdedc49063..c59e50f4ae4c 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } From 149dcb211349f3f77b58cf5839a30be035f87483 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Sat, 22 Mar 2014 11:28:06 +0100 Subject: [PATCH 155/248] conkeror: upgrade to more recent snapshot needed for scripting Downloads.jsm with Gecko >= 26 --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index fc84f7fcecc2..79402c31f8b6 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20131116-1"; + name = "conkeror-1.0pre-20140212"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "refs/tags/debian-1.0--pre+git131116-1"; - sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3"; + rev = "07064d76d10e0978c6de535e21f4597d44560fbd"; + sha256 = "b03a7debee8583ff7a3f2d95474f60e956f0e24dbd1a8fd22412de1d6627f322"; }; buildInputs = [ unzip makeWrapper ]; From d8d8606da456c7ebe40039bbebc12320eb86301b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Sat, 22 Mar 2014 23:37:05 +0100 Subject: [PATCH 156/248] unison: upgrade to 2.40.102 --- pkgs/applications/networking/sync/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 35dd2d2a7d02..744c8c01efa5 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation (rec { - name = "unison-2.40.63"; + name = "unison-2.40.102"; src = fetchurl { - url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz"; - sha256 = "17fd2bg5jxwbib87j6j2bjpwdm66whqm1fq46v70hfby79j00vkf"; + url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz"; + sha256 = "0m78q5vnsric1virvkmxxx32ipaq0cnj0kbirdbg36395gq94jix"; }; buildInputs = [ ocaml makeWrapper ncurses ]; From 231f6c546048b9604a3bc321c4b43476c6e9740c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Sun, 23 Mar 2014 14:39:32 +0100 Subject: [PATCH 157/248] psmisc: the tarball got updated upstream looking at our git history, I think it is very peculiar that we managed to have this version (22.21) 2 months before release :) So I think we were using some beta/rc that accidentally got called 22.21 --- pkgs/os-specific/linux/psmisc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 0e423f85d66f..1215c5261f4f 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.gz"; - sha256 = "1p13s2323mi2868y4fzy3q2kkmv4fn1ggabqnjf202x4030vjj1q"; + sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp"; }; buildInputs = [ncurses]; From 64e7ee41425e93bf70338a2e7281f400c25eaf7d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Sun, 23 Mar 2014 14:47:09 +0100 Subject: [PATCH 158/248] libarchive: patch checksum failure Probably github changed some headers in their patch output. I verified other sources for CVE2013-0211 and the patch seems the same. --- pkgs/development/libraries/libarchive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index b7b001e44eb2..e6b01f695dc7 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [(fetchurl { url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch"; - sha256 = "0c1a0prlpq5nn7zgs7cqvw9xnmhkkc8l0mpsip86k1lafircqhzh"; + sha256 = "1y649pvilwx4jpjhyq5pfs2jb0ay01ylrn1y8098v785z0j82wml"; name = "CVE-2013-0211.patch"; })]; From fa5a583098f493fb6503967dc384cb7c5e82ee86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name> Date: Mon, 24 Mar 2014 10:09:40 +0100 Subject: [PATCH 159/248] Bringing back the xkeyboard-config eo patch --- pkgs/servers/x11/xorg/overrides.nix | 4 +- .../x11/xorg/xkeyboard-config-eo.patch | 71 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/x11/xorg/xkeyboard-config-eo.patch diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8b2617f06216..d95ef24e998e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -197,10 +197,12 @@ in }; xkeyboardconfig = attrs: attrs // { - #TODO: resurrect patches for US_intl and Esperanto? buildInputs = attrs.buildInputs ++ [args.intltool]; + #TODO: resurrect patches for US_intl? + patches = [ ./xkeyboard-config-eo.patch ]; + # 1: compatibility for X11/xkb location # 2: I think pkgconfig/ is supposed to be in /lib/ postInstall = '' diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch new file mode 100644 index 000000000000..f288a5c0f6dd --- /dev/null +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -0,0 +1,71 @@ +diff --git a/rules/base.xml.in b/rules/base.xml.in +index ec321f8..e9c3546 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -1786,6 +1786,13 @@ + </layout> + <layout> + <configItem> ++ <name>eo</name> ++ <_shortDescription>Esp</_shortDescription> ++ <_description>Esperanto</_description> ++ </configItem> ++ </layout> ++ <layout> ++ <configItem> + <name>ir</name> + <_shortDescription>Irn</_shortDescription> + <_description>Iran</_description> +diff --git a/symbols/Makefile.am b/symbols/Makefile.am +index 97c816d..d7e3a4e 100644 +--- a/symbols/Makefile.am ++++ b/symbols/Makefile.am +@@ -10,7 +10,7 @@ bt by braille \ + ca cd \ + ch cn cz \ + de dk \ +-ee es et epo \ ++ee eo es et epo \ + fi fo fr \ + gb ge gh gn \ + gr hr hu \ +diff --git a/symbols/Makefile.in b/symbols/Makefile.in +index b5be077..5cddcc7 100644 +--- a/symbols/Makefile.in ++++ b/symbols/Makefile.in +@@ -222,7 +222,7 @@ bt by braille \ + ca cd \ + ch cn cz \ + de dk \ +-ee es et epo \ ++ee eo es et epo \ + fi fo fr \ + gb ge gh gn \ + gr hr hu \ +diff --git a/symbols/eo b/symbols/eo +new file mode 100644 +index 0000000..d6358c9 +--- /dev/null ++++ b/symbols/eo +@@ -0,0 +1,21 @@ ++// $XFree86$ ++ ++partial alphanumeric_keys ++xkb_symbols "basic" { ++ ++ // Describes the differences between a very simple en_US ++ // keyboard and a simple Esperanto keyboard ++ // Press AltGr or Windows Menu key together with C, H, J, S, U ++ // to get accented letters. ++ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk> ++ ++ key.type = "FOUR_LEVEL"; ++ ++ key <AD02> { [w,W, ubreve,Ubreve ] }; ++ key <AD07> { [u,U, ubreve, Ubreve ] }; ++ key <AC02> { [s,S, scircumflex, Scircumflex ] }; ++ key <AC05> { [g,G, gcircumflex,Gcircumflex ] }; ++ key <AC06> { [h,H, hcircumflex,Hcircumflex ] }; ++ key <AC07> { [j,J, jcircumflex,Jcircumflex ] }; ++ key <AB03> { [c,C, ccircumflex,Ccircumflex ] }; ++}; From d4c711ee1d1080179958fb2cb9553d73acf4b2af Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 24 Mar 2014 08:37:36 -0400 Subject: [PATCH 160/248] Add memcache php module --- pkgs/build-support/build-pecl.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 ++++ pkgs/top-level/php-packages.nix | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/build-support/build-pecl.nix create mode 100644 pkgs/top-level/php-packages.nix diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix new file mode 100644 index 000000000000..d84497e8019c --- /dev/null +++ b/pkgs/build-support/build-pecl.nix @@ -0,0 +1,9 @@ +{ stdenv, php, autoreconfHook }: + +args: stdenv.mkDerivation (args // { + buildInputs = [ php autoreconfHook ] ++ args.buildInputs or []; + + makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or []; + + autoreconfPhase = "phpize"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0360a87ac56..7e81a39ec083 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3267,6 +3267,10 @@ let php = php54; + phpPackages = import ./php-packages.nix { + inherit php pkgs; + }; + php53 = callPackage ../development/interpreters/php/5.3.nix { }; php54 = callPackage ../development/interpreters/php/5.4.nix { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix new file mode 100644 index 000000000000..e26ec8c9eb8c --- /dev/null +++ b/pkgs/top-level/php-packages.nix @@ -0,0 +1,19 @@ +{ pkgs, php }: + +let self = with self; { + buildPecl = import ../build-support/build-pecl.nix { + inherit php; + inherit (pkgs) stdenv autoreconfHook; + }; + + memcache = buildPecl { + name = "memcache-3.0.8"; + + src = pkgs.fetchurl { + url = http://pecl.php.net/get/memcache-3.0.8.tgz; + sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; + }; + + configureFlags = "--with-zlib-dir=${pkgs.zlib}"; + }; +}; in self From 5221cfdda95d7072b475161a2de82732f2f68ea6 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 24 Mar 2014 09:23:10 -0400 Subject: [PATCH 161/248] Add memcached php module. Yes, it's different from memcache. Yes, we need both --- pkgs/top-level/php-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e26ec8c9eb8c..654a071a182b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,4 +16,20 @@ let self = with self; { configureFlags = "--with-zlib-dir=${pkgs.zlib}"; }; + + memcached = buildPecl { + name = "memcached-2.1.0"; + + src = pkgs.fetchurl { + url = http://pecl.php.net/get/memcached-2.1.0.tgz; + sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw"; + }; + + configureFlags = [ + "--with-zlib-dir=${pkgs.zlib}" + "--with-libmemcached-dir=${pkgs.libmemcached}" + ]; + + buildInputs = [ pkgs.cyrus_sasl ]; + }; }; in self From 84fba566f148543f06255e447225fae554b6a2c2 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 24 Mar 2014 09:48:23 -0400 Subject: [PATCH 162/248] quickcheck-instances: jailbreak to work with newer QuickCheck --- .../libraries/haskell/quickcheck-instances/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 3260fd17e9e5..d532a83015ca 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -14,4 +14,5 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; + jailbreak = true; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b39974c3158..4888d51b3b74 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2065,7 +2065,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; - quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; + quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances { + QuickCheck = self.QuickCheck_2_7_1; + }; quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; From ff6febb75da2d0a5d822b517c8f3e82d1ef75d92 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 24 Mar 2014 12:01:20 -0400 Subject: [PATCH 163/248] sox: Update, get rid of composableDerivation --- pkgs/applications/misc/audio/sox/default.nix | 57 +++++++------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 50aa92f8d293..570699fb619e 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,48 +1,31 @@ -{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { - name = "sox-14.3.0"; +{ stdenv, fetchurl +, enableAlsa ? true, alsaLib ? null +, enableLibao ? true, libao ? null +, enableLame ? false, lame ? null +, enableLibmad ? true, libmad ? null +, enableLibogg ? true, libogg ? null, libvorbis ? null +}: +let + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { + name = "sox-14.4.1"; src = fetchurl { - url = mirror://sourceforge/sox/sox-14.3.0.tar.gz; - sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws"; + url = "mirror://sourceforge/sox/${name}.tar.gz"; + sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s"; }; - flags = - # are these options of interest? We'll see - #--disable-fftw disable usage of FFTW - #--enable-debug enable debugging - #--disable-cpu-clip disable tricky cpu specific clipper - edf { name = "alsa"; enable = { buildInputs = [alsaLib]; }; } - // edf { name = "libao"; enable = { buildInputs = [libao]; }; } - // edf { name = "oss"; } - // edf { name = "sun_audio"; } - // edf { name = "dl-lame"; enable.buildInputs = [ lame ]; } # use shared library - // edf { name = "lame"; enable.buildInputs = [ lame ]; } - // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library - // edf { name = "mad"; enable.buildInputs =[ libmad ]; } - ; - - cfg = { - ossSupport = false; - sun_audioSupport = false; - } // lib.listToAttrs - [ { name = "dl-lameSupport"; value = true; } - { name = "dl-madSupport"; value = true; } - ]; - - configureFlags = ["-enable-dl-lame"]; - - optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame" - /* "amr-wb" "amr-nb" */ - "libsamplerate" /* "ladspa" */ ]; + buildInputs = + (optional enableAlsa alsaLib) ++ + (optional enableLibao libao) ++ + (optional enableLame lame) ++ + (optional enableLibmad libmad) ++ + (optionals enableLibogg [ libogg libvorbis ]); meta = { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; - maintainers = [lib.maintainers.marcweber]; + maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy]; # you can choose one of the following licenses: license = [ "GPL" From c814dab2eeb97c15f4a309e69435988fc3e65c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Sat, 15 Mar 2014 17:00:10 +0100 Subject: [PATCH 164/248] libarchive: *permanently* fix patch source and hash Unfortunately github's *.patch URIs contain version of git generating them, which changes from time to time. It seems that *.diff doesn't suffer from that. --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index e6b01f695dc7..5e728d9b3dd1 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; patches = [(fetchurl { - url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch"; - sha256 = "1y649pvilwx4jpjhyq5pfs2jb0ay01ylrn1y8098v785z0j82wml"; + url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.diff"; + sha256 = "1466ddrkdh2r8idmj3v7fk2gwnhc1kdxvyczdpnqms0qlmas6fj5"; name = "CVE-2013-0211.patch"; })]; From 0242b3c6ac186aea0ae7bf2c7f876133325d7119 Mon Sep 17 00:00:00 2001 From: Artyom Shalkhakov <artyom.shalkhakov@gmail.com> Date: Tue, 25 Mar 2014 04:51:35 +0100 Subject: [PATCH 165/248] Adding ATS1, updating ATS2 package. --- pkgs/development/compilers/ats/default.nix | 41 +++++++++++++++++++ .../ats/install-atsdoc-hats-files.patch | 38 +++++++++++++++++ pkgs/development/compilers/ats2/default.nix | 6 ++- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/ats/default.nix create mode 100644 pkgs/development/compilers/ats/install-atsdoc-hats-files.patch diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix new file mode 100644 index 000000000000..a5ed478a879f --- /dev/null +++ b/pkgs/development/compilers/ats/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, gmp }: + +let version = "0.2.11"; in stdenv.mkDerivation { + name = "ats-anairiats-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; + sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6"; + }; + # this is necessary because atxt files usually include some .hats files + patches = [ ./install-atsdoc-hats-files.patch ]; + + buildInputs = [ gmp ]; + + meta = { + description = "A statically typed programming language that unifies implementation with formal specification"; + homepage = http://www.ats-lang.org/; + license = stdenv.lib.licenses.gpl3Plus; + longDescription = + '' + ATS is a programming language with a highly expressive type system + rooted in the framework Applied Type System. In particular, both + dependent types and linear types are available in ATS. The current + implementation of ATS (ATS/Anairiats) is written in ATS itself. It can + be as efficient as C/C++ and supports a variety of programming + paradigms. + + In addition, ATS contains a component ATS/LF that supports a form of + (interactive) theorem proving, where proofs are constructed as total + functions. With this component, ATS advocates a programming style that + combines programming with theorem proving. Furthermore, this component + may be used as a logical framework to encode various deduction systems + and their (meta-)properties. + + This package contains the compiler atsopt, the frontend atscc, + and the lexer atslex. + ''; + }; + + platforms = stdenv.lib.platforms.all; +} diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch new file mode 100644 index 000000000000..93c6fa07d8a6 --- /dev/null +++ b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch @@ -0,0 +1,38 @@ +--- ats-lang-anairiats-0.2.11/Makefile 2013-12-10 00:43:52.000000000 +0100 ++++ ats-lang-anairiats-0.2.11/Makefile 2014-03-02 07:49:06.985837425 +0100 +@@ -97,7 +97,7 @@ + cd $(abs_top_srcdir) + [ -d $(bindir2) ] || $(MKDIR_P) $(bindir2) + $(MKDIR_P) $(ATSLIBHOME2)/bin +- find ccomp contrib doc libats libc prelude -type d \ ++ find ccomp contrib doc libats libatsdoc libc prelude -type d \ + -exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \ + -print + +@@ -105,7 +105,7 @@ + # + # recursively install all files in the list except .svn control files. + # +- for d in ccomp/runtime contrib doc libats libc prelude; do \ ++ for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \ + cd $(abs_top_srcdir) && \ + $(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \ + find "$$d" -name .svn -prune -o -type f \ +@@ -143,6 +143,17 @@ + $(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \ + echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \ + done ++# ++# install atsdoc headers ++# ++ for f in \ ++ utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \ ++ do \ ++ [ -f "$$f" ] || continue; \ ++ cd $(abs_top_srcdir) && \ ++ $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \ ++ echo "$$f"; \ ++ done + + install:: install_files + diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index ae9a202a529e..c1c71b0dfe21 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: -let version = "0.0.5"; in stdenv.mkDerivation { +let version = "0.0.6"; in stdenv.mkDerivation { name = "ats2-postiats-${version}"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1rzcqc7fwqf0y4cc14lr282r25s66jygf6cxrnf5l8p5p550l0dl"; + sha256 = "110a4drzf656j9s5yfvxj1cwgh5g9ysnh40cv8y9qfjjkki8vd5b"; }; buildInputs = [ gmp ]; @@ -15,4 +15,6 @@ let version = "0.0.5"; in stdenv.mkDerivation { homepage = http://www.ats-lang.org/; license = stdenv.lib.licenses.gpl3Plus; }; + + platforms = stdenv.lib.platforms.all; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e81a39ec083..8e2a54b17cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2360,6 +2360,7 @@ let aspectj = callPackage ../development/compilers/aspectj { }; + ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; avra = callPackage ../development/compilers/avra { }; From 45c6aabf69d549839aef400018b69c1e9a7fd570 Mon Sep 17 00:00:00 2001 From: Oliver Charles <ollie@ocharles.org.uk> Date: Tue, 25 Mar 2014 14:23:59 +0000 Subject: [PATCH 166/248] haskellPackages.jsonAssertions: Update to 1.0.2 --- .../development/libraries/haskell/json-assertions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 8797ca90029c..027cf20064e4 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.1"; - sha256 = "0rpj300knyk602wqkqipmy54xv3pn20cd06sa8irkf2wz0xribzm"; + version = "1.0.2"; + sha256 = "0ppj1xxbi0yrmv6vkmwkz91vvwzjd0ixj60432liwmd6h13apky0"; buildDepends = [ aeson indexed indexedFree lens text ]; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; From af89e63bf73f43b094958c2b744ada1731d37f8a Mon Sep 17 00:00:00 2001 From: Oliver Charles <ollie@ocharles.org.uk> Date: Tue, 25 Mar 2014 14:29:41 +0000 Subject: [PATCH 167/248] haskellPackages.digestiveFunctorsAeson: Update to 1.1.6 --- .../libraries/haskell/digestive-functors-aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index dd098cbe183e..64137054a70e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.5"; - sha256 = "1mxi8zbv3hxy2crj6h6p1a885k8rd0fqhmwq7l7w7d7d73h8bmm3"; + version = "1.1.6"; + sha256 = "1zhw0zksl48q9y699phadf6ixsyll52clr3yyhqghki6l820xwci"; buildDepends = [ aeson digestiveFunctors lens safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl tasty tastyHunit text From 02a30bea44edf1116dcab16c5e64501312b2927b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich <moritz@tarn-vedra.de> Date: Tue, 25 Mar 2014 16:48:19 +0100 Subject: [PATCH 168/248] Fix services.udisks.enable. Latest update to udisks in 344f2e65 broke it for me. Fix it by doing the following: - Add udisks.service to /etc/systemd/system (via systemd.packages) - Fix path to udisks-daemon in udisks.service (libexec/ instead of lib/) --- nixos/modules/services/hardware/udisks.nix | 2 ++ pkgs/os-specific/linux/udisks/1-default.nix | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix index 531ee192573a..a3527468cce6 100644 --- a/nixos/modules/services/hardware/udisks.nix +++ b/nixos/modules/services/hardware/udisks.nix @@ -40,6 +40,8 @@ with pkgs.lib; ''; services.udev.packages = [ pkgs.udisks ]; + + systemd.packages = [ pkgs.udisks ]; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 19cfec9f0657..485880f0cbb9 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { substituteInPlace src/main.c --replace \ "/sbin:/bin:/usr/sbin:/usr/bin" \ "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" + + # For some reason @libexec@ is set to 'lib/' when building. + # Passing --libexecdir in configureFlags didn't help. + substituteInPlace data/systemd/udisks.service.in \ + --replace "@libexecdir@" "$out/libexec" ''; buildInputs = From 3a765a7309504957961363960eb03b3e4fb9d680 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" <Ambroz Bizjak> Date: Sun, 23 Mar 2014 17:19:39 +0100 Subject: [PATCH 169/248] fetchgit: Implement option to not check out submodules. --- pkgs/build-support/fetchgit/builder.sh | 4 +++- pkgs/build-support/fetchgit/default.nix | 4 ++-- pkgs/build-support/fetchgit/nix-prefetch-git | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 5c7d92698cc3..9050cce6ee8f 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,6 +6,8 @@ source $stdenv/setup header "exporting $url (rev $rev) into $out" -$fetcher --builder --url "$url" --out "$out" --rev "$rev" ${leaveDotGit:+--leave-dotGit} +$fetcher --builder --url "$url" --out "$out" --rev "$rev" \ + ${leaveDotGit:+--leave-dotGit} \ + ${fetchSubmodules:+--fetch-submodules} stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index b22bdc88f83b..a17daf9a2c57 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,5 +1,5 @@ {stdenv, git, cacert}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}: /* NOTE: fetchgit has one problem: git fetch only works for refs. @@ -35,7 +35,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit; + inherit url rev leaveDotGit fetchSubmodules; GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8d0de055c756..6e79f82eae86 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -6,6 +6,7 @@ expHash= hashType=$NIX_HASH_ALGO deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT +fetchSubmodules= builder= if test -n "$deepClone"; then @@ -33,6 +34,7 @@ for arg; do --deepClone) deepClone=true;; --no-deepClone) deepClone=false;; --leave-dotGit) leaveDotGit=true;; + --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; *) argi=$(($argi + 1)) @@ -66,6 +68,7 @@ Options: --deepClone Clone submodules recursively. --no-deepClone Do not clone submodules. --leave-dotGit Keep the .git directories. + --fetch-submodules Fetch submodules. --builder Clone as fetchgit does, but url, rev, and out option are mandatory. " exit 1 @@ -178,7 +181,9 @@ clone(){ ) # Checkout linked sources. - init_submodules; + if test -n "$fetchSubmodules"; then + init_submodules; + fi if [ -z "$builder" -a -f .topdeps ]; then if tg help 2>&1 > /dev/null From be46ca48822fb1dd8b912ca52ca692b2fb9a39b2 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" <Ambroz Bizjak> Date: Tue, 25 Mar 2014 22:18:02 +0100 Subject: [PATCH 170/248] pyopengl: Bump to 3.0.2 and hack the library loading to make it work. --- pkgs/top-level/python-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab605199e7f9..10be397835e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5591,18 +5591,25 @@ rec { pyopengl = - let version = "3.0.0b5"; + let version = "3.0.2"; in buildPythonPackage { name = "pyopengl-${version}"; src = fetchurl { - url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; - sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; + url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; + sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03"; }; propagatedBuildInputs = with pkgs; [ mesa freeglut pil ]; + patchPhase = '' + sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py + sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py + sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py + sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py + ''; + meta = { homepage = http://pyopengl.sourceforge.net/; description = "PyOpenGL, the Python OpenGL bindings"; From 93d313c0ed34df4d4f8969d95c0cf721bb69f10c Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" <Ambroz Bizjak> Date: Tue, 25 Mar 2014 22:32:39 +0100 Subject: [PATCH 171/248] Add wxPython-3.0 with OpenGL support. --- .../python-modules/wxPython/3.0.nix | 25 +++++++++++++++++++ .../python-modules/wxPython/builder3.0.sh | 22 ++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/wxPython/3.0.nix create mode 100644 pkgs/development/python-modules/wxPython/builder3.0.sh diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix new file mode 100644 index 000000000000..9aa6148643bd --- /dev/null +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages, openglSupport ? true }: + +assert wxGTK.unicode; + +with stdenv.lib; + +let version = "3.0.0.0"; in + +stdenv.mkDerivation { + name = "wxPython-${version}"; + + builder = ./builder3.0.sh; + + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11"; + }; + + buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ] + ++ optional openglSupport pythonPackages.pyopengl; + + inherit openglSupport; + + passthru = { inherit wxGTK openglSupport; }; +} diff --git a/pkgs/development/python-modules/wxPython/builder3.0.sh b/pkgs/development/python-modules/wxPython/builder3.0.sh new file mode 100644 index 000000000000..7403c67d0912 --- /dev/null +++ b/pkgs/development/python-modules/wxPython/builder3.0.sh @@ -0,0 +1,22 @@ +source $stdenv/setup + +flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${openglSupport?1:0} UNICODE=1" + +configurePhase() { + cd wxPython +} + +buildPhase() { + python setup.py $flags build +} + +installPhase() { + python setup.py $flags install --prefix=$out + + # Ugly workaround for Nixpkgs/111. + ln -s $out/lib/python*/site-packages/wx-*-gtk2-unicode/* $out/lib/python*/site-packages + + wrapPythonPrograms +} + +genericBuild diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab605199e7f9..e5a72517d978 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7610,6 +7610,12 @@ rec { wxGTK = pkgs.wxGTK28; }; + wxPython30 = import ../development/python-modules/wxPython/3.0.nix { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit pythonPackages; + wxGTK = pkgs.wxGTK30; + }; + xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; From 58857096fb679848730892d3f939be471e185cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Tue, 25 Mar 2014 23:00:26 +0100 Subject: [PATCH 172/248] file: update to fix CVE-2014-2270, CVE-2013-7345 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cbcbbb2bb4aa..8d6cbc1359bb 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "file-5.14"; + name = "file-5.17"; buildInputs = [ zlib ]; src = fetchurl { url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz"; - sha256 = "1r3zqxr7al5yy2595hd9hxwc14iij021p46d5my3n2lhs0fs06s6"; + sha256 = "1jl31jli87s5xnjq14r1fh72qc95562qbr5f63d68yrq3ca9gsrz"; }; meta = { From 5f2167627eb7ee0d43bdd5898cbf8dee05665fd4 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" <Ambroz Bizjak> Date: Tue, 25 Mar 2014 23:17:17 +0100 Subject: [PATCH 173/248] Add Cura. --- pkgs/applications/misc/cura/default.nix | 71 +++++++++++++++++++ pkgs/applications/misc/curaengine/default.nix | 22 ++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 97 insertions(+) create mode 100644 pkgs/applications/misc/cura/default.nix create mode 100644 pkgs/applications/misc/curaengine/default.nix diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix new file mode 100644 index 000000000000..937025c08403 --- /dev/null +++ b/pkgs/applications/misc/cura/default.nix @@ -0,0 +1,71 @@ +{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }: +let + py = python27Packages; +in +stdenv.mkDerivation rec { + name = "cura"; + + src = fetchgit { + url = "https://github.com/daid/Cura"; + rev = "58414695269d60ca9b165e8cbc3424933ed79403"; + sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23"; + fetchSubmodules = false; + }; + + desktopItem = makeDesktopItem { + name = "Cura"; + exec = "cura"; + icon = "cura"; + comment = "Cura"; + desktopName = "Cura"; + genericName = "3D printing host software"; + categories = "GNOME;GTK;Utility;"; + }; + + python_deps = [ py.pyopengl py.pyserial py.numpy py.wxPython30 py.power py.setuptools ]; + + pythonPath = python_deps; + + propagatedBuildInputs = python_deps; + + buildInputs = [ curaengine py.wrapPython ]; + + configurePhase = ""; + buildPhase = ""; + + installPhase = '' + # Install Python code. + site_packages=$out/lib/python2.7/site-packages + mkdir -p $site_packages + cp -r Cura $site_packages/ + + # Install resources. + resources=$out/share/cura + mkdir -p $resources + cp -r resources/* $resources/ + sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py + + # Install executable. + mkdir -p $out/bin + cp Cura/cura.py $out/bin/cura + chmod +x $out/bin/cura + sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura + wrapPythonPrograms + + # Make it find CuraEngine. + echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py + + # Install desktop item. + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$resources/images/c.png" "$out"/share/icons/cura.png + ''; + + meta = with stdenv.lib; { + description = "3D printing host software"; + homepage = https://github.com/daid/Cura; + license = licenses.agpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix new file mode 100644 index 000000000000..256d337f679e --- /dev/null +++ b/pkgs/applications/misc/curaengine/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: +stdenv.mkDerivation { + name = "curaengine"; + + src = fetchgit { + url = "https://github.com/Ultimaker/CuraEngine"; + rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0"; + sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr"; + }; + + installPhase = '' + mkdir -p $out/bin + cp CuraEngine $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Engine for processing 3D models into 3D printing instructions"; + homepage = https://github.com/Ultimaker/CuraEngine; + license = licenses.agpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f1543fc83d..29251a513dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8939,6 +8939,10 @@ let perl = perl514; }; + curaengine = callPackage ../applications/misc/curaengine { }; + + cura = callPackage ../applications/misc/cura { }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; From 4121f9d745cdf0db7e2876b8b4e9beada46b5ae1 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" <ambrop7@gmail.com> Date: Tue, 25 Mar 2014 22:27:05 +0100 Subject: [PATCH 174/248] python-packages: Add power-1.2. --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab605199e7f9..dd7d187693c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8781,6 +8781,21 @@ rec { }; }; + power = buildPythonPackage rec { + name = "power-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/power/${name}.tar.gz"; + sha256 = "09a00af8357f63dbb1a1eb13b82e39ccc0a14d6d2e44e5b235afe60ce8ee8195"; + }; + + meta = { + description = "Cross-platform system power status information"; + homepage = https://github.com/Kentzo/Power; + license = "mit"; + }; + }; + # python2.7 specific packages } // optionalAttrs isPy27 ( with pythonPackages; From 72d8c4225b3a3195f8e549a96edcdac21b1f8d95 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin <jakahudoklin@gmail.com> Date: Mon, 24 Mar 2014 21:05:28 +0100 Subject: [PATCH 175/248] Add seyren, an alerting dashboard for Graphite --- pkgs/servers/monitoring/seyren/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/monitoring/seyren/default.nix diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix new file mode 100644 index 000000000000..541c377c4049 --- /dev/null +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "seyren-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar"; + sha256 = "14p97yzfyacvavfms8qs3q5515vpfkjlfvislbwrf7qa89xzz8x0"; + }; + + phases = ["installPhase"]; + + buildInputs = [ makeWrapper jre src ]; + + installPhase = '' + ensureDir "$out"/bin + makeWrapper "${jre}/bin/java" "$out"/bin/seyren --add-flags "-jar $src" + ''; + + meta = with stdenv.lib; { + description = "An alerting dashboard for Graphite"; + homepage = https://github.com/scobal/seyren; + license = licenses.asl20; + maintainers = [ maintainers.offline ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e81a39ec083..46ddcd9c4dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6486,6 +6486,8 @@ let serfdom = callPackage ../servers/serfdom { }; + seyren = callPackage ../servers/monitoring/seyren { }; + shishi = callPackage ../servers/shishi { }; sipwitch = callPackage ../servers/sip/sipwitch { }; From a5a5abd2feea900aead301c7f559a0bc1e2c6456 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Wed, 26 Mar 2014 01:33:07 +0100 Subject: [PATCH 176/248] chromium: Fix startup of beta and dev channels. Since version 34, ICU data files are now created separately and thus need to be installed as well. Closes #2016 Signed-off-by: aszlig <aszlig@redmoonstudios.org> (cherry picked from commit f117341ff2de4b95d223b41b36942e2f60ada2a3) Signed-off-by: aszlig <aszlig@redmoonstudios.org> --- pkgs/applications/networking/browsers/chromium/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index baf67371769d..df5c2bff0d3f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -246,6 +246,9 @@ in stdenv.mkDerivation rec { installPhase = '' ensureDir "${libExecPath}" cp -v "${buildPath}/"*.pak "${libExecPath}/" + ${optionalString (!versionOlder src.version "34.0.0.0") '' + cp -v "${buildPath}/icudtl.dat" "${libExecPath}/" + ''} cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/" cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/" From 70a51b75e1aaadcf8ea21fe77c3f3b97f3b3673e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Sat, 22 Mar 2014 12:49:20 +0200 Subject: [PATCH 177/248] springLobby: update from 0.180 to 0.182, get rid of patch, improve meta --- pkgs/games/spring/springlobby.nix | 11 +++++------ pkgs/games/spring/unitsync_path_find.patch | 10 ---------- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/games/spring/unitsync_path_find.patch diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 34760db7c68d..9d7b281935b9 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.180"; + version = "0.182"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na"; + sha256 = "121kvbbrcnp2yqzbnz3wai2m6mn7nrgqvb1d4ly0k98p3ar20m4v"; }; buildInputs = [ @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { libnotify gtk doxygen makeWrapper ]; - patches = [ ./unitsync_path_find.patch ]; - prePatch = '' substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk" @@ -31,14 +29,15 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/springlobby \ --prefix PATH : "${spring}/bin" \ - --set SPRING_LIB_DIRS "${spring}/lib" + --set SPRING_BUNDLE_DIR "${spring}/lib" ''; meta = with stdenv.lib; { homepage = http://springlobby.info/; + repositories.git = git://github.com/springlobby/springlobby.git; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ]; + maintainers = with maintainers; [ phreedom qknight iElectric ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/spring/unitsync_path_find.patch b/pkgs/games/spring/unitsync_path_find.patch deleted file mode 100644 index 66257a5f52fc..000000000000 --- a/pkgs/games/spring/unitsync_path_find.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/settings.cpp 2013-12-02 10:09:19.000000000 +0000 -+++ b/src/settings.cpp-new 2014-02-10 11:39:48.265628767 +0000 -@@ -498,6 +498,7 @@ - - wxString Settings::AutoFindUnitSync(wxPathList pl) const - { -+ pl.AddEnvList( _T( "SPRING_LIB_DIRS" ) ); - wxString retpath = pl.FindValidPath( _T( "unitsync" ) + GetLibExtension() ); - if ( retpath.IsEmpty() ) - retpath = pl.FindValidPath( _T( "libunitsync" ) + GetLibExtension() ); From aaa5685b1492b2df7225e8933518fe13c1c8ca82 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 12:15:12 +0200 Subject: [PATCH 178/248] libtorrentRasterbar: update from 0.16.15 to 0.16.16 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 9c4d3bfd2dd9..0745313b41e7 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.16.15"; + version = "0.16.16"; src = fetchurl { - url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.15.tar.gz; - sha256 = "0xcz4hphgkcdxcbmgzk27mxn7478hy417pn55zn5hnpllgndy3w2"; + url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.16.tar.gz; + sha256 = "1a3yxwjs4qb0rwx6cfpvar0a8jmavb6ik580b27md08jhvq80if7"; }; buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; From cca30b37f8962079794740eab0c5e60d1cf0786a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 12:16:29 +0200 Subject: [PATCH 179/248] youtubeDL: update from 2014.03.18.1 to 2014.03.25.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 986e0f449d26..a70678c50343 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.03.18.1"; + version = "2014.03.25.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0yyyvwa5av4ay8kxxlsav49mp2dcxflz6w0as0nklyg6k5zb5pn1"; + sha256 = "09jayir0n10pgp6h3swzlx4d2x82by6f3dgbvnlvby73h5lpf668"; }; buildInputs = [ python ]; From 34301c89e1566c7c3584eda63e12bc918095b302 Mon Sep 17 00:00:00 2001 From: _1126 <mail@elfsechsundzwanzig.de> Date: Tue, 25 Mar 2014 15:45:24 +0100 Subject: [PATCH 180/248] ncmcp: New expression --- lib/maintainers.nix | 1 + pkgs/applications/audio/ncmpc/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100755 pkgs/applications/audio/ncmpc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index aa0dabc19dad..bcce04e4eba9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -4,6 +4,7 @@ /* Add your name and email address here. Keep the list alphabetically sorted. */ + _1126 = "Christian Lask <mail@elfsechsundzwanzig.de>"; aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; akc = "Anders Claesson <akc@akc.is>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix new file mode 100755 index 000000000000..05972bb28810 --- /dev/null +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }: + +stdenv.mkDerivation rec { + version = "0.21"; + name = "ncmpc-${version}"; + + src = fetchurl { + url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2"; + sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07"; + }; + + buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]; + + meta = with stdenv.lib; { + description = "Curses-based interface for MPD (music player daemon)"; + homepage = http://www.musicpd.org/clients/ncmpc/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ 1126 ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd6b7cd6210..4e912d63daf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8592,6 +8592,8 @@ let mpc_cli = callPackage ../applications/audio/mpc { }; + ncmpc = callPackage ../applications/audio/ncmpc { }; + ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; normalize = callPackage ../applications/audio/normalize { }; From d2571617c0c42ffa50ac62ef3024b66e4ada7486 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 13:03:31 +0200 Subject: [PATCH 181/248] stunnel: update from 4.56 to 5.00, potentially fixes CVE-2014-0016 --- pkgs/tools/networking/stunnel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cb93e8a504b8..672f05577dd5 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation { - name = "stunnel-4.56"; + name = "stunnel-5.00"; src = fetchurl { - url = http://www.stunnel.org/downloads/stunnel-4.56.tar.gz; - sha256 = "14qjhwfa0y17ipnd5mc970vfmralvgaxfl6fk0rl91vdwbxjrblw"; + url = http://www.stunnel.org/downloads/stunnel-5.00.tar.gz; + sha256 = "04xwfppvmj0wrzar3rbypax93jb10f1skh3gq86gy6pglx96v648"; }; buildInputs = [openssl]; From fa49cba2373ee360e8b7cde24dc04dd000c19af4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 13:04:35 +0200 Subject: [PATCH 182/248] net_snmp: update from 5.7.2 to 5.7.2.1, potentially fixes CVE-2014-2284, change source to .zip because tar.gz is broken --- pkgs/servers/monitoring/net-snmp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index ad44860e7bd8..30317d25cff7 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoreconfHook, file, openssl, perl }: +{ stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }: stdenv.mkDerivation rec { - name = "net-snmp-5.7.2"; + name = "net-snmp-5.7.2.1"; src = fetchurl { - url = "mirror://sourceforge/net-snmp/${name}.tar.gz"; - sha256 = "05mqrv22c65405d6v91cqf4hvczkkvvyy5lsxw8h8g0zrjs33v89"; + url = "mirror://sourceforge/net-snmp/${name}.zip"; + sha256 = "1nj3b2x4fhsh82nra99128vqp2lfw5wx91ka8nqwzxvik59hb4dc"; }; preConfigure = @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-persistent-directory=/var/lib/net-snmp" ]; - buildInputs = [ autoreconfHook file openssl perl ]; + buildInputs = [ autoreconfHook file openssl perl unzip ]; enableParallelBuilding = true; From 431ff0f769d97ea27061e330bf877d7a06f732e4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 17:56:55 +0200 Subject: [PATCH 183/248] nginx: update from 1.4.6 to 1.4.7 --- pkgs/servers/http/nginx/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index f2bc07656364..757d4cb9566d 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,10 +5,10 @@ , moreheaders ? false}: let - version = "1.4.6"; + version = "1.4.7"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1ihjb3dqw4icc5pvgaqbp740cyr4m8zxjfvj3v3bkd88swamp2vs"; + sha256 = "09mnw4f1yk64f21xq4k65x4r76pmrszyzc4iixkr0w41fr5gzf13"; }; rtmp-ext = fetchgit { @@ -71,7 +71,8 @@ stdenv.mkDerivation rec { meta = { description = "A reverse proxy and lightweight webserver"; - maintainers = [ stdenv.lib.maintainers.raskin]; + homepage = http://nginx.org; + maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.all; inherit version; }; From 37f8bcc028c3b5b50e52866455f1e6fd6e8aa3df Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 19:18:15 +0200 Subject: [PATCH 184/248] kde4_prev.quasselDaemon: update from 0.9.2 to 0.10.0 --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 9066bfb6c4cf..57cfc928afb9 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -12,12 +12,12 @@ let in with stdenv; mkDerivation rec { - version = "0.9.2"; + version = "0.10.0"; name = "quassel${tag}-${version}"; src = fetchurl { url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; - sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh"; + sha256 = "08vwxkwnzlgnxn0wi6ga9fk8qgc6nklb236hsfnr5ad37bi8q8k8"; }; enableParallelBuilding = true; From 8cd858b100a1a24c7e17a66138482aa98e6826c6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Wed, 26 Mar 2014 19:20:11 +0200 Subject: [PATCH 185/248] ocamlPackages.mldonkey: update from 3.1.3 to 3.1.5 --- pkgs/applications/networking/p2p/mldonkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 2f739b056d4f..57ea62485310 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.3"; + name = "mldonkey-3.1.5"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1qnr0qzliw4aynf2zhmm5hmrc9bd5vhdq3bi8n88j4nc86gry9bw"; + sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; }; meta = { From 8af6b20856fe6523463b54154b072c4f4347df07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc> Date: Sat, 22 Feb 2014 23:42:11 +0100 Subject: [PATCH 186/248] idea: update 13.0.2 -> 13.1.1 And use buildnumbers only in the buildscript and use more familiar version numbers in the package name. [bjorn.forsman@gmail.com: modify commit message] --- pkgs/applications/editors/idea/default.nix | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 31812bcb9895..c6301bd8a302 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -5,10 +5,10 @@ let buildIdea = - { name, src, description, license }: + { name, version, build, src, description, license }: stdenv.mkDerivation rec { - inherit name src license; + inherit name build src license; ideaItem = makeDesktopItem { name = "IDEA"; exec = "idea"; @@ -23,26 +23,26 @@ let buildCommand = '' tar xvzf $src mkdir -p $out - cp -a $name $out + cp -a idea-$build $out interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) - 7z x $out/$name/lib/snappy-java-1.0.5.jar - rm $out/$name/lib/snappy-java-1.0.5.jar + 7z x $out/idea-$build/lib/snappy-java-1.0.5.jar + rm $out/idea-$build/lib/snappy-java-1.0.5.jar if [ "${stdenv.system}" == "x86_64-linux" ];then - patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64 + patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier64 patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so else - patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier + patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so fi - 7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar . + 7z a -tzip $out/idea-$build/lib/snappy-java-1.0.5.jar . mkdir -p $out/bin jdk=${jdk}/lib/openjdk - makeWrapper $out/$name/bin/idea.sh $out/bin/idea \ + makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \ --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \ --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \ --prefix JDK_HOME : $jdk \ @@ -64,23 +64,27 @@ let in { - idea_community_1302 = buildIdea { - name = "idea-IC-133.696"; + idea_community_1311 = buildIdea rec { + name = "idea-community-${version}"; + version = "13.1.1"; + build = "IC-135.480"; description = "IntelliJ IDEA 13 Community Edition"; license = stdenv.lib.licenses.asl20.shortName; src = fetchurl { - url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz; - sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53"; + url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; + sha256 = "9e28d3e5682b037c9d6190622ab2a47112fa792539083cc7a4cb24f3f7bf7d22"; }; }; - idea_ultimate_1302 = buildIdea { - name = "idea-IU-133.696"; + idea_ultimate_1311 = buildIdea rec { + name = "idea-ultimate-${version}"; + version = "13.1.1"; + build = "IU-135.480"; description = "IntelliJ IDEA 13 Ultimate Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz; - sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0"; + url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "d699abcdcace387105a465049e015c1367dedf42f7a5f5a1f7b3d840e98b2658"; }; }; From 7381035bc2489be3152868efbb53271c68834bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> Date: Wed, 26 Mar 2014 22:25:40 +0100 Subject: [PATCH 187/248] blender: update from 2.69 to 2.70 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 683c4242a9c1..2e9cf46bf864 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "blender-2.69"; + name = "blender-2.70"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9"; + sha256 = "0j73yfpavcrzg5v54kcha7sig6179g5ykrlhih8d288pnb5c7596"; }; buildInputs = [ From fc4542c99de712e882ef85e9e9d46a0b853d182b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> Date: Wed, 26 Mar 2014 22:26:43 +0100 Subject: [PATCH 188/248] qtractor: update from 0.5.12 to 0.6.0 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index e04ad9ddd14c..c70842c399ad 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.5.12"; + version = "0.6.0"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc"; + sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r"; }; buildInputs = From b60f8810b214d2b2b5a8257c446ce89419f964f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> Date: Wed, 26 Mar 2014 22:27:02 +0100 Subject: [PATCH 189/248] yoshimi: update from 1.1.0 to 1.2.0 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 698c8dc0ddad..df0b98cdd9e4 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv"; + sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx"; }; buildInputs = [ From 62793a007db2911cadebfc738d5415d7cc2cacbf Mon Sep 17 00:00:00 2001 From: Austin Seipp <aseipp@pobox.com> Date: Sun, 23 Mar 2014 23:32:00 -0500 Subject: [PATCH 190/248] fmod: adopt, and upgrade 4.22.04 -> 4.44.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This installs the headers in a fashion which matches Gentoo, and it also changes the version numbering scheme as well to match, so hopefully Nixpkgs Monitor can provide security tracking updates or anything (although technically Gentoo is outdated!) [Bjørn: add github pull-request cover letter to commit message; it contains useful info.] Signed-off-by: Austin Seipp <aseipp@pobox.com> --- pkgs/development/libraries/fmod/default.nix | 44 +++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index d85a24fa63ad..ba9bb286cdfa 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -1,28 +1,32 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "fmod-42204"; - src = if stdenv.system == "i686-linux" then - fetchurl { - url = http://www.fmod.org/index.php/release/version/fmodapi42204linux.tar.gz; - sha256 = "64eedc5b37c597eb925de446106d75cab0b5a79697d5ec048d34702812c08563"; - } else if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://www.fmod.org/index.php/release/version/fmodapi42204linux64.tar.gz; - sha256 = "3f2eec8265838a1005febe07c4971660e85010e4622911890642dc438746edf3"; - } else throw "unsupported platform ${stdenv.system} (only i686-linux and x86_64 linux supported yet)"; +assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); +let + bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; +in +stdenv.mkDerivation rec { + name = "fmod-${version}"; + version = "4.44.32"; - preInstall = '' - sed -e /ldconfig/d -i Makefile - sed -e s@/usr/local@$out@ -i Makefile - sed -e s@/include/fmodex@/include@ -i Makefile - mkdir -p $out/lib - mkdir -p $out/include + src = fetchurl { + url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44432linux.tar.gz"; + sha256 = "071m2snzz5vc5ca7dvsf6w31nrgk5k9xb6mp7yzqdj4bkjad2hyd"; + }; + + buildPhase = "true"; + installPhase = '' + mkdir -p $out/lib $out/include/fmodex + + cd api/inc && cp * $out/include/fmodex && cd ../lib + cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so + cp libfmodexL${bits}-${version}.so $out/lib/libfmodexL.so ''; meta = { - homepage = http://www.fmod.org/; description = "Programming library and toolkit for the creation and playback of interactive audio"; - license = "unfree"; + homepage = "http://www.fmod.org/"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } From de3b5b450076b3f881359646a32268baaa14ce5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Wed, 26 Mar 2014 23:02:15 +0100 Subject: [PATCH 191/248] Add simplescreenrecorder: an excellent screen recorder for linux --- .../video/simplescreenrecorder/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/video/simplescreenrecorder/default.nix diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix new file mode 100644 index 000000000000..3251127c7a19 --- /dev/null +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext +, libXfixes, mesa, pkgconfig, pulseaudio, qt4 +}: + +stdenv.mkDerivation rec { + name = "simplescreenrecorder-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; + sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls"; + }; + + buildInputs = [ + alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig + pulseaudio qt4 + ]; + + meta = with stdenv.lib; { + description = "A screen recorder for Linux"; + homepage = http://www.maartenbaert.be/simplescreenrecorder; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e912d63daf4..47515b4b575d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1897,6 +1897,8 @@ let silver-searcher = callPackage ../tools/text/silver-searcher { }; + simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + sleuthkit = callPackage ../tools/system/sleuthkit {}; slimrat = callPackage ../tools/networking/slimrat { From 1c73e6f9d8edd3d975db096d6ba1d203d56d10db Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Wed, 26 Mar 2014 21:20:48 +0100 Subject: [PATCH 192/248] linux: Update to 3.13.7 --- pkgs/os-specific/linux/kernel/linux-3.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix index 361106bf0654..c7658cc232e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.6"; + version = "3.13.7"; extraMeta.branch = "3.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "10j1rc63y0rcrnc2rx8jyczqg42gcbijd83qqd795qrrp5wnf7qw"; + sha256 = "0llyc343hzk8a2vhv63xja269jfqaavz613x98y71qfi05ald524"; }; features.iwlwifi = true; From 911f33227940aa7a5d446827af52c4887b7834fd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Wed, 26 Mar 2014 21:21:05 +0100 Subject: [PATCH 193/248] grsecurity: Update stable and test patches stable: 3.0-3.2.55-201403202347 -> 3.0-3.2.55-201403252026 test: 3.0-3.13.6-201403202349 -> 3.0-3.13.7-201403252047 --- pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a41290168fe0..492fe647a887 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -75,22 +75,22 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403202347.patch; - sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403252026.patch; + sha256 = "1jfy4cfzgfixyyq5436fzwhg9ch31ynq6d5sxzajqkvmprq5kbhn"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 features.apparmor = true; }; - grsecurity_3_0_3_13_6 = - { name = "grsecurity-3.0-3.13.6"; + grsecurity_3_0_3_13_7 = + { name = "grsecurity-3.0-3.13.7"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch; - sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.7-201403252047.patch; + sha256 = "0f3mhkf15fpgy28rkfkd0wnccvz2n7s21gppnksl5w9dlw8m7mib"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.7 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47515b4b575d..41646b7a25cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6812,7 +6812,7 @@ let })) (args: grsecurityOverrider args)); linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_6 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; From 897bbc3702b8c5451f49f7614f3e3e86542b897b Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Sun, 16 Mar 2014 20:38:40 +0100 Subject: [PATCH 194/248] grsecurity: Add myself as a maintainer --- pkgs/top-level/all-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41646b7a25cf..8817060b8502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6804,19 +6804,23 @@ let # Note: grsec is not enabled automatically, you need to specify which kernel # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options - linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { + linux_3_2_grsecurity = lowPrio (lib.addMetaAttrs { + maintainers = with lib.maintainers; [ wizeman ]; + } (lib.overrideDerivation (linux_3_2.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_55 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_2.modDirVersion}-grsec"; }; - })) (args: grsecurityOverrider args)); + })) (args: grsecurityOverrider args))); - linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: { + linux_3_13_grsecurity = lowPrio (lib.addMetaAttrs { + maintainers = with lib.maintainers; [ wizeman ]; + } (lib.overrideDerivation (linux_3_13.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_7 kernelPatches.grsec_path ]; argsOverride = { modDirVersion = "${linux_3_13.modDirVersion}-grsec"; }; - })) (args: grsecurityOverrider args)); + })) (args: grsecurityOverrider args))); linux_3_2_apparmor = lowPrio (linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; From fd827e643754af4469932ae33a601c0416c475d9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin <phreedom@yandex.ru> Date: Thu, 27 Mar 2014 03:01:45 +0200 Subject: [PATCH 195/248] springLobby: update from 0.182 to 0.186 --- pkgs/games/spring/springlobby.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 9d7b281935b9..b5c8ef0154c2 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.182"; + version = "0.186"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "121kvbbrcnp2yqzbnz3wai2m6mn7nrgqvb1d4ly0k98p3ar20m4v"; + sha256 = "0pj7v85gl76hxvfhcypxsayk8lnnhgjn2irawgx49p80wsivl64k"; }; buildInputs = [ From e16595f14963d61dc4876da45d18d79b319247b0 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Wed, 26 Mar 2014 22:46:05 -0400 Subject: [PATCH 196/248] Build all ghcs on hydra --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8817060b8502..c2cf120490b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2724,7 +2724,13 @@ let # NOTE (recurseIntoAttrs): After discussion, we originally decided to # enable it for all GHC versions. However, this is getting too much, # particularly in connection with Hydra builds for all these packages. - # So we enable it for selected versions only. + # So we enable it for selected versions only. We build all ghcs, though + + ghc = recurseIntoAttrs (lib.mapAttrs' (name: value: + lib.nameValuePair (builtins.substring (builtins.stringLength "packages_") (builtins.stringLength name) name) value.ghc + ) (lib.filterAttrs (name: value: + builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" + ) haskell)); # Current default version: 7.6.3. haskellPackages = haskellPackages_ghc763; From 558eac386985356e4a613a4e91f242656c6e7889 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 12:45:58 +0100 Subject: [PATCH 197/248] haskell-dataenc: jailbreak to fix build with GHC 7.8.1 --- pkgs/development/libraries/haskell/dataenc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 9c4de4a1b84d..6eda9ca3c439 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w"; isLibrary = true; isExecutable = true; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; From 284ea5859b13e40a319785f4dc616a6f1517e691 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 12:49:46 +0100 Subject: [PATCH 198/248] BNFC: fix build with GHC 7.8.1 --- pkgs/development/tools/haskell/BNFC/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index 3cb85b86acbd..ebe8d2c3e24c 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, fetchurl }: +{ cabal, mtl, fetchurl, alex, happy }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -7,8 +7,10 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + buildTools = [ alex happy ]; patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ]; patchFlags = "-p2"; + preConfigure = "runhaskell Setup.lhs clean"; meta = { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; From 5943227a263172388b95164f7329c58b505c6ae9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 25 Mar 2014 16:00:06 +0100 Subject: [PATCH 199/248] neoload: fix for the new jdk/jre location --- pkgs/development/tools/neoload/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 384e724dfad8..8b00d17ac7d1 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -13,9 +13,9 @@ if !licenseAccepted then throw '' else assert licenseAccepted; # the installer is very picky and demands 1.7.0.07 -let dotInstall4j = writeTextFile { name = "dot-install4j"; text = '' - JRE_VERSION ${jre} 1 7 0 7 - JRE_INFO ${jre} 94 +let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' + JRE_VERSION ${jre}${path} 1 7 0 7 + JRE_INFO ${jre}${path} 94 ''; }; responseVarfile = writeTextFile { name = "response.varfile"; text = '' @@ -48,7 +48,6 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/neoload - ln -s ${jre} $out/lib/neoload/jre # the installer wants to use its internal JRE # disable this. The extra spaces are needed because the installer carries @@ -56,7 +55,7 @@ in stdenv.mkDerivation rec { sed -e 's/^if \[ -f jre.tar.gz/if false /' $src > installer chmod a+x installer - cp ${dotInstall4j} .install4j + cp ${dotInstall4j ""} .install4j chmod u+w .install4j sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile @@ -66,7 +65,7 @@ in stdenv.mkDerivation rec { bash -ic './installer -q -varfile response.varfile' for i in $out/bin/*; do - wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \ + wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \ --run 'chmod u+w ~/.install4j' done @@ -75,7 +74,7 @@ in stdenv.mkDerivation rec { name=$(basename "$i") sed -e 's|/lib/neoload/bin|/bin|' "$i" > "$out/share/applications/$name" done - rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall + rm -r $out/lib/neoload/*.desktop $out/lib/neoload/uninstall ''; From e39b70dd79d3dc8caf8e32a1eaa3400b7184cd40 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Thu, 27 Mar 2014 12:13:26 +0100 Subject: [PATCH 200/248] go: Update to 1.2.1 --- pkgs/development/compilers/go/1.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 2abdc51e4c6a..4219e0d88731 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.2"; + name = "go-1.2.1"; src = fetchurl { - url = http://go.googlecode.com/files/go1.2.src.tar.gz; - sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5"; + url = http://go.googlecode.com/files/go1.2.1.src.tar.gz; + sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f"; }; buildInputs = [ bison glibc bash makeWrapper ]; From 342fc9c20769bbaa3a44c4941456ff47bc718225 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Thu, 27 Mar 2014 12:15:54 +0100 Subject: [PATCH 201/248] go: Add myself as maintainer to receive Hydra notifications --- pkgs/development/compilers/go/1.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 4219e0d88731..82b0c400fa66 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ]; platforms = stdenv.lib.platforms.linux; }; } From 3551e2ee06664d8eeff748b12da0867222e8da2f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:46:23 +0100 Subject: [PATCH 202/248] haskell-quickcheck-instances: re-generate with cabal2nix --- .../libraries/haskell/quickcheck-instances/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index d532a83015ca..00ea65388fd9 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ hashable QuickCheck text time unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/aslatter/qc-instances"; description = "Common quickcheck instances"; @@ -14,5 +15,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - jailbreak = true; }) From da7fe3fe8a1a50b7c2df16b16d327c6287db189c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:49:11 +0100 Subject: [PATCH 203/248] haskell-QuickCheck: update to version 2.7.3 --- .../haskell/QuickCheck/{2.7.1.nix => 2.7.3.nix} | 7 ++----- pkgs/top-level/haskell-packages.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) rename pkgs/development/libraries/haskell/QuickCheck/{2.7.1.nix => 2.7.3.nix} (71%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix similarity index 71% rename from pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix index 85829093c34f..b3acd535d8f5 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix @@ -2,13 +2,10 @@ cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.7.1"; - sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21"; + version = "2.7.3"; + sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh"; buildDepends = [ random tfRandom ]; testDepends = [ testFramework ]; - patchPhase = '' - sed -i -e 's|QuickCheck == .*,|QuickCheck,|' QuickCheck.cabal - ''; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0c176c8700f0..a94bf643d934 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1452,8 +1452,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; hspec = callPackage ../development/libraries/haskell/hspec { - QuickCheck = self.QuickCheck_2_7_1; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + QuickCheck = self.QuickCheck_2_7_3; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; }; }; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; @@ -1461,8 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { - QuickCheck = self.QuickCheck_2_7_1; - quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + QuickCheck = self.QuickCheck_2_7_3; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; }; }; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -2058,7 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.nix {}; + QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; @@ -2066,7 +2066,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances { - QuickCheck = self.QuickCheck_2_7_1; + QuickCheck = self.QuickCheck_2_7_3; }; quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; @@ -2391,7 +2391,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { - QuickCheck = self.QuickCheck_2_7_1; + QuickCheck = self.QuickCheck_2_7_3; }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; @@ -2934,7 +2934,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_3; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { - hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; }; + hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; }; }; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; From 7f9558896fcb23c56213b6daa7978d35bf41e0b0 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:10 +0100 Subject: [PATCH 204/248] haskell-tls: update to version 1.2.6 --- .../libraries/haskell/tls/{1.2.3.nix => 1.2.6.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/tls/{1.2.3.nix => 1.2.6.nix} (92%) diff --git a/pkgs/development/libraries/haskell/tls/1.2.3.nix b/pkgs/development/libraries/haskell/tls/1.2.6.nix similarity index 92% rename from pkgs/development/libraries/haskell/tls/1.2.3.nix rename to pkgs/development/libraries/haskell/tls/1.2.6.nix index 5906413796db..15019265f911 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.3.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.6.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.3"; - sha256 = "0vv81z5m223b90zzfp5dk376fh8yngyd8h9anrxjrqb4f3bycaxg"; + version = "1.2.6"; + sha256 = "16r60acz9q84dv91jms9qaqvc53r98761ap9ijj3pifizzxcyswi"; buildDepends = [ asn1Encoding asn1Types byteable cereal cipherAes cipherRc4 cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a94bf643d934..533b12b3d981 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2481,8 +2481,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {}; - tls = self.tls_1_2_3; + tls_1_2_6 = callPackage ../development/libraries/haskell/tls/1.2.6.nix {}; + tls = self.tls_1_2_6; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; From 27ebc33d6560b9fc2954abf62371468560552471 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:33 +0100 Subject: [PATCH 205/248] haskell-elm-server: update to version 0.11 --- pkgs/development/compilers/elm/elm-server.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index 760a6f072de1..fce6f4a26995 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -1,21 +1,20 @@ -{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP -, mtl, parsec, transformers +{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer +, unorderedContainers }: cabal.mkDerivation (self: { pname = "elm-server"; - version = "0.10.1"; - sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn"; + version = "0.11"; + sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2"; isLibrary = false; isExecutable = true; buildDepends = [ - blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec - transformers + cmdargs Elm filepath mtl snapCore snapServer unorderedContainers ]; jailbreak = true; meta = { homepage = "http://elm-lang.org"; - description = "The Elm language server"; + description = "Server for developing Elm projects"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 0f86e37b6cba1143862601e8650d817102fdb419 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:34 +0100 Subject: [PATCH 206/248] haskell-Elm: update to version 0.12 --- pkgs/development/compilers/elm/elm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 00c5e2907c69..5a9ba8f63792 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Elm"; - version = "0.11"; - sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s"; + version = "0.12"; + sha256 = "1gmhnpcfv49bdifvz70fif71947q482pd1dbs5c84m8sn7c5n3ss"; isLibrary = true; isExecutable = true; buildDepends = [ From 55697418082463b48c7d045db9ce796486066dbd Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:36 +0100 Subject: [PATCH 207/248] haskell-JuicyPixels: update to version 3.1.5 --- 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 5e12adc39a8f..95831927a308 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.4.1"; - sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324"; + version = "3.1.5"; + sha256 = "1dcqqmj7skx17mwaf0sayqdknnz9w6q2y8z3c8ixmbjyg4jh6a66"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From c72248808c152a894b9e1f99975aeede64d64515 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:37 +0100 Subject: [PATCH 208/248] haskell-adjunctions: update to version 4.0.3 --- pkgs/development/libraries/haskell/adjunctions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 69c7751270cf..d0804959ccb6 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "adjunctions"; - version = "4.0.2"; - sha256 = "0c9168jmnfpzv3025n05b80b9p7jzkdzs0hzymjmh1qvz3iximq5"; + version = "4.0.3"; + sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0"; buildDepends = [ comonad contravariant distributive free mtl semigroupoids semigroups tagged transformers void From dcc028ba74cc984bbbef2c3187f7d5bf81262b36 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:38 +0100 Subject: [PATCH 209/248] haskell-c2hs: update to version 0.16.6 --- pkgs/development/libraries/haskell/c2hs/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index 90fb53051e23..f63d9f1771b5 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -1,12 +1,17 @@ -{ cabal, filepath, languageC }: +{ cabal, filepath, HUnit, languageC, shelly, testFramework +, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.16.5"; - sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y"; + version = "0.16.6"; + sha256 = "1yf7mcslkf6m1nizifqva8j5sxnw87bg60dw8mfgpmqvrzpbxizm"; isLibrary = false; isExecutable = true; buildDepends = [ filepath languageC ]; + testDepends = [ + filepath HUnit shelly testFramework testFrameworkHunit text + ]; meta = { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; From 5b726ef6ba15d2c2797c178653db380db3910764 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:39 +0100 Subject: [PATCH 210/248] haskell-comonad: update to version 4.0.1 --- pkgs/development/libraries/haskell/comonad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 9457a2ad44dc..92c70b551561 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonad"; - version = "4.0"; - sha256 = "1f57wqxy1la59kippbj924prnj53a5hwc2ppg48n9xx2wfr63iha"; + version = "4.0.1"; + sha256 = "1ib3spgyjbdsnpbz4alaqb1m13v48l5dpv7s68c0mi2nyjkli7lx"; buildDepends = [ contravariant distributive mtl semigroups tagged transformers ]; From 426f03d9656b1f324e4445ddee8facd19d17e5e6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:40 +0100 Subject: [PATCH 211/248] haskell-conduit: update to version 1.0.17.1 --- 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 b2a3ec9804bf..8a73ef04d1d0 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.17"; - sha256 = "0skshic2glx0sfy75skj8b4iip62zha51pgnnx5hsswhx8j2whcw"; + version = "1.0.17.1"; + sha256 = "0s2cszwfmz7j249bdydh0d97r5br1p6nizw7ycbkxlmpcrmdvifk"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void From e3309447a989c0435f1edf5a9dd5582fbc05ef42 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:42 +0100 Subject: [PATCH 212/248] haskell-data-lens-template: update to version 2.1.8 --- .../libraries/haskell/data-lens-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index 7ba9e3f9da74..67bd753b3025 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-lens-template"; - version = "2.1.7"; - sha256 = "108xvk5glsw016vdvjb1p3a9zh7rgbkjv5xashs1hj25f8k4cw49"; + version = "2.1.8"; + sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q"; buildDepends = [ dataLens ]; meta = { homepage = "http://github.com/roconnor/data-lens-template/"; From 81f596a32bf16789fc12d5da8cb5e067950d5ed0 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:43 +0100 Subject: [PATCH 213/248] haskell-distributive: update to version 0.4.1 --- pkgs/development/libraries/haskell/distributive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 72510e26d36d..4a0167eb0308 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "distributive"; - version = "0.4"; - sha256 = "11zln3h7pflv1f6jfma5b505p4wnr9xrs711mhh3a8xi20n4r318"; + version = "0.4.1"; + sha256 = "0izsgasml3didklkk6z274fzfd1c6qnn0wlzprcz0bnd07zkh814"; buildDepends = [ tagged transformers transformersCompat ]; testDepends = [ doctest filepath ]; meta = { From 0a6e61033a832fa23fcaa8298fd8d748c082baa3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:44 +0100 Subject: [PATCH 214/248] haskell-dlist: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/dlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index f87e7e2d7589..bf63239dd812 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dlist"; - version = "0.7"; - sha256 = "1abbym3afm77xkgcrv3d9nl4wn69m7m3gxahdcvkg1ir1sm2pkyi"; + version = "0.7.0.1"; + sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l"; buildDepends = [ deepseq ]; testDepends = [ Cabal QuickCheck ]; meta = { From 76cf6b026a89aa48cc63c2d3b8cbfffe7d8b126c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:45 +0100 Subject: [PATCH 215/248] haskell-doctest: update to version 0.9.11 --- .../libraries/haskell/doctest/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 8ed11decf059..ad7bcfe62409 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,17 +1,17 @@ -{ cabal, deepseq, filepath, ghcPaths, hspec, HUnit, QuickCheck -, setenv, silently, stringbuilder, syb, transformers +{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit +, QuickCheck, setenv, silently, stringbuilder, syb, transformers }: cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.10.2"; - sha256 = "1vrhfbw59vfypylkr2ica2wx1vm62r40s4165syy76r8cyy0i554"; + version = "0.9.11"; + sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; testDepends = [ - deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently - stringbuilder syb transformers + baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv + silently stringbuilder syb transformers ]; doCheck = false; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; From 11dc7a8e2cdfda24ad2ffdf2ebcff27fa8f66e15 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:48 +0100 Subject: [PATCH 216/248] haskell-free: update to version 4.6.1 --- pkgs/development/libraries/haskell/free/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 7d8376da28e9..1c7c236ba64f 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.5"; - sha256 = "0hcdl02whmnyxd3mbfrncd978778irm5sx5f4z54zsigwlk822vx"; + version = "4.6.1"; + sha256 = "0xmnxp6x7b6pp2ap7jrjhz00cm30v334i9dcxc14d3r070h7l73w"; buildDepends = [ bifunctors comonad distributive mtl profunctors semigroupoids semigroups transformers From 45625d48a15acdd805aefc164c0fbb673b2a85ba Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:49 +0100 Subject: [PATCH 217/248] haskell-generic-deriving: update to version 1.6.3 --- .../libraries/haskell/generic-deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 5081d09939bf..9b1d911638ff 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.6.2"; - sha256 = "1ryzg7zgnlhx6mbmpsh4fgqf2d758c94qz2zpg3jxns30hd4sfy6"; + version = "1.6.3"; + sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; From a1060da3944cd25fe26e518b623fae6620b4cd71 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:50 +0100 Subject: [PATCH 218/248] haskell-ghcjs-dom: update to version 0.0.7 --- pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index d42c4c84bf1d..20fc85b95f18 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.6"; - sha256 = "0c27mf5cjvw5q4lwbmi245q4y09b61y5s6hxsfzgdn4lhfbvdma6"; + version = "0.0.7"; + sha256 = "1yg2c0slndg3y9bk95xkbgl8zp4lmcgw9wk3jkk1sdizn3y3yggq"; buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; From e61c57686bd0bf5676c16897d35407cf61b49599 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:51 +0100 Subject: [PATCH 219/248] haskell-hoogle: update to version 4.2.30 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 9f8c10f86fb2..53b037ec3014 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.29"; - sha256 = "0w4fgf0qvd5zsa7dk99vcbr2pnyyg1hl3k0zwvp5v26v1lfijzil"; + version = "4.2.30"; + sha256 = "0vw0chqsq8wmi1mpdxj1c9g4ah7lqxm8rwh85j2vyp56vfscw9q1"; isLibrary = true; isExecutable = true; buildDepends = [ From b1cbcea6d2fdcba5f0973265f64f4b95ad43e9d1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:52 +0100 Subject: [PATCH 220/248] haskell-hsimport: update to version 0.3 --- pkgs/development/libraries/haskell/hsimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index c114e5aae0fd..ca2808e5aba0 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.2.10"; - sha256 = "0xvsjgckh2jab9q7l8pvnnn5x977mb6hkhqb175m10brr13yzk4z"; + version = "0.3"; + sha256 = "124dimaa8v4x6vlh51v2r7569d8122l42q19bpzgqih33vw2djcs"; isLibrary = true; isExecutable = true; buildDepends = [ From 8282fb8327b9cd8cdce6b21c520d6b0328e0d51d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:54 +0100 Subject: [PATCH 221/248] haskell-hybrid-vectors: update to version 0.1.2 --- pkgs/development/libraries/haskell/hybrid-vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix index 56fd36fbe87d..0ad23b694373 100644 --- a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix +++ b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hybrid-vectors"; - version = "0.1"; - sha256 = "0a5ry6xmkr0zjz0kp7qbm7kdz5yr9842gy116902djppmdn5dq05"; + version = "0.1.2"; + sha256 = "1scx1xr9rqdpxc1kj5zgf8w1ld1mj68hxr3nl1p352wspvpgd3qf"; buildDepends = [ deepseq primitive vector ]; meta = { homepage = "http://github.com/ekmett/hybrid-vectors"; From db09633e7b0541d595c8103aeda1b64c3e0590a9 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:55 +0100 Subject: [PATCH 222/248] haskell-intervals: update to version 0.4.2 --- pkgs/development/libraries/haskell/intervals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index b48aa8884ad4..88a001afadd9 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "intervals"; - version = "0.4.1"; - sha256 = "09pgy400r47lsa9w5g5dxydshw7lv9i4yv65ld1arssx3n59wyvl"; + version = "0.4.2"; + sha256 = "08l7q22rlhyigls1qksf7lnb7g1yrkmdh9clq68xxaf6wzm26aaz"; buildDepends = [ distributive ]; testDepends = [ doctest filepath ]; meta = { From 1aa1cee4f4ea8f22ac0d7335cb5130065f0c560e Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:56 +0100 Subject: [PATCH 223/248] haskell-lens: update to version 4.1.2 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 427cf681d2e9..1c1fe9b7cd39 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.1"; - sha256 = "0fsl2cydmkj2k49z3cgv6hfgrlkmx7zsy0ikp4k5jn2kp3hs77dw"; + version = "4.1.2"; + sha256 = "0jpr78bn7bh5v11vw21hjwzmwpzl1zgyq9l3yk3k711vz6689dg2"; buildDepends = [ aeson bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors From 0f0755da8cf36e846760942a30989b0867e4ba1a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:57 +0100 Subject: [PATCH 224/248] haskell-semigroupoids: update to version 4.0.1 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index e0dbf4568049..c46bfa910b09 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "4.0"; - sha256 = "12h2b9pisy21xca3x9ilj0aix9clni0za35d2dmv55gb8y8df54l"; + version = "4.0.1"; + sha256 = "0w4r4nmyq94aq9xlyvrankipfwdmlcz2ghqicn9drqfjirhi8lrl"; buildDepends = [ comonad contravariant distributive semigroups transformers ]; From 94f0403692033753a92f214f8c81f3d1871b3c98 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:50:58 +0100 Subject: [PATCH 225/248] haskell-shakespeare-css: update to version 1.0.7.3 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 4a2305cce2a4..ae966a4501e7 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.7.1"; - sha256 = "1qw8hlldzdijp0vgikrbj83q4wmx6i1vswn4314dwjxcihljl8ls"; + version = "1.0.7.3"; + sha256 = "0f2l1i4h3h5xps74nx3gy1mbi96m12rzgidlh4ilxz6p7dx9wnbq"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From a566d81b4153f29f5f53f7868c68e0a393035e00 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:00 +0100 Subject: [PATCH 226/248] haskell-shelly: update to version 1.5.2 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 3ebc62932cf2..5a7171c46199 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.0.1"; - sha256 = "19mfxdwnzv01bxd0l5q2z4mbdp7r8p6z2bm083vjlxx7cc35wv7a"; + version = "1.5.2"; + sha256 = "1iyn3xxmqbrx6xfay364m2qgflscmz9crr051jpzg0b629b8wssa"; buildDepends = [ async mtl systemFileio systemFilepath text time unixCompat ]; From c8b03742d5b169cba1c0c95ff8ab0f7d3db486dd Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:01 +0100 Subject: [PATCH 227/248] haskell-stm-conduit: update to version 2.3.0 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 412dfa1fcd21..07d1fc03bf0d 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.2.2"; - sha256 = "0a6yi35iw0p18asr6l8370kndmvim097vklayads6gbk74gg67cy"; + version = "2.3.0"; + sha256 = "1qvzqzk822sc0sjblgqb5y73mggsvh70zpzz908isfiqcwp7llc4"; buildDepends = [ async cereal cerealConduit conduit liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans transformers From 4246511556b50101a483489db7c60bba8b495c2c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:02 +0100 Subject: [PATCH 228/248] haskell-wai-middleware-static: update to version 0.5.0.0 --- .../libraries/haskell/wai-middleware-static/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 005305d77092..8c0540ee1014 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.4.0.3"; - sha256 = "0nvzdj04g10bcay6x4y5l7gxx38gs3ns0izair8n1j1awrp8px07"; + version = "0.5.0.0"; + sha256 = "0mvsm1ff7i2v09gchkc60r8klin1lb0w690m2kwhf9q6y7fxphdf"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; - description = "WAI middleware that intercepts requests to static files"; + description = "WAI middleware that serves requests to static files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From d1fc054b02ad4d496804cf437abc28cb9f017ad3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:03 +0100 Subject: [PATCH 229/248] haskell-warp: update to version 2.1.3 --- pkgs/development/libraries/haskell/warp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d08f8d6e5450..abd301dcc789 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,22 +1,22 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive , conduit, doctest, hashable, hspec, HTTP, httpDate, httpTypes , HUnit, liftedBase, network, networkConduit, QuickCheck -, simpleSendfile, time, transformers, unixCompat, void, wai +, simpleSendfile, text, time, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.2"; - sha256 = "15630g8qzshn2620qsdki1nwr4bkapqz0k2bls0yxyblvw0fn9cf"; + version = "2.1.3"; + sha256 = "00861dimzvbbqx3pbpihfml8k2fkvsw8kda7mkkix59xqsjwc1nz"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile - transformers unixCompat void wai + text transformers unixCompat void wai ]; testDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest hashable hspec HTTP httpDate httpTypes HUnit liftedBase network - networkConduit QuickCheck simpleSendfile time transformers + networkConduit QuickCheck simpleSendfile text time transformers unixCompat void wai ]; doCheck = false; From bbcf7320154ba92dd03f589c0a4e144ebac0d7a9 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:04 +0100 Subject: [PATCH 230/248] haskell-wxc: update to version 0.90.1.1 --- pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 7a9f05c6b624..b816c3007f99 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,12 +2,14 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.1.0"; - sha256 = "1j318pxn6wqjwhz5rinb8az1bkhasgm9rhb3l36dlbzwcc4p0a2a"; + version = "0.90.1.1"; + sha256 = "0cvfphskvsq3lsl24h6jh8r6yw5jg8qa9wdc883yasfvmzmxwwgc"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; - preConfigure = "find . -type f -exec touch {} +"; + postInstall = '' + cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so + ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; From c53463dcee0c452730458efa87f00220cd76af1f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:06 +0100 Subject: [PATCH 231/248] haskell-wxcore: update to version 0.90.1.1 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 3ee5d9e2cdb7..ae01992db975 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,11 +4,10 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.1.0"; - sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c"; + version = "0.90.1.1"; + sha256 = "1ma6vjf87b493vz3sj6hxzifqixk62n6b5gvixpfzfig1lysddgp"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; From 29187bc16a8c0ed91e5fb92bbca9f9b3f9705483 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:07 +0100 Subject: [PATCH 232/248] haskell-wxdirect: update to version 0.90.1.1 --- pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 0f379401b35e..63bc82d6f67b 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.90.1.0"; - sha256 = "06r8z4css7md35rcbi805407dcabcrb1knif9f7445aphwzgadr0"; + version = "0.90.1.1"; + sha256 = "0ibhxl4n66w094jhca01z2vmibgz0nn7qddgxzqngvajzjvnha98"; isLibrary = true; isExecutable = true; buildDepends = [ filepath parsec strict time ]; - preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; From 0312c15071c33b25b99dd678ef6868ad87012979 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:08 +0100 Subject: [PATCH 233/248] haskell-zlib-bindings: update to version 0.1.1.4 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index f69be8ae99e2..231e3ac40f07 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.1.1.3"; - sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr"; + version = "0.1.1.4"; + sha256 = "02ln0gv9kkq68s3n195q2mpqimxb6k4wqs731b1gg8wrbbkaxb6w"; buildDepends = [ zlib ]; testDepends = [ hspec QuickCheck zlib ]; meta = { From b27ddc3d05a43b48546ba4a833aad4c7045e74f8 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:09 +0100 Subject: [PATCH 234/248] haskell-HaRe: update to version 0.7.2.0 --- pkgs/development/tools/haskell/HaRe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 883be6a8d411..11c36f320f2a 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.6"; - sha256 = "1nj70f7ki6wxvjm5ra83xr2yymfsakb5kg2q1dl54hvxsd0wqcw7"; + version = "0.7.2.0"; + sha256 = "0i769mryjr3v9vh4zkdycpha8skq9xcdln3plrxx55bf42c4aqi9"; isLibrary = true; isExecutable = true; buildDepends = [ From b692096f9dbcbe4ff8a09d229c14bfa77a3cb098 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:10 +0100 Subject: [PATCH 235/248] haskell-timeplot: update to version 1.0.24 --- pkgs/development/tools/haskell/timeplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index fc8c0e3f0526..84444522d195 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.23"; - sha256 = "0z87yzqv1bjclvyslzpclhrbfm4vcyz0q32jr4kbnfwjk3s8zyi2"; + version = "1.0.24"; + sha256 = "1k6xinnnc0723mbf0yvqn6qipjr3hcvy2qjv38sy7f5h0gp8lfhc"; isLibrary = false; isExecutable = true; buildDepends = [ From ae2cb475c99ed9fe4e6f8cb3d50c494a4876d613 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 09:51:12 +0100 Subject: [PATCH 236/248] haskell-cpphs: update to version 1.18.4 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 8d03d8ee4cb2..72a6571f3ccf 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.3"; - sha256 = "0m2083ynjfxad4ykvpm6c7q1clrm7nsvbwv10abhyzqkpazyzzxy"; + version = "1.18.4"; + sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51"; isLibrary = true; isExecutable = true; buildDepends = [ polyparse ]; From a46352aad1731bdcfacb750e5b9c492b7fbd601c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 11:01:53 +0100 Subject: [PATCH 237/248] haskell-bmp: use version 1.2.5.2 on all platforms --- .../development/libraries/haskell/bmp/1.2.2.1.nix | 15 --------------- .../haskell/bmp/{1.2.5.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/bmp/1.2.2.1.nix rename pkgs/development/libraries/haskell/bmp/{1.2.5.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix deleted file mode 100644 index e018ac7a8d28..000000000000 --- a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, binary }: - -cabal.mkDerivation (self: { - pname = "bmp"; - version = "1.2.2.1"; - sha256 = "0yxkkvpgavk9im9i9f6zpzc1n5nj2g4qsk4ck51aqz2fv6z1rhiy"; - buildDepends = [ binary ]; - meta = { - homepage = "http://code.ouroborus.net/bmp"; - description = "Read and write uncompressed BMP image files"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.5.2.nix b/pkgs/development/libraries/haskell/bmp/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/bmp/1.2.5.2.nix rename to pkgs/development/libraries/haskell/bmp/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 533b12b3d981..54cc982c0725 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -674,9 +674,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; - bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; - bmp_1_2_5_2 = callPackage ../development/libraries/haskell/bmp/1.2.5.2.nix {}; - bmp = self.bmp_1_2_2_1; # the latest version needs a very recent 'binary' library + bmp = callPackage ../development/libraries/haskell/bmp {}; Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 4a4439fd140bd2607a629a536acbd29ed2881a53 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 11:27:16 +0100 Subject: [PATCH 238/248] haskell-filestore: jailbreak to fix build with GHC 7.8.1 --- pkgs/development/libraries/haskell/filestore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 04321d34ffa1..d0056dd9c35a 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; testDepends = [ Diff filepath HUnit mtl time ]; - doCheck = false; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; From 088a652eb447be664adcc2d23e925b0e2d6163ec Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 26 Mar 2014 11:31:31 +0100 Subject: [PATCH 239/248] haskell-ghc-events: jailbreak to fix build with GHC 7.8.1 --- pkgs/development/libraries/haskell/ghc-events/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 5b7decf9416b..a13f56e4b53d 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary mtl ]; testDepends = [ binary mtl ]; + jailbreak = true; doCheck = false; meta = { description = "Library and tool for parsing .eventlog files from GHC"; From e5725d35c11eb06b1de5d35e8f3532f68d0c0376 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 27 Mar 2014 10:53:36 +0100 Subject: [PATCH 240/248] haskell-bmp: require a recent version of 'binary' --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 54cc982c0725..b8f4076c89a5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -674,7 +674,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; - bmp = callPackage ../development/libraries/haskell/bmp {}; + bmp = callPackage ../development/libraries/haskell/bmp { + binary = self.binary_0_7_1_0; + }; Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 93c973f45f3a7b1236d35b38d11744058fa29204 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 27 Mar 2014 10:58:06 +0100 Subject: [PATCH 241/248] haskell-temporary: jailbreak to fix build with recent versions of 'exceptions' --- pkgs/development/libraries/haskell/temporary/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 5bb668e86a87..cf5d76f8cd6c 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.2.0.1"; sha256 = "12z8qnqn1fg9ymaav5ds7gk067lmj0bv1lhhxcnvmvjcpk1l5b54"; buildDepends = [ exceptions filepath transformers ]; + jailbreak = true; meta = { homepage = "http://www.github.com/batterseapower/temporary"; description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; From 61efc76a635867d95099e4e1abf1f47e9e9001c4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 27 Mar 2014 11:54:36 +0100 Subject: [PATCH 242/248] haskell-c2hs: jailbreak to fix build with recent versions of 'shelly' Also, disable the test suite because of <https://github.com/haskell/c2hs/issues/67>. --- pkgs/development/libraries/haskell/c2hs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index f63d9f1771b5..9313deaf840d 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -12,6 +12,8 @@ cabal.mkDerivation (self: { testDepends = [ filepath HUnit shelly testFramework testFrameworkHunit text ]; + jailbreak = true; + doCheck = false; meta = { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; From 56adfd34fcf88cc0a903921dd983c453719c8084 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Thu, 27 Mar 2014 14:08:36 +0100 Subject: [PATCH 243/248] libvirt: Add support for macvtap and VEPA --- pkgs/development/libraries/libvirt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index d883f1da9caa..a8b20078cfef 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq +, dnsmasq, libnl }: let version = "1.2.2"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng + libcap_ng libnl ]; preConfigure = '' @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--with-init-script=redhat" - "--without-macvtap" + "--with-macvtap" + "--with-virtualport" ]; installFlags = [ From 3078cf3e75428984b3cf08a1a4db505d073e8d31 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Thu, 27 Mar 2014 14:27:12 +0100 Subject: [PATCH 244/248] libvirt: Add git repository to meta attributes --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a8b20078cfef..972d287e10ad 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libvirt.org/; + repositories.git = git://libvirt.org/libvirt.git; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) From a541350cb3c3bafb583b7f8ec018617da03623d4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" <rcorreia@wizy.org> Date: Thu, 27 Mar 2014 14:27:50 +0100 Subject: [PATCH 245/248] libvirt: Assume maintainership --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 972d287e10ad..587fbfe48d32 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { versions of Linux (and other OSes) ''; license = licenses.lgpl2Plus; + maintainers = with maintainers; [ wizeman ]; platforms = platforms.linux; }; } From b13a33550a344ec4a35e0494781d3b48156cc88c Mon Sep 17 00:00:00 2001 From: Georges Dubus <georges.dubus@compiletoi.net> Date: Thu, 27 Mar 2014 17:47:18 +0100 Subject: [PATCH 246/248] silver-searcher: update to 0.21.0 --- pkgs/tools/text/silver-searcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index d5d022c8063f..fa780b11f688 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: -let release = "0.19.2"; in +let release = "0.21.0"; in stdenv.mkDerivation { name = "silver-searcher-${release}"; src = fetchgit { url = "https://github.com/ggreer/the_silver_searcher.git"; rev = "refs/tags/${release}"; - sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff"; + sha256 = "bd49c6cadabeaf7bde130e5d2d0083367ae2d19cfedb40e45f5bb1ff9f4a3e51"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From abda7ec36f53f529975df63a9c53b5b4f9994a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Wed, 26 Mar 2014 21:26:04 +0100 Subject: [PATCH 247/248] liferea: maintenance update --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index c0892740dbdc..83eeb18d126d 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.7"; + version = "1.10.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "17kvg44brdz99firr5h5qx8icvadlr7p1cz3xr3437sf5rhj25wh"; + sha256 = "1d3icma90mj0nai20pfhxp4k4l33iwkkkcddb9vg5hi4yq4wpmwx"; }; buildInputs = with gst_all_1; [ From 9bde84a75d1ca5d60b1c21abab405206e0e5742c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Thu, 27 Mar 2014 21:32:54 +0100 Subject: [PATCH 248/248] fix evaluation since 34301c8 --- pkgs/applications/audio/ncmpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 05972bb28810..6db80f39e2cf 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ 1126 ]; + maintainers = with maintainers; [ _1126 ]; platforms = platforms.all; }; }