From 854b1fb9fb5f482da697bb4658b97949380ce64e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 5 May 2014 19:51:05 -0500 Subject: [PATCH 001/202] Build AgdaStdlib before installing it --- pkgs/development/compilers/agda/stdlib.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index d71713674f72..c07b3e7c7dd2 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -1,4 +1,4 @@ -{ cabal, fetchurl }: +{ cabal, fetchurl, filemanip, Agda }: cabal.mkDerivation (self: { pname = "Agda-stdlib"; @@ -9,11 +9,16 @@ cabal.mkDerivation (self: { sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3"; }; + buildDepends = [ filemanip Agda ]; + preConfigure = "cd ffi"; postInstall = '' mkdir -p $out/share - cp -pR ../src $out/share/agda + cd .. + runhaskell GenerateEverything + agda -i . -i src Everything.agda + cp -pR src $out/share/agda ''; meta = { From 7be94d3b5956cfd0b1ca36d932490c830b4c2f51 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 12 May 2014 16:48:51 -0500 Subject: [PATCH 002/202] Add an expression for build fullly local Hoogle docs --- .../haskell/hoogle/hoogle-local.diff | 28 +++++ .../libraries/haskell/hoogle/local.nix | 116 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 + 3 files changed, 147 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hoogle/hoogle-local.diff create mode 100644 pkgs/development/libraries/haskell/hoogle/local.nix diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff new file mode 100644 index 000000000000..df507c5a4705 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff @@ -0,0 +1,28 @@ +diff --git a/src/CmdLine/All.hs b/src/CmdLine/All.hs +index 94b1d48..f41f270 100644 +--- a/src/CmdLine/All.hs ++++ b/src/CmdLine/All.hs +@@ -86,8 +86,10 @@ guessLocal = do + ghc <- findExecutable "ghc" + home <- getHomeDirectory + lib <- getLibDir ++ path <- lookup "HOOGLE_DOC_PATH" <$> getEnvironment + let xs = [takeDirectory (takeDirectory lib) "doc" {- Windows, installed with Cabal -} ] ++ + [takeDirectory (takeDirectory ghc) "doc/html/libraries" | Just ghc <- [ghc] {- Windows, installed by GHC -} ] ++ ++ maybeToList path ++ + [home ".cabal/share/doc" {- Linux -} ] + filterM doesDirectoryExist xs + +diff --git a/src/Hoogle/Language/Haskell.hs b/src/Hoogle/Language/Haskell.hs +index b037f11..f2ac047 100644 +--- a/src/Hoogle/Language/Haskell.hs ++++ b/src/Hoogle/Language/Haskell.hs +@@ -112,7 +112,7 @@ setPriority pkg mod x = x{itemPriority = pri} + + setModuleURL (Just pkg) _ x | itemLevel x == 1 = x{itemURL=if null $ itemURL x then f $ itemName x else itemURL x} + where f xs = if "http://hackage.haskell.org/package/" `isPrefixOf` itemURL pkg +- then "http://hackage.haskell.org/packages/archive/" ++ itemName pkg ++ "/latest/doc/html/" ++ file ++ then "http://hackage.haskell.org/package/" ++ itemName pkg ++ "/docs/" ++ file + else takeDirectory (itemURL pkg) ++ "/" ++ file + where file = reps '.' '-' xs ++ ".html" + setModuleURL _ _ x = x diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix new file mode 100644 index 000000000000..20816d3b2f91 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -0,0 +1,116 @@ +# Install not only the Hoogle library and executable, but also a local Hoogle +# database which provides "Source" links to all specified 'packages' -- or the +# current Haskell Platform if no custom package set is provided. +# +# It is intended to be used in config.nix similarly to: +# +# { packageOverrides = pkgs: rec { +# +# haskellPackages = +# let callPackage = pkgs.lib.callPackageWith haskellPackages; +# in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override { +# extraPrefs = self: { +# hoogleLocal = pkgs.haskellPackages.hoogleLocal.override { +# packages = with pkgs.haskellPackages; [ +# mmorph +# monadControl +# ] +# }; +# }; +# }); +# }} +# +# This will build mmorph and monadControl, and have the hoogle installation +# refer to their documentation via symlink so they are not garbage collected. + +{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text +, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp + +, parallel, perl, wget, rehoo, haskellPlatform +, packages ? haskellPlatform.propagatedUserEnvPkgs +}: + +cabal.mkDerivation (self: rec { + pname = "hoogle"; + version = "4.2.32"; + sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; + isLibrary = true; + isExecutable = true; + buildInputs = [ self.ghc Cabal parallel perl wget rehoo ] + ++ self.extraBuildInputs ++ packages; + buildDepends = [ + aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + resourcet safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp parallel perl wget rehoo + ]; + testDepends = [ filepath ]; + testTarget = "--test-option=--no-net"; + + # The tests will fail because of the added documentation. + doCheck = false; + patches = [ ./hoogle-local.diff ]; + + docPackages = packages; + + postInstall = '' + if [ -z "$docPackages" ]; then + echo "ERROR: The packages attribute has not been set" + exit 1 + fi + + ensureDir $out/share/hoogle/doc + export HOOGLE_DOC_PATH=$out/share/hoogle/doc + + cd $out/share/hoogle + + function import_dbs() { + find $1 -name '*.txt' \ + | parallel -j$NIX_BUILD_CORES 'cp -p {} .; perl -i -pe "print \"\@url file://{//}/index.html\n\" if /^\@version/;" {/}; $out/bin/hoogle convert {/}' + } + + for i in $docPackages; do + import_dbs $i/share/doc + ln -sf $i/share/doc/* $out/share/hoogle/doc + done + + import_dbs ${self.ghc}/share/doc/ghc*/html/libraries + ln -sf ${self.ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc + + unset http_proxy + unset ftp_proxy + + chmod 644 *.hoo *.txt + $out/bin/hoogle data -d $PWD --redownload -l $(echo *.txt | sed 's/\.txt//g') + PATH=$out/bin:$PATH ${rehoo}/bin/rehoo -j4 -c64 . + + rm -fr downloads *.txt *.dep + mv default.hoo x || exit 0 + rm -f *.hoo + mv x default.hoo || exit 1 + + if [ ! -f default.hoo ]; then + echo "Unable to build the default Hoogle database" + exit 1 + fi + + mv $out/bin/hoogle $out/bin/.hoogle-wrapped + cat - > $out/bin/hoogle < Date: Mon, 12 May 2014 16:53:11 -0500 Subject: [PATCH 003/202] Get glib, gtk+, harfbuzz and pango working on Darwin --- pkgs/development/libraries/glib/default.nix | 4 +++- pkgs/development/libraries/gtk+/2.x.nix | 11 +++++++---- pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 033a1def3ce7..b1dd66584f4a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; + propagatedBuildInputs = [ pcre zlib libffi ] + ++ optional (!stdenv.isDarwin) libiconvOrEmpty + ++ libintlOrEmpty; configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 92c6debaa661..c57179364a7c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -23,14 +23,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xlibs; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] - ++ optionals stdenv.isLinux - [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optional stdenv.isDarwin x11 + ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ + libXrandr libXrender libXcomposite libXi libXcursor + ] + ++ optionals stdenv.isDarwin [ x11 libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; + configureFlags = if stdenv.isDarwin + then "--disable-glibtest --disable-introspection --disable-visibility" + else "--with-xinput=yes"; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3d..9cdd2a275bff 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? true # it is small and major distros do include it +, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 2dc71bb2d11b..1c62a64d006d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # jww (2014-05-05): The tests currently fail on Darwin: + # + # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) + # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst + # FAIL: testiter + doCheck = !stdenv.isDarwin; postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fa278924b6a..33c3664686f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10762,7 +10762,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; withGraphite2 = !stdenv.isDarwin; }; }; From bcc36ee23ed5ea448b0efd18d5c872562c78d227 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 21 May 2014 15:37:34 +1000 Subject: [PATCH 004/202] mpd: fix build on darwin --- pkgs/development/compilers/nasm/default.nix | 2 +- pkgs/development/compilers/yasm/default.nix | 2 +- pkgs/development/libraries/ffmpeg/2.x.nix | 13 +++++++------ pkgs/servers/mpd/clientlib.nix | 2 +- pkgs/servers/mpd/default.nix | 1 + pkgs/top-level/all-packages.nix | 7 +------ 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 76359de65753..8098b9d278f4 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 9a803a6d5106..ec1fda10d8c3 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; license = "BSD"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 0e94b78c0372..847d561fbe4b 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--enable-avresample" "--enable-runtime-cpudetect" ] - ++ stdenv.lib.optional subtitleSupport "--enable-libass" + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" ++ stdenv.lib.optional speexSupport "--enable-libspeex" ++ stdenv.lib.optional theoraSupport "--enable-libtheora" @@ -55,13 +55,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay" + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] - ++ stdenv.lib.optional subtitleSupport libass + buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora @@ -75,10 +74,12 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL + ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls; + ++ stdenv.lib.optional gnutlsSupport gnutls + ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; enableParallelBuilding = true; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index cd65234855f3..40b4ff1f2d72 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = "GPLv2"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7a2f3538fb8c..792aa49f447f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -80,6 +80,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag stdenv.isDarwin "osx") "--enable-debugging" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..b13d0c47d69c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6606,12 +6606,7 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mpd = callPackage ../servers/mpd { - # resolve the "stray '@' in program" errors - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + mpd = callPackage ../servers/mpd { }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; From 35925d7a768a951809a6bb4aa0004f3fcb0139ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 11:04:45 +0200 Subject: [PATCH 005/202] Fix installer test The installer now asks the user to set a root password if stdin is a tty, which doesn't work for an interactive test. http://hydra.nixos.org/build/11130072 --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 9149b1bff02f..bc3a757ad54e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -161,10 +161,10 @@ let "/mnt/etc/nixos/configuration.nix"); # Perform the installation. - $machine->succeed("nixos-install >&2"); + $machine->succeed("nixos-install < /dev/null >&2"); # Do it again to make sure it's idempotent. - $machine->succeed("nixos-install >&2"); + $machine->succeed("nixos-install < /dev/null >&2"); $machine->succeed("umount /mnt/boot || true"); $machine->succeed("umount /mnt"); From e135e6b35b4ac75cfee7c561b2ea864967568f81 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 11:20:33 +0200 Subject: [PATCH 006/202] nixos-install: Copy /etc/hosts http://hydra.nixos.org/build/11130069 --- nixos/modules/installer/tools/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 3311e4c8e9aa..ec48394435da 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -80,7 +80,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/run mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers rm -rf $mountPoint/var/run ln -s /run $mountPoint/var/run -cp -f /etc/resolv.conf $mountPoint/etc/resolv.conf +cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/ if [ -n "$runChroot" ]; then From 48768f3129f0c10153a85d57c1a02869ed22d9fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 12:04:08 +0200 Subject: [PATCH 007/202] NixOS ISO: Set empty root password --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index a120a01041bd..eb7c4026857b 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -39,6 +39,9 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Get a console as soon as the initrd loads fbcon on EFI boot + # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; + + # Allow the user to log in as root without a password. + security.initialRootPassword = ""; } From 265351051eca39dff4dabcb58548c1ec32b5c1f4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 10:54:49 +0200 Subject: [PATCH 008/202] Override networkmanager GUI packages with gnome 3.12 scope --- pkgs/desktops/gnome-3/3.12/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 7fbbd9413278..1deb9dccb516 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -134,6 +134,16 @@ rec { nautilus = callPackage ./core/nautilus { }; + networkmanager_openvpn = pkgs.networkmanager_openvpn.override { inherit gnome3; }; + + networkmanager_pptp = pkgs.networkmanager_pptp.override { inherit gnome3; }; + + networkmanager_vpnc = pkgs.networkmanager_vpnc.override { inherit gnome3; }; + + networkmanager_openconnect = pkgs.networkmanager_openconnect.override { inherit gnome3; }; + + networkmanagerapplet = pkgs.networkmanagerapplet.override { inherit gnome3; }; + rest = callPackage ./core/rest { }; sushi = callPackage ./core/sushi { }; From 7da235a9885b60539413a00d483037eec71f1ae4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 10:55:10 +0200 Subject: [PATCH 009/202] evolution-data-server: use the right gnome3 package set in the service --- .../services/desktops/gnome3/evolution-data-server.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index a49b5b477689..a8f8da0eed56 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -4,6 +4,9 @@ with lib; +let + gnome3 = config.environment.gnome3.packageSet; +in { ###### interface @@ -30,9 +33,9 @@ with lib; config = mkIf config.services.gnome3.evolution-data-server.enable { - environment.systemPackages = [ pkgs.evolution_data_server ]; + environment.systemPackages = [ gnome3.evolution_data_server ]; - services.dbus.packages = [ pkgs.evolution_data_server ]; + services.dbus.packages = [ gnome3.evolution_data_server ]; }; From 90eb94d7e87973e2726aef1c272b679bb4e80cc2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 10:58:18 +0200 Subject: [PATCH 010/202] Override gvfs with gnome 3.12 scope --- pkgs/desktops/gnome-3/3.12/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 1deb9dccb516..49bf62160fac 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -112,7 +112,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; }; + gvfs = pkgs.gvfs.override { gnome = gnome3; }; eog = callPackage ./core/eog { }; From e49509a4b14eb5ae64bdf136cd55bedb23246d5b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 11:00:00 +0200 Subject: [PATCH 011/202] glib-networking: 2.38.2 -> 2.40.1 --- pkgs/development/libraries/glib-networking/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 618b37bae4c5..6b715028e8ac 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,15 +2,15 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.38"; - ver_min = "2"; + ver_maj = "2.40"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8"; + sha256 = "9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28"; }; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; From 6e13cc82df0df507ba60c74ae28c4f8e91c25bc6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 11:01:14 +0200 Subject: [PATCH 012/202] Override glib_networking with gnome 3.12 scope --- .../services/x11/desktop-managers/gnome3.nix | 6 ++--- pkgs/desktops/gnome-3/3.12/default.nix | 26 +++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 4398a97ff47d..78ab7aee92bb 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -101,11 +101,11 @@ in { }; environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" - "${pkgs.glib_networking}/lib/gio/modules" ]; + "${gnome3.glib_networking}/lib/gio/modules" ]; environment.systemPackages = [ pkgs.desktop_file_utils - pkgs.glib_networking - pkgs.gtk3 # for gtk-update-icon-cache + gnome3.glib_networking + gnome3.gtk3 # for gtk-update-icon-cache pkgs.ibus pkgs.shared_mime_info # for update-mime-database gnome3.dconf diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 49bf62160fac..0600b4ebbf91 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -44,6 +44,10 @@ rec { gjs = callPackage ./core/gjs { }; + glib_networking = pkgs.glib_networking.override { + inherit gsettings_desktop_schemas; + }; + gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-contacts = callPackage ./core/gnome-contacts { }; @@ -134,15 +138,27 @@ rec { nautilus = callPackage ./core/nautilus { }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { inherit gnome3; }; + networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + inherit gnome3; + }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { inherit gnome3; }; + networkmanager_pptp = pkgs.networkmanager_pptp.override { + inherit gnome3; + }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { inherit gnome3; }; + networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + inherit gnome3; + }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { inherit gnome3; }; + networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + inherit gnome3; + }; - networkmanagerapplet = pkgs.networkmanagerapplet.override { inherit gnome3; }; + networkmanagerapplet = pkgs.networkmanagerapplet.override { + inherit gnome3 gsettings_desktop_schemas glib_networking + networkmanager_openvpn networkmanager_pptp networkmanager_vpnc + networkmanager_openconnect; + }; rest = callPackage ./core/rest { }; From 09ab3bb6f78d59c1c5daa142bbe56bb46e7ed428 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 12:43:24 +0200 Subject: [PATCH 013/202] gnome-photos 3.12: fix wrapping binaries --- .../gnome-3/3.12/apps/gnome-photos/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index 17ed92da8707..cc92cdd3014b 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -27,10 +27,14 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' - wrapProgram "$out/bin/gnome-photos" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication" + + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done rm $out/share/icons/hicolor/icon-theme.cache ''; From 7d0d2e3166c9d45cfa6693cbb1a1e211dfef0e46 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 12:47:49 +0200 Subject: [PATCH 014/202] gnome-documents 3.12: fix wrapping binaries --- .../gnome-3/3.12/apps/gnome-documents/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index 8e47382954a5..5c2206641e55 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -35,12 +35,15 @@ stdenv.mkDerivation rec { in '' substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - wrapProgram "$out/bin/gnome-documents" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libPath}" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" + + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${libPath}" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" + done rm $out/share/icons/hicolor/icon-theme.cache ''; From cecd439827c80fbc2469e0d75adce88f67671251 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 12:59:59 +0200 Subject: [PATCH 015/202] epiphany 3.12: fix wrapping binaries --- pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix index e7c94d8003f7..d159965c5443 100644 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - wrapProgram "$out/bin/epiphany" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done ''; patches = [ ./libxml_missing_dep.patch ]; From 7a1e2d5a397a9f5fb21c3dddf168a8fe052141c8 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 13:39:55 +0200 Subject: [PATCH 016/202] evolution 3.12: fix wrapping binaries --- pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix index 982256b15d87..f9fbbbe56c62 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix @@ -33,9 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - wrapProgram "$out/bin/evolution" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + done ''; meta = with stdenv.lib; { From 93a7cf74b938598447343c49d80392c2ca607cba Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 21 May 2014 14:58:37 +0200 Subject: [PATCH 017/202] typescript: add package. Closes #2712 Typed superset of JavaScript that compiles to plain JavaScript. http://www.typescriptlang.org/ --- lib/maintainers.nix | 1 + pkgs/development/web/typescript/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/web/typescript/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 80d0bed23dce..fc94de6d0866 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; + joamaki = "Jussi Maki "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; diff --git a/pkgs/development/web/typescript/default.nix b/pkgs/development/web/typescript/default.nix new file mode 100644 index 000000000000..07b75e1350ea --- /dev/null +++ b/pkgs/development/web/typescript/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, nodejs }: + +stdenv.mkDerivation rec { + version = "0.9.1-1"; + name = "typescript-${version}"; + + src = fetchurl { + url = "http://registry.npmjs.org/typescript/-/${name}.tgz"; + sha256 = "0fgfp58hki0g1255lvv17pdk77m1bf7dbwzb0vdb91mhp2masc6q"; + }; + + propagatedBuildInputs = [ nodejs ]; + + installPhase = '' + mkdir -p $out + cp -r * $out + chmod a+x $out/bin/tsc + ''; + + meta = with stdenv.lib; { + description = "TypeScript is a language for application scale JavaScript development"; + longDescription = '' + TypeScript is a language for application scale JavaScript development''; + homepage = http://nodejs.org; + license = licenses.asl20; + maintainers = [ maintainers.joamaki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..d0e0b341e990 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2141,6 +2141,8 @@ let txt2man = callPackage ../tools/misc/txt2man { }; + typescript = callPackage ../development/web/typescript { }; + ucl = callPackage ../development/libraries/ucl { }; udftools = callPackage ../tools/filesystems/udftools {}; From 1e2291f23ae2f51615353610db0482f464a7a77e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 12:44:00 +0200 Subject: [PATCH 018/202] nixos-install: Fix running it after again the activation script --- nixos/modules/installer/tools/nixos-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index ec48394435da..9d62ba131dc7 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -80,6 +80,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/run mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers rm -rf $mountPoint/var/run ln -s /run $mountPoint/var/run +rm -f $mountPoint/etc/{resolv.conf,hosts} cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/ From f43d9f01648fb2362a85b348fdeb96b772cf71b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 12:46:39 +0200 Subject: [PATCH 019/202] mkpasswd: Add to channel --- pkgs/tools/security/mkpasswd/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 1df8c1a62d2b..8975ca4324d1 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub }: - + stdenv.mkDerivation rec { name = "mkpasswd-${version}"; @@ -22,10 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://packages.qa.debian.org/w/whois.html; - description = '' - Overfeatured front end to crypt, from the Debian whois package - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan ]; + description = "Overfeatured front-end to crypt, from the Debian whois package"; + license = licenses.gpl2; + maintainers = [ maintainers.cstrahan ]; + platforms = platforms.linux; }; } From d4ccfe3f6b2e6368373bfb81bb3154869271c895 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 14:01:56 +0200 Subject: [PATCH 020/202] Don't create /media It's obsolete - udisks2 uses /run/media/. --- nixos/modules/system/activation/activation-script.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index fe5935c2ffad..b1bad956b4bb 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -127,11 +127,6 @@ in mkdir -m 0555 -p /var/empty ''; - system.activationScripts.media = - '' - mkdir -m 0755 -p /media - ''; - system.activationScripts.usrbinenv = '' mkdir -m 0755 -p /usr/bin From 48601269a94456ae61b187ab48e5ba2d98d2ea0b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 14:05:43 +0200 Subject: [PATCH 021/202] test-driver: Set context to include machines created by createMachine --- nixos/lib/test-driver/test-driver.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index 358c29e515f2..8ad0d67f68c3 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -52,12 +52,12 @@ sub createMachine { my ($args) = @_; my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"}); $vms{$vm->name} = $vm; + $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; return $vm; } foreach my $vmScript (@ARGV) { my $vm = createMachine({startCommand => $vmScript}); - $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; } From 5e364503d5b219e81c54e3616e3bf8e61a2cf1c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 14:06:31 +0200 Subject: [PATCH 022/202] NixOS ISO: Don't use a unionfs for / We don't need a unionfs on /, we only need a tmpfs. --- nixos/modules/installer/cd-dvd/iso-image.nix | 56 ++++++++++---------- nixos/modules/system/boot/stage-1.nix | 3 ++ 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 00f5fae84342..28c42d64f6fb 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -67,7 +67,7 @@ let ${config.boot.kernelPackages.kernel}/bzImage ::boot/bzImage mcopy -v -i "$out" \ ${config.system.build.initialRamdisk}/initrd ::boot/initrd - ''; + ''; # */ targetArch = if pkgs.stdenv.isi686 then "ia32" @@ -177,39 +177,45 @@ in # recognise that. boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ]; - # Note that /dev/root is a symlink to the actual root device - # specified on the kernel command line, created in the stage 1 init - # script. - fileSystems."/".device = "/dev/root"; + fileSystems."/" = + { fsType = "tmpfs"; + device = "none"; + options = "mode=0755"; + }; - fileSystems."/nix/store" = + # Note that /dev/root is a symlink to the actual root device + # specified on the kernel command line, created in the stage 1 + # init script. + fileSystems."/iso" = + { device = "/dev/root"; + neededForBoot = true; + noCheck = true; + }; + + fileSystems."/nix/.ro-store" = { fsType = "squashfs"; - device = "/nix-store.squashfs"; + device = "/iso/nix-store.squashfs"; options = "loop"; + neededForBoot = true; + }; + + fileSystems."/nix/.rw-store" = + { fsType = "tmpfs"; + device = "none"; + options = "mode=0755"; + neededForBoot = true; }; boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; - # In stage 1, mount a tmpfs on top of / (the ISO image) and - # /nix/store (the squashfs image) to make this a live CD. + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. boot.initrd.postMountCommands = '' - mkdir -p /unionfs-chroot/ro-root - mount --rbind $targetRoot /unionfs-chroot/ro-root - - mkdir /unionfs-chroot/rw-root - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root - mkdir /mnt-root-union - unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union - oldTargetRoot=$targetRoot - targetRoot=/mnt-root-union - - mkdir /unionfs-chroot/rw-store - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store - mkdir -p $oldTargetRoot/nix/store - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store + mkdir -p $targetRoot/nix/store + unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store ''; # Closures to be copied to the Nix store on the CD, namely the init @@ -253,10 +259,6 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { # Quick hack: need a mount point for the store. - source = pkgs.runCommand "empty" {} "mkdir -p $out"; - target = "/nix/store"; - } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index c38d33c45d6e..b6249b6c0915 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -344,5 +344,8 @@ in (isYes "BLK_DEV_INITRD") ]; + # Prevent systemd from waiting for the /dev/root symlink. + systemd.units."dev-root.device".text = ""; + }; } From c54eb790633c85bc22c4328e0f035cfa0be06780 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 15:19:01 +0200 Subject: [PATCH 023/202] Don't kill unionfs-fuse during shutdown Killing the daemon backing /nix/store prevents a clean shutdown. See http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ --- nixos/modules/system/boot/stage-1-init.sh | 5 +++-- pkgs/tools/filesystems/unionfs-fuse/default.nix | 8 ++++++++ .../unionfs-fuse/prevent-kill-on-shutdown.patch | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index c4a21b02cac3..15586e68e7e5 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -58,6 +58,7 @@ echo mkdir -p /etc touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs +touch /etc/initrd-release mkdir -p /proc mount -t proc none /proc mkdir -p /sys @@ -345,8 +346,8 @@ exec 3>&- udevadm control --exit || true # Kill any remaining processes, just to be sure we're not taking any -# with us into stage 2. unionfs-fuse mounts require the unionfs process. -pkill -9 -v '(1|unionfs)' +# with us into stage 2. But keep storage daemons like unionfs-fuse. +pkill -9 -v -f '@' if test -n "$debug1mounts"; then fail; fi diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 4da1a84e937a..bff5aaf242ba 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d"; }; + patches = + [ # Prevent the unionfs daemon from being killed during + # shutdown. See + # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # for details. + ./prevent-kill-on-shutdown.patch + ]; + buildInputs = [ cmake fuse ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch new file mode 100644 index 000000000000..0a98b83282b6 --- /dev/null +++ b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' unionfs-fuse-0.26-orig/src/unionfs.c unionfs-fuse-0.26/src/unionfs.c +--- unionfs-fuse-0.26-orig/src/unionfs.c 2012-09-11 00:06:32.000000000 +0200 ++++ unionfs-fuse-0.26/src/unionfs.c 2014-05-21 14:22:03.597861805 +0200 +@@ -831,6 +831,10 @@ + } + #endif + ++ /* Prevent systemd's shutdown from killing us. */ ++ if (access("/etc/initrd-release", F_OK) >= 0) ++ argv[0][0] = '@'; ++ + umask(0); + int res = fuse_main(args.argc, args.argv, &unionfs_oper, NULL); + RETURN(uopt.doexit ? uopt.retval : res); From ca123bc274b23c5bc6de2578c137760d2bb26c5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 15:20:37 +0200 Subject: [PATCH 024/202] Installer test: Get rid of a warning --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index bc3a757ad54e..60d5166821fc 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -173,7 +173,7 @@ let $machine->shutdown; # Now see if we can boot the installation. - my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); @@ -205,7 +205,7 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". - my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); $machine->waitForUnit("network.target"); $machine->shutdown; ''; From 784503864bb1961f523f24fa6d6d745de6b01b0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 15:40:48 +0200 Subject: [PATCH 025/202] Enable the xf86-video-modesetting driver --- nixos/modules/services/x11/xserver.nix | 2 +- pkgs/top-level/release.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index dc3aa9d15ccf..5f3e8003b45b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -169,7 +169,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "ati" "cirrus" "intel" "vesa" "vmware" ]; + default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; example = [ "vesa" ]; description = '' The names of the video drivers the configuration diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fd990ebf17eb..ce01b257741f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -422,6 +422,7 @@ let xf86videonv = linux; xf86videovesa = linux; xf86videovmware = linux; + xf86videomodesetting = linux; xfs = linux; xinput = linux; xkbcomp = linux; From f23231f198f3122ab52982bcd4fbf0e225b24664 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 15:42:02 +0200 Subject: [PATCH 026/202] Installer test: Don't wait for dhcpcd if we don't have a network --- nixos/tests/installer.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 60d5166821fc..1c3fb148410c 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -129,9 +129,10 @@ let #$machine->waitForUnit('getty@tty2'); $machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); - $machine->waitForUnit("dhcpcd"); ${optionalString testChannel '' + $machine->waitForUnit("dhcpcd"); + # Allow the machine to talk to the fake nixos.org. $machine->succeed( "rm /etc/hosts", From 0f51ae90b93e8b5555e9077aa5e473ac6fa227f8 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 15:57:34 +0200 Subject: [PATCH 027/202] Revert "typescript: add package. Closes #2712" This reverts commit 93a7cf74b938598447343c49d80392c2ca607cba. --- lib/maintainers.nix | 1 - pkgs/development/web/typescript/default.nix | 28 --------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 pkgs/development/web/typescript/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fc94de6d0866..80d0bed23dce 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,7 +43,6 @@ iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; - joamaki = "Jussi Maki "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; diff --git a/pkgs/development/web/typescript/default.nix b/pkgs/development/web/typescript/default.nix deleted file mode 100644 index 07b75e1350ea..000000000000 --- a/pkgs/development/web/typescript/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, nodejs }: - -stdenv.mkDerivation rec { - version = "0.9.1-1"; - name = "typescript-${version}"; - - src = fetchurl { - url = "http://registry.npmjs.org/typescript/-/${name}.tgz"; - sha256 = "0fgfp58hki0g1255lvv17pdk77m1bf7dbwzb0vdb91mhp2masc6q"; - }; - - propagatedBuildInputs = [ nodejs ]; - - installPhase = '' - mkdir -p $out - cp -r * $out - chmod a+x $out/bin/tsc - ''; - - meta = with stdenv.lib; { - description = "TypeScript is a language for application scale JavaScript development"; - longDescription = '' - TypeScript is a language for application scale JavaScript development''; - homepage = http://nodejs.org; - license = licenses.asl20; - maintainers = [ maintainers.joamaki ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0e0b341e990..70cab717c169 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2141,8 +2141,6 @@ let txt2man = callPackage ../tools/misc/txt2man { }; - typescript = callPackage ../development/web/typescript { }; - ucl = callPackage ../development/libraries/ucl { }; udftools = callPackage ../tools/filesystems/udftools {}; From 8882c77d4b51a76751f4a652f9829526e1c7f9c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 14:54:01 +0200 Subject: [PATCH 028/202] haskell-vector: update to version 0.10.9.2 --- .../libraries/haskell/vector/{0.10.9.1.nix => 0.10.9.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vector/{0.10.9.1.nix => 0.10.9.2.nix} (81%) diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.1.nix b/pkgs/development/libraries/haskell/vector/0.10.9.2.nix similarity index 81% rename from pkgs/development/libraries/haskell/vector/0.10.9.1.nix rename to pkgs/development/libraries/haskell/vector/0.10.9.2.nix index 975d75526a60..57c924aff487 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.10.9.1"; - sha256 = "1rdx0r7bwx6217ip9mg9yfymvgv52szqv63y89p41b8sfklmcmi0"; + version = "0.10.9.2"; + sha256 = "046w4w5dr5136smfxzhzkhzcx6jgpnqrc2x5lzy4vrlxhb8za6c1"; buildDepends = [ deepseq primitive ]; meta = { homepage = "https://github.com/haskell/vector"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 205961701eda..d0479588134e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2299,8 +2299,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector_0_10_9_1 = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {}; - vector = self.vector_0_10_9_1; + vector_0_10_9_2 = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {}; + vector = self.vector_0_10_9_2; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From b1b24494f2f4e6e2addcfbffa37e81ad752a0008 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 14:56:44 +0200 Subject: [PATCH 029/202] haskell-binary: update to version 0.7.2.1 --- .../haskell/binary/{0.7.2.0.nix => 0.7.2.1.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 12 ++++++------ pkgs/top-level/haskell-packages.nix | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/development/libraries/haskell/binary/{0.7.2.0.nix => 0.7.2.1.nix} (86%) diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix similarity index 86% rename from pkgs/development/libraries/haskell/binary/0.7.2.0.nix rename to pkgs/development/libraries/haskell/binary/0.7.2.1.nix index 102206b59472..bf91922835d6 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.2.0"; - sha256 = "149pdhzjg9bhl66azgv0nmj3fy38s4klzk01vhzazngdiagfq6wn"; + version = "0.7.2.1"; + sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3c5d50835ea9..a39bf2d4be52 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -29,17 +29,17 @@ haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; }; }; - binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_0; }; - bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_0; }; }; + binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; + bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; criterion = super.criterion.override { statistics = self.statistics.override { - vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_0; }; + vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; }; }; }; gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 - pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; }; + pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x }; @@ -59,7 +59,7 @@ }; ghc704Prefs = self : super : ghc722Prefs self super // { - binary = self.binary_0_7_2_0; # core package in ghc >= 7.2.2 + binary = self.binary_0_7_2_1; # core package in ghc >= 7.2.2 haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; @@ -80,7 +80,7 @@ ghc6104Prefs = self : super : ghc6123Prefs self super // { alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; Cabal = self.Cabal_1_16_0_3; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d0479588134e..605195d83b22 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -228,7 +228,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; - binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {}; + binary_0_7_2_1 = callPackage ../development/libraries/haskell/binary/0.7.2.1.nix {}; binary = null; # core package since ghc >= 7.2.x binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; @@ -270,7 +270,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp = callPackage ../development/libraries/haskell/bmp { - binary = self.binary_0_7_2_0; + binary = self.binary_0_7_2_1; }; Boolean = callPackage ../development/libraries/haskell/Boolean {}; @@ -1355,7 +1355,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in minimorph = callPackage ../development/libraries/haskell/minimorph {}; miniutter = callPackage ../development/libraries/haskell/miniutter { - binary = self.binary_0_7_2_0; + binary = self.binary_0_7_2_1; }; mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; @@ -2687,7 +2687,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in LambdaHack = callPackage ../games/LambdaHack { vectorBinaryInstances = self.vectorBinaryInstances.override { - binary = self.binary_0_7_2_0; # the miniutter build input requires this version + binary = self.binary_0_7_2_1; # the miniutter build input requires this version }; }; From 18a82b7da12debc1f0c50a2d33399298c8858352 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 14:57:00 +0200 Subject: [PATCH 030/202] haskell-amqp: re-generate with cabal2nix --- pkgs/development/libraries/haskell/amqp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 8e9f69f8fc06..9d08994af4f2 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -16,11 +16,11 @@ cabal.mkDerivation (self: { binary clock connection dataBinaryIeee754 hspec hspecExpectations network split text ]; + doCheck = false; meta = { homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; }) From 6eeb989a355c7897e4636541916c690f3e23884f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 14:58:35 +0200 Subject: [PATCH 031/202] xmobar: re-generate with cabal2nix --- pkgs/applications/misc/xmobar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index d631b28a67f0..227fa438a14a 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,6 +1,6 @@ -{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl -, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd -, X11Xft +{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr +, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools +, X11, X11Xft }: cabal.mkDerivation (self: { @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time - utf8String X11 X11Xft libmpd + alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm + time utf8String X11 X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd"; From d05e832b145485bb754f3aae6097ad75da54744e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 16:12:03 +0200 Subject: [PATCH 032/202] vlock: add meta and take maintainership --- pkgs/misc/screensavers/vlock/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index f2cea3f257be..012fef1b5b0e 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation { buildInputs = [ pam ]; - meta = { + meta = with stdenv.lib; { description = "Virtual console locking program"; + license = licenses.gpl2; + maintainers = [ maintainers.lethalman ]; + platforms = platforms.linux; }; } From 3da94435c07d09c792d56d1a4547668422d7c539 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 21 May 2014 10:55:34 +0200 Subject: [PATCH 033/202] Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances. (cherry picked from commit 35c76d917307b7ac405486855cfe63021810dba5) Conflicts: nixos/modules/virtualisation/amazon-image.nix --- nixos/modules/virtualisation/amazon-image.nix | 277 ++++++++++-------- 1 file changed, 148 insertions(+), 129 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 138047a07db0..9e64327c3abd 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -1,164 +1,183 @@ { config, lib, pkgs, ... }: with lib; - +let + cfg = config.ec2; +in { imports = [ ../profiles/headless.nix ./ec2-data.nix ]; - system.build.amazonImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "amazon-image" - { preVM = - '' - mkdir $out - diskImage=$out/nixos.img - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G" - mv closure xchg/ - ''; - buildInputs = [ pkgs.utillinux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda - mkdir /mnt - mount /dev/vda /mnt + options = { + ec2 = { + hvm = mkOption { + default = false; + description = '' + Whether the EC2 instance is a HVM instance. + ''; + }; + }; + }; - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys + config = { + system.build.amazonImage = + pkgs.vmTools.runInLinuxVM ( + pkgs.runCommand "amazon-image" + { preVM = + '' + mkdir $out + diskImage=$out/nixos.img + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G" + mv closure xchg/ + ''; + buildInputs = [ pkgs.utillinux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; + } + '' + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda + mkdir /mnt + mount /dev/vda /mnt - mount -o bind /proc /mnt/proc + # The initrd expects these directories to exist. + mkdir /mnt/dev /mnt/proc /mnt/sys - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) + mount -o bind /proc /mnt/proc - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ + # Copy all paths in the closure to the filesystem. + storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db + mkdir -p /mnt/nix/store + echo "copying everything (will take a while)..." + cp -prd $storePaths /mnt/nix/store/ - # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} + # Register the paths in the Nix database. + printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ + chroot /mnt ${config.nix.package}/bin/nix-store --load-db - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS + # Create the system profile to allow nixos-rebuild to work. + chroot /mnt ${config.nix.package}/bin/nix-env \ + -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + # `nixos-rebuild' requires an /etc/NIXOS. + mkdir -p /mnt/etc + touch /mnt/etc/NIXOS - # Install a configuration.nix. - mkdir -p /mnt/etc/nixos - cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - # Generate the GRUB menu. - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + # Install a configuration.nix. + mkdir -p /mnt/etc/nixos + cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix - umount /mnt/proc - umount /mnt - '' - ); + # Generate the GRUB menu. + chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - fileSystems."/".device = "/dev/disk/by-label/nixos"; + umount /mnt/proc + umount /mnt + '' + ); - boot.initrd.kernelModules = [ "xen-blkfront" ]; - boot.kernelModules = [ "xen-netfront" ]; - boot.kernelParams = [ "console=ttyS0" ]; + fileSystems."/".device = "/dev/disk/by-label/nixos"; - # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.version = 1; - boot.loader.grub.device = "nodev"; - boot.loader.grub.timeout = 0; - boot.loader.grub.extraPerEntryConfig = "root (hd0)"; + boot.initrd.kernelModules = [ "xen-blkfront" ]; + boot.kernelModules = [ "xen-netfront" ]; - boot.initrd.postDeviceCommands = - '' - # Force udev to exit to prevent random "Device or resource busy - # while trying to open /dev/xvda" errors from fsck. - udevadm control --exit || true - kill -9 -1 - ''; + # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. + boot.loader.grub.version = 1; + boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; + boot.loader.grub.timeout = 0; + boot.loader.grub.extraPerEntryConfig = "root (hd0${lib.optionalString cfg.hvm ",0"})"; - # Mount all formatted ephemeral disks and activate all swap devices. - # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options - # because the set of devices is dependent on the instance type - # (e.g. "m1.large" has one ephemeral filesystem and one swap device, - # while "m1.large" has two ephemeral filesystems and no swap - # devices). Also, put /tmp and /var on /disk0, since it has a lot - # more space than the root device. Similarly, "move" /nix to /disk0 - # by layering a unionfs-fuse mount on top of it so we have a lot more space for - # Nix operations. - boot.initrd.postMountCommands = - '' - diskNr=0 - diskForUnionfs= - for device in /dev/xvd[abcde]*; do - if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi - fsType=$(blkid -o value -s TYPE "$device" || true) - if [ "$fsType" = swap ]; then - echo "activating swap device $device..." - swapon "$device" || true - elif [ "$fsType" = ext3 ]; then - mp="/disk$diskNr" - diskNr=$((diskNr + 1)) - echo "mounting $device on $mp..." - if mountFS "$device" "$mp" "" ext3; then - if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi - fi - else - echo "skipping unknown device type $device" - fi - done + boot.initrd.postDeviceCommands = + '' + # Force udev to exit to prevent random "Device or resource busy + # while trying to open /dev/xvda" errors from fsck. + udevadm control --exit || true + kill -9 -1 + ''; - if [ -n "$diskForUnionfs" ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root + # Mount all formatted ephemeral disks and activate all swap devices. + # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options + # because the set of devices is dependent on the instance type + # (e.g. "m1.large" has one ephemeral filesystem and one swap device, + # while "m1.large" has two ephemeral filesystems and no swap + # devices). Also, put /tmp and /var on /disk0, since it has a lot + # more space than the root device. Similarly, "move" /nix to /disk0 + # by layering a unionfs-fuse mount on top of it so we have a lot more space for + # Nix operations. + boot.initrd.postMountCommands = + '' + diskNr=0 + diskForUnionfs= + for device in /dev/xvd[abcde]*; do + if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi + fsType=$(blkid -o value -s TYPE "$device" || true) + if [ "$fsType" = swap ]; then + echo "activating swap device $device..." + swapon "$device" || true + elif [ "$fsType" = ext3 ]; then + mp="/disk$diskNr" + diskNr=$((diskNr + 1)) + echo "mounting $device on $mp..." + if mountFS "$device" "$mp" "" ext3; then + if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi + fi + else + echo "skipping unknown device type $device" + fi + done - mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp + if [ -n "$diskForUnionfs" ]; then + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root - if [ ! -e $targetRoot/.ebs ]; then - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var - mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var + mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp + mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp - mkdir -p /unionfs-chroot/ro-nix - mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix + if [ ! -e $targetRoot/.ebs ]; then + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var + mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var - mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix - mkdir -p /unionfs-chroot/rw-nix - mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix + mkdir -p /unionfs-chroot/ro-nix + mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix - fi - fi - ''; + mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix + mkdir -p /unionfs-chroot/rw-nix + mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix - boot.initrd.extraUtilsCommands = - '' - # We need swapon in the initrd. - cp ${pkgs.utillinux}/sbin/swapon $out/bin - ''; + unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix + fi + fi + ''; - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; + boot.initrd.extraUtilsCommands = + '' + # We need swapon in the initrd. + cp ${pkgs.utillinux}/sbin/swapon $out/bin + ''; - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; - # Force getting the hostname from EC2. - networking.hostName = mkDefault ""; + # Allow root logins only using the SSH key that the user specified + # at instance creation time. + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; - # Always include cryptsetup so that Charon can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; + # Force getting the hostname from EC2. + networking.hostName = mkDefault ""; - boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + # Always include cryptsetup so that Charon can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + + # Prevent logging in as root without a password. This doesn't really matter, + # since the only PAM services that allow logging in with a null + # password are local ones that are inaccessible on EC2 machines. + security.initialRootPassword = mkDefault "!"; + }; } From cdfb8738a4f93f1e4146b8f7251632640de8e34a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 21 May 2014 13:40:19 +0200 Subject: [PATCH 034/202] Use HVM instance for EBS creator, guarantees everything is created in the correct zone. (cherry picked from commit c9763e20e5e793be5eef155601f59dd7639c7ba3) --- nixos/maintainers/scripts/ec2/ebs-creator.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix index 43dbd86f6754..5a5c57c72eb5 100644 --- a/nixos/maintainers/scripts/ec2/ebs-creator.nix +++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix @@ -4,7 +4,7 @@ machine = { config, pkgs, resources, ... }: { deployment.targetEnv = "ec2"; - deployment.ec2.instanceType = "m1.large"; + deployment.ec2.instanceType = "c3.large"; deployment.ec2.securityGroups = [ "admin" ]; deployment.ec2.ebsBoot = false; deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name; From 973fa21b52d0222ea5033ef265b2fbc0d2ab85c2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 21 May 2014 16:31:52 +0200 Subject: [PATCH 035/202] Better support for HVM instances. Now the NixOS images can be used on HVM instances without needing nixops. Previously the grub setup was incorrect, so a plain 'nixos-rebuild switch' and a reboot would result in a broken system. Also added growing of the partition of the root disk in the initrd, so you can run resize2fs after initial boot, without needing an extra reboot. This is useful especially for nixops' deployment.ec2.ebsInitialRootDiskSize option. (cherry picked from commit 044a24e58bcf4cf48df02df936c542839fb08d90) --- .../scripts/ec2/amazon-hvm-config.nix | 5 +++ .../scripts/ec2/amazon-hvm-install-config.nix | 33 +++++++++++++++++++ .../scripts/ec2/create-ebs-amis.py | 20 ++++++----- nixos/maintainers/scripts/ec2/ebs-creator.nix | 1 + 4 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 nixos/maintainers/scripts/ec2/amazon-hvm-config.nix create mode 100644 nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix new file mode 100644 index 000000000000..d0c7f3a6a6c9 --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ...}: +{ + imports = [ ./amazon-base-config.nix ]; + ec2.hvm = true; +} diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix new file mode 100644 index 000000000000..d9feba164a76 --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix @@ -0,0 +1,33 @@ +{ config, pkgs, lib, ...}: +let + cloudUtils = pkgs.fetchurl { + url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; + sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + }; + growpart = pkgs.stdenv.mkDerivation { + name = "growpart"; + src = cloudUtils; + buildPhase = '' + cp bin/growpart $out + sed -i 's|awk|gawk|' $out + sed -i 's|sed|gnused|' $out + ''; + dontInstall = true; + dontPatchShebangs = true; + }; +in +{ + imports = [ ./amazon-base-config.nix ]; + ec2.hvm = true; + boot.loader.grub.device = lib.mkOverride 0 "nodev"; + + boot.initrd.extraUtilsCommands = '' + cp -v ${pkgs.gawk}/bin/gawk $out/bin/gawk + cp -v ${pkgs.gnused}/bin/sed $out/bin/gnused + cp -v ${pkgs.utillinux}/sbin/sfdisk $out/bin/sfdisk + cp -v ${growpart} $out/bin/growpart + ''; + boot.initrd.postDeviceCommands = '' + [ -e /dev/xvda ] && [ -e /dev/xvda1 ] && TMPDIR=/run sh $(type -P growpart) /dev/xvda 1 + ''; +} diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 4e1aea659803..14607b9a3678 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -18,7 +18,7 @@ parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM i parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob") args = parser.parse_args() -instance_type = "m3.xlarge" if args.hvm else "m1.small" +instance_type = "m3.medium" if args.hvm else "m1.small" ebs_size = 8 if args.hvm else 20 @@ -52,7 +52,6 @@ depl.deploy(allow_reboot=True) m = depl.machines['machine'] - # Do the installation. device="/dev/xvdg" if args.hvm: @@ -66,24 +65,27 @@ m.run_command("mkdir -p /mnt") m.run_command("mount {0} /mnt".format(device)) m.run_command("touch /mnt/.ebs") m.run_command("mkdir -p /mnt/etc/nixos") + m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel)) m.run_command("nix-channel --update") -m.run_command("nixos-rebuild switch") -version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0] + +version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion ''", capture_stdout=True).split(' ')[0].replace('"','').strip() print >> sys.stderr, "NixOS version is {0}".format(version) -m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") -m.run_command("nixos-install") if args.hvm: + m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/amazon-base-config.nix") + m.upload_file("./amazon-hvm-config.nix", "/mnt/etc/nixos/configuration.nix") + m.upload_file("./amazon-hvm-install-config.nix", "/mnt/etc/nixos/amazon-hvm-install-config.nix") + m.run_command("NIXOS_CONFIG=/etc/nixos/amazon-hvm-install-config.nix nixos-install") m.run_command('nix-env -iA nixos.pkgs.grub') m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub') - m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst') m.run_command('echo "(hd1) /dev/xvdg" > device.map') m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch') - +else: + m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") + m.run_command("nixos-install") m.run_command("umount /mnt") - if args.hvm: ami_name = "nixos-{0}-x86_64-ebs-hvm".format(version) description = "NixOS {0} (x86_64; EBS root; hvm)".format(version) diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix index 5a5c57c72eb5..37795d5d5b4a 100644 --- a/nixos/maintainers/scripts/ec2/ebs-creator.nix +++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix @@ -8,6 +8,7 @@ deployment.ec2.securityGroups = [ "admin" ]; deployment.ec2.ebsBoot = false; deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name; + deployment.ec2.zone = "us-east-1e"; environment.systemPackages = [ pkgs.parted ]; }; } From 927b385cc9d7b297c96aef3698ee3b5f0aee2a87 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 21 May 2014 18:07:27 +0200 Subject: [PATCH 036/202] Fix mumble test: wait for X windows to appear, not only sleep --- nixos/tests/mumble.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 8896830b0c22..68ab8b642b01 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -28,7 +28,9 @@ in $client1->execute("mumble mumble://client1\@server/test &"); $client2->execute("mumble mumble://client2\@server/test &"); - $server->sleep(10); # Wait for Mumble UI to pop up + $client1->waitForWindow(qr/Mumble/); + $client2->waitForWindow(qr/Mumble/); + $server->sleep(3); # Wait some more for the Mumble UI # cancel client audio configuration $client1->sendKeys("esc"); From 7fd13ddc66a0dfa07dd0eadf3c5a01ce28cc41f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2014 18:26:13 +0200 Subject: [PATCH 037/202] Set TZDIR for all systemd services This only matters if a service also overrides the $TZ variable. Issue #2447. --- nixos/modules/config/timezone.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index 88aa7866c2b2..65703d8bb080 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -2,6 +2,12 @@ with lib; +let + + tzdir = "${pkgs.tzdata}/share/zoneinfo"; + +in + { options = { @@ -26,8 +32,10 @@ with lib; environment.variables.TZDIR = "/etc/zoneinfo"; + systemd.globalEnvironment.TZDIR = tzdir; + environment.etc.localtime = - { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}"; + { source = "${tzdir}/${config.time.timeZone}"; mode = "direct-symlink"; }; From 79a0ae902f14fcb960eaa0d01b0c327725f3a14d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 21 May 2014 15:17:52 -0500 Subject: [PATCH 038/202] arcanist: version 20140521 Signed-off-by: Austin Seipp --- .../tools/misc/arcanist/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/misc/arcanist/default.nix diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix new file mode 100644 index 000000000000..bcc5e039ef57 --- /dev/null +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, php }: + +let + libphutil = fetchgit { + url = "git://github.com/facebook/libphutil.git"; + rev = "1ba1de50e9ee1ca63e472f625282346693eb0a18"; + sha256 = "d571906b6ecb3700f0d57498426d2ab2a5fbed469d739ee1e03d410215738d2f"; + }; + arcanist = fetchgit { + url = "git://github.com/facebook/arcanist.git"; + rev = "c999f3e6b5c7edef82761ed1db00d79683e2e37a"; + sha256 = "d1d9f5ada8ffcb02f03210356c5087019e164f456660469e2825dcbdf5f07d35"; + }; +in +stdenv.mkDerivation rec { + name = "arcanist-${version}"; + version = "20140521"; + + src = [ arcanist libphutil ]; + buildInputs = [ php ]; + + unpackPhase = "true"; + buildPhase = "true"; + installPhase = '' + mkdir -p $out/bin $out/libexec + cp -R ${libphutil} $out/libexec/libphutil + cp -R ${arcanist} $out/libexec/arcanist + + ln -s $out/libexec/arcanist/bin/arc $out/bin + ''; + + meta = { + description = "Command line interface to Phabricator"; + homepage = "http://phabricator.org"; + license = stdenv.lib.licenses.apache; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..67fc1d8ce760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -468,6 +468,8 @@ let arandr = callPackage ../tools/X11/arandr { }; + arcanist = callPackage ../development/tools/misc/arcanist {}; + arduino_core = callPackage ../development/arduino/arduino-core { jdk = jdk; jre = jdk; From 7685754f0f5ceb4f9ce062b54809765a88153c81 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 21 May 2014 15:21:50 -0500 Subject: [PATCH 039/202] arcanist: Fix license Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index bcc5e039ef57..5a17ac167f80 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line interface to Phabricator"; homepage = "http://phabricator.org"; - license = stdenv.lib.licenses.apache; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; From 548cce8826336dfbb1e128f0d31b49604f4a2f37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:18:33 +0200 Subject: [PATCH 040/202] haskell-language-glsl: add version 0.0.2 --- .../libraries/haskell/language-glsl/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/language-glsl/default.nix diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix new file mode 100644 index 000000000000..bdde61739e35 --- /dev/null +++ b/pkgs/development/libraries/haskell/language-glsl/default.nix @@ -0,0 +1,15 @@ +{ cabal, HUnit, parsec, prettyclass }: + +cabal.mkDerivation (self: { + pname = "language-glsl"; + version = "0.0.2"; + sha256 = "1ixgivyc5kqjg83rymrjs1mvypvqrczmj6dhn3dbw2a9lhrvljsz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ HUnit parsec prettyclass ]; + meta = { + description = "GLSL abstract syntax tree, parser, and pretty-printer"; + 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 605195d83b22..15049f6f84fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1242,6 +1242,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageEcmascript = callPackage ../development/libraries/haskell/language-ecmascript {}; + languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; + languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; From a59b8c143e86b5afc825fd82a7b8f594bae44ccd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:18:47 +0200 Subject: [PATCH 041/202] haskell-fmlist: add version 0.8 --- .../development/libraries/haskell/fmlist/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fmlist/default.nix diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix new file mode 100644 index 000000000000..8dcbb7fff181 --- /dev/null +++ b/pkgs/development/libraries/haskell/fmlist/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "fmlist"; + version = "0.8"; + sha256 = "1knr9yh58fwjpkm37hvrqghlchf5qibwf9q52app6zh3ys999rrs"; + meta = { + description = "FoldMap lists"; + 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 15049f6f84fe..dcbaed701931 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -712,6 +712,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fileLocation = callPackage ../development/libraries/haskell/file-location {}; + fmlist = callPackage ../development/libraries/haskell/fmlist {}; + ftphs = callPackage ../development/libraries/haskell/ftphs {}; extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; From 2244541cdaa4a33dd3a88a5f16d37d7574d82f4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:18:59 +0200 Subject: [PATCH 042/202] haskell-parsers: add version 0.11.0.1 --- .../libraries/haskell/parsers/{0.11.nix => 0.11.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.11.nix => 0.11.0.1.nix} (84%) diff --git a/pkgs/development/libraries/haskell/parsers/0.11.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix similarity index 84% rename from pkgs/development/libraries/haskell/parsers/0.11.nix rename to pkgs/development/libraries/haskell/parsers/0.11.0.1.nix index c5d91f167cc6..f24c96b1fad3 100644 --- a/pkgs/development/libraries/haskell/parsers/0.11.nix +++ b/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.11"; - sha256 = "0k3xm9ww4q2wkjik4n4ww6ys79kl7xyzbhcb7xi81jz9py0xciqd"; + version = "0.11.0.1"; + sha256 = "0jg91zzsq12vxxsxrd1kx8h2c06asccymjbpx0zl7nvj5dhjfkpq"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dcbaed701931..d3d2ae5fea22 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1591,8 +1591,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {}; - parsers = self.parsers_0_11; + parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {}; + parsers = self.parsers_0_11_0_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 8de29ff4e1976dbb201913665d930b30f1d57b6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:23 +0200 Subject: [PATCH 043/202] haskell-git-annex: update to version 5.20140517 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index cc0003988551..191b24304bfe 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 @@ -16,8 +16,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140421"; - sha256 = "1ahn62gmgszssl2ni7b6rran548wjkb10035hrgvag6dwiiyik9g"; + version = "5.20140517"; + sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680"; isLibrary = false; isExecutable = true; buildDepends = [ From 41d7d0ad31ef297aa60eda22a881aa08e9dc4b2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:26 +0200 Subject: [PATCH 044/202] haskell-elm-server: update to version 0.11.0.1 --- pkgs/development/compilers/elm/elm-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index fce6f4a26995..5f389d48c8ed 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "elm-server"; - version = "0.11"; - sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2"; + version = "0.11.0.1"; + sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1"; isLibrary = false; isExecutable = true; buildDepends = [ From 4f5fce27106a147cf8af1e765b631e2ff1da7aa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:28 +0200 Subject: [PATCH 045/202] haskell-Elm: update to version 0.12.3 --- pkgs/development/compilers/elm/elm.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 9fe18cdaf30e..3daa1b507b76 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,27 +1,27 @@ { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup , cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript -, mtl, pandoc, parsec, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers -, unionFind, unorderedContainers +, languageGlsl, mtl, pandoc, parsec, QuickCheck, scientific +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, transformers, unionFind, unorderedContainers, yaml }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.12.1.3"; - sha256 = "1p4py4qyxsp25qa8141ywfh0qnvdid4v7xlbqkk8aafxccb7lsm9"; + version = "0.12.3"; + sha256 = "1v6h9qbbz27ikh19xwjbyfw0zi5ag9x1gp0khh9v4af1g0j86320"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath - indents languageEcmascript mtl pandoc parsec text transformers - unionFind unorderedContainers + indents languageEcmascript languageGlsl mtl pandoc parsec + scientific text transformers unionFind unorderedContainers yaml ]; testDepends = [ aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip - filepath HUnit indents languageEcmascript mtl pandoc parsec - QuickCheck testFramework testFrameworkHunit + filepath HUnit indents languageEcmascript languageGlsl mtl pandoc + parsec QuickCheck scientific testFramework testFrameworkHunit testFrameworkQuickcheck2 text transformers unionFind - unorderedContainers + unorderedContainers yaml ]; doCheck = false; meta = { From 8388d60aeb538bc201a59a6c7ea621046eb8d4b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:31 +0200 Subject: [PATCH 046/202] haskell-ListLike: update to version 4.1.0 --- .../development/libraries/haskell/ListLike/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index a9723721e1e9..03c8853cfd71 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,11 +1,11 @@ -{ cabal, HUnit, QuickCheck, random, text, vector }: +{ cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.2"; - sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; - buildDepends = [ text vector ]; - testDepends = [ HUnit QuickCheck random text vector ]; + version = "4.1.0"; + sha256 = "0j78mm9vsl3scwgqp4h2bhq54hf22bxj9cg9pl26d12zw7038kwj"; + buildDepends = [ dlist fmlist text vector ]; + testDepends = [ dlist fmlist HUnit QuickCheck random text vector ]; jailbreak = true; meta = { homepage = "http://software.complete.org/listlike"; From 28eb5cf3e25888a999fe4e29ac44fa39dcbb93cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:33 +0200 Subject: [PATCH 047/202] haskell-blaze-svg: update to version 0.3.4 --- pkgs/development/libraries/haskell/blaze-svg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index 0502f1eabc28..92a25e5e3b4a 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-svg"; - version = "0.3.3.1"; - sha256 = "00i0apyklvmkr4w30d4r86gcg86h35sc3ncvqax70827126cdmsj"; + version = "0.3.4"; + sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3"; buildDepends = [ blazeMarkup mtl ]; jailbreak = true; meta = { From 05956e3b3fc11bdcf3b8a511ab9fa3ab00e58ac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:35 +0200 Subject: [PATCH 048/202] haskell-chell-quickcheck: update to version 0.2.4 --- .../libraries/haskell/chell-quickcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix index 5025fcc403b9..bc5b0b4ffba5 100644 --- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "chell-quickcheck"; - version = "0.2.3"; - sha256 = "15j1wzhfyr9v8hy9d5lnr6jkrfr1zfb7dwgiy3ni90mvpf8x54yc"; + version = "0.2.4"; + sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd"; buildDepends = [ chell QuickCheck random ]; meta = { homepage = "https://john-millikin.com/software/chell/"; From c7891eb8f3e7dab83839bc62a60427b1954dbf01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:38 +0200 Subject: [PATCH 049/202] haskell-chell: update to version 0.4 --- pkgs/development/libraries/haskell/chell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix index c69994e6868b..cab43842f73c 100644 --- a/pkgs/development/libraries/haskell/chell/default.nix +++ b/pkgs/development/libraries/haskell/chell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "chell"; - version = "0.3.3"; - sha256 = "1k5vxipf47753d41dgr1gr4zy7y72gz2x8lcn0fgfmxi2v810nsm"; + version = "0.4"; + sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng"; buildDepends = [ ansiTerminal options patience random text transformers ]; From 938eeff7e3f414b37ed896496b64ed840e996e09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:40 +0200 Subject: [PATCH 050/202] haskell-dbus: update to version 0.10.8 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 7f0285dfc7aa..d2700195b108 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.7"; - sha256 = "0xszynw6p07r7z9nlq8alx5lxfjm57gljya835ccj63hqhkr5yxh"; + version = "0.10.8"; + sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes From ee84b91d18aa27078efe4366a3dd44e37a4d254e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:42 +0200 Subject: [PATCH 051/202] haskell-graphviz: update to version 2999.17.0.1 --- pkgs/development/libraries/haskell/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index bd3ccbba7a4e..18ef54746a95 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.17.0.0"; - sha256 = "1wi5yzs0b321as10h9awin87501njbd4ii40nak1fr534g1abhf5"; + version = "2999.17.0.1"; + sha256 = "0s6l1mlqvllrlx7vc06lgcs68ajhfk98awm63ab1dkqmcnj23ixv"; isLibrary = true; isExecutable = true; buildDepends = [ From 27905f4654ec19f7eed1f0242ca5c92ddbdf02bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:44 +0200 Subject: [PATCH 052/202] haskell-happstack-server: update to version 7.3.6 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 723fdb0fdb9a..e59bccaf6b5a 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.5"; - sha256 = "1n0pdishsngrri83flipfzmk0gn01n256rg7vrbn7kjl1aff9r1g"; + version = "7.3.6"; + sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From d689ae91d310656666bf6bf97154a4f63c8481a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:46 +0200 Subject: [PATCH 053/202] haskell-http-reverse-proxy: update to version 0.3.1.7 --- .../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 5c6da92953cd..ec34cc98d744 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1.6"; - sha256 = "1ckxiabk685a47xy0khj6h05j26hsc5hlxfysbkmk2q70y0ljk7k"; + version = "0.3.1.7"; + sha256 = "0fhndk9zjv1kcqgrhj42brfg96p7flrcpy609asba1vc0i9213j4"; buildDepends = [ async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl From c5793ae6147e200ad53fbb687fe8998721ca53b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:49 +0200 Subject: [PATCH 054/202] haskell-iteratee: update to version 0.8.9.6 Drop the jailbreak which seems to have become unnecessary. --- .../libraries/haskell/iteratee/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 62bc3f7a2a41..f0772ca4db13 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,16 +1,21 @@ -{ cabal, ListLike, MonadCatchIOTransformers, monadControl, parallel -, transformers, transformersBase +{ cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel +, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.5"; - sha256 = "0akv7zcyb3c213f8qz1xv1qyq04wa427a4mh8rmz1jlmcwiznk7z"; + version = "0.8.9.6"; + sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p"; buildDepends = [ - ListLike MonadCatchIOTransformers monadControl parallel - transformers transformersBase + exceptions ListLike monadControl parallel transformers + transformersBase + ]; + testDepends = [ + exceptions HUnit ListLike monadControl mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 transformers + transformersBase ]; - jailbreak = true; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; description = "Iteratee-based I/O"; From 784fb7f43490fa919b05b551bb628e4d7e3c0da2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:51 +0200 Subject: [PATCH 055/202] haskell-network-simple: update to version 0.4 --- pkgs/development/libraries/haskell/network-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index c69ac2a8a639..c50afdb21201 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-simple"; - version = "0.3.1"; - sha256 = "0bk015d0np07887flah76vgrgrqaqj4x1sdxmghvazj8c78nkan8"; + version = "0.4"; + sha256 = "1jw0xd53c0mydh6jm6627c0d8w014r1s46fycdhavnimh7bb77cp"; buildDepends = [ exceptions network transformers ]; jailbreak = true; meta = { From 17d0a2831d9839a4f43d938a71a5785cc393812c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:53 +0200 Subject: [PATCH 056/202] haskell-options: update to version 1.2 --- pkgs/development/libraries/haskell/options/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix index 3772a142a58d..f89cdd5045fe 100644 --- a/pkgs/development/libraries/haskell/options/default.nix +++ b/pkgs/development/libraries/haskell/options/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "options"; - version = "1.0"; - sha256 = "0d40d6k1c8v2b0bgchgl54sk9wx28kysp8bjws8bwjcmmd57775f"; + version = "1.2"; + sha256 = "14qrkwd8h50wf6972p0ylvhnc8mh11fqk9l8q0h9lapj7ywm74vx"; buildDepends = [ monadsTf transformers ]; testDepends = [ chell chellQuickcheck monadsTf transformers ]; doCheck = false; From 38ea99475e02e38b45bc1e61810210c9bc3a321a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:56 +0200 Subject: [PATCH 057/202] haskell-pipes-network: update to version 0.6.3 --- pkgs/development/libraries/haskell/pipes-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index 1b816a704f26..5ec70a010a5e 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-network"; - version = "0.6.2"; - sha256 = "1y64cyi1lq7y5x3b1rv2iixlwqnz4g82nxk2m14x214fmj3np965"; + version = "0.6.3"; + sha256 = "09gihca0hinq3sqsx9753gmas6g22pg792ag6ckdw5z3607razrg"; buildDepends = [ network networkSimple pipes pipesSafe transformers ]; From 1b1d572d702cd8ec904fe1fe4fbfd5cbe8874995 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:19:58 +0200 Subject: [PATCH 058/202] haskell-pointed: update to version 4.1 --- pkgs/development/libraries/haskell/pointed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index 65048ca757c5..7a02d5850d2b 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pointed"; - version = "4.0"; - sha256 = "02y7ba1pcpmwcp762516p4x75y3ma2kml9mbiv1y8gcnn4ylvir4"; + version = "4.1"; + sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g"; buildDepends = [ comonad dataDefaultClass semigroupoids semigroups stm tagged transformers From 1d402bc6ba9ab70c3d0654b126ae4b00ce00fd0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:01 +0200 Subject: [PATCH 059/202] haskell-reactive-banana: update to version 0.8.0.2 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 535b289a389e..e2cda01ee40b 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.8.0.0"; - sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1"; + version = "0.8.0.2"; + sha256 = "0hfhq663dvvb3jbgdnarawryw09m8ckqvqp6p5n4d4dms4gfzcdv"; buildDepends = [ hashable pqueue transformers unorderedContainers vault ]; From 4e2d47c3142ce27472d177abe841fb1bfaa18dc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:03 +0200 Subject: [PATCH 060/202] haskell-snap-loader-dynamic: update to version 0.10.0.2 --- pkgs/development/libraries/haskell/snap/loader-dynamic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix index ec054cc80653..f6dbf7332652 100644 --- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snap-loader-dynamic"; - version = "0.10.0.1"; - sha256 = "0iqhspvfp0d6qivis2l3v0rqrnb8qbzvi4n53zgyb9cwvqxx5fix"; + version = "0.10.0.2"; + sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7"; buildDepends = [ directoryTree hint mtl snapCore time ]; meta = { homepage = "http://snapframework.com/"; From c8a72f96abecf8573b59b67151729ce39677c386 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:08 +0200 Subject: [PATCH 061/202] haskell-tasty-ant-xml: update to version 1.0.0.7 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 695d7edca625..9ad4b2de7471 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.6"; - sha256 = "06ll7mj60iiskla2x53yncs0931b7dw4l0shxkhz88558gjzy7cj"; + version = "1.0.0.7"; + sha256 = "0jjh2lyr33l5mps123azszwnk0h61ar99zlqbc4h04a8vkd9x813"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; From 271ef11cc14c48c4be43cc5bac7c161af6a77552 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:10 +0200 Subject: [PATCH 062/202] haskell-tasty-hspec: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/tasty-hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 34b13c69bf6a..196788059008 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tasty-hspec"; - version = "0.1"; - sha256 = "1pf4ffaqy0f25a2sjirg5g4gdcfslapwq4mm0pkdsysmh9bv1f64"; + version = "0.1.0.1"; + sha256 = "0m8v9kj557vfqzmrindwfcjl7wqmdix2xvmsb94n8hx9qv075s3v"; buildDepends = [ hspec tasty ]; meta = { homepage = "http://github.com/mitchellwrosen/tasty-hspec"; From 8662d7aefa07d963cdb23ba11409ff8aa1e5dd63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:12 +0200 Subject: [PATCH 063/202] haskell-threepenny-gui: update to version 0.4.2.0 --- pkgs/development/libraries/haskell/threepenny-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index 1855f4938120..ea655ab91c14 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "threepenny-gui"; - version = "0.4.1.0"; - sha256 = "0fafwnlbl96z9m5fr3wiyv090fga78cr9hrd4yd3vyiz44gfrpcw"; + version = "0.4.2.0"; + sha256 = "1746l90h9xkwnwxvfqsr93nax7ihv8lwc4kz203v13rrwckr7m8h"; isLibrary = true; isExecutable = true; buildDepends = [ From b20aede17a3b6c301c3096e68a7f308247cc1946 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:15 +0200 Subject: [PATCH 064/202] haskell-transformers-compat: update to version 0.3.2 --- .../libraries/haskell/transformers-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index bdb101914a40..e160ed5226e7 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-compat"; - version = "0.3"; - sha256 = "0dncakmg4wszi20apfzwdlgp69pka8bwwdrg1pl7nrn3sybq97yf"; + version = "0.3.2"; + sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/transformers-compat/"; From 5396bcdad11c6f37eacca386373375ed5a6874eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 May 2014 16:20:22 +0200 Subject: [PATCH 065/202] haskell-zlib-enum: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/zlib-enum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index f799194c0f69..7dc700b3532f 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-enum"; - version = "0.2.3"; - sha256 = "0lr72h4wlclav0p0j5wwaxifq97lw7rh3612lva73fg45akl9di1"; + version = "0.2.3.1"; + sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers zlibBindings ]; From eac9fe354c06ee7306935225e4db145edaa9c7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 22 May 2014 08:58:49 +0200 Subject: [PATCH 066/202] python27Packages is now a hiPrioSet to avoid other python versions interfering --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67fc1d8ce760..b3e88a61b9d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6390,10 +6390,10 @@ let python = python32; }; - python27Packages = recurseIntoAttrs (import ./python-packages.nix { + python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = python27; - }); + })); pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; From 53465c35a0a19d440b1f0b4867ae68ab26997a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 22 May 2014 09:05:38 +0200 Subject: [PATCH 067/202] python: 3.4.0 -> 3.4.1 --- pkgs/development/interpreters/python/3.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 0b8774463245..d5402c5cb033 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let majorVersion = "3.4"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi"; + sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From 48e969d776ba3e2e8352826148921f703585df74 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 22 May 2014 11:17:00 +0200 Subject: [PATCH 068/202] Fix gnome3 evaluation due to missing glib_networking --- pkgs/desktops/gnome-3/3.10/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index b58bf7ef1d3b..c601a1501a3b 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -1,7 +1,7 @@ { callPackage, self, pkgs }: rec { - inherit (pkgs) glib gtk2 gtk3 gnome2 upower; + inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; From 0b484a0a1d287a178937241f479b15a0c1563530 Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Thu, 22 May 2014 11:38:40 +0200 Subject: [PATCH 069/202] Add typescript to node-packages Typescript (http://www.typescriptlang.org/) is a typed language for JavaScript application development. --- pkgs/top-level/node-packages-generated.nix | 20 ++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 21 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 356b736506df..e250085f7307 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -18226,6 +18226,26 @@ ]; passthru.names = [ "typedarray" ]; }; + by-spec."typescript"."*" = + self.by-version."typescript"."1.0.1"; + by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "typescript-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz"; + name = "typescript-1.0.1.tgz"; + sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a"; + }) + ]; + buildInputs = + (self.nativeDeps."typescript" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typescript" ]; + }; + "typescript" = self.by-version."typescript"."1.0.1"; by-spec."uglify-js"."*" = self.by-version."uglify-js"."2.4.13"; by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 57eab330ce21..4d220a008290 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -130,4 +130,5 @@ , "phantomjs" , "sinon" , "shelljs" +, "typescript" ] From 9b6eeecbdee39c563e4388a17edff7cbe5c7e226 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 11:22:20 +0200 Subject: [PATCH 070/202] openssh: Fix broken URL --- pkgs/tools/networking/openssh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 6926b9aa82aa..ea94560219f0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "openssh-6.6p1"; src = fetchurl { - url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; + url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8"; }; From 1e6c82825a7f15c6dada3df1d73d6064df31ebef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 11:48:42 +0200 Subject: [PATCH 071/202] gimp: Fix download URL --- pkgs/applications/graphics/gimp/2.8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 0f8d6d45f128..aca4d822c820 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gimp-2.8.10"; src = fetchurl { - url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; + url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; }; From e6c304a5d988b6fcc7c27587e62b449a5841f510 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:01:50 +0200 Subject: [PATCH 072/202] Update some Perl packages --- pkgs/top-level/perl-packages.nix | 62 ++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9949682d337f..2b67e2a89d88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1631,15 +1631,17 @@ let self = _self // overrides; _self = with self; { }; CPANMetaYAML = buildPerlPackage { - name = "CPAN-Meta-YAML-0.008"; + name = "CPAN-Meta-YAML-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.008.tar.gz; - sha256 = "1fxc8ybn6mdgzxyq1n69rgihmpfaarfclmbdw2rznya5zg2b0nz0"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.012.tar.gz; + sha256 = "7c728c573ba74294d3df2f0cbae2cd1b3830ed47040649b49a33a086b8300d28"; }; + buildInputs = [ JSONPP ]; + doCheck = false; # Test::More too old meta = { - homepage = https://github.com/dagolden/cpan-meta-yaml; + homepage = https://github.com/dagolden/CPAN-Meta-YAML; description = "Read and write a subset of YAML for CPAN Meta files"; - license = "perl5"; + license = "perl"; }; }; @@ -3318,16 +3320,19 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsMakeMaker = buildPerlPackage rec{ + ExtUtilsMakeMaker = buildPerlPackage { name = "ExtUtils-MakeMaker-6.98"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1vv3v9rc2dnx8amwa7lpdywg3lakx7yv2n38qvfbk9jzkqc27c1f"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.98.tar.gz; + sha256 = "2eb023189e5fa6b9dcc66858b1fde953d1f1b86f971ec5ab42dd36c172da63ef"; }; propagatedBuildInputs = - [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta - FileCopyRecursive VersionRequirements ExtUtilsManifest - ]; + [ ParseCPANMeta JSONPP JSONPPCompat5006 CPANMetaYAML FileCopyRecursive ]; + meta = { + homepage = https://metacpan.org/release/ExtUtils-MakeMaker; + description = "Create a module Makefile"; + license = "perl"; + }; }; ExtUtilsManifest = buildPerlPackage rec { @@ -4616,6 +4621,18 @@ let self = _self // overrides; _self = with self; { }; }; + JSONPPCompat5006 = buildPerlPackage { + name = "JSON-PP-Compat5006-1.09"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz; + sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a"; + }; + meta = { + description = "Helper module in using JSON::PP in Perl 5.6"; + license = "perl"; + }; + }; + JSONXS = buildPerlPackage { name = "JSON-XS-2.34"; src = fetchurl { @@ -6610,13 +6627,18 @@ let self = _self // overrides; _self = with self; { }; }; - ParseCPANMeta = buildPerlPackage rec { - name = "Parse-CPAN-Meta-1.4409"; + ParseCPANMeta = buildPerlPackage { + name = "Parse-CPAN-Meta-1.4414"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; - sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4414.tar.gz; + sha256 = "cd7608154dfb72c9e110f012befe6b75d78448cb3e761716b60aa7545e16ca1b"; }; propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; + meta = { + homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; + description = "Parse META.yml and META.json CPAN metadata files"; + license = "perl"; + }; }; ParseRecDescent = buildPerlPackage rec { @@ -9234,10 +9256,14 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALrequire = buildPerlPackage { - name = "UNIVERSAL-require-0.16"; + name = "UNIVERSAL-require-0.17"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz; - sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2"; + url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.17.tar.gz; + sha256 = "5dc9f13f2d2bbdf852387e2a63c0753728c2bea9125dd628c313db3ef66ec4c3"; + }; + meta = { + description = "Require() modules from a variable"; + license = "perl"; }; }; From 0bc7ec6e28bef9459b14884b1fb2b54963e8e0dc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:05:19 +0200 Subject: [PATCH 073/202] Remove obsolete udisks test Closes #2716. --- nixos/release-combined.nix | 1 - nixos/release.nix | 1 - nixos/tests/udisks.nix | 56 -------------------------------------- 3 files changed, 58 deletions(-) delete mode 100644 nixos/tests/udisks.nix diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 090d8400f1cb..f59f71b0d6f8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -62,7 +62,6 @@ in rec { (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.simple) - (all nixos.tests.udisks) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index 30f87aaa4f2c..06749966cbb7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -241,7 +241,6 @@ in rec { tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; - tests.udisks = callTest tests/udisks.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix deleted file mode 100644 index b7f2e2c00315..000000000000 --- a/nixos/tests/udisks.nix +++ /dev/null @@ -1,56 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: - -let - - stick = pkgs.fetchurl { - url = http://nixos.org/~eelco/nix/udisks-test.img.xz; - sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; - }; - -in - -{ - - machine = - { config, pkgs, ... }: - { services.udisks.enable = true; - imports = [ ./common/user-account.nix ]; - - security.polkit.extraConfig = - '' - polkit.addRule(function(action, subject) { - if (subject.user == "alice") return "yes"; - }); - ''; - }; - - testScript = - '' - my $stick = $machine->stateDir . "/usbstick.img"; - system("xz -d < ${stick} > $stick") == 0 or die; - - $machine->succeed("udisks --enumerate | grep /org/freedesktop/UDisks/devices/vda"); - $machine->fail("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - - # Attach a USB stick and wait for it to show up. - $machine->sendMonitorCommand("usb_add disk:$stick"); - $machine->waitUntilSucceeds("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - $machine->succeed("udisks --show-info /dev/sda1 | grep 'label:.*USBSTICK'"); - - # Mount the stick as a non-root user and do some stuff with it. - $machine->succeed("su - alice -c 'udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1'"); - $machine->succeed("su - alice -c 'udisks --mount /dev/sda1'"); - $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/ or die; - $machine->succeed("su - alice -c 'echo foo > /media/USBSTICK/bar.txt'"); - - # Unmounting the stick should make the mountpoint disappear. - $machine->succeed("su - alice -c 'udisks --unmount /dev/sda1'"); - $machine->fail("[ -d /media/USBSTICK ]"); - - # Remove the USB stick. - $machine->sendMonitorCommand("usb_del 0.3"); # FIXME - $machine->waitUntilFails("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1"); - $machine->fail("[ -e /dev/sda ]"); - ''; - -}) From f4b7ac11a3bca0ce85415701753a348c757da6c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:06:29 +0200 Subject: [PATCH 074/202] Remove udisks module It's no longer used in NixOS. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/hardware/udisks.nix | 45 ---------------------- 2 files changed, 46 deletions(-) delete mode 100644 nixos/modules/services/hardware/udisks.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ab0b263c4b84..b80ecce90ce8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -121,7 +121,6 @@ ./services/hardware/pommed.nix ./services/hardware/sane.nix ./services/hardware/udev.nix - ./services/hardware/udisks.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thinkfan.nix diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix deleted file mode 100644 index c9d11bcfc687..000000000000 --- a/nixos/modules/services/hardware/udisks.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Udisks daemon. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - ###### interface - - options = { - - services.udisks = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Udisks, a DBus service that allows - applications to query and manipulate storage devices. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.udisks.enable { - - environment.systemPackages = [ pkgs.udisks ]; - - services.dbus.packages = [ pkgs.udisks ]; - - system.activationScripts.udisks = - '' - mkdir -m 0755 -p /var/lib/udisks - ''; - - services.udev.packages = [ pkgs.udisks ]; - }; - -} From b6569c84974a0807241c70dfe6e75b0275e62764 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:11:07 +0200 Subject: [PATCH 075/202] copy-tarballs.pl: Create base-32 symlinks --- maintainers/scripts/copy-tarballs.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index b7178fb7d715..c6d77529dd49 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -91,4 +91,7 @@ foreach my $file (@{$data->{list}->{attrs}}) { my $sha256 = hashFile("sha256", 0, $storePath) or die; symlink("../$fn", "$tarballsCache/sha256/$sha256"); + + $sha256 = hashFile("sha256", 1, $storePath) or die; + symlink("../$fn", "$tarballsCache/sha256/$sha256"); } From 29dc000e60f9d6356b889460003c2d06623777e6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:53:51 +0200 Subject: [PATCH 076/202] unrar: update from 5.1.2 to 5.1.5 --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index bd52a70eaf24..a88c0b345d72 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.1.2"; + version = "5.1.5"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0344cn4w3lw2111m3g431khiyndx9ibbp952bli1inx2fixps9cq"; + sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912"; }; patchPhase = '' From f430a8810d586cfd75857403c18ff8e4356dc7be Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:54:06 +0200 Subject: [PATCH 077/202] syslogng: update from 3.5.3 to 3.5.4.1 --- pkgs/tools/system/syslog-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 184701ceb598..cbffd8648d47 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python }: stdenv.mkDerivation { - name = "syslog-ng-3.5.3"; + name = "syslog-ng-3.5.4.1"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.3/source/syslog-ng_3.5.3.tar.gz"; - sha256 = "1l3424qn9bf9z742pqba8x3dj7g729asimmhlizv1rvjlaxa2jd3"; + url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz"; + sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; }; buildInputs = [ eventlog pkgconfig glib python ]; From 1cb2f20511d405715fa04e745d35572add413fa1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:55:03 +0200 Subject: [PATCH 078/202] swiProlog: update from 6.6.3 to 6.6.5 --- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 2070da0bee41..220d3f87fba8 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -4,14 +4,14 @@ }: let - version = "6.6.3"; + version = "6.6.5"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "01dr66d7rm2xvxwm6wy71bbjvfrmzxgvmaz3sl1fb63cn8d78nz3"; + sha256 = "0lsa90sdnkd286xgm1amwkdhvnrpsz7imfzczrfdaw4arqk4bvkr"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama From c32e17b31983da86119c8486dc71154346856a82 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:55:15 +0200 Subject: [PATCH 079/202] speedtest_cli: update from 0.2.5 to 0.2.7 --- pkgs/tools/networking/speedtest-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 4f54404b713a..7162e29e1eac 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "speedtest-cli-${version}"; - version = "0.2.5"; + version = "0.2.7"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn"; + sha256 = "00r3mjr8852glwryfj9f86pikqg1v0f0xivy25cj86n526wdpy95"; }; meta = with stdenv.lib; { From 1cc7ebe3cc0632829c416e37477b0575aba8edb2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:56:14 +0200 Subject: [PATCH 080/202] pv: update from 1.5.2 to 1.5.3 --- pkgs/tools/misc/pv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 480e00c850d3..d99fc1960ddd 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.5.2"; + name = "pv-1.5.3"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2"; + sha256 = "03prg025kzivl1a5xqlf45szpnpqrmkzcvnf7lb2fc1v3jdrkwvn"; }; meta = { From 5abc5dea27e4f264f60a84dcff9a8d943c84e3dc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:57:17 +0200 Subject: [PATCH 081/202] lynx: update from 2.8.7 to 2.8.8 --- pkgs/applications/networking/browsers/lynx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index b0f9b69012cc..74c9574c7d62 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -5,11 +5,11 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation { - name = "lynx-2.8.7"; + name = "lynx-2.8.8"; src = fetchurl { - url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.bz2; - sha256 = "1baxwpdvak6nalr943g22z67r1d3fbibbkqvkvvar9xlvrs9gv20"; + url = http://lynx.isc.org/lynx2.8.8/lynx2.8.8.tar.bz2; + sha256 = "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039"; }; configureFlags = if sslSupport then "--with-ssl=${openssl}" else ""; From 06f2afa77be2a2bbbdbce85bc5885fed037181f6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:57:34 +0200 Subject: [PATCH 082/202] libmicrohttpd: update from 0.9.34 to 0.9.35 --- pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index d2237e22fceb..be1f3f2b4b96 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl, libgcrypt}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.34"; + name = "libmicrohttpd-0.9.35"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9"; + sha256 = "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw"; }; buildInputs = [ curl libgcrypt ]; From 3ec28512640d119ba593f3a7d2627b4679921a36 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 22 May 2014 12:58:08 +0200 Subject: [PATCH 083/202] dcraw: update from 9.19 to 9.20 --- pkgs/tools/graphics/dcraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 5df814530a11..ed9ac2da2d2a 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.19"; + name = "dcraw-9.20"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv"; + sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f"; }; buildInputs = [ libjpeg lcms gettext jasper ]; From 5ec3a63fcbbe8daabe6da595e250b1fba507e51f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:51:55 +0200 Subject: [PATCH 084/202] nvidia-x11: Update to 331.79 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 +++++++--- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 51144bc10519..06ab334e3071 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,9 +74,9 @@ installPhase() { mkdir -p $out/bin for i in nvidia-settings nvidia-smi nvidia-xconfig; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done # Header files etc. @@ -96,6 +96,10 @@ installPhase() { substituteInPlace $out/share/applications/nvidia-settings.desktop \ --replace '__UTILS_PATH__' $out/bin \ --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + $out/bin/nvidia-smi --help > /dev/null fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2afbf12097cd..0c0f6ecc71ee 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "331.67"; + versionNumber = "331.79"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1imc66yxnm01i58xwqrwqc612h0rhdz8x170hqr2pjyk99bllsv9"; + sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0qxd4jd25ymcr6w97f71kfn549x6wgg4g3vixd3sqlczknn85f47"; + sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From fc70d6f7123c9387853c42cb1391711b3989bd81 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 12:55:28 +0200 Subject: [PATCH 085/202] nvidia-x11: Don't install nvidia-xconfig Rewriting the X11 config doesn't work on NixOS. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 06ab334e3071..fef97002eaa0 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -73,7 +73,7 @@ installPhase() { # Install the programs. mkdir -p $out/bin - for i in nvidia-settings nvidia-smi nvidia-xconfig; do + for i in nvidia-settings nvidia-smi; do cp $i $out/bin/$i patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i @@ -85,6 +85,7 @@ installPhase() { mkdir -p $out/share/man/man1 cp -p *.1.gz $out/share/man/man1 + rm $out/share/man/man1/nvidia-xconfig.1.gz mkdir -p $out/share/applications cp -p *.desktop $out/share/applications From 58226a7b0600fbb74984f983e4adff42ddb57b68 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 May 2014 14:20:03 +0200 Subject: [PATCH 086/202] Add type for fonts.fonts option --- nixos/modules/config/fonts/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index ac804bef7fe4..49b1e1d42a3f 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -10,6 +10,7 @@ with lib; # TODO: find another name for it. fonts = mkOption { + type = types.listOf types.path; example = [ pkgs.dejavu_fonts ]; description = "List of primary font paths."; apply = list: list ++ From 4d634e2baea60a02b63d17f27af37e64ee3e30f2 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 22 May 2014 15:29:36 +0200 Subject: [PATCH 087/202] Add apktool, tool for reverse engineering Android apk files --- pkgs/development/tools/apktool/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/apktool/default.nix diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix new file mode 100644 index 000000000000..a415ffd152d7 --- /dev/null +++ b/pkgs/development/tools/apktool/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jre, buildTools }: + +stdenv.mkDerivation rec { + name = "apktool-${version}"; + version = "1.5.2"; + + src = fetchurl { + url = "https://android-apktool.googlecode.com/files/apktool${version}.tar.bz2"; + sha1 = "2dd828cf79467730c7406aa918f1da1bd21aaec8"; + }; + + unpackCmd = '' + tar -xvf $src || true + cd apktool* + ''; + + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D apktool.jar "$out/libexec/apktool/apktool.jar" + ensureDir "$out/bin" + makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ + --add-flags "-jar $out/libexec/apktool/apktool.jar" \ + --prefix PATH : "${buildTools}/build-tools/android-4.3/" + ''; + + meta = with stdenv.lib; { + description = "A tool for reverse engineering Android apk files"; + homepage = https://code.google.com/p/android-apktool/; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3e88a61b9d4..7fc5bd53244d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -462,6 +462,10 @@ let analog = callPackage ../tools/admin/analog {}; + apktool = callPackage ../development/tools/apktool { + buildTools = androidenv.buildTools; + }; + apt-offline = callPackage ../tools/misc/apt-offline { }; archivemount = callPackage ../tools/filesystems/archivemount { }; From 1ab0cd12423bbfc6c396f29fed7d2101f9fce430 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 21 May 2014 21:45:23 +0200 Subject: [PATCH 088/202] transmission: Update from 2.82 -> 2.83 --- pkgs/applications/networking/p2p/transmission/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 29fb558c83d6..0f1ce2b2efad 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.82"; + version = "2.83"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz"; - sha256 = "08imy28hpjxwdzgvhm66hkfyzp8qnnqr4jhv3rgshryzhw86b5ir"; + sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh"; }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] From f9daf5021464e8443ab21312f15a66b04774d8fc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 22 May 2014 11:34:47 +0200 Subject: [PATCH 089/202] transmission: Fix compilation due to missing systemd dependency --- pkgs/applications/networking/p2p/transmission/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 0f1ce2b2efad..f260e3eb30ae 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools +, openssl, curl, libevent, inotifyTools, systemd , enableGTK3 ? false, gtk3 }: @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] - ++ optionals enableGTK3 [ gtk3 makeWrapper ]; + ++ optionals enableGTK3 [ gtk3 makeWrapper ] + ++ optional stdenv.isLinux systemd; preConfigure = '' sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure From a131baf502512b891d4efde73d458da325f69c2b Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 22 May 2014 19:10:46 +0200 Subject: [PATCH 090/202] transmission: Fix apparmor rules to allow loading more libraries --- .../modules/services/torrent/transmission.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5cdecd1eb577..02db4a7a5b2b 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -125,13 +125,17 @@ in #include #include - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.libevent}/lib/libevent*.so* mr, - ${pkgs.curl}/lib/libcurl*.so* mr, - ${pkgs.openssl}/lib/libssl*.so* mr, - ${pkgs.openssl}/lib/libcrypto*.so* mr, - ${pkgs.zlib}/lib/libz*.so* mr, - ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.libevent}/lib/libevent*.so* mr, + ${pkgs.curl}/lib/libcurl*.so* mr, + ${pkgs.openssl}/lib/libssl*.so* mr, + ${pkgs.openssl}/lib/libcrypto*.so* mr, + ${pkgs.zlib}/lib/libz*.so* mr, + ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.systemd}/lib/libsystemd*.so* mr, + ${pkgs.xz}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr, + ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, From 68d93de10c2574b9a867b5052f7941f258515950 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 21 May 2014 21:45:21 +0200 Subject: [PATCH 091/202] chromium: Update stable channel from 34.0.1847.132 -> 35.0.1916.114 --- .../networking/browsers/chromium/source/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 715b1e958256..bd5ded3f4c63 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -13,9 +13,9 @@ sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr"; }; stable = { - version = "34.0.1847.132"; - sha256 = "0f30i0jxqx059imfiyvsaslkydkva9x6nbvpsjccvwygs91hm4z8"; - sha256bin32 = "1czbydkyazhc63ndyiarbwmmi7p3wh2rb4x7avs41yx7sx9vdqjl"; - sha256bin64 = "01k301629m4m8a4mpg0m5kblygfs72kpa4qi3mlkl8cbb0rlq6mv"; + version = "35.0.1916.114"; + sha256 = "1bvpkwjchkzx1qfc93hd8md6sz5sd7pl55xc8b8m3iakbp0csvsn"; + sha256bin32 = "0zm5770cv9dld37xall9lpl9faa0bgjcp8hjx6l1ivfhs6lxbxxa"; + sha256bin64 = "18p302aj2d7xdza9kf438vbz3wqh8db7v2dq5d9b4b3ak6w9ld03"; }; } From 5255e5692e81cee11a08cf87cc731b28765fba6f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 13 May 2014 16:01:01 +0200 Subject: [PATCH 092/202] flashplayer: Update from 11.2.202.356 -> 11.2.202.359 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index a7002dec2f6e..378e32c0afb4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.356"; + version = "11.2.202.359"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1g09a9fvm3wm2zi885q2kc2rwq0a7ywc637i31pzfic6kij10ps5"; + sha256 = "13myq6f999qy1jbgm73gxnadrxdvasi2jiffdyxmwpbwglhhrpka"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1r7sbwfbgq7c5jhginsc95rihdcjsfzrbx0kxgwv7sk2jc7x8hhb"; + sha256 = "04wh18jbscp7m3drvsxxhp2vjnhww69vw0pgr23hx81ry0ccvb8m"; } else throw "Flash Player is not supported on this platform"; From f0cf8f4140bffbe1016ae11e25e8a7ad6ca7e9c9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 21 May 2014 23:49:32 +0200 Subject: [PATCH 093/202] grsecurity: Fix module evaluation --- nixos/modules/security/grsecurity.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 8fbeeb9ba610..f4af04247fe9 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -7,7 +7,10 @@ let customGrsecPkg = (import ../../../pkgs/build-support/grsecurity - { grsecOptions = cfg; } + { + inherit lib pkgs; + grsecOptions = cfg; + } ).grsecPackage; in { From ecee297a18fa985ed7cc103b28bac69cae5162e9 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 22 May 2014 22:01:00 +0200 Subject: [PATCH 094/202] fhs-chrootenv (steam): support directly using users other than root, fix sound support, fix /run/user --- pkgs/build-support/build-fhs-chrootenv/default.nix | 4 ++-- pkgs/build-support/build-fhs-chrootenv/load.sh.in | 2 +- pkgs/build-support/build-fhs-chrootenv/mount.sh.in | 2 +- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 2f3aa14c6a0f..e807a04628a3 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,11 +1,11 @@ {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, -bashInteractive, xz, shadow, gawk, less, su, buildEnv}: +bashInteractive, xz, shadow, gawk, less, buildEnv}: {name, pkgs ? [], profile ? ""}: let basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar - gzip bzip2 bashInteractive xz shadow gawk less su + gzip bzip2 bashInteractive xz shadow gawk less ]; # Compose a global profile for the chroot environment diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in index 8d3f464186b7..6089fa275855 100644 --- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -3,4 +3,4 @@ chrootenvDest=/run/chrootenv/@name@ # Enter the LFS chroot environment -chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login +sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in index 68459cca2560..225d9dbc4f72 100644 --- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home # Bind mount state directories mount --bind /var $chrootenvDest/var -mount --bind /run $chrootenvDest/run +mount --rbind /run $chrootenvDest/run # Bind mount the host system's /etc mount --bind /etc $chrootenvDest/host-etc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc5bd53244d..af6bdb1b198c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -270,7 +270,7 @@ let buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; - inherit less su buildEnv; + inherit less buildEnv; }; dotnetenv = import ../build-support/dotnetenv { From eb928c5d4654d09bd0615a71a9f52e6e9409ffe5 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 22 May 2014 22:18:30 +0200 Subject: [PATCH 095/202] fhs-chrootenv: use -l to umount for the rbind mount --- pkgs/build-support/build-fhs-chrootenv/umount.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in index 29d631fbd90b..5089141c0aa4 100644 --- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in @@ -2,5 +2,5 @@ chrootenvDest=/run/chrootenv/@name@ -# Unmount all bind mounts -umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} +# Unmount all (r)bind mounts +umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} From f8ae62a8d033a77cbf9996c3c44cf3b2e35af5ae Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 22 May 2014 23:45:46 +0200 Subject: [PATCH 096/202] setlocale: 0.0.3 --- .../libraries/haskell/setlocale/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/setlocale/default.nix diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix new file mode 100644 index 000000000000..09ffc7159a4a --- /dev/null +++ b/pkgs/development/libraries/haskell/setlocale/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "setlocale"; + version = "0.0.3"; + sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl"; + meta = { + description = "A Haskell interface to setlocale()"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9c33cb8ff479..58a161e87603 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1876,6 +1876,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setenv = callPackage ../development/libraries/haskell/setenv {}; + setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; From cb2cf60a14d2cfdaf120434e35ca7d91f5bd2dd6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 22 May 2014 23:46:12 +0200 Subject: [PATCH 097/202] wcwidth: 0.0.2 --- .../libraries/haskell/wcwidth/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wcwidth/default.nix diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix new file mode 100644 index 000000000000..0307642f62ba --- /dev/null +++ b/pkgs/development/libraries/haskell/wcwidth/default.nix @@ -0,0 +1,16 @@ +{ cabal, attoparsec, setlocale, utf8String }: + +cabal.mkDerivation (self: { + pname = "wcwidth"; + version = "0.0.2"; + sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ attoparsec setlocale utf8String ]; + meta = { + homepage = "http://github.com/solidsnack/wcwidth/"; + description = "Native wcwidth"; + 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 58a161e87603..ea50057569c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2353,6 +2353,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; From 1ab31c05e7cecec140d8d53879546d960bd0de81 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 23 May 2014 08:39:28 +1000 Subject: [PATCH 098/202] mpdcron: add expression --- pkgs/tools/audio/mpdcron/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/audio/mpdcron/default.nix diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix new file mode 100644 index 000000000000..61553566d6c9 --- /dev/null +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon +, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }: + +stdenv.mkDerivation rec { + version = "20130809"; + name = "mpdcron-${version}"; + + src = fetchgit { + url = https://github.com/alip/mpdcron.git; + rev = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd"; + sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3"; + }; + + meta = { + description = "A cron like daemon for mpd."; + homepage = http://alip.github.io/mpdcron/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; unix; + maintainers = [ stdenv.lib.maintainers.lovek323 ]; + }; + + buildInputs = + [ autoconf automake libtool pkgconfig glib libdaemon + mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b13d0c47d69c..681b369a43d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -632,6 +632,8 @@ let mcrl2 = callPackage ../tools/misc/mcrl2 { }; + mpdcron = callPackage ../tools/audio/mpdcron { }; + syslogng = callPackage ../tools/system/syslog-ng { }; rsyslog = callPackage ../tools/system/rsyslog { }; @@ -6606,7 +6608,10 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mpd = callPackage ../servers/mpd { }; + mpd = callPackage ../servers/mpd { + aacSupport = config.mpd.aacSupport or true; + ffmpegSupport = config.mpd.ffmpegSupport or true; + }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; From c84d81541ec6356305bc2175d90ee647bb1a5920 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 23 May 2014 14:53:24 +0400 Subject: [PATCH 099/202] alsa: add option to change system wide configuration --- nixos/modules/services/audio/alsa.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 9a70d9edfa72..7699b3bff3e7 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -9,6 +9,8 @@ let soundState = "/var/lib/alsa/asound.state"; + configPaht = "asound.conf"; + in { @@ -35,6 +37,17 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ''''; + example = '' + defaults.pcm.!card 3 + ''; + description = '' + Set addition configuration for system-wide alsa. + ''; + }; + }; }; @@ -46,6 +59,11 @@ in environment.systemPackages = [ alsaUtils ]; + environment.etc = [ { source = config.sound.extraConfig; + target = configPath; + } + ]; + # ALSA provides a udev rule for restoring volume settings. services.udev.packages = [ alsaUtils ]; From dc8625305a503af5af9a486415efee14a7d502fe Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 23 May 2014 14:58:07 +0400 Subject: [PATCH 100/202] fix mistake --- nixos/modules/services/audio/alsa.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 7699b3bff3e7..d49c2676f7df 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -9,7 +9,7 @@ let soundState = "/var/lib/alsa/asound.state"; - configPaht = "asound.conf"; + configPath = "asound.conf"; in From 3514ad8b98a9155353d489fa6696bf52ee7b56fe Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 23 May 2014 15:22:57 +0200 Subject: [PATCH 101/202] geary: new package Mail client for GNOME 3 https://wiki.gnome.org/Apps/Geary --- pkgs/desktops/gnome-3/3.12/default.nix | 2 + .../gnome-3/3.12/misc/geary/default.nix | 49 +++++++++++++++++++ .../3.12/misc/geary/disable_valadoc.patch | 24 +++++++++ 3 files changed, 75 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 0600b4ebbf91..baa7113ce90f 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -211,6 +211,8 @@ rec { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + geary = callPackage ./misc/geary { }; + gfbgraph = callPackage ./misc/gfbgraph { }; goffice = callPackage ./misc/goffice { }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix new file mode 100644 index 000000000000..1eb6c0e3ed29 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala +, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +, libnotify, libcanberra, libsecret, gmime +, libpthreadstubs, hicolor_icon_theme +, gnome3, librsvg, gnome_doc_utils, webkitgtk }: + +stdenv.mkDerivation rec { + name = "geary-0.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; + sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime + libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme + gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; + + preConfigure = '' + substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' + ''; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/${name}/ + mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + ''; + + preFixup = '' + wrapProgram "$out/bin/geary" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + patches = [ ./disable_valadoc.patch ]; + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Geary; + description = "Mail client for GNOME 3"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch new file mode 100644 index 000000000000..e65c0dea7472 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch @@ -0,0 +1,24 @@ +--- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 ++++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 +@@ -696,21 +696,6 @@ + ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ + ) + +-# Valadoc +-################################################# +-foreach(pkg ${ENGINE_PACKAGES}) +- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") +-endforeach(pkg ${ENGINE_PACKAGES}) +- +-include(FindValadoc) +-add_custom_target( +- valadoc +- WORKING_DIRECTORY +- ${CMAKE_SOURCE_DIR}/src +- COMMAND +- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi +-) +- + ## Make clean: remove copied files + ################################################## + set_property( From a815933a5d482d8aef068994fa1be9e5e20e2ec3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 15:57:20 +0200 Subject: [PATCH 102/202] haskell-pretty-show: update to version 1.6.7 ... and drop obsolete 1.2 version. --- .../libraries/haskell/pretty-show/1.2.nix | 16 ---------------- .../pretty-show/{1.6.7.nix => default.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{1.6.7.nix => default.nix} (86%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a02..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix similarity index 86% rename from pkgs/development/libraries/haskell/pretty-show/1.6.7.nix rename to pkgs/development/libraries/haskell/pretty-show/default.nix index 7e3e3e25e8a0..56126a42cb36 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.6.7"; - sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz"; + version = "1.6.8"; + sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellLexer ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9c33cb8ff479..0a745ead70d0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1691,9 +1691,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {}; - prettyShow = self.prettyShow_1_6_7; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; From eb1a7e83cde0a8dc1e09fd6404e6fd76885c9d34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 15:59:40 +0200 Subject: [PATCH 103/202] haskell-amqp: update to version 0.8.3 --- pkgs/development/libraries/haskell/amqp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 9d08994af4f2..8256ff54e191 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,20 +1,21 @@ { cabal, binary, clock, connection, dataBinaryIeee754, hspec -, hspecExpectations, monadControl, network, split, text, xml +, hspecExpectations, monadControl, network, split, text, vector +, xml }: cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.2"; - sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf"; + version = "0.8.3"; + sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; isLibrary = true; isExecutable = true; buildDepends = [ binary clock connection dataBinaryIeee754 monadControl network - split text xml + split text vector xml ]; testDepends = [ binary clock connection dataBinaryIeee754 hspec hspecExpectations - network split text + network split text vector ]; doCheck = false; meta = { From b8c26e757e7b9128b4a536de1253fed491d063d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:02 +0200 Subject: [PATCH 104/202] haskell-conduit: update to version 1.1.3 --- 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 99308d432724..94423cc41eff 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.2.1"; - sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai"; + version = "1.1.3"; + sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void From f125c54f1ea719cf9b4dcebabf2487dabb02ae58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:04 +0200 Subject: [PATCH 105/202] haskell-directory-tree: update to version 0.12.0 --- .../development/libraries/haskell/directory-tree/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 5c8b357593e4..343aeb014ad1 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.11.0"; - sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9"; + version = "0.12.0"; + sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz"; buildDepends = [ filepath ]; + testDepends = [ filepath ]; meta = { homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; From c3b34eafc45659a7f37bc0c7d9947c09f8244687 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:05 +0200 Subject: [PATCH 106/202] haskell-esqueleto: update to version 1.4.1.2 --- pkgs/development/libraries/haskell/esqueleto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 0a92db399e50..0538e2f1899c 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.4.1"; - sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj"; + version = "1.4.1.2"; + sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "https://github.com/meteficha/esqueleto"; - description = "Bare bones, type-safe EDSL for SQL queries on persistent backends"; + description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; From d07260e6851e76169b39005e299355e9de3f1073 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:07 +0200 Subject: [PATCH 107/202] haskell-fay: update to version 0.20.0.4 --- 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 d67cc988a2d7..d32a57597802 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.3"; - sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5"; + version = "0.20.0.4"; + sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; isLibrary = true; isExecutable = true; buildDepends = [ From b247f72680c33d00c735c55df11212c7d5d245af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:09 +0200 Subject: [PATCH 108/202] haskell-file-embed: update to version 0.0.7 --- pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 7aa1b78a03eb..a42e963d5582 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.6"; - sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz"; + version = "0.0.7"; + sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { From 85aef68466d2785c873550658948ba39d9b2bfd9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:11 +0200 Subject: [PATCH 109/202] haskell-http-client: update to version 0.3.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 cc8341e2ac4f..b447d9a1f11c 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.3.2.2"; - sha256 = "1znfcn549zxz4wdlv9rvyqz0x52ygx9jba9r1fzxk08mbi8xz6ff"; + version = "0.3.3"; + sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes From bb3d7b8a8507ae6cb7f6e1ae9530797e93774ed1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:12 +0200 Subject: [PATCH 110/202] haskell-httpd-shed: update to version 0.4.0.2 --- pkgs/development/libraries/haskell/httpd-shed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 90f11940a465..2ebb89026176 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "httpd-shed"; - version = "0.4.0.1"; - sha256 = "04m07wqhaggkgksha7x528y890j30ay5axipfy6b1ma9cf0a9jwq"; + version = "0.4.0.2"; + sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3"; isLibrary = true; isExecutable = true; buildDepends = [ network ]; From 163ae08d4667d521e46dd75fadc5e63db287cdf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:14 +0200 Subject: [PATCH 111/202] haskell-io-streams: update to version 1.1.4.4 --- pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 4e3617246813..4813771cb53c 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.1.4.3"; - sha256 = "0qp63xfbfz5ymfn8l9fiy27z30fi4sq201zgsh9x2mkhp6z2yzld"; + version = "1.1.4.4"; + sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings From b1da717d8a7cde4cede9302964672a68e9d2e694 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:16 +0200 Subject: [PATCH 112/202] haskell-openssl-streams: update to version 1.1.0.1 --- .../development/libraries/haskell/openssl-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix index 14d256a471e9..2813b88e95ad 100644 --- a/pkgs/development/libraries/haskell/openssl-streams/default.nix +++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "openssl-streams"; - version = "1.1.0.0"; - sha256 = "0xww3n1mhw0sp9nkx4847gqbq4wnfcnc2m782kn5n8jxnjnm1fqn"; + version = "1.1.0.1"; + sha256 = "1y3vj17951gz3wlf75j3ph3hlkjbrplrmnbd9rcyiipzv51vy8ym"; buildDepends = [ HsOpenSSL ioStreams network ]; testDepends = [ HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit From ae772427596d83bf3a83063c987149413cf28298 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:17 +0200 Subject: [PATCH 113/202] haskell-optparse-applicative: update to version 0.9.0 --- .../libraries/haskell/optparse-applicative/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 94d4b5746e2c..bad23a102ee2 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,13 +1,13 @@ { cabal, ansiWlPprint, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkThPrime, transformers +, testFrameworkThPrime, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.8.1"; - sha256 = "0zy295r2idrwz030i1slpgysyw08782cjc4vgpkxby8i6piixwlh"; - buildDepends = [ ansiWlPprint transformers ]; + version = "0.9.0"; + sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay"; + buildDepends = [ ansiWlPprint transformers transformersCompat ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkThPrime From 3fc2c64ba9eabf5cb19a664b792ebd4c5e9ec4da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:19 +0200 Subject: [PATCH 114/202] haskell-pipes-aeson: update to version 0.4 --- pkgs/development/libraries/haskell/pipes-aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 899810c1539e..85fd3a0a548b 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-aeson"; - version = "0.3.0"; - sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn"; + version = "0.4"; + sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse transformers From 649536da192897d09c9b56b5e521839904857806 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:21 +0200 Subject: [PATCH 115/202] haskell-pipes-parse: update to version 3.0.2 --- pkgs/development/libraries/haskell/pipes-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index ef615ebb808b..5f5dec485b62 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "3.0.1"; - sha256 = "0f262p8mfcpvs3f3myy6bll9v61rfgrfdy2scdzf7vvx0h0lrpj7"; + version = "3.0.2"; + sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08"; buildDepends = [ pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; From 52b290805ab46d9da93898dd8a53f9f9fb794233 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:23 +0200 Subject: [PATCH 116/202] haskell-shelly: update to version 1.5.3.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 01f07ae6a089..4549adaf43e2 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.3.1"; - sha256 = "0lhan549nkxihd94byaknswczlr757smha2fwq7y82rr0k16im4y"; + version = "1.5.3.2"; + sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers From 84373ee34d49aa4bcb09a50e9d0c24be308e0c69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:24 +0200 Subject: [PATCH 117/202] haskell-streaming-commons: update to version 0.1.3 --- .../libraries/haskell/streaming-commons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index f98e6a7b4a2c..1a17cd5f14f5 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.2.4"; - sha256 = "1wy1cdmx3fhxg9xb7v5r3nyyjhr7irvcwy3l4g6br671zh8j8kcg"; + version = "0.1.3"; + sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3"; buildDepends = [ blazeBuilder network random text transformers zlib ]; From d874bb14d2d8d1b787efc6fe078fa731b399888d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:28 +0200 Subject: [PATCH 118/202] haskell-transformers-compat: update to version 0.3.3 --- .../libraries/haskell/transformers-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index e160ed5226e7..dfe9e2ef0d65 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-compat"; - version = "0.3.2"; - sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy"; + version = "0.3.3"; + sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/ekmett/transformers-compat/"; From a2d8dd06885b517f94c648d274407059fb5802b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:29 +0200 Subject: [PATCH 119/202] haskell-vty-ui: update to version 1.7 --- pkgs/development/libraries/haskell/vty-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index ad3ab7823c0e..913451de213b 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6.1"; - sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; + version = "1.7"; + sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd"; isLibrary = true; isExecutable = true; buildDepends = [ From a8cfe984c3dc6ff06d4e5d64ca175e870acb6c4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:31 +0200 Subject: [PATCH 120/202] haskell-wai-extra: update to version 2.1.1.2 --- 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 ef91a8726874..66d45f059129 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.1.1"; - sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1"; + version = "2.1.1.2"; + sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra dataDefault fastLogger From 48810471c1e90224e664cb7df1564f9322d6efa1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:33 +0200 Subject: [PATCH 121/202] haskell-wai-handler-launch: update to version 2.0.1.3 --- .../libraries/haskell/wai-handler-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index 9be534725825..9d59fd68ed61 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "2.0.1.2"; - sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q"; + version = "2.0.1.3"; + sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes transformers wai warp zlibConduit From 6de944958c11ea595445d5d8b3df46b276d4d1db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:34 +0200 Subject: [PATCH 122/202] haskell-wai-test: update to version 2.0.1.3 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 6f9760054664..b15aa1070ba5 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.1.2"; - sha256 = "11mkzh5wlfhdrwzqhsbcl3qnbawmks4vxr1vv0s2ny50q5na41ln"; + version = "2.0.1.3"; + sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra cookie deepseq httpTypes network text transformers wai From 08b81cfa08e12dc76251e3468535c082516de440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:36 +0200 Subject: [PATCH 123/202] haskell-wai-websockets: update to version 2.1.0.2 --- pkgs/development/libraries/haskell/wai-websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index 5558f2e32ce1..5d909c7d773c 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "2.1.0.1"; - sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571"; + version = "2.1.0.2"; + sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2"; isLibrary = true; isExecutable = true; buildDepends = [ From 0c0bbfb8833907e131b157ab9822d1c06545d9c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:38 +0200 Subject: [PATCH 124/202] haskell-wai: update to version 2.1.0.3 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 18c6e08c0b36..540df207241d 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "2.1.0.2"; - sha256 = "02hj07s3vlhbd2hds5pyksghildadjqhr8mmiyabwb7ap8iybidg"; + version = "2.1.0.3"; + sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3"; buildDepends = [ blazeBuilder conduit conduitExtra httpTypes network text transformers vault From d2b7d998910b2adaee340b4e836bfc97e8dd12ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:39 +0200 Subject: [PATCH 125/202] haskell-warp: update to version 2.1.5.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 6a41f6e5bdf6..be5dd392d16f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.5.1"; - sha256 = "1dx911y3nr2ixsn3zdp1rd97rydnvixr9chs3nmmkswzdg3qihvl"; + version = "2.1.5.2"; + sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit conduitExtra hashable httpDate httpTypes liftedBase network From c9cd254f5ca94ab3a4e578a24407f02a8bffccaf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:41 +0200 Subject: [PATCH 126/202] haskell-websockets: update to version 0.8.2.3 --- pkgs/development/libraries/haskell/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 774b17140e19..9e22d0cab185 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.2"; - sha256 = "16q4znki5f4133cgwcs8wqgx6ljl8x59khrsdsi646nclb3lyl0a"; + version = "0.8.2.3"; + sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text From 3fdef94fd142d6fcc2843d2d7ae054510b4d23ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:43 +0200 Subject: [PATCH 127/202] haskell-xml-conduit: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index d31f1d0e70d7..4f3e7fcebb7a 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.0.1"; - sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9"; + version = "1.2.0.2"; + sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq From 0259eaf66c8739d1471ec9d573b41837865d8116 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:00:44 +0200 Subject: [PATCH 128/202] haskell-yaml: update to version 0.8.8.3 --- 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 edbd5afe20bf..502a11e81251 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.8.2"; - sha256 = "0dqn5pzk3bh9pprnlp9ggmjdwbb1j9yyd6ihq7vwky5g4yrqbl8m"; + version = "0.8.8.3"; + sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf"; isLibrary = true; isExecutable = true; buildDepends = [ From 363b35ac2c43ebf0cc5583904ca9bdac21057518 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:01:17 +0200 Subject: [PATCH 129/202] haskell-tls: update to version 1.2.8.nix --- .../haskell/tls/{1.2.7.nix => 1.2.8.nix} | 20 +++++++++---------- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/development/libraries/haskell/tls/{1.2.7.nix => 1.2.8.nix} (52%) diff --git a/pkgs/development/libraries/haskell/tls/1.2.7.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix similarity index 52% rename from pkgs/development/libraries/haskell/tls/1.2.7.nix rename to pkgs/development/libraries/haskell/tls/1.2.8.nix index fbd9b048f065..8bba66b6c92e 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.7.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix @@ -1,19 +1,19 @@ { cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes -, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network -, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 -, x509Store, x509Validation +, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash +, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, dataDefaultClass, mtl, network, QuickCheck, testFramework +, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.7"; - sha256 = "0f0zlyiw6bgqkhg0czlpqyz8jgb1zbgbpzpk73v5p7hsjffsblgs"; + version = "1.2.8"; + sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha"; buildDepends = [ - asn1Encoding asn1Types byteable cereal cipherAes cipherRc4 - cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandom dataDefaultClass mtl network x509 x509Store - x509Validation + asn1Encoding asn1Types byteable cereal cipherAes cipherDes + cipherRc4 cryptoCipherTypes 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 0a745ead70d0..deea8d8081b3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2187,8 +2187,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {}; - tls = self.tls_1_2_7; + tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {}; + tls = self.tls_1_2_8; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; From ba5473676f867e32e9be5c2225ab4e8c8ded2be2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 16:06:40 +0200 Subject: [PATCH 130/202] Update Haskell OpenGL and GLUT packages. 1) GLURaw 1.4.0.0 --> 1.4.0.1 2) GLUT 2.5.1.0 -> 2.5.1.1 3) OpenGL 2.9.1.0 -> 2.9.2.0 4) OpenGLRaw 1.5.0.0 added --- .../GLURaw/{1.4.0.0.nix => 1.4.0.1.nix} | 4 ++-- .../haskell/GLUT/{2.5.1.0.nix => 2.5.1.1.nix} | 4 ++-- .../OpenGL/{2.9.1.0.nix => 2.9.2.0.nix} | 4 ++-- .../libraries/haskell/OpenGLRaw/1.5.0.0.nix | 15 +++++++++++++ pkgs/top-level/haskell-packages.nix | 21 +++++++++---------- 5 files changed, 31 insertions(+), 17 deletions(-) rename pkgs/development/libraries/haskell/GLURaw/{1.4.0.0.nix => 1.4.0.1.nix} (83%) rename pkgs/development/libraries/haskell/GLUT/{2.5.1.0.nix => 2.5.1.1.nix} (85%) rename pkgs/development/libraries/haskell/OpenGL/{2.9.1.0.nix => 2.9.2.0.nix} (84%) create mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix similarity index 83% rename from pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix rename to pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index a6f0e61d2730..1da2b743687a 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.4.0.0"; - sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g"; + version = "1.4.0.1"; + sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix similarity index 85% rename from pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 1cfd9a37eb0d..79112138b4ac 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.5.1.0"; - sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s"; + version = "2.5.1.1"; + sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa"; buildDepends = [ OpenGL OpenGLRaw ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix similarity index 84% rename from pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index 6f79b5c7a068..c012c65d5228 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.9.1.0"; - sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3"; + version = "2.9.2.0"; + sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p"; buildDepends = [ GLURaw OpenGLRaw text ]; extraLibraries = [ libX11 mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix new file mode 100644 index 000000000000..f0e6c7ac7adb --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -0,0 +1,15 @@ +{ cabal, mesa }: + +cabal.mkDerivation (self: { + pname = "OpenGLRaw"; + version = "1.5.0.0"; + sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5"; + extraLibraries = [ mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + 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 deea8d8081b3..239d1c413b08 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -852,8 +852,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; }; - GLURaw = self.GLURaw_1_4_0_0; + GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; + GLURaw = self.GLURaw_1_4_0_1; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -869,10 +869,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; }; - GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix { - OpenGL = self.OpenGL_2_9_1_0; + GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { + OpenGL = self.OpenGL_2_9_2_0; }; - GLUT = self.GLUT_2_5_1_0; + GLUT = self.GLUT_2_5_1_1; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; @@ -1534,9 +1534,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL { - OpenGL = self.OpenGL_2_9_1_0; - }; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; @@ -1544,12 +1542,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; - OpenGL = self.OpenGL_2_9_1_0; + OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {}; + OpenGL = self.OpenGL_2_9_2_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_4_0_0; + OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; + OpenGLRaw = self.OpenGLRaw_1_5_0_0; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {}; From d7bc0de8c851cfd2a228813060d2780ce3e63b2c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 23 May 2014 16:54:35 +0200 Subject: [PATCH 131/202] haskell-categories: add version 1.0.6 --- .../libraries/haskell/categories/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/categories/default.nix diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix new file mode 100644 index 000000000000..54483f177011 --- /dev/null +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -0,0 +1,14 @@ +{ cabal, void }: + +cabal.mkDerivation (self: { + pname = "categories"; + version = "1.0.6"; + sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy"; + buildDepends = [ void ]; + meta = { + homepage = "http://github.com/ekmett/categories"; + description = "Categories"; + 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 239d1c413b08..4ecb6da5516f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -326,6 +326,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in carray = callPackage ../development/libraries/haskell/carray {}; + categories = callPackage ../development/libraries/haskell/categories {}; + cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; From 34c6a26f5dda453b5a332a0b13564dd4c13069c5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 23 May 2014 16:54:46 +0200 Subject: [PATCH 132/202] haskell-compdata: add version 0.7.0.1 --- .../libraries/haskell/compdata/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/compdata/default.nix diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix new file mode 100644 index 000000000000..564f1179d875 --- /dev/null +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -0,0 +1,23 @@ +{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns +, transformers +}: + +cabal.mkDerivation (self: { + pname = "compdata"; + version = "0.7.0.1"; + sha256 = "0d511yjfydv43sr74ggz6pnqm0wqz2m9fgrxpl6avvj8p10va7h7"; + buildDepends = [ + deepseq derive mtl QuickCheck thExpandSyns transformers + ]; + testDepends = [ + deepseq derive HUnit mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns + transformers + ]; + meta = { + description = "Compositional Data 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 4ecb6da5516f..497e1dde6a6a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -416,6 +416,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + compdata = callPackage ../development/libraries/haskell/compdata {}; + composition = callPackage ../development/libraries/haskell/composition {}; concatenative = callPackage ../development/libraries/haskell/concatenative {}; From 04f3c8e718f12b04703e9b11db81381bc4b78eab Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 23 May 2014 16:54:57 +0200 Subject: [PATCH 133/202] haskell-recursion-schemes: add version 4.0 --- .../haskell/recursion-schemes/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/recursion-schemes/default.nix diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix new file mode 100644 index 000000000000..78e7da44061a --- /dev/null +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, free, transformers }: + +cabal.mkDerivation (self: { + pname = "recursion-schemes"; + version = "4.0"; + sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06"; + buildDepends = [ comonad free transformers ]; + meta = { + homepage = "http://github.com/ekmett/recursion-schemes/"; + description = "Generalized bananas, lenses and barbed wire"; + 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 497e1dde6a6a..abb58bd7bcc1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1781,6 +1781,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; + recursionSchemes = callPackage ../development/libraries/haskell/recursion-schemes {}; + reducers = callPackage ../development/libraries/haskell/reducers {}; reflection = callPackage ../development/libraries/haskell/reflection {}; From 47a8cd70086167cf6ccbe21fd29d7e2f7ccfbca8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 23 May 2014 16:55:12 +0200 Subject: [PATCH 134/202] haskell-codex: add version 0.0.1.6 --- .../tools/haskell/codex/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/haskell/codex/default.nix diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix new file mode 100644 index 000000000000..b8c9e297ce8b --- /dev/null +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -0,0 +1,21 @@ +{ cabal, Cabal_1_20_0_0, downloadCurl, either, filepath, hackageDb, MissingH +, monadLoops, tar, text, transformers, yaml, zlib +}: + +cabal.mkDerivation (self: { + pname = "codex"; + version = "0.0.1.6"; + sha256 = "0yr3qygxxj4k8ld7jh1h87jjawvixbz5wjssdxd5ix7askmm1dx2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Cabal_1_20_0_0 downloadCurl either filepath hackageDb MissingH + monadLoops tar text transformers yaml zlib + ]; + meta = { + homepage = "http://github.com/aloiscochard/codex"; + description = "A ctags file generator for cabal project dependencies"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index abb58bd7bcc1..f6fb03478e45 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2671,6 +2671,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; cabalInstall = self.cabalInstall_1_20_0_1; + codex = callPackage ../development/tools/haskell/codex {}; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; From a1df473db7fc6e40446cb0e7b0d32603f0c1f13f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 23 May 2014 16:55:23 +0200 Subject: [PATCH 135/202] haskell-hobbes: add version 0.2.2 --- .../development/tools/haskell/hobbes/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/haskell/hobbes/default.nix diff --git a/pkgs/development/tools/haskell/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix new file mode 100644 index 000000000000..0c9b2d45ae17 --- /dev/null +++ b/pkgs/development/tools/haskell/hobbes/default.nix @@ -0,0 +1,16 @@ +{ cabal, filemanip, filepath, fsnotify, systemFilepath, text }: + +cabal.mkDerivation (self: { + pname = "hobbes"; + version = "0.2.2"; + sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filemanip filepath fsnotify systemFilepath text ]; + meta = { + homepage = "http://github.com/jhickner/hobbes"; + description = "A small file watcher for OSX"; + 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 f6fb03478e45..c78b34a05a07 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2677,6 +2677,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; + hobbes = callPackage ../development/tools/haskell/hobbes {}; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; keter = callPackage ../development/tools/haskell/keter {}; From 4d7d3d6aabd9b47842f885548f18acc62c8fe62b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:02:31 +0200 Subject: [PATCH 136/202] haskell-heist: jailbreak to fix build with current versions of 'directory-tree' --- pkgs/development/libraries/haskell/heist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 77ebf3fd9af1..faf5212a7942 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time transformers unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; From a71a8e85deaf4d6eb10d8ecd83ce345c2da52b80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:37:35 +0200 Subject: [PATCH 137/202] arbtt: jailbreak to fix build with tasty > 0.7 --- pkgs/applications/misc/arbtt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index b8c56baf9560..9cd192fc14aa 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { binary deepseq HUnit parsec pcreLight processExtras tasty tastyGolden tastyHunit time transformers utf8String ]; + jailbreak = true; extraLibraries = [ libXScrnSaver ]; meta = { homepage = "http://arbtt.nomeata.de/"; From 6421a74f67f5c0f0883595146aad83782591f009 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:42:51 +0200 Subject: [PATCH 138/202] haskell-packages.nix: rename GLFWb to GLFWB for consistency https://github.com/NixOS/cabal2nix/issues/65 --- 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 c78b34a05a07..1f993dd4b67a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -834,7 +834,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in GLFW = callPackage ../development/libraries/haskell/GLFW {}; - GLFWb = callPackage ../development/libraries/haskell/GLFW-b {}; + GLFWB = callPackage ../development/libraries/haskell/GLFW-b {}; glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; From 3d59f42ce50038e5299d5a589734afc210a6c2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 23 May 2014 23:51:05 +0800 Subject: [PATCH 139/202] renpy: update to 6.17.6 --- pkgs/development/interpreters/renpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d3630888f64f..ccaa45c6c338 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "renpy-6.17.4"; + name = "renpy-6.17.6"; meta = { description = "Ren'Py Visual Novel Engine"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2"; - sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp"; + url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2"; + sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic"; }; buildInputs = [ From 5b85e4825c59d3623f20fc310d92fe8babef9ccf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:58:05 +0200 Subject: [PATCH 140/202] arbtt: re-generate with cabal2nix --- pkgs/applications/misc/arbtt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 9cd192fc14aa..b5ecf8fa1d11 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { binary deepseq HUnit parsec pcreLight processExtras tasty tastyGolden tastyHunit time transformers utf8String ]; - jailbreak = true; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; meta = { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; From 3f0a45e88fb3b7e1cdf452f23b4bdb3658501d59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:58:48 +0200 Subject: [PATCH 141/202] haskell-codex: update to version 0.0.2 --- pkgs/development/tools/haskell/codex/default.nix | 12 ++++++------ pkgs/top-level/haskell-defaults.nix | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index b8c9e297ce8b..eeba452f5c8a 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -1,21 +1,21 @@ -{ cabal, Cabal_1_20_0_0, downloadCurl, either, filepath, hackageDb, MissingH +{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH , monadLoops, tar, text, transformers, yaml, zlib }: cabal.mkDerivation (self: { pname = "codex"; - version = "0.0.1.6"; - sha256 = "0yr3qygxxj4k8ld7jh1h87jjawvixbz5wjssdxd5ix7askmm1dx2"; + version = "0.0.2"; + sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55"; isLibrary = true; isExecutable = true; buildDepends = [ - Cabal_1_20_0_0 downloadCurl either filepath hackageDb MissingH - monadLoops tar text transformers yaml zlib + Cabal downloadCurl either filepath hackageDb MissingH monadLoops + tar text transformers yaml zlib ]; meta = { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; - license = "unknown"; + license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a39bf2d4be52..9943a1d9f9dc 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,6 +21,7 @@ ghc782Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; }; ghc763Prefs = self : super : ghc782Prefs self super // { From 466678afdab84162c5be6c5df30567028af20f31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 17:59:24 +0200 Subject: [PATCH 142/202] haskell-compdata: update to version 0.8.1.0 --- pkgs/development/libraries/haskell/compdata/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 564f1179d875..13e6fd8a2b21 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -1,14 +1,14 @@ { cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns -, transformers +, transformers, treeView }: cabal.mkDerivation (self: { pname = "compdata"; - version = "0.7.0.1"; - sha256 = "0d511yjfydv43sr74ggz6pnqm0wqz2m9fgrxpl6avvj8p10va7h7"; + version = "0.8.1.0"; + sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; buildDepends = [ - deepseq derive mtl QuickCheck thExpandSyns transformers + deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; testDepends = [ deepseq derive HUnit mtl QuickCheck testFramework From 10f96a30ffa44d7d27bcef63202100767ed5d1ec Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 23 May 2014 18:00:36 +0200 Subject: [PATCH 143/202] Update dwb. This fixes some bugs in dwb. --- pkgs/applications/networking/browsers/dwb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 010dbd168a8d..b426019efca3 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-04-20"; + name = "dwb-2014-05-23"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2"; - sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b"; + rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa"; + sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; From 555d1fbfdf06a2ae8970849457f1a5661afda89d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 05:51:16 +0200 Subject: [PATCH 144/202] colors: 0.1.1 --- .../libraries/haskell/colors/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/colors/default.nix diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix new file mode 100644 index 000000000000..245ea3ef30e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -0,0 +1,14 @@ +{ cabal, profunctors }: + +cabal.mkDerivation (self: { + pname = "colors"; + version = "0.1.1"; + sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm"; + buildDepends = [ profunctors ]; + meta = { + homepage = "https://github.com/fumieval/colors"; + description = "A type for colors"; + 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 2a4dc66b82db..e140d6075ea0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -406,6 +406,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; + colors = callPackage ../development/libraries/haskell/colors {}; + colour = callPackage ../development/libraries/haskell/colour {}; comonad = callPackage ../development/libraries/haskell/comonad {}; From 9e8f9b55284a955045d4f179ca6298ed59ecb70b Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 05:51:33 +0200 Subject: [PATCH 145/202] boundingboxes: 0.1.1, 0.2 --- .../libraries/haskell/boundingboxes/0.1.1.nix | 24 +++++++++++++++++++ .../libraries/haskell/boundingboxes/0.2.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix create mode 100644 pkgs/development/libraries/haskell/boundingboxes/0.2.nix diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix new file mode 100644 index 000000000000..babec91cd90a --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -0,0 +1,24 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.1.1"; + sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0"; + buildDepends = [ lens linear ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + + # https://github.com/fumieval/boundingboxes/issues/1 + doCheck = false; + + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix new file mode 100644 index 000000000000..1e534c0edf85 --- /dev/null +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -0,0 +1,24 @@ +{ cabal, lens, linear, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, testFrameworkTh +}: + +cabal.mkDerivation (self: { + pname = "boundingboxes"; + version = "0.2"; + sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp"; + buildDepends = [ lens ]; + testDepends = [ + lens linear QuickCheck random testFramework + testFrameworkQuickcheck2 testFrameworkTh + ]; + + # https://github.com/fumieval/boundingboxes/issues/1 + doCheck = false; + + meta = { + homepage = "https://github.com/fumieval/boundingboxes"; + description = "The type for 2D bounding box"; + 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 e140d6075ea0..4c420695f9ec 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -275,6 +275,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Boolean = callPackage ../development/libraries/haskell/Boolean {}; + boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {}; + boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; + boundingboxes = self.boundingboxes_0_2; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; bson = callPackage ../development/libraries/haskell/bson {}; From 7bd546b816f7de19fcded12d700a49d3165d8ab2 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 05:51:48 +0200 Subject: [PATCH 146/202] control-bool: 0.2.1 --- .../libraries/haskell/control-bool/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/control-bool/default.nix diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix new file mode 100644 index 000000000000..4fe9a975f41d --- /dev/null +++ b/pkgs/development/libraries/haskell/control-bool/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "control-bool"; + version = "0.2.1"; + sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4"; + meta = { + homepage = "https://github.com/fumieval/control-bool"; + description = "Useful combinators for boolean expressions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c420695f9ec..4432d2f53177 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -446,6 +446,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in constraints = callPackage ../development/libraries/haskell/constraints {}; + controlBool = callPackage ../development/libraries/haskell/control-bool {}; + controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {}; controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; From ab59d64a59781958157d741cf43c0cebb376db7f Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 06:16:52 +0200 Subject: [PATCH 147/202] freetype2: 0.1.1 --- .../libraries/haskell/freetype2/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/freetype2/default.nix diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix new file mode 100644 index 000000000000..145ae4a2d792 --- /dev/null +++ b/pkgs/development/libraries/haskell/freetype2/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "freetype2"; + version = "0.1.1"; + sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s"; + isLibrary = true; + isExecutable = true; + meta = { + description = "Haskell binding for FreeType 2 library"; + 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 4432d2f53177..4d5bdd3d3d8e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -784,6 +784,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gamma = callPackage ../development/libraries/haskell/gamma {}; + freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + geniplate = callPackage ../development/libraries/haskell/geniplate {}; gd = callPackage ../development/libraries/haskell/gd { From f4f0dab825354a3faec1b245d1b08e6b3d8cf53d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 06:29:50 +0200 Subject: [PATCH 148/202] JuicyPixels-util: 0.1 --- .../libraries/haskell/JuicyPixels-util/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/JuicyPixels-util/default.nix diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix new file mode 100644 index 000000000000..844d512c62f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -0,0 +1,14 @@ +{ cabal, JuicyPixels, vector }: + +cabal.mkDerivation (self: { + pname = "JuicyPixels-util"; + version = "0.1"; + sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc"; + buildDepends = [ JuicyPixels vector ]; + meta = { + homepage = "https://github.com/fumieval/JuicyPixels-util"; + description = "Convert JuicyPixel images into RGBA format, flip, trim and so on"; + 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 4d5bdd3d3d8e..9f58cbf08ee1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1245,6 +1245,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; + JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {}; + kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {}; kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; From 099f7d5620eeea80bdfced5429761c80e3f72d6a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 06:32:50 +0200 Subject: [PATCH 149/202] minioperational: 0.4.3 --- .../libraries/haskell/minioperational/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/minioperational/default.nix diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix new file mode 100644 index 000000000000..99cae442c3bb --- /dev/null +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "minioperational"; + version = "0.4.3"; + sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/fumieval/minioperational"; + description = "fast and simple operational monad"; + 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 9f58cbf08ee1..e772160255b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1377,6 +1377,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in minimorph = callPackage ../development/libraries/haskell/minimorph {}; + minioperational = callPackage ../development/libraries/haskell/minioperational {}; + miniutter = callPackage ../development/libraries/haskell/miniutter { binary = self.binary_0_7_2_1; }; From 7943355954f9a9f874356f7f51f3114989894337 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 06:36:03 +0200 Subject: [PATCH 150/202] free-game: 1.0.5, 1.1 --- .../libraries/haskell/free-game/1.0.5.nix | 22 +++++++++++++++++++ .../libraries/haskell/free-game/1.1.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 +++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/free-game/1.0.5.nix create mode 100644 pkgs/development/libraries/haskell/free-game/1.1.nix diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix new file mode 100644 index 000000000000..2ebec4c71535 --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -0,0 +1,22 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.0.5"; + sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWb + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix new file mode 100644 index 000000000000..132e06bd96ba --- /dev/null +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -0,0 +1,22 @@ +{ cabal, boundingboxes, colors, controlBool, filepath, free +, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens +, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers +, vector, void +}: + +cabal.mkDerivation (self: { + pname = "free-game"; + version = "1.1"; + sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; + buildDepends = [ + boundingboxes colors controlBool filepath free freetype2 GLFWb + hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL + OpenGLRaw random reflection transformers vector void + ]; + meta = { + homepage = "https://github.com/fumieval/free-game"; + description = "Create games for free"; + 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 e772160255b6..2f3d5e497384 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -780,12 +780,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; + freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { + boundingboxes = self.boundingboxes_0_1_1; + }; + freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; + freeGame = self.freeGame_1_1; + fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; - gamma = callPackage ../development/libraries/haskell/gamma {}; - freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; + geniplate = callPackage ../development/libraries/haskell/geniplate {}; gd = callPackage ../development/libraries/haskell/gd { From 807482ca18585e50fb3fb779f42f32d896505aab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 18:13:30 +0200 Subject: [PATCH 151/202] xmobar: enable all extensions by default https://github.com/NixOS/nixpkgs/pull/2728 --- pkgs/applications/misc/xmobar/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 227fa438a14a..acd0568772aa 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,6 +1,7 @@ -{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr -, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools -, X11, X11Xft +{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP +, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time +, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11 +, X11Xft }: cabal.mkDerivation (self: { @@ -10,11 +11,12 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm - time utf8String X11 X11Xft + alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec + regexCompat stm time timezoneOlson timezoneSeries utf8String X11 + X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; - configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd"; + configureFlags = "-fall_extensions"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 020b1bf00aeefbf50ca66f9841a83d08bc289305 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 18:17:53 +0200 Subject: [PATCH 152/202] Re-generate expressions with cabal2nix. --- pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix | 3 --- pkgs/development/libraries/haskell/boundingboxes/0.2.nix | 3 --- pkgs/development/libraries/haskell/free-game/1.0.5.nix | 4 ++-- pkgs/development/libraries/haskell/free-game/1.1.nix | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix index babec91cd90a..3dfd986ee62b 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -11,10 +11,7 @@ cabal.mkDerivation (self: { lens linear QuickCheck random testFramework testFrameworkQuickcheck2 testFrameworkTh ]; - - # https://github.com/fumieval/boundingboxes/issues/1 doCheck = false; - meta = { homepage = "https://github.com/fumieval/boundingboxes"; description = "The type for 2D bounding box"; diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix index 1e534c0edf85..44c8b3fee6f4 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -11,10 +11,7 @@ cabal.mkDerivation (self: { lens linear QuickCheck random testFramework testFrameworkQuickcheck2 testFrameworkTh ]; - - # https://github.com/fumieval/boundingboxes/issues/1 doCheck = false; - meta = { homepage = "https://github.com/fumieval/boundingboxes"; description = "The type for 2D bounding box"; diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix index 2ebec4c71535..f6f057852c2e 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -1,5 +1,5 @@ { cabal, boundingboxes, colors, controlBool, filepath, free -, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers , vector, void }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { version = "1.0.5"; sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; buildDepends = [ - boundingboxes colors controlBool filepath free freetype2 GLFWb + boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL OpenGLRaw random reflection transformers vector void ]; diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix index 132e06bd96ba..4d9f57799dba 100644 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -1,5 +1,5 @@ { cabal, boundingboxes, colors, controlBool, filepath, free -, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens +, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers , vector, void }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { version = "1.1"; sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; buildDepends = [ - boundingboxes colors controlBool filepath free freetype2 GLFWb + boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL OpenGLRaw random reflection transformers vector void ]; From de014b4b86affea363b3b1759870ff1436ca51b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 18:56:10 +0200 Subject: [PATCH 153/202] haskell-split: add version 0.1.4.3 for the benefit of GHC 6.x --- .../development/libraries/haskell/split/0.1.4.3.nix | 13 +++++++++++++ pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 1 + 3 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/split/0.1.4.3.nix diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix new file mode 100644 index 000000000000..ad0df5c2cb02 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.1.4.3"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + meta = { + homepage = "http://code.haskell.org/~byorgey/code/split"; + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9943a1d9f9dc..664ef8074def 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -75,6 +75,7 @@ haddock = self.haddock_2_7_2; parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2f3d5e497384..4c2ecda87ba2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2039,6 +2039,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; + split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; From 70d61f85175457898f37987ee7136e51e56e58d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 18:57:03 +0200 Subject: [PATCH 154/202] haskell-defaults.nix: don't override 'Cabal' in GHC 6.10.4; it's a core library --- pkgs/top-level/haskell-defaults.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 664ef8074def..12413783b897 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -81,24 +81,23 @@ }; ghc6104Prefs = self : super : ghc6123Prefs self super // { - alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - Cabal = self.Cabal_1_16_0_3; + alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; - happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = self.hashable_1_1_2_5; - HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_6_0_1; - QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; - zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; # Abstraction for Haskell packages collections From 78618e12d39d1088f0eb6ae647e731d3cd23ab33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 18:59:09 +0200 Subject: [PATCH 155/202] haskell-async: fix build with GHC 6.12.x --- pkgs/top-level/haskell-defaults.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 12413783b897..f079e4ac4038 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -69,6 +69,7 @@ ghc6123Prefs = self : super : ghc704Prefs self super // { alex = self.alex_3_1_3; + async = self.async_2_0_1_4; cabalInstall = self.cabalInstall_1_16_0_2; cgi = self.cgi_3001_1_7_5; deepseq = self.deepseq_1_2_0_1; @@ -82,6 +83,7 @@ ghc6104Prefs = self : super : ghc6123Prefs self super // { alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + async = null; # none of our versions compile binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; From c18775837cf7122e2448539b738beea62c96af1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:20:16 +0200 Subject: [PATCH 156/202] nixos/modules/services/audio/alsa.nix: fix evaluation https://github.com/NixOS/nixpkgs/issues/2732 --- nixos/modules/services/audio/alsa.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index d49c2676f7df..653c0ed5d70b 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -7,10 +7,6 @@ let inherit (pkgs) alsaUtils; - soundState = "/var/lib/alsa/asound.state"; - - configPath = "asound.conf"; - in { @@ -39,7 +35,7 @@ in extraConfig = mkOption { type = types.lines; - default = ''''; + default = ""; example = '' defaults.pcm.!card 3 ''; @@ -59,10 +55,12 @@ in environment.systemPackages = [ alsaUtils ]; - environment.etc = [ { source = config.sound.extraConfig; - target = configPath; - } - ]; + environment.etc = mkIf (config.sound.extraConfig != "") + [ + { source = pkgs.writeText "asound.conf" config.sound.extraConfig; + target = "asound.conf"; + } + ]; # ALSA provides a udev rule for restoring volume settings. services.udev.packages = [ alsaUtils ]; From 8806abe97e768d37906b93af5cf9d4a32ca8f707 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 23 May 2014 20:06:02 +0200 Subject: [PATCH 157/202] Update org-mode to latest stable version --- pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ad2bd2f0ba6a..9af7c24e8008 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-8.2.1"; + name = "org-8.2.6"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823"; + sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1"; }; buildInputs = [ emacs ]; From db0b1b76d3aa2394504b64c61d79b630cc1b8811 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:04:06 +0200 Subject: [PATCH 158/202] haskell-scientific: add versions 0.1.0.1 and 0.3.2.1 --- .../libraries/haskell/scientific/0.1.0.1.nix | 17 ++++++++++++++ .../scientific/{default.nix => 0.2.0.2.nix} | 0 .../libraries/haskell/scientific/0.3.2.1.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/scientific/0.1.0.1.nix rename pkgs/development/libraries/haskell/scientific/{default.nix => 0.2.0.2.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/scientific/0.3.2.1.nix diff --git a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix new file mode 100644 index 000000000000..178476ad3cf7 --- /dev/null +++ b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck +, text +}: + +cabal.mkDerivation (self: { + pname = "scientific"; + version = "0.1.0.1"; + sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ smallcheck tasty tastySmallcheck text ]; + meta = { + homepage = "https://github.com/basvandijk/scientific"; + description = "Arbitrary-precision floating-point numbers represented using scientific notation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/scientific/default.nix rename to pkgs/development/libraries/haskell/scientific/0.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix new file mode 100644 index 000000000000..467f2f1d1608 --- /dev/null +++ b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix @@ -0,0 +1,22 @@ +{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty +, tastyAntXml, tastyQuickcheck, tastySmallcheck, text +}: + +cabal.mkDerivation (self: { + pname = "scientific"; + version = "0.3.2.1"; + sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ + QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck + tastySmallcheck text + ]; + jailbreak = true; + meta = { + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c2ecda87ba2..ed03835de1a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1879,7 +1879,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; - scientific = callPackage ../development/libraries/haskell/scientific {}; + scientific_0_1_0_1 = callPackage ../development/libraries/haskell/scientific/0.1.0.1.nix {}; + scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; + scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; + scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff scotty = callPackage ../development/libraries/haskell/scotty {}; From 45799eeabaadf81f4bd5d7e7b70a38bd22a5c301 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:26:11 +0200 Subject: [PATCH 159/202] haskell-scientific: there's no point in using 0.1.0.1, because it doesn't build with GHC 6.12.x either :-( --- .../libraries/haskell/scientific/0.1.0.1.nix | 17 ----------------- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/scientific/0.1.0.1.nix diff --git a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix deleted file mode 100644 index 178476ad3cf7..000000000000 --- a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck -, text -}: - -cabal.mkDerivation (self: { - pname = "scientific"; - version = "0.1.0.1"; - sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ smallcheck tasty tastySmallcheck text ]; - meta = { - homepage = "https://github.com/basvandijk/scientific"; - description = "Arbitrary-precision floating-point numbers represented using scientific notation"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index f079e4ac4038..e85d7a57327b 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -76,6 +76,7 @@ haddock = self.haddock_2_7_2; parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + scientific = null; # none of our versions compile split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed03835de1a3..9819a4cb5ed7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1879,7 +1879,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; - scientific_0_1_0_1 = callPackage ../development/libraries/haskell/scientific/0.1.0.1.nix {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff From d364ba0fba7bbbe108f97d3d0721df6f9025a82e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:27:47 +0200 Subject: [PATCH 160/202] haskell-wreq: remove unnecessary overrides --- pkgs/top-level/haskell-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9819a4cb5ed7..36b22b935ce1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2405,13 +2405,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; - wreq = callPackage ../development/libraries/haskell/wreq { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - attoparsec = self.attoparsec_0_11_3_1; - lens = self.lens.override { - aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; }; - }; - }; + wreq = callPackage ../development/libraries/haskell/wreq {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; From da38198b4ff662d41d573c0e71adad690332b676 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:30:01 +0200 Subject: [PATCH 161/202] Use attoparsec 0.10.x when building with GHC 6.x. Newer versions depend on 'scientific', which this compiler cannot build. --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e85d7a57327b..a30b91be52e6 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -70,6 +70,7 @@ ghc6123Prefs = self : super : ghc704Prefs self super // { alex = self.alex_3_1_3; async = self.async_2_0_1_4; + attoparsec = self.attoparsec_0_10_4_0; cabalInstall = self.cabalInstall_1_16_0_2; cgi = self.cgi_3001_1_7_5; deepseq = self.deepseq_1_2_0_1; From 6962c86135db83d3f78c2b20e5161d99f7ba25a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:57:35 +0200 Subject: [PATCH 162/202] haskell-defaults.nix: improve configuration for GHC 6.x --- pkgs/top-level/haskell-defaults.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a30b91be52e6..296c85b4d074 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -74,18 +74,28 @@ cabalInstall = self.cabalInstall_1_16_0_2; cgi = self.cgi_3001_1_7_5; deepseq = self.deepseq_1_2_0_1; + dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + exceptions = null; # none of our versions compile haddock = self.haddock_2_7_2; + logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + monadPar = self.monadPar_0_1_0_3; + nats = null; # none of our versions compile parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; scientific = null; # none of our versions compile split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 + tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + temporary = null; # none of our versions compile + vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; ghc6104Prefs = self : super : ghc6123Prefs self super // { alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; async = null; # none of our versions compile + attoparsec = null; # none of our versions compile binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; From 5538d68acaa4326fcd9480b19f5b38dec681bea8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 20:16:53 +0200 Subject: [PATCH 163/202] haskell-defaults.nix: move extensible-exceptions override into the right place --- pkgs/top-level/haskell-defaults.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 296c85b4d074..5c45a663d556 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -46,6 +46,7 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; @@ -54,7 +55,6 @@ ghc722Prefs = self : super : ghc742Prefs self super // { deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - extensibleExceptions = null; # core package in ghc <= 7.4.x haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; From ca02d3734b719b3da7464f31acc16f8aea25480a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 20:51:31 +0200 Subject: [PATCH 164/202] haskell-defaults.nix: override case-sensitive on GHC 7.2.2 to avoid build error --- pkgs/top-level/haskell-defaults.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 5c45a663d556..02357c7eca91 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -53,6 +53,7 @@ }; ghc722Prefs = self : super : ghc742Prefs self super // { + caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions haddock = self.haddock_2_9_4; @@ -61,6 +62,7 @@ ghc704Prefs = self : super : ghc722Prefs self super // { binary = self.binary_0_7_2_1; # core package in ghc >= 7.2.2 + caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; From e081cc3b44d071e8c56d8b819c0336788d5fd126 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 20:59:50 +0200 Subject: [PATCH 165/202] haskell-defaults.nix: fix hashable and case-insensitive builds with GHC 6.x --- pkgs/top-level/haskell-defaults.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 02357c7eca91..a8f4110fdb35 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -99,10 +99,11 @@ async = null; # none of our versions compile attoparsec = null; # none of our versions compile binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; - hashable = self.hashable_1_1_2_5; + hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; From a1e3aef5d8cf8198d40bbaf928ca6ce90bac4cff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 21:32:19 +0200 Subject: [PATCH 166/202] haskell-split: don't run the test suite with GHC 7.9.x to avoid infinite loop --- pkgs/development/libraries/haskell/split/0.2.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index ab60774cca40..2d768e2e71d7 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"; testDepends = [ QuickCheck ]; + doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9"; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; From 00594510e8043c8c30df3d66b1a4484676ff2a6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 21:34:16 +0200 Subject: [PATCH 167/202] haskell-defaults.nix: fix hashtables build with GHC 6.10.x --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a8f4110fdb35..708fe3271a6c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -104,6 +104,7 @@ haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; From 95aa6a9afa40ed71f0d7e5cfc08c68a2e0d7c4f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 21:56:03 +0200 Subject: [PATCH 168/202] esniper: update to version 2.30.0 --- pkgs/applications/networking/esniper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 0a9703d5e34a..766ec0c17fc0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.29.0"; + name = "esniper-2.30.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-29-0.tgz"; - sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc"; + url = "mirror://sourceforge/esniper/esniper-2-30-0.tgz"; + sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl"; }; buildInputs = [ openssl curl ]; From 116ab5f0c122532ba7834ad1a4f511ba6f820be2 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 24 May 2014 03:32:02 +0200 Subject: [PATCH 169/202] seafile: update client, ccnet, libsearpc and shared --- .../networking/seafile-client/default.nix | 4 +- .../libraries/libsearpc/default.nix | 8 +- ...Add-autoconfiguration-for-libjansson.patch | 121 ------------------ pkgs/misc/seafile-shared/default.nix | 6 +- ...Add-autoconfiguration-for-libjansson.patch | 72 ----------- pkgs/tools/networking/ccnet/default.nix | 8 +- pkgs/tools/networking/ccnet/libccnet.pc.patch | 10 -- 7 files changed, 11 insertions(+), 218 deletions(-) delete mode 100644 pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch delete mode 100644 pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch delete mode 100644 pkgs/tools/networking/ccnet/libccnet.pc.patch diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index d24437aabb6b..e9036ba92614 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-client-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"; - sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0"; + sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2"; }; buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 863a42b741ba..32cb7b860c4e 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.2.1"; - seafileVersion = "2.1.1"; + version = "1.2.2"; + seafileVersion = "3.0.4"; name = "libsearpc-${version}"; src = fetchurl { url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz"; - sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec"; + sha256 = "0s5bqqajxfzyw4km6nhhx39nyq20gv0fxlf2v6ifipvnyk14850k"; }; patches = [ ./libsearpc.pc.patch ]; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.calrama ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 7966d1e683b9..000000000000 --- a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -r -u a/app/Makefile.am b/app/Makefile.am ---- a/app/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/app/Makefile.am 2014-01-16 14:22:24.584094619 +0100 -@@ -21,7 +21,7 @@ - seafile_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/lib/libseafile_common.la \ -- @SEARPC_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@ -@@ -29,7 +29,7 @@ - if COMPILE_SERVER - seafserv_tool_SOURCES = seafserv-tool.c - seafserv_tool_LDADD = @CCNET_LIBS@ \ -- $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \ -+ $(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 - - seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -diff -r -u a/configure.ac b/configure.ac ---- a/configure.ac 2014-01-10 11:38:46.000000000 +0100 -+++ b/configure.ac 2014-01-16 14:22:24.584094619 +0100 -@@ -233,6 +233,7 @@ - GLIB_REQUIRED=2.16.0 - CCNET_REQUIRED=0.9.3 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - ZDB_REQUIRED=2.10 - #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - CURL_REQUIRED=7.17 -@@ -254,6 +255,11 @@ - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ -+ - PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED]) - AC_SUBST(LIBEVENT_CFLAGS) - AC_SUBST(LIBEVENT_LIBS) -diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am ---- a/daemon/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/daemon/Makefile.am 2014-01-16 14:22:24.587427993 +0100 -@@ -139,7 +139,7 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/common/index/libindex.la ${LIB_WS32} \ -- @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ -+ @SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@ - - seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ - -diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am ---- a/server/gc/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/gc/Makefile.am 2014-01-16 14:23:20.991449822 +0100 -@@ -50,7 +50,7 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ - -@@ -63,6 +63,6 @@ - $(top_builddir)/common/cdc/libcdc.la \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/server/Makefile.am b/server/Makefile.am ---- a/server/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/server/Makefile.am 2014-01-16 14:23:40.498354610 +0100 -@@ -99,6 +99,6 @@ - $(top_builddir)/common/index/libindex.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32} - - seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am ---- a/httpserver/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/httpserver/Makefile.am 2014-01-16 14:26:48.673985279 +0100 -@@ -50,7 +50,7 @@ - @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile.la \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \ - @LIBARCHIVE_LIBS@ ${LIB_WS32} - - httpserver_LDFLAGS = @STATIC_COMPILE@ -diff -r -u a/controller/Makefile.am b/controller/Makefile.am ---- a/controller/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/controller/Makefile.am 2014-01-16 14:29:42.076102675 +0100 -@@ -18,6 +18,6 @@ - seafile_controller_LDADD = @CCNET_LIBS@ \ - $(top_builddir)/lib/libseafile_common.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \ -- @SEARPC_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ - - seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ -diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am ---- a/fuse/Makefile.am 2014-01-10 11:38:46.000000000 +0100 -+++ b/fuse/Makefile.am 2014-01-16 14:31:44.764267711 +0100 -@@ -43,6 +43,6 @@ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \ - -lsqlite3 -levent \ - $(top_builddir)/common/cdc/libcdc.la \ -- @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ -+ @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@ - - seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 53092e3a8b74..d6c08e99a51f 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { - version = "2.1.1"; + version = "3.0.4"; name = "seafile-shared-${version}"; src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; - sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6"; + sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0"; }; - patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ]; propagatedBuildInputs = [ ccnet ]; diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch deleted file mode 100644 index 83cdbad7bbac..000000000000 --- a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001 -From: Aaron Lindsay -Date: Wed, 15 Jan 2014 13:49:40 -0500 -Subject: [PATCH] Add autoconfiguration for libjansson - ---- - configure.ac | 5 +++++ - net/daemon/Makefile.am | 4 ++-- - net/server/Makefile.am | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64e74b5..0911671 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0 - ZDB_REQUIRED=2.10 - LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1 - SEARPC_REQUIRED=1.0 -+JANSSON_REQUIRED=2.2.1 - CURL_REQUIRED=7.17 - - PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) -@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED]) - AC_SUBST(SEARPC_CFLAGS) - AC_SUBST(SEARPC_LIBS) - -+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED]) -+AC_SUBST(JANSSON_CFLAGS) -+AC_SUBST(JANSSON_LIBS) -+ - if test x${compile_python} = xyes; then - AM_PATH_PYTHON([2.6]) - -diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am -index 35d1a3c..0e28c6a 100644 ---- a/net/daemon/Makefile.am -+++ b/net/daemon/Makefile.am -@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \ - - ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - - ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined -@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs) - - ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ -- @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ -+ @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@ - - ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@ - -diff --git a/net/server/Makefile.am b/net/server/Makefile.am -index d587f48..b048936 100644 ---- a/net/server/Makefile.am -+++ b/net/server/Makefile.am -@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \ - @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \ - -lpthread \ - @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \ -- @LDAP_LIBS@ -+ @LDAP_LIBS@ @JANSSON_LIBS@ - - - ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined --- -1.8.5.2 - diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 14b88ddafe84..8896156bd1c5 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { - version = "1.4.0"; - seafileVersion = "2.1.1"; + version = "1.4.2"; + seafileVersion = "3.0.4"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz"; - sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0"; + sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q"; }; - patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ]; - buildInputs = [ which automake autoconf pkgconfig libtool vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch deleted file mode 100644 index 0d9fea552bcd..000000000000 --- a/pkgs/tools/networking/ccnet/libccnet.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay - ---- a/libccnet.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libccnet.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ From 6da85d3cf6690747592346492a091e761ec543fd Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 24 May 2014 01:54:55 +0200 Subject: [PATCH 170/202] free-game: jailbreak due to new OpenGLRaw version This allows it to keep building after ba5473676f867e32e9be5c2225ab4e8c8ded2be2 was pushed. Perhaps we should add the extra OpenGL versions (2.9.1.0) and specify strict versions so that it doesn't fail to build in 2 weeks. --- pkgs/development/libraries/haskell/free-game/1.0.5.nix | 1 + pkgs/development/libraries/haskell/free-game/1.1.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix index f6f057852c2e..efe269db26c5 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL OpenGLRaw random reflection transformers vector void ]; + jailbreak = true; meta = { homepage = "https://github.com/fumieval/free-game"; description = "Create games for free"; diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix index 4d9f57799dba..b19e32027412 100644 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL OpenGLRaw random reflection transformers vector void ]; + jailbreak = true; meta = { homepage = "https://github.com/fumieval/free-game"; description = "Create games for free"; From 19c4909124625e86c3780640a839fdbb207d3cc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:42:07 +0200 Subject: [PATCH 171/202] cabal-install: update to version 1.20.0.2 --- .../cabal-install/{1.20.0.1.nix => 1.20.0.2.nix} | 4 ++-- pkgs/top-level/haskell-defaults.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/tools/package-management/cabal-install/{1.20.0.1.nix => 1.20.0.2.nix} (90%) diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix similarity index 90% rename from pkgs/tools/package-management/cabal-install/1.20.0.1.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.2.nix index d0db9354ae05..dba92ab9321b 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.1"; - sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi"; + version = "1.20.0.2"; + sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 708fe3271a6c..ad0da2265421 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -16,11 +16,11 @@ ghcHEADPrefs = self : super : super // { mtl = self.mtl_2_1_3_1; - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 36b22b935ce1..2f24f206dfb9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2689,8 +2689,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; }; - cabalInstall = self.cabalInstall_1_20_0_1; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall = self.cabalInstall_1_20_0_2; codex = callPackage ../development/tools/haskell/codex {}; From 9b86fb4ea490a17167802c4df70f8fc0c110a711 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 11:08:23 +0200 Subject: [PATCH 172/202] haskell-scientific: update default to the latest version --- 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 2f24f206dfb9..c929665fe482 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1881,7 +1881,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; - scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff + scientific = self.scientific_0_3_2_1; scotty = callPackage ../development/libraries/haskell/scotty {}; From ecaf15c324987c96014a44c85fd19e5d817ff042 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:54:33 +0200 Subject: [PATCH 173/202] haskell-attoparsec: add version 0.11.3.4 --- .../libraries/haskell/attoparsec/0.11.3.4.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-defaults.nix | 2 ++ pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix new file mode 100644 index 000000000000..4af501e7dca6 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -0,0 +1,20 @@ +{ cabal, deepseq, QuickCheck, scientific, testFramework +, testFrameworkQuickcheck2, text +}: + +cabal.mkDerivation (self: { + pname = "attoparsec"; + version = "0.11.3.4"; + sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; + buildDepends = [ deepseq scientific text ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 text + ]; + meta = { + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index ad0da2265421..ed7e33868ea7 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -46,10 +46,12 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + attoparsec = self.attoparsec_0_11_3_1; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + scientific = self.scientific_0_2_0_2; }; ghc722Prefs = self : super : ghc742Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c929665fe482..21cc618fc90a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -191,7 +191,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; - attoparsec = self.attoparsec_0_11_3_1; + attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; + attoparsec = self.attoparsec_0_11_3_4; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; From 82df69a1de1aeb92350a61cd5b9c1183ceb04852 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:20 +0200 Subject: [PATCH 174/202] haskell-zip-archive: add version 0.2.3.2 Use latest zip archive only with GHC 7.8.2 so that we don't have to override 'binary' everywhere else. --- .../zip-archive/{default.nix => 0.2.2.1.nix} | 0 .../libraries/haskell/zip-archive/0.2.3.2.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 23 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/zip-archive/{default.nix => 0.2.2.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/zip-archive/default.nix rename to pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix new file mode 100644 index 000000000000..f1a36feda904 --- /dev/null +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix @@ -0,0 +1,19 @@ +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: + +cabal.mkDerivation (self: { + pname = "zip-archive"; + version = "0.2.3.2"; + sha256 = "1y69sk6jyw1klgpl6bcamq1i9wy1536hz9x4s9b8n375sbhj10f1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary digest filepath mtl text time zlib ]; + testDepends = [ HUnit time ]; + doCheck = false; + meta = { + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index ed7e33868ea7..cc8c68129859 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -42,6 +42,7 @@ modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x + zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; ghc742Prefs = self : super : ghc763Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 21cc618fc90a..7f34e01461ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2502,7 +2502,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; - zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; + zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; + zipArchive_0_2_3_2 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.2.nix {}; + zipArchive = self.zipArchive_0_2_3_2; zipper = callPackage ../development/libraries/haskell/zipper {}; From ff6db963fc2edcb912faed74a19a1ac36d458cb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:27 +0200 Subject: [PATCH 175/202] haskell-aeson: update to version 0.7.0.6 Keep version 0.7.0.4 for builds with ghc <= 7.4.2. --- .../aeson/{default.nix => 0.7.0.4.nix} | 4 --- .../libraries/haskell/aeson/0.7.0.6.nix | 26 +++++++++++++++++++ pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 6 ++--- 4 files changed, 30 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/aeson/{default.nix => 0.7.0.4.nix} (85%) create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix similarity index 85% rename from pkgs/development/libraries/haskell/aeson/default.nix rename to pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index 7c8dd42c0052..b5c959bb6176 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -16,14 +16,10 @@ cabal.mkDerivation (self: { attoparsec HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text time unorderedContainers vector ]; - patchPhase = '' - sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal - ''; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix new file mode 100644 index 000000000000..96a93b40195f --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.7.0.6"; + sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; + buildDepends = [ + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index cc8c68129859..3618c0f10ed9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -46,7 +46,7 @@ }; ghc742Prefs = self : super : ghc763Prefs self super // { - aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; }; + aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; attoparsec = self.attoparsec_0_11_3_1; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7f34e01461ca..216037e74cdf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -138,9 +138,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aes = callPackage ../development/libraries/haskell/aes {}; - aeson = callPackage ../development/libraries/haskell/aeson { - blazeBuilder = null; - }; + aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; + aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; + aeson = self.aeson_0_7_0_6; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; From e08c94e8044d2f31a6459649db0c3e16fc54eb8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:28 +0200 Subject: [PATCH 176/202] haskell-ghc-vis: update to version 0.7.2.2 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index be0b72aa963e..40700b52f61d 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,17 +4,17 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.1"; - sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih"; + version = "0.7.2.2"; + sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot ]; + jailbreak = true; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; - jailbreak = true; meta = { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; From 5e9b258bd8b7760971885adfcd0a92fa6153e785 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:30 +0200 Subject: [PATCH 177/202] haskell-http-types: update to version 0.8.5 --- .../libraries/haskell/http-types/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index a3fa1c8c9ee4..4b1a7b956f67 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,11 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }: +{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck +, quickcheckInstances, text +}: cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.4"; - sha256 = "0bz7g537if863vk29z72hndf1x019dj7shj1aa77pssrxma3a685"; + version = "0.8.5"; + sha256 = "0d282sf3xyk5makhnwfm2k9mgw1fkh07kasmy85fiwjkc1447ciw"; buildDepends = [ blazeBuilder caseInsensitive text ]; - testDepends = [ blazeBuilder hspec QuickCheck text ]; + testDepends = [ + blazeBuilder doctest hspec QuickCheck quickcheckInstances text + ]; jailbreak = true; meta = { homepage = "https://github.com/aristidb/http-types"; From 9f6469a1a1040a5af816f16b715cf711750f7a1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:31 +0200 Subject: [PATCH 178/202] haskell-openssl-streams: update to version 1.1.0.2 --- .../development/libraries/haskell/openssl-streams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix index 2813b88e95ad..33b48d1f1216 100644 --- a/pkgs/development/libraries/haskell/openssl-streams/default.nix +++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "openssl-streams"; - version = "1.1.0.1"; - sha256 = "1y3vj17951gz3wlf75j3ph3hlkjbrplrmnbd9rcyiipzv51vy8ym"; + version = "1.1.0.2"; + sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy"; buildDepends = [ HsOpenSSL ioStreams network ]; testDepends = [ HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit From 26f0953158655a79de8faa94867cc333638440b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:33 +0200 Subject: [PATCH 179/202] haskell-usb: update to version 1.2.0.1 --- pkgs/development/libraries/haskell/usb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix index 05f151bfd2cf..a023a682a921 100644 --- a/pkgs/development/libraries/haskell/usb/default.nix +++ b/pkgs/development/libraries/haskell/usb/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }: +{ cabal, bindingsLibusb, text, vector }: cabal.mkDerivation (self: { pname = "usb"; - version = "1.2"; - sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b"; - buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ]; + version = "1.2.0.1"; + sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk"; + buildDepends = [ bindingsLibusb text vector ]; jailbreak = true; meta = { homepage = "http://basvandijk.github.com/usb"; From 283e4f19215cf5c7e54330c916c6d173c4197c88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:55:34 +0200 Subject: [PATCH 180/202] haskell-xdot: update to version 0.2.4.3 --- pkgs/development/libraries/haskell/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 9c1a938234da..78a9d921ff6c 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.2"; - sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f"; + version = "0.2.4.3"; + sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; jailbreak = true; meta = { From acaf4a6253ddd6fbd1dba59756ea006024a34575 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 May 2014 10:58:26 +0200 Subject: [PATCH 181/202] haskell-tasty: update to version 0.8.1.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 13e4e37e4b06..bb8e20e98e45 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.0.4"; - sha256 = "016niwympxbxpg3yq7samgh92l20wxm2h6cwhqal4zdj8n9262j0"; + version = "0.8.1.1"; + sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm tagged unboundedDelays From 1cfea9bd1a61c7f30f0eee2c476e987dcacb882e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 24 May 2014 12:34:00 +0200 Subject: [PATCH 182/202] qt-5: Don't build tests Building the tests (which as far as I can tell we don't even run) makes the build take > 19 GiB of disk space, which is a bit excessive. Without the tests, it takes 2.6 GiB. --- pkgs/development/libraries/qt-5/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index e94aecc41e43..3a89f20beab3 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -10,7 +10,7 @@ , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , buildDocs ? false , buildExamples ? false -, buildTests ? true +, buildTests ? false , developerBuild ? false }: @@ -84,8 +84,6 @@ stdenv.mkDerivation rec { -optimized-qmake -strip -reduce-relocations - -force-debug-info - -no-separate-debug-info -system-proxies -gui From 39f994cd604fc3dc7f7cd1e6077dc144b070e5d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 24 May 2014 12:35:05 +0200 Subject: [PATCH 183/202] qt-5: Prevent some unnecessary runtime dependencies The file $out/mkspecs/qconfig.pri contains a list of all include / library paths used during the build, including build-time-only packages like GDB and Ruby. So get rid of those. --- pkgs/development/libraries/qt-5/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index 3a89f20beab3..be028e89ce84 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -141,7 +141,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python perl pkgconfig ]; - postInstall = if buildDocs then "make docs&&make install_docs" else ""; + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + ''; #enableParallelBuilding = true; # often fails on Hydra, as well as qt4 From 18df371fe39b1b637e0b08975bf32c584bdb1230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 24 May 2014 15:41:45 +0200 Subject: [PATCH 184/202] drumkv1: update from 0.4.1 to 0.4.2 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 39f6ae0ded4e..ab8027e23711 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56"; + sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; From 2dc6eb3941e39435d03c501e5fbc83ff9b53f763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 24 May 2014 15:42:32 +0200 Subject: [PATCH 185/202] samplv1: update from 0.4.1 to 0.4.2 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index f1d3be317d17..c201536ed347 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x"; + sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; From 056bd4fdba4a879fbcc58c4b17a5e32352b0fdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 24 May 2014 15:43:07 +0200 Subject: [PATCH 186/202] synthv1: update from 0.4.1 to 0.4.2 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4037b88ecb7e..d1c2230cf16d 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl"; + sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; }; buildInputs = [ qt4 jackaudio lv2 ]; From 4c459974235f5230cdb3a39ff4ee4a0530a7888a Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 24 May 2014 22:34:27 +0400 Subject: [PATCH 187/202] update moc --- pkgs/applications/audio/moc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 5356d4ce298a..c5a33796ca52 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; - version = "2.5.0-beta1"; + version = "2.5.0-beta2"; src = fetchurl { url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2"; - sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6"; + sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c"; }; configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; From 94fd1a83bd980cc04c12dd2d9fdc3a17e05ddf5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 24 May 2014 20:42:47 +0200 Subject: [PATCH 188/202] ardour3: 3.5.357 -> 3.5.380 Critical bug fix release --- pkgs/applications/audio/ardour/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 4315a5a7547e..88bc7399c65e 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -6,7 +6,7 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - tag = "3.5.357"; + tag = "3.5.380"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; rev = "refs/tags/${tag}"; - sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; + sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b"; }; buildInputs = @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { patchPhase = '' # The funny revision number is from `git describe rev` - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc # Note the different version number - sed -i '33i rev = \"3.5-357-gce4d125\"' wscript + sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl From b9249596488e465daffd29446314d37efeb0fb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 24 May 2014 21:11:59 +0200 Subject: [PATCH 189/202] qtractor: update from 0.6.0 to 0.6.1 --- 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 c70842c399ad..a15cf2550407 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.6.0"; + version = "0.6.1"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r"; + sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; }; buildInputs = From 0a794b79ca0eb751d2a16c1d6ac93fc0ce3fd17f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 24 May 2014 18:25:04 -0500 Subject: [PATCH 190/202] clementine: disable unfree dependencies by default Clementine has an optional dependency on libspotify, which is unfree. Enabling libspotify unconditionally prevented Hydra from distributing Clementine. Now, we optionally enable it based on config.clementine.spotify. --- pkgs/applications/audio/clementine/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 5d4a3614e408..512ca89031d0 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig -, sparsehash }: +, sparsehash, config }: +let withSpotify = config.clementine.spotify or false; +in stdenv.mkDerivation { name = "clementine-1.2.1"; @@ -27,7 +29,6 @@ stdenv.mkDerivation { liblastfm libmtp libplist - libspotify pkgconfig protobuf qca2 @@ -37,7 +38,7 @@ stdenv.mkDerivation { sqlite taglib usbmuxd - ]; + ] ++ stdenv.lib.optional withSpotify libspotify; meta = with stdenv.lib; { homepage = "http://www.clementine-player.org"; @@ -45,6 +46,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; - hydraPlatforms = []; # libspotify is unfree + # libspotify is unfree + hydraPlatforms = optional (not withSpotify) platforms.linux; }; } From 1d79330e1d019789536ae01073a77db6ac076eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 12:58:10 +0200 Subject: [PATCH 191/202] basex: update 7.7.2 -> 7.8.2 --- pkgs/tools/text/xml/basex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 2484aac8b0d1..c67444838b24 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7.2"; + name = "basex-7.8.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; - sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; + url = "http://files.basex.org/releases/7.8.2/BaseX782.zip"; + sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm"; }; buildInputs = [ unzip jre ]; From ef66088ae1dc759ba5c65962ed027efd82c64e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 13:15:25 +0200 Subject: [PATCH 192/202] bcache-tools: update 1.0.5 -> 1.0.7 --- pkgs/tools/filesystems/bcache-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 183b889da9b3..161383cb9de5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bcache-tools-${version}"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; - sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l"; + sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; buildInputs = [ pkgconfig utillinux ]; From e1d2e0d3804eb6c6a19b27cc9590f221bd41b52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 13:44:31 +0200 Subject: [PATCH 193/202] srecord: update 1.62 -> 1.63 --- pkgs/development/tools/misc/srecord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index 25140093f516..e316b4a628e5 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, boost, libtool, groff, ghostscript }: stdenv.mkDerivation rec { - name = "srecord-1.62"; + name = "srecord-1.63"; src = fetchurl { url = "mirror://sourceforge/srecord/${name}.tar.gz"; - sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904"; + sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq"; }; buildInputs = [ boost libtool groff ghostscript ]; From 5e460b2dee5fb531f5c43a895e9f879dfc14ab00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 13:55:20 +0200 Subject: [PATCH 194/202] munin: update 2.0.20 -> 2.0.21 (bug fix) --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 8d1b03ddf344..be890ff59005 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.20"; + version = "2.0.21"; name = "munin-${version}"; src = fetchurl { url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; - sha256 = "17b24fsr8abipq09hipnh6cd4h2aiwyzyjhg0wpplngwals54qmc"; + sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8"; }; buildInputs = [ From 15beb4054d113c917703bc84cb5b096c6aea733a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 14:13:05 +0200 Subject: [PATCH 195/202] nixos: add 'gvfs' when using GNOME3 desktop One reason for adding this is to make Chromium able to open files it has downloaded. Currently this happens: /run/current-system/sw/bin/xdg-open: line 364: gnome-open: command not found (And nothing happens in the GUI when clicking a downloaded file.) Looking into xdg-open, one can see that it first tries to run gvfs-open and then falls back to gnome-open. Adding 'gvfs' makes the first command succeed. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 78ab7aee92bb..74d9fee2357e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -108,6 +108,7 @@ in { gnome3.gtk3 # for gtk-update-icon-cache pkgs.ibus pkgs.shared_mime_info # for update-mime-database + gnome3.gvfs gnome3.dconf gnome3.gnome-backgrounds gnome3.gnome_control_center From 115b7313c5787c81a82ed43935cc819256da68cd Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 20 May 2014 22:57:03 +0200 Subject: [PATCH 196/202] xca: fix package For some reason library paths are not set at all for some libraries during the build. Wrapper with LD_LIBRARY_PATH set for relevant libraries is currently solution. --- pkgs/applications/misc/xca/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fb6b011f30a4..0bc2170340c8 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }: +{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }: stdenv.mkDerivation rec { name = "xca-${version}"; @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { prefix=$out ./configure ${openssl} ${libtool} ''; - buildInputs = [ openssl qt4 libtool ]; + postInstall = '' + wrapProgram "$out/bin/xca" \ + --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib" + ''; + + buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { From 7ce1ffbfa594a51fc7c27d899624cc4c64da0a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 25 May 2014 15:27:25 +0200 Subject: [PATCH 197/202] weechatDev: 0.4.4dev -> 0.1dev --- pkgs/applications/networking/irc/weechat/devel.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index cf52838b78cc..f8558ef052e0 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b"; - version = "0.4.4-rev${rev}"; + rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509"; + version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z"; + sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2"; }; buildInputs = From 6d173e2a81266f48e909f02edc4113478396cbd5 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 19 May 2014 18:50:38 -0400 Subject: [PATCH 198/202] spawn-fcgi: Add package --- pkgs/servers/http/spawn-fcgi/default.nix | 26 +++++++++++++++++++ .../http/spawn-fcgi/show_version.patch | 14 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/servers/http/spawn-fcgi/default.nix create mode 100644 pkgs/servers/http/spawn-fcgi/show_version.patch diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix new file mode 100644 index 000000000000..7c11aa8e8378 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchsvn, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "spawn-fcgi-${version}"; + version = "1.6.3"; + + src = fetchsvn { + url = "svn://svn.lighttpd.net/spawn-fcgi/tags/spawn-fcgi-${version}"; + sha256 = "06f0zw3rja42d9vg8j68nqkm3mn5pfzzhwfadpvs4aidh6kz9p42"; + }; + + buildInputs = [ automake autoconf ]; + + patches = [ ./show_version.patch ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://redmine.lighttpd.net/projects/spawn-fcgi"; + description = "Provides an interface to external programs that support the FastCGI interface"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/servers/http/spawn-fcgi/show_version.patch b/pkgs/servers/http/spawn-fcgi/show_version.patch new file mode 100644 index 000000000000..90c64ed66209 --- /dev/null +++ b/pkgs/servers/http/spawn-fcgi/show_version.patch @@ -0,0 +1,14 @@ +diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c +index 7f3f594..2f1046f 100644 +--- a/src/spawn-fcgi.c ++++ b/src/spawn-fcgi.c +@@ -405,8 +405,7 @@ static int find_user_group(const char *user, const char *group, uid_t *uid, gid_ + + static void show_version () { + write(1, CONST_STR_LEN( +- PACKAGE_DESC \ +- "Build-Date: " __DATE__ " " __TIME__ "\n" ++ PACKAGE_DESC "\n" + )); + } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadabfdceb04..4b0bdb32fb71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6769,6 +6769,8 @@ let sipwitch = callPackage ../servers/sip/sipwitch { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool From 7fafc6ff857e61a34894eb54b4e4e8afe968198c Mon Sep 17 00:00:00 2001 From: wmertens Date: Tue, 20 May 2014 02:21:25 +0200 Subject: [PATCH 199/202] monit: bump 5.8 -> 5.8.1 (bug fixes) --- pkgs/tools/system/monit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 28d58abe5aac..8e4848f2db62 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.8"; + name = "monit-5.8.1"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c"; + sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2"; }; nativeBuildInputs = [ bison flex ]; From 1815ac2dfc78ba9b66ea635166ad8333766d4511 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 20 May 2014 15:41:11 +0200 Subject: [PATCH 200/202] tibia: update 10.39 -> 10.40 --- pkgs/games/tibia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index a7ded1095268..a980aa53f5f9 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.39"; + name = "tibia-10.40"; src = fetchurl { - url = http://static.tibia.com/download/tibia1039.tgz; - sha256 = "0401sdg2b4jb6350z841f9xjipi37z4z82bc72rs0chgdp363n79"; + url = http://static.tibia.com/download/tibia1040.tgz; + sha256 = "1d6wibwr84cnglnc0c9d6m3nynbg2zwgnxpyy9ykqiiwsz8qgzyg"; }; shell = stdenv.shell; From 97af2620c7db6603f0c5d8b49638f46345cf1352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 20:30:18 +0200 Subject: [PATCH 201/202] clementine: fix evaluation $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace error: while querying the derivation named `clementine-1.2.1': while evaluating `optional' at .../lib/lists.nix:113:20, called from .../pkgs/applications/audio/clementine/default.nix:50:22: undefined variable `not' at .../pkgs/applications/audio/clementine/default.nix:50:32 --- pkgs/applications/audio/clementine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 512ca89031d0..82f24b05f729 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; # libspotify is unfree - hydraPlatforms = optional (not withSpotify) platforms.linux; + hydraPlatforms = optional (!withSpotify) platforms.linux; }; } From b0234f216ccf71013daf8e4e8b8bcfc4044d36cf Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 25 May 2014 21:37:02 +0200 Subject: [PATCH 202/202] Fix passing extra qemu opts when using boot loader --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 323f1bfc57e0..bccf6583e47d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -65,7 +65,7 @@ let ${if cfg.useBootLoader then '' -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \ - -boot menu=on + -boot menu=on \ '' else '' -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \