From 8989a32d34654fd2475044b645389df8b6a00578 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Wed, 10 Dec 2014 22:43:42 +0100 Subject: [PATCH 001/216] j: Fix building libj.so --- pkgs/development/interpreters/j/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 9c09038051e..3668fedf051 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -37,14 +37,19 @@ rec { builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; doBuildJ = a.fullDepEntry '' - sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' + sed -i bin/jconfig -e ' + s@bits=32@bits=${bits}@g; + s@readline=0@readline=1@; + s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@; + s@-W1,soname,libj.so@-Wl,-soname,libj.so@ + ' sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@' touch *.c *.h - sh bin/build_jconsole - sh bin/build_libj - sh bin/build_defs - sh bin/build_tsdll + sh -o errexit bin/build_jconsole + sh -o errexit bin/build_libj + sh -o errexit bin/build_defs + sh -o errexit bin/build_tsdll sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; From 2682c01f293cefeda973cf0ff38ca4a39723cd01 Mon Sep 17 00:00:00 2001 From: bbarker Date: Thu, 11 Dec 2014 04:19:14 +0100 Subject: [PATCH 002/216] keeping gradle updated --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 62662d273c8..3bbfff9221b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-2.1"; + name = "gradle-2.2.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0y7qifc61nng24zn73bdwh5d0m25dnllfiwfkyw220mblag4zviy"; + sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; From 9fa2c35ec8199951f217296e40f534c1e2e0f336 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Thu, 11 Dec 2014 23:28:09 +0100 Subject: [PATCH 003/216] virtualbox: Allow disabling the network interface. The current nixos module for VirtualBox unconditionally configures a vboxnet0 network interface at boot. This may be undesired, especially when the user wants to manage network interfaces in a centralized manner. --- nixos/modules/programs/virtualbox-host.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index ea962d5d6ce..45d5ec01d30 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -9,6 +9,11 @@ in { options = { services.virtualboxHost.enable = mkEnableOption "VirtualBox Host support"; + services.virtualboxHost.addNetworkInterface = mkOption { + type = types.bool; + default = true; + description = "Automatically set up a vboxnet0 host-only network interface."; + }; }; config = mkIf config.services.virtualboxHost.enable { @@ -46,7 +51,7 @@ in ''; # Since we lack the right setuid binaries, set up a host-only network by default. - + } // mkIf config.services.virtualboxHost.addNetworkInterface { systemd.services."vboxnet0" = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; From 8b512261be9cfbbdc8a55f0a10efc1c83502222c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 12 Dec 2014 00:09:24 +0100 Subject: [PATCH 004/216] Add cava, console-based Audio Visualizer for Alsa --- pkgs/applications/audio/cava/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/cava/default.nix diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix new file mode 100644 index 00000000000..c1b5aef333b --- /dev/null +++ b/pkgs/applications/audio/cava/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, alsaLib, fftw }: + +stdenv.mkDerivation rec { + name = "cava-${version}"; + version = "27dbdf47daae44c780db9998c760007b3bf63738"; + + buildInputs = [ alsaLib fftw ]; + + src = fetchgit { + url = "https://github.com/karlstav/cava"; + rev = version; + sha256 = "1a61e2c869376276cf78e6446cd1cc7f96b3e378fa8bc0bc4c5ca81945429909"; + }; + + installPhase = '' + mkdir -p $out/bin + cp cava $out/bin + ''; + + meta = with stdenv.lib; { + description = "Console-based Audio Visualizer for Alsa"; + homepage = https://github.com/karlstav/cava; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4256f98eb3..c26ec089063 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9196,6 +9196,8 @@ let }; funpidgin = carrier; + cava = callPackage ../applications/audio/cava { }; + cc1394 = callPackage ../applications/video/cc1394 { }; cddiscid = callPackage ../applications/audio/cd-discid { }; From 65393ca8d3b959657e16e402a3db3ac8f1fdb6ed Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Fri, 12 Dec 2014 00:15:28 +0100 Subject: [PATCH 005/216] virtualbox: Unbreak the nixos module. --- nixos/modules/programs/virtualbox-host.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index 45d5ec01d30..25f17e3c060 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -16,7 +16,7 @@ in }; }; - config = mkIf config.services.virtualboxHost.enable { + config = mkIf config.services.virtualboxHost.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.extraModulePackages = [ virtualbox ]; environment.systemPackages = [ virtualbox ]; @@ -51,7 +51,7 @@ in ''; # Since we lack the right setuid binaries, set up a host-only network by default. - } // mkIf config.services.virtualboxHost.addNetworkInterface { + } (mkIf config.services.virtualboxHost.addNetworkInterface { systemd.services."vboxnet0" = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; @@ -73,5 +73,5 @@ in }; networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; - }; + })]); } From 95fdc8cf2970b1f94b33afb80bdec374ce237b0d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 9 Dec 2014 16:10:06 +0100 Subject: [PATCH 006/216] openjdk: Introduce JAVAX_NET_SSL_TRUSTSTORE env This small patch makes it possible to control java's truststore path through the environment. This lets you add (system- or session-wide) CAs that should be allowed by Java. Java users can still use -Djavax.net.ssl.truststore to override the truststore set by JAVAX_NET_SSL_TRUSTSTORE. Something like this can be used to build the truststore (in this example just using the standard pkgs.cacert CA-bundle): { environment.variables.JAVAX_NET_SSL_TRUSTSTORE = "${ pkgs.runCommand "cacerts" {} '' ${pkgs.perl}/bin/perl \ ${pkgs.path}/pkgs/development/compilers/openjdk/generate-cacerts.pl \ ${pkgs.jre}/bin/keytool \ ${pkgs.cacert}/etc/ca-bundle.crt mv cacerts $out '' }"; } Ideally, the dependency on pkgs.cacert should also be removed from pkgs.openjdk to avoid rebuilding java each time the standard CA-bundle changes. Something along the example above must then be added to NixOS (however, it would be nice to not depend on ${pkgs.jre}/bin/keytool to generate that environment variable). --- .../development/compilers/openjdk/default.nix | 7 ++++++- .../openjdk/read-truststore-from-env.patch | 21 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/openjdk/read-truststore-from-env.patch diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6a07c7af69e..3c0ace0ac93 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -61,7 +61,12 @@ stdenv.mkDerivation rec { makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; - patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; + patches = [ + ./cppflags-include-fix.patch + ./fix-java-home.patch + ./paxctl.patch + ./read-truststore-from-env.patch + ]; NIX_NO_SELF_RPATH = true; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch new file mode 100644 index 00000000000..8fb0f409d0a --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch @@ -0,0 +1,21 @@ +diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java +--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 ++++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 +@@ -158,6 +158,7 @@ + /* + * Try: + * javax.net.ssl.trustStore (if this variable exists, stop) ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + * +@@ -165,6 +166,9 @@ + */ + + storeFileName = props.get("trustStore"); ++ if (storeFileName == null) { ++ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storeFileName)) { + if (storeFileName != null) { + storeFile = new File(storeFileName); From 32f9644943e8772b33a58a4f7105b3dc7f38723d Mon Sep 17 00:00:00 2001 From: Massimo Zaniboni Date: Fri, 12 Dec 2014 01:20:53 +0100 Subject: [PATCH 007/216] redmine: use libc libciconv implementation on Linux. --- pkgs/applications/version-management/redmine/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 4655a16671e..a4254384e5b 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + ruby rubyLibs.bundler + ] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [ + libxslt libxml2 pkgconfig libffi imagemagickBig postgresql ]; @@ -46,7 +48,7 @@ in stdenv.mkDerivation rec { bundle config build.nokogiri \ --use-system-libraries \ - --with-iconv-dir=${libiconv} \ + --with-iconv-dir=${libiconvOrLibc} \ --with-xslt-dir=${libxslt} \ --with-xml2-dir=${libxml2} \ --with-pkg-config \ From f2e20fa83729981c679b4dfb1689db8ca3f70ec7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 12 Dec 2014 02:54:53 +0100 Subject: [PATCH 008/216] nixos: container profile, update /init symlink on rebuild --- nixos/modules/profiles/container.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/container.nix index 5b531e5c3df..e6344a0d5c7 100644 --- a/nixos/modules/profiles/container.nix +++ b/nixos/modules/profiles/container.nix @@ -20,17 +20,18 @@ in { contents = []; extraArgs = "--owner=0"; - # Some container managers like lxc need these - extraCommands = "mkdir -p proc sys dev"; - # Add init script to image storeContents = [ { object = config.system.build.toplevel + "/init"; symlink = "/init"; } ] ++ (pkgs2storeContents [ pkgs.stdenv ]); + + # Some container managers like lxc need these + extraCommands = "mkdir -p proc sys dev"; }; + boot.isContainer = true; boot.postBootCommands = '' # After booting, register the contents of the Nix store in the Nix @@ -46,12 +47,12 @@ in { ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - boot.isContainer = true; - # Disable some features that are not useful in a container. sound.enable = mkDefault false; services.udisks2.enable = mkDefault false; - # Shut up warnings about not having a boot loader. - system.build.installBootLoader = "${pkgs.coreutils}/bin/true"; + # Install new init script + system.activationScripts.installInitScript = '' + ln -fs $systemConfig/init /init + ''; } From cf7f15c92ca07d2d6d249fd2965b9e1950fb11a5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 12 Dec 2014 02:56:11 +0100 Subject: [PATCH 009/216] nixos-install: Pass CA cert bundle to chroot. Since we're using HTTPS for the binary cache (introduced in faf0797) by default, the binary cache should also be available during installation. The file that is defined in SSL_CERT_FILE outside of the chroot is copied over to /tmp/ca-cert.crt inside the chroot, so we have an absolute path we can reference during nixos-install. However, this might end up with the file not being cleaned up properly from outside of the store, but neither would be /tmp/root so the cleanup issue needs to be solved in another place (or commit to be more exact). Signed-off-by: aszlig --- nixos/modules/installer/tools/nixos-install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index bd334c2a3cb..a7333fbd541 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -89,6 +89,12 @@ ln -s /run $mountPoint/var/run rm -f $mountPoint/etc/{resolv.conf,hosts} cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/ +if [ -e "$SSL_CERT_FILE" ]; then + cp -Lf "$SSL_CERT_FILE" "$mountPoint/tmp/ca-cert.crt" + export SSL_CERT_FILE=/tmp/ca-cert.crt + # For Nix 1.7 + export CURL_CA_BUNDLE=/tmp/ca-cert.crt +fi if [ -n "$runChroot" ]; then if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then From b772ba327e19087faff9348d44fa411ce606dabd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 12 Dec 2014 03:36:35 +0100 Subject: [PATCH 010/216] python3Packages.scikitlearn: Enable on py3k --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f96b8cb15f9..618dfa8d4c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8678,8 +8678,6 @@ let scikitlearn = buildPythonPackage { name = "scikit-learn-0.15.2"; - disabled = isPy3k; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz"; md5 = "d9822ad0238e17b382a3c756ea94fe0d"; From 4fcb61549895747eae601ea3ce09e607a2224e9a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 12 Dec 2014 03:09:02 +0000 Subject: [PATCH 011/216] youtube-dl: update to 2014.12.12.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 2a211c014cd..d1e9e6385c8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.12.10.3"; + version = "2014.12.12.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "19rlzqiphaapdxkql5w304klzf11i16x53lpm3p9wqabplf2bhqg"; + sha256 = "1rhxmkikhf213dikwv46xnl0fafwjygflabbkl3wr4pdbhjpan0j"; }; buildInputs = [ python ]; From 614ea25952e45d25b3c607cbfc63aba5119639f3 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 12 Dec 2014 03:16:17 +0000 Subject: [PATCH 012/216] mpv: update to 0.7.1 --- pkgs/applications/video/mpv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5acdcac9737..052add92a1f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x"; + sha256 = "1grnmhj7hymi77ivvyzpgykj4wwrjd7a9apm5vyz2xqrankn3hyc"; }; buildInputs = with stdenv.lib; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpv.io; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ]; platforms = platforms.linux; }; } From 0bdff430a4e804b42cc600bbe3b9b88ea4c86784 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 12 Dec 2014 01:19:50 -0600 Subject: [PATCH 013/216] nixpkgs: rr 2.0.0 -> 3.0.0, with 64bit support Signed-off-by: Austin Seipp --- .../development/tools/analysis/rr/default.nix | 24 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index c2ab7a334fe..992d797c189 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,17 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "3.0.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; + sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg"; }; - buildInputs = [ cmake libpfm zlib ]; + patchPhase = '' + substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + '' + # On 64bit machines, don't build the 32-bit components for debugging + # 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate + # easily with how CMake works to build 32 and 64bit binaries at once. + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)' + ''; + + buildInputs = [ cmake libpfm zlib python ]; cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; meta = { @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = "custom"; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = [ "i686-linux" ]; + maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c26ec089063..515c7f45279 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4699,7 +4699,7 @@ let remake = callPackage ../development/tools/build-managers/remake { }; - rr = callPackage_i686 ../development/tools/analysis/rr { }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; From 61d4faa59d56905b2fe915249d48576419eb6447 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:26:37 +0100 Subject: [PATCH 014/216] haskell-Allure: update to version 0.4.100.0 --- pkgs/games/Allure/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix index 532ef092f09..63d6a0a2fb2 100644 --- a/pkgs/games/Allure/default.nix +++ b/pkgs/games/Allure/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Allure"; - version = "0.4.99.0"; - sha256 = "1i4v1h4ynx4aap0nmf8qn2qx22wqfgypr83l7bh38fd4qibsvx3q"; + version = "0.4.100.0"; + sha256 = "15rkj5xab23wqr2d44xbri7hggbb3zmmka41xfiscqq4ifagfj4m"; isLibrary = false; isExecutable = true; buildDepends = [ enummapsetTh filepath LambdaHack text ]; @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = "unknown"; + license = "AGPL"; platforms = self.ghc.meta.platforms; }; }) From 29546928b13ea1f2d6e24dcb7aefb45e0633342a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:26:39 +0100 Subject: [PATCH 015/216] haskell-LambdaHack: update to version 0.4.100.0 --- pkgs/games/LambdaHack/default.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index eb4edf2b36a..2130c423cfe 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,28 +1,30 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, async, binary, deepseq, enummapsetTh -, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow -, random, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, x11, zlib +{ cabal, assertFailure, async, binary, dataDefault, deepseq +, enummapsetTh, filepath, gtk, hashable, hsini, keys, miniutter +, mtl, prettyShow, random, stm, text, transformers +, unorderedContainers, vector, vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.4.99.0"; - sha256 = "1mcz44akf706a0q1xr4h7hlf1gj60570bi8im6jpg73k728314cp"; + version = "0.4.100.0"; + sha256 = "15v3aagwsh180603an3wd7rfgbjzgamdw270ciw2m03v8pkg9d28"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure async binary deepseq enummapsetTh filepath gtk - hashable hsini keys miniutter mtl prettyShow random stm text - transformers unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath gtk hashable hsini keys miniutter mtl prettyShow random + stm text transformers unorderedContainers vector + vectorBinaryInstances zlib ]; testDepends = [ - assertFailure async binary deepseq enummapsetTh filepath hashable - hsini keys miniutter mtl prettyShow random stm text transformers - unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath hashable hsini keys miniutter mtl prettyShow random stm + text transformers unorderedContainers vector vectorBinaryInstances + zlib ]; - pkgconfigDepends = [ gtk x11 ]; + pkgconfigDepends = [ gtk ]; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; From 8bb494c1709c6481e82f03b0bca413d578e07ae4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Dec 2014 09:55:58 +0100 Subject: [PATCH 016/216] Get rid of a warning about dbus in the activation script --- nixos/modules/config/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 77e55fddf69..f99cea7d17b 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -140,7 +140,7 @@ in '' + optionalString config.services.nscd.enable '' # Invalidate the nscd cache whenever resolv.conf is # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service' + libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString cfg.dnsSingleRequest '' # only send one DNS request at a time resolv_conf_options='single-request' From 3bcd3ed0178f8de1a8bdd9eaaeeaa513ae9c3c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Dec 2014 11:49:25 +0100 Subject: [PATCH 017/216] nixos: check resumeDevice is absolute path and document MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #5219 after merging #4995. (cherry picked from commit 0681d61c3730c686548df3af9a7dc1a59abaf371) Signed-off-by: Domen Kožar --- nixos/modules/system/boot/stage-1.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index cf211404649..cd30ce1b7ce 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -240,8 +240,9 @@ in example = "/dev/sda3"; description = '' Device for manual resume attempt during boot. This should be used primarily - if you want to resume from file. Specify here the device where the file - resides. You should also use boot.kernelParams to specify + if you want to resume from file. If left empty, the swap partitions are used. + Specify here the device where the file resides. + You should also use boot.kernelParams to specify resume_offset. ''; }; @@ -355,10 +356,17 @@ in config = mkIf (!config.boot.isContainer) { - assertions = singleton + assertions = [ { assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems); message = "The ‘fileSystems’ option does not specify your root file system."; - }; + } + { assertion = let inherit (config.boot) resumeDevice; in + resumeDevice == "" || builtins.substring 0 1 resumeDevice == "/"; + message = "boot.resumeDevice has to be an absolute path." + + " Old \"x:y\" style is no longer supported."; + } + ]; + system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; From 377822fb64190e98b8d9bd4a2ad820850a0c759b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 12 Dec 2014 12:13:31 +0100 Subject: [PATCH 018/216] mujs: update to latest revision --- pkgs/development/interpreters/mujs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 7ef475ddab8..e21216ffe5e 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "6afabf445cad0dd9afbc1f5870dba730801f09c0"; - sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n"; + rev = "9bc5fec0804381d59ef8dc62304ed6892fb7c4ca"; + sha256 = "0ba6p92ygcssfzd4ij89vilfr2kwql2d1jpyqxflh5wyh1i92wjl"; }; buildInputs = [ clang ]; From 59ec0f0e0df93120c9cf4c084f8a9bc9e9392abc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 12 Dec 2014 14:48:14 +0300 Subject: [PATCH 019/216] Improve eudev paths in the same way as they are set in the original package --- pkgs/os-specific/linux/eudev/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 43cb9c4a5d6..f0370fea6ea 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -18,6 +18,20 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; + makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin"; + installFlags = + [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + "udevconfdir=$(out)/etc/udev" + "udevhwdbbin=$(out)/var/lib/udev/hwdb.bin" + "udevhwdbdir=$(out)/var/lib/udev/hwdb.d" + ]; + enableParallelBuilding = true; meta = { inherit (s) version; description = ''An udev fork by Gentoo''; From 9ed097ab50201f75a6b81a3d0b5c74ad4b163f53 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 12 Dec 2014 15:16:57 +0300 Subject: [PATCH 020/216] Fix fetchzip for actuall zip files --- pkgs/build-support/fetchzip/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 12fb69ba8ef..dd927ed8363 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -12,7 +12,7 @@ , url , ... } @ args: -fetchurl ({ +lib.overrideDerivation (fetchurl ({ name = args.name or (baseNameOf url); recursiveHash = true; @@ -39,4 +39,6 @@ fetchurl ({ mv $out/$fn/* "$out/" rmdir "$out/$fn" ''; -} // args) +} // args)) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) From f581054dc40baa382b6668d98a6e51d5a8594e87 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 11 Dec 2014 14:03:30 +0100 Subject: [PATCH 021/216] Add python package mutag --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09236291488..20f743c51ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5631,6 +5631,23 @@ let }; }; + mutag = buildPythonPackage rec { + disabled = ! isPy3k; + name = "mutag-0.0.1-b1b3ff2ad8"; + src = pkgs.fetchgit { + url = "https://github.com/aroig/mutag.git"; + sha256 = "1x9wl789ib62zmrbjy96jhcbjnym6fb1jvdjiw4smapifm2hnyr7"; + rev = "efc9bc7e1ea345e7bd0568848598de"; + }; + + propagatedBuildInputs = with self; [ pyparsing ]; + + meta = { + homepage = https://github.com/aroig/mutag; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + }; + }; mutagen = buildPythonPackage (rec { name = "mutagen-1.23"; From 40bbc1806a2f26592993d038da89667d6fd6b161 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 12 Dec 2014 12:42:39 +0000 Subject: [PATCH 022/216] opentsdb: Use the release tarball Now that https://github.com/OpenTSDB/opentsdb/issues/420 is resolved we can use the official release tarball. This includes all third party JARs, which vastly simplifies the build expression. --- pkgs/tools/misc/opentsdb/default.nix | 154 +-------------------------- 1 file changed, 3 insertions(+), 151 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index eb646d8457d..6f9695ba363 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,145 +1,11 @@ { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; -let - thirdPartyDeps = { - guava = { - "guava-18.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar; - md5 = "947641f6bb535b1d942d1bc387c45290"; - }; - }; - gwt = { - "gwt-dev-2.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar; - md5 = "23d8bf52709230c2c7e6dd817261f9ee"; - }; - "gwt-user-2.6.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar; - md5 = "99226fc2764f2b8fd6db6e05d0847659"; - }; - }; - hamcrest = { - "hamcrest-core-1.3.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; - md5 = "6393363b47ddcbba82321110c3e07519"; - }; - }; - hbase = { - "asynchbase-1.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar; - md5 = "6738dd73fd48d30cbf5c78f62bc18852"; - }; - }; - jackson = { - "jackson-annotations-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar; - md5 = "31ef4fa866f9d24960a6807c9c299e98"; - }; - "jackson-core-2.4.3.jar" = fetchurl { - url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar; - md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d"; - }; - "jackson-databind-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar; - md5 = "4fcb9f74280eaa21de10191212c65b11"; - }; - }; - javassist = { - "javassist-3.18.1-GA.jar" = fetchurl { - url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar; - md5 = "5bb83868c87334320562af7eded65cc2"; - }; - }; - junit = { - "junit-4.11.jar" = fetchurl { - url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar; - md5 = "3c42be5ea7cbf3635716abbb429cb90d"; - }; - }; - logback = { - "logback-classic-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar; - md5 = "b4dc8eb42150aafd6d9fd3d211807621"; - }; - "logback-core-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar; - md5 = "3d5f8ce8dca36e493d39177b71958bd4"; - }; - }; - mockito = { - "mockito-1.9.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar; - md5 = "cab21b44958a173a5b1d55a6aff0ab54"; - }; - "mockito-core-1.9.5.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar; - md5 = "98f3076e2a691d1ac291624e5a46b80b"; - }; - }; - netty = { - "netty-3.9.4.Final.jar" = fetchurl { - url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar; - md5 = "b3701ef46c7518d0d63705e2f092dbe5"; - }; - }; - objenesis = { - "objenesis-1.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar; - md5 = "2d649907bd6203f2661f70d430a6ade8"; - }; - }; - powermock = { - "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar; - md5 = "5dee1dce6952bb7338d4d053157ae647"; - }; - }; - protobuf = { - "protobuf-java-2.5.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar; - md5 = "a44473b98947e2a54c54e0db1387d137"; - }; - }; - slf4j = { - "log4j-over-slf4j-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar; - md5 = "93ab42a5216afd683c35988c6b6fc3d8"; - }; - "slf4j-api-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar; - md5 = "ca4280bf93d64367723ae5c8d42dd0b9"; - }; - }; - suasync = { - "suasync-1.4.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar; - md5 = "289ce3f3e6a9bb17857981eacf6d74b6"; - }; - }; - validation-api = { - "validation-api-1.0.0.GA.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar; - md5 = "40c1ee909493066397a6d4d9f8d375d8"; - }; - "validation-api-1.0.0.GA-sources.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar; - md5 = "f816682933b59c5ffe32bdb4ab4bf628"; - }; - }; - zookeeper = { - "zookeeper-3.3.6.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar; - md5 = "02786e11c19d1671640992f1bda4a858"; - }; - }; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opentsdb-2.1.0-rc1"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/archive/v2.1.0RC1.tar.gz; - sha256 = "01li02j8kjanmas2gxkcz3gsn54nyfyvqdylxz3fqqjgg6y7hrm7"; + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz; + sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; @@ -153,20 +19,6 @@ in stdenv.mkDerivation rec { patchShebangs ../build-aux/ ''; - buildPhase = - concatStringsSep - "\n" - (mapAttrsToList - (folder: jars: - "mkdir -p third_party/${folder}\n" + - (concatStringsSep - "\n" - (mapAttrsToList - (jar: src: - "ln -s ${src} third_party/${folder}/${jar}") - jars))) - thirdPartyDeps); - installPhase = '' make install wrapProgram $out/bin/tsdb \ From fcd4aa44d51216f709934727f2cdaed4fb490635 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Dec 2014 15:08:17 +0100 Subject: [PATCH 023/216] valgrind: Update to 3.10.1 --- .../tools/analysis/valgrind/default.nix | 6 +-- .../tools/analysis/valgrind/glibc-2.19.patch | 39 ------------------- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/tools/analysis/valgrind/glibc-2.19.patch diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 27fd739ed54..28456d931e0 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.10.0"; + name = "valgrind-3.10.1"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103"; + sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; }; - patches = [ ./glibc-2.19.patch ]; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch deleted file mode 100644 index 137b0a325b0..00000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://projects.archlinux.org/svntogit/packages.git/plain/trunk/valgrind-3.9.0-glibc-2.19.patch?h=packages/valgrind - -diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure ---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 -+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 -@@ -6689,6 +6689,16 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 -+$as_echo "2.19 family" >&6; } -+ -+$as_echo "#define GLIBC_2_19 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac ---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 -+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 -@@ -918,6 +918,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ AC_MSG_RESULT(2.19 family) -+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) From bc789064d8d13ff14f65161d8d4dcc51667b7248 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 8 Dec 2014 15:59:06 +0100 Subject: [PATCH 024/216] Package for the Polari IRC app This commit includes a patch to telepathy's derivation, written by Lethalman. This patch makes public the Telepathy's dependency to dbus_glib. This patch will become problematic with the next pkgconfig upgrade but this upgrade should make the patch irrelevant. See these 2 links for more information: - https://bugs.freedesktop.org/show_bug.cgi?id=15199 - https://bugzilla.redhat.com/show_bug.cgi?id=436773 Modified by Luca Bruno: - Moved telepathy_idle to propagatedUserEnvPkgs - Added myself to maintainers - Enable parallel building --- .../telepathy/idle/default.nix | 20 ++++++++++++++ .../gnome-3/3.12/apps/polari/default.nix | 27 +++++++++++++++++++ pkgs/desktops/gnome-3/3.12/default.nix | 2 ++ .../libraries/telepathy/glib/default.nix | 4 +++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 55 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix create mode 100644 pkgs/desktops/gnome-3/3.12/apps/polari/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix new file mode 100644 index 00000000000..16a31f6f3ba --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: + +stdenv.mkDerivation rec { + pname = "telepathy-idle"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; + }; + + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; + + meta = { + description = "IRC connection manager for the Telepathy framework"; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix new file mode 100644 index 00000000000..f30d1424679 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib, gtk3, telepathy_glib, gnome3, telepathy_idle }: + +stdenv.mkDerivation rec { + version = "3.12.2"; + name = "polari-${version}"; + src = fetchurl { + url = "https://download.gnome.org/sources/polari/3.12/polari-${version}.tar.xz"; + sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; + }; + buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 telepathy_glib gnome3.gjs ]; + propagatedUserEnvPkgs = [ telepathy_idle ]; + + preFixup = '' + wrapProgram "$out/bin/polari" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Internet Relay Chat (IRC) client designed for GNOME 3"; + homepage = https://wiki.gnome.org/Apps/Polari; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a60e1a85bca..7a972925f66 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -234,6 +234,8 @@ rec { seahorse = callPackage ./apps/seahorse { }; + polari = callPackage ./apps/polari { }; + pomodoro = callPackage ./apps/pomodoro { }; #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 6c0806ec4cd..9167ecc76d4 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; + preConfigure = '' + substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires + ''; + meta = { homepage = http://telepathy.freedesktop.org; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 515c7f45279..cffc67c7bf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10881,6 +10881,8 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + terminator = callPackage ../applications/misc/terminator { vte = gnome.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; From e3b84d8dfc8af18e0eb507d13084f9ef4db0965f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 12 Dec 2014 15:24:23 +0100 Subject: [PATCH 025/216] Some fixes to the polari irc client --- .../gnome-3/3.12/apps/polari/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix index f30d1424679..6289fd4a6db 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix @@ -1,18 +1,26 @@ -{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib, gtk3, telepathy_glib, gnome3, telepathy_idle }: +{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib +, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup +, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - version = "3.12.2"; - name = "polari-${version}"; + name = "polari-3.12.2"; + src = fetchurl { - url = "https://download.gnome.org/sources/polari/3.12/polari-${version}.tar.xz"; + url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; }; - buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 telepathy_glib gnome3.gjs ]; + + buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 + telepathy_glib gnome3.gjs telepathy_logger libsoup + gdk_pixbuf librsvg + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; + propagatedUserEnvPkgs = [ telepathy_idle ]; preFixup = '' wrapProgram "$out/bin/polari" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; From 86055e2f0071a4c865561b2ff26081c31145894b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Dec 2014 16:30:54 +0100 Subject: [PATCH 026/216] nixopsUnstable: Initial version 1.3pre1362_2a616f8 --- .../package-management/nixops/unstable.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/package-management/nixops/unstable.nix diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix new file mode 100644 index 00000000000..17532039d91 --- /dev/null +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -0,0 +1,63 @@ +{ lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }: + +let + + # Use this until the patches are upstreamed. + # Warning: will be rebased at will + libcloud = lib.overrideDerivation pythonPackages.libcloud ( args: { + src = fetchgit { + url = https://github.com/Phreedom/libcloud.git; + rev = "784427f549829a00d551e3468184a708420ad1ec"; + sha256 = "fd0e092b39fa1fde6a8847e6dc69855d30c2dad9e95ee0373297658ff53edf8a"; + }; + + preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; + }); + +in + +pythonPackages.buildPythonPackage rec { + name = "nixops-1.3pre1362_2a616f8"; + namePrefix = ""; + + src = fetchgit { + url = https://github.com/NixOS/nixops; + rev = "2a616f8ddc18800c9e1c7013632078a55c06c3e3"; + sha256 = "12arppri2j9sblja73jlfdcbpz1z94cd35n9ypazcsw4irmya3k6"; + }; + + buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; + + propagatedBuildInputs = + [ pythonPackages.prettytable + pythonPackages.boto + pythonPackages.hetzner + libcloud + pythonPackages.sqlite3 + ]; + + doCheck = true; + + postInstall = + '' + # Backward compatibility symlink. + ln -s nixops $out/bin/charon + + make -C doc/manual install \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av nix/* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; # */ + + meta = { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cffc67c7bf8..88159b84233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12586,6 +12586,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; nix-repl = callPackage ../tools/package-management/nix-repl { }; From b7eba773dc636fc0892753b11c941dae85ddf390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 12 Dec 2014 17:05:08 +0100 Subject: [PATCH 027/216] hhvm: 3.2.0 -> 3.3.0, fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9d0d9ae9f7ea940ea63dfe019c2818edd6fc376a) Signed-off-by: Domen Kožar --- pkgs/development/compilers/hhvm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index c48e6d5a81e..e7237d9059c 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,22 +2,23 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype +, libxslt, ocaml, freetype, gdb }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.2.0"; + version = "3.3.0"; + # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; - sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; + rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; + sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; fetchSubmodules = true; }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; - patchPhase = '' + prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} substituteInPlace ./configure \ From 59995e168cf3f682ca8086a58015edc9781a847b Mon Sep 17 00:00:00 2001 From: Thomas Hunger Date: Sat, 25 Oct 2014 17:22:49 +0100 Subject: [PATCH 028/216] nixos: Add gitlab and gitlab-shell I had to make several adjustments to make it work with nixos: * Replace relative config file lookups with ENV variable. * Modify gitlab-shell to not clear then environment when running pre-receive. * Modify gitlab-shell to write some environment variables into the .authorized_keys file to make sure gitlab-shell reads the correct config file. * Log unicorn output to syslog. I tried various ways of adding a syslog package but the bundler would not pick them up. Please fix in a better way if possible. * Gitlab-runner program wrapper. This is useful to run e.g. backups etc. with the correct environment set up. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/misc/defaultUnicornConfig.rb | 206 +++ nixos/modules/services/misc/gitlab.nix | 283 +++ .../gitlab-shell/default.nix | 59 + .../version-management/gitlab/Gemfile.lock | 711 ++++++++ .../version-management/gitlab/Gemfile.nix | 1526 +++++++++++++++++ .../version-management/gitlab/README | 5 + .../version-management/gitlab/bootstrap.nix | 43 + .../version-management/gitlab/default.nix | 80 + .../gitlab/generate_nix_requirements.rb | 56 + .../gitlab/remove-hardcoded-locations.patch | 109 ++ pkgs/top-level/all-packages.nix | 4 + 13 files changed, 3085 insertions(+) create mode 100644 nixos/modules/services/misc/defaultUnicornConfig.rb create mode 100644 nixos/modules/services/misc/gitlab.nix create mode 100644 pkgs/applications/version-management/gitlab-shell/default.nix create mode 100644 pkgs/applications/version-management/gitlab/Gemfile.lock create mode 100644 pkgs/applications/version-management/gitlab/Gemfile.nix create mode 100644 pkgs/applications/version-management/gitlab/README create mode 100644 pkgs/applications/version-management/gitlab/bootstrap.nix create mode 100644 pkgs/applications/version-management/gitlab/default.nix create mode 100755 pkgs/applications/version-management/gitlab/generate_nix_requirements.rb create mode 100644 pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bdaf85a03ce..3bb7fdb9b2d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -172,6 +172,7 @@ kubernetes = 162; peerflix = 163; chronos = 164; + gitlab = 165; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -308,6 +309,7 @@ bosun = 157; kubernetes = 158; fleet = 159; + gitlab = 160; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c6980f3208b..ec5e4e0fab4 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -176,6 +176,7 @@ ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix + ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/mesos-master.nix diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb new file mode 100644 index 00000000000..81abaf336dc --- /dev/null +++ b/nixos/modules/services/misc/defaultUnicornConfig.rb @@ -0,0 +1,206 @@ +# The following was taken from github.com/crohr/syslogger and is BSD +# licensed. +require 'syslog' +require 'logger' +require 'thread' + +class Syslogger + + VERSION = "1.6.0" + + attr_reader :level, :ident, :options, :facility, :max_octets + attr_accessor :formatter + + MAPPING = { + Logger::DEBUG => Syslog::LOG_DEBUG, + Logger::INFO => Syslog::LOG_INFO, + Logger::WARN => Syslog::LOG_WARNING, + Logger::ERROR => Syslog::LOG_ERR, + Logger::FATAL => Syslog::LOG_CRIT, + Logger::UNKNOWN => Syslog::LOG_ALERT + } + + # + # Initializes default options for the logger + # ident:: the name of your program [default=$0]. + # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS]. + # Correct values are: + # LOG_CONS : writes the message on the console if an error occurs when sending the message; + # LOG_NDELAY : no delay before sending the message; + # LOG_PERROR : messages will also be written on STDERR; + # LOG_PID : adds the process number to the message (just after the program name) + # facility:: the syslog facility [default=nil] Correct values include: + # Syslog::LOG_DAEMON + # Syslog::LOG_USER + # Syslog::LOG_SYSLOG + # Syslog::LOG_LOCAL2 + # Syslog::LOG_NEWS + # etc. + # + # Usage: + # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0) + # logger.level = Logger::INFO # use Logger levels + # logger.warn "warning message" + # logger.debug "debug message" + # + def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil) + @ident = ident + @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS) + @facility = facility + @level = Logger::INFO + @mutex = Mutex.new + @formatter = Logger::Formatter.new + end + + %w{debug info warn error fatal unknown}.each do |logger_method| + # Accepting *args as message could be nil. + # Default params not supported in ruby 1.8.7 + define_method logger_method.to_sym do |*args, &block| + return true if @level > Logger.const_get(logger_method.upcase) + message = args.first || block && block.call + add(Logger.const_get(logger_method.upcase), message) + end + + unless logger_method == 'unknown' + define_method "#{logger_method}?".to_sym do + @level <= Logger.const_get(logger_method.upcase) + end + end + end + + # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger + def write(msg) + add(Logger::INFO, msg) + end + + # Logs a message at the Logger::INFO level. + def <<(msg) + add(Logger::INFO, msg) + end + + # Low level method to add a message. + # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN + # +message+:: the message string. + # If nil, the method will call the block and use the result as the message string. + # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger. + # +progname+:: optionally, overwrite the program name that appears in the log message. + def add(severity, message = nil, progname = nil, &block) + if message.nil? && block.nil? && !progname.nil? + message, progname = progname, nil + end + progname ||= @ident + + @mutex.synchronize do + Syslog.open(progname, @options, @facility) do |s| + s.mask = Syslog::LOG_UPTO(MAPPING[@level]) + communication = clean(message || block && block.call) + if self.max_octets + buffer = "#{tags_text}" + communication.bytes do |byte| + buffer.concat(byte) + # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte + if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte) + s.log(MAPPING[severity],buffer) + buffer = "" + end + end + s.log(MAPPING[severity],buffer) unless buffer.empty? + else + s.log(MAPPING[severity],"#{tags_text}#{communication}") + end + end + end + end + + # Set the max octets of the messages written to the log + def max_octets=(max_octets) + @max_octets = max_octets + end + + # Sets the minimum level for messages to be written in the log. + # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN + def level=(level) + level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol) + + unless level.is_a?(Fixnum) + raise ArgumentError.new("Invalid logger level `#{level.inspect}`") + end + + @level = level + end + + # Sets the ident string passed along to Syslog + def ident=(ident) + @ident = ident + end + + # Tagging code borrowed from ActiveSupport gem + def tagged(*tags) + new_tags = push_tags(*tags) + yield self + ensure + pop_tags(new_tags.size) + end + + def push_tags(*tags) + tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags| + current_tags.concat new_tags + end + end + + def pop_tags(size = 1) + current_tags.pop size + end + + def clear_tags! + current_tags.clear + end + + protected + + # Borrowed from SyslogLogger. + def clean(message) + message = message.to_s.dup + message.strip! # remove whitespace + message.gsub!(/\n/, '\\n') # escape newlines + message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf) + message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes + message + end + + private + + def tags_text + tags = current_tags + if tags.any? + tags.collect { |tag| "[#{tag}] " }.join + end + end + + def current_tags + Thread.current[:syslogger_tagged_logging_tags] ||= [] + end +end + +worker_processes 2 +working_directory ENV["GITLAB_PATH"] +pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" + +listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 +listen "127.0.0.1:8080", :tcp_nopush => true + +timeout 60 + +logger Syslogger.new + +preload_app true + +GC.respond_to?(:copy_on_write_friendly=) and + GC.copy_on_write_friendly = true + +check_client_connection false + +after_fork do |server, worker| + defined?(ActiveRecord::Base) and + ActiveRecord::Base.establish_connection +end diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix new file mode 100644 index 00000000000..cbef1e43448 --- /dev/null +++ b/nixos/modules/services/misc/gitlab.nix @@ -0,0 +1,283 @@ +{ config, lib, pkgs, ... }: + +# TODO: support non-postgresql + +with lib; + +let + cfg = config.services.gitlab; + + ruby = pkgs.ruby; + rubyLibs = pkgs.rubyLibs; + + databaseYml = '' + production: + adapter: postgresql + database: ${cfg.databaseName} + host: ${cfg.databaseHost} + password: ${cfg.databasePassword} + username: ${cfg.databaseUsername} + encoding: utf8 + ''; + gitlabShellYml = '' + user: gitlab + gitlab_url: "http://localhost:8080/" + http_settings: + self_signed_cert: false + repos_path: "${cfg.stateDir}/repositories" + log_file: "${cfg.stateDir}/log/gitlab-shell.log" + redis: + bin: ${pkgs.redis}/bin/redis-cli + host: 127.0.0.1 + port: 6379 + database: 0 + namespace: resque:gitlab + ''; + + unicornConfig = builtins.readFile ./defaultUnicornConfig.rb; + + gitlab-runner = pkgs.stdenv.mkDerivation rec { + name = "gitlab-runner"; + buildInputs = [ pkgs.gitlab pkgs.rubyLibs.bundler pkgs.makeWrapper ]; + phases = "installPhase fixupPhase"; + buildPhase = ""; + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyLibs.bundler}/bin/bundle $out/bin/gitlab-runner\ + --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'\ + --set UNICORN_PATH "${cfg.stateDir}/"\ + --set GITLAB_PATH "${pkgs.gitlab}/share/gitlab/"\ + --set GITLAB_APPLICATION_LOG_PATH "${cfg.stateDir}/log/application.log"\ + --set GITLAB_SATELLITES_PATH "${cfg.stateDir}/satellites"\ + --set GITLAB_SHELL_PATH "${pkgs.gitlab-shell}"\ + --set GITLAB_REPOSITORIES_PATH "${cfg.stateDir}/repositories"\ + --set GITLAB_SHELL_HOOKS_PATH "${cfg.stateDir}/shell/hooks"\ + --set BUNDLE_GEMFILE "${pkgs.gitlab}/share/gitlab/Gemfile"\ + --set GITLAB_EMAIL_FROM "${cfg.emailFrom}"\ + --set GITLAB_SHELL_CONFIG_PATH "${cfg.stateDir}/shell/config.yml"\ + --set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\ + --set GITLAB_HOST "${cfg.host}"\ + --set GITLAB_BACKUP_PATH"${cfg.backupPath}"\ + --set RAILS_ENV "production" + ''; + }; + +in { + + options = { + services.gitlab = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the gitlab service. + ''; + }; + + satelliteDir = mkOption { + type = types.str; + default = "/var/gitlab/git-satellites"; + description = "Directory to store checked out git trees requires for operation."; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/gitlab/state"; + description = "The state directory, logs are stored here."; + }; + + backupPath = mkOption { + type = types.str; + default = cfg.stateDir + "/backup"; + description = "Path for backups."; + }; + + databaseHost = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database hostname"; + }; + + databasePassword = mkOption { + type = types.str; + default = ""; + description = "Database user password"; + }; + + databaseName = mkOption { + type = types.str; + default = "gitlab"; + description = "Database name"; + }; + + databaseUsername = mkOption { + type = types.str; + default = "gitlab"; + description = "Database user"; + }; + + emailFrom = mkOption { + type = types.str; + default = "example@example.org"; + description = "The source address for emails sent by gitlab."; + }; + + host = mkOption { + type = types.str; + default = config.networking.hostName; + description = "The gitlab host name. Used e.g. for copy-paste URLs."; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ]; + + assertions = [ + { assertion = cfg.databasePassword != ""; + message = "databasePassword must be set"; + } + ]; + + # Redis is required for the sidekiq queue runner. + services.redis.enable = mkDefault true; + # We use postgres as the main data store. + services.postgresql.enable = mkDefault true; + # Use postfix to send out mails. + services.postfix.enable = mkDefault true; + + users.extraUsers = [ + { name = "gitlab"; + group = "gitlab"; + home = "${cfg.stateDir}/home"; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.gitlab; + } ]; + + users.extraGroups = [ + { name = "gitlab"; + gid = config.ids.gids.gitlab; + } ]; + + systemd.services.gitlab-sidekiq = { + after = [ "network.target" "redis.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + environment.UNICORN_PATH = "${cfg.stateDir}/"; + environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/"; + environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; + environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; + environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; + environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; + environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; + environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}"; + environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml"; + environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret"; + environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; + environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; + environment.RAILS_ENV = "production"; + path = with pkgs; [ + config.services.postgresql.package + gitAndTools.git + ruby + openssh + ]; + serviceConfig = { + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.gitlab}/share/gitlab"; + ExecStart="${rubyLibs.bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\""; + }; + }; + + systemd.services.gitlab = { + after = [ "network.target" "postgresql.service" "redis.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + environment.UNICORN_PATH = "${cfg.stateDir}/"; + environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/"; + environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; + environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; + environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; + environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; + environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; + environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}"; + environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; + environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; + environment.RAILS_ENV = "production"; + path = with pkgs; [ + config.services.postgresql.package + gitAndTools.git + ruby + openssh + ]; + preStart = '' + # TODO: use env vars + mkdir -p ${cfg.stateDir} + mkdir -p ${cfg.stateDir}/log + mkdir -p ${cfg.stateDir}/satellites + mkdir -p ${cfg.stateDir}/repositories + mkdir -p ${cfg.stateDir}/shell/hooks + mkdir -p ${cfg.stateDir}/tmp/pids + mkdir -p ${cfg.stateDir}/tmp/sockets + rm -rf ${cfg.stateDir}/config + mkdir -p ${cfg.stateDir}/config + # TODO: What exactly is gitlab-shell doing with the secret? + head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret + mkdir -p ${cfg.stateDir}/home/.ssh + touch ${cfg.stateDir}/home/.ssh/authorized_keys + + cp -rf ${pkgs.gitlab}/share/gitlab/config ${cfg.stateDir}/ + cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.stateDir}/VERSION + + ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml + ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.stateDir}/config/unicorn.rb + + chown -R gitlab:gitlab ${cfg.stateDir}/ + chmod -R 755 ${cfg.stateDir}/ + + if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then + if ! test -e "${cfg.stateDir}/db-created"; then + psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true + touch "${cfg.stateDir}/db-created" + + # force=yes disables the manual-interaction yes/no prompt + # which breaks without an stdin. + force=yes ${rubyLibs.bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production + fi + fi + + # Install the shell required to push repositories + ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml + export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml + ${pkgs.gitlab-shell}/bin/install + + # Change permissions in the last step because some of the + # intermediary scripts like to create directories as root. + chown -R gitlab:gitlab ${cfg.stateDir}/ + chmod -R 755 ${cfg.stateDir}/ + ''; + + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.gitlab}/share/gitlab"; + ExecStart="${rubyLibs.bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\""; + }; + + }; + + }; + +} diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix new file mode 100644 index 00000000000..3d4ae689f6b --- /dev/null +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -0,0 +1,59 @@ +{ stdenv, ruby, rubyLibs, fetchgit }: + +stdenv.mkDerivation rec { + version = "2.1.0"; + name = "gitlab-shell-${version}"; + + srcs = fetchgit { + url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; + rev = "823aba63e444afa2f45477819770fec3cb5f0159"; + sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq"; + }; + + buildInputs = [ + ruby rubyLibs.bundler + ]; + + installPhase = '' + mkdir -p $out/ + cp -R . $out/ + + # Nothing to install ATM for non-development but keeping the + # install command anyway in case that changes in the future: + export HOME=$(pwd) + bundle install -j4 --verbose --local --deployment --without development test + ''; + + # gitlab-shell will try to read its config relative to the source + # code by default which doesn't work in nixos because it's a + # read-only filesystem + postPatch = '' + substituteInPlace lib/gitlab_config.rb --replace\ + "File.join(ROOT_PATH, 'config.yml')"\ + "ENV['GITLAB_SHELL_CONFIG_PATH']" + substituteInPlace lib/gitlab_net.rb --replace\ + "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\ + "File.read ENV['GITLAB_SHELL_SECRET_PATH']" + + # Note that we're running gitlab-shell from current-system/sw + # because otherwise updating gitlab-shell won't be reflected in + # the hardcoded path of the authorized-keys file: + substituteInPlace lib/gitlab_keys.rb --replace\ + "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\ + "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell" + + # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key + # environment because we need it in gitlab_configrb + # . unsetenv_others will remove that so we're not doing it for + # now. + # + # TODO: Are there any security implications? The commit adding + # unsetenv_others didn't mention anything... + # + # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true) + substituteInPlace lib/gitlab_shell.rb --replace\ + " *args, unsetenv_others: true)"\ + " *args)" + ''; + +} diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock new file mode 100644 index 00000000000..a7c6d626b12 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -0,0 +1,711 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + ace-rails-ap (2.0.1) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + mail (~> 2.5.4) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) + addressable (2.3.5) + annotate (2.6.0) + activerecord (>= 2.3.0) + rake (>= 0.8.7) + arel (5.0.1.20140414130214) + asciidoctor (0.1.4) + awesome_print (1.2.0) + axiom-types (0.0.5) + descendants_tracker (~> 0.0.1) + ice_nine (~> 0.9) + bcrypt (3.1.7) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.0.3.0) + sass (~> 3.2) + builder (3.2.2) + capybara (2.2.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + carrierwave (0.9.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + celluloid (0.15.2) + timers (~> 1.1.0) + charlock_holmes (0.6.9.4) + cliver (0.3.2) + code_analyzer (0.4.3) + sexp_processor + coderay (1.1.0) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.3) + colored (1.2) + colorize (0.5.8) + connection_pool (1.2.0) + coveralls (0.7.0) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + crack (0.4.1) + safe_yaml (~> 0.9.0) + creole (0.3.8) + d3_rails (3.1.10) + railties (>= 3.1.0) + daemons (1.1.9) + database_cleaner (1.3.0) + debug_inspector (0.0.2) + default_value_for (3.0.0) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.3) + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) + devise-async (0.9.0) + devise (~> 3.2) + diff-lcs (1.2.5) + diffy (3.0.3) + docile (1.1.5) + dotenv (0.9.0) + dropzonejs-rails (0.4.14) + rails (> 3.1) + email_spec (1.5.0) + launchy (~> 2.1) + mail (~> 2.2) + emoji (1.0.1) + json + enumerize (0.7.0) + activesupport (>= 3.2) + equalizer (0.0.8) + erubis (2.7.0) + escape_utils (0.2.4) + eventmachine (1.0.3) + excon (0.32.1) + execjs (2.0.2) + expression_parser (0.9.0) + factory_girl (4.3.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.3.0) + factory_girl (~> 4.3.0) + railties (>= 3.0.0) + faraday (0.8.9) + multipart-post (~> 1.2.0) + faraday_middleware (0.9.0) + faraday (>= 0.7.4, < 0.9) + ffaker (1.22.1) + ffi (1.9.3) + fog (1.21.0) + fog-brightbox + fog-core (~> 1.21, >= 1.21.1) + fog-json + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.1) + fog-core + fog-json + fog-core (1.21.1) + builder + excon (~> 0.32) + formatador (~> 0.2.0) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-json (1.0.0) + multi_json (~> 1.0) + font-awesome-rails (4.2.0.0) + railties (>= 3.2, < 5.0) + foreman (0.63.0) + dotenv (>= 0.7) + thor (>= 0.13.6) + formatador (0.2.4) + gemnasium-gitlab-service (0.2.2) + rugged (~> 0.19) + gherkin-ruby (0.3.1) + racc + github-markup (1.1.0) + gitlab-flowdock-git-hook (0.4.2.2) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grack (2.0.0.pre) + rack (~> 1.5.1) + gitlab-grit (2.6.12) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3) + gitlab-linguist (3.0.0) + charlock_holmes (~> 0.6.6) + escape_utils (~> 0.2.4) + mime-types (~> 1.19) + gitlab_emoji (0.0.1.1) + emoji (~> 1.0.1) + gitlab_git (7.0.0.rc10) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-linguist (~> 3.0) + rugged (~> 0.21.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.1.0) + net-ldap (~> 0.7.0) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.1.1) + gollum-lib (3.0.0) + github-markup (~> 1.1.0) + gitlab-grit (~> 2.6.5) + nokogiri (~> 1.6.1) + rouge (~> 1.3.3) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gon (5.0.1) + actionpack (>= 2.3.0) + json + grape (0.6.1) + activesupport + builder + hashie (>= 1.2.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.2) + activesupport + multi_json (>= 1.3.2) + growl (1.0.3) + guard (2.2.4) + formatador (>= 0.2.4) + listen (~> 2.1) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-rspec (4.2.0) + guard (>= 2.1.1) + rspec (>= 2.14, < 4.0) + guard-spinach (0.0.2) + guard (>= 1.1) + spinach + haml (4.0.5) + tilt + haml-rails (0.5.3) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 3.1, < 5.0) + railties (>= 4.0.1) + hashie (2.1.2) + hike (1.2.3) + hipchat (0.14.0) + httparty + httparty + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + html-pipeline-gitlab (0.1.5) + actionpack (~> 4) + gitlab_emoji (~> 0.0.1) + html-pipeline (~> 1.11.0) + sanitize (~> 2.1) + http_parser.rb (0.5.3) + httparty (0.13.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpauth (0.2.1) + i18n (0.6.11) + ice_nine (0.10.0) + jasmine (2.0.2) + jasmine-core (~> 2.0.0) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.0.0) + jquery-atwho-rails (0.3.3) + jquery-rails (3.1.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-scrollto-rails (1.4.3) + railties (> 3.1, < 5.0) + jquery-turbolinks (2.0.1) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (1.8.1) + jwt (0.1.13) + multi_json (>= 1.5) + kaminari (0.15.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.8.1) + launchy (2.4.2) + addressable (~> 2.3) + letter_opener (1.1.2) + launchy (~> 2.2) + libv8 (3.16.14.3) + listen (2.3.1) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + method_source (0.8.2) + mime-types (1.25.1) + mini_portile (0.6.0) + minitest (5.3.5) + mousetrap-rails (1.4.6) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-ldap (0.7.0) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.8.0) + newrelic_rpm (3.9.4.245) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + nprogress-rails (0.1.2.3) + oauth (0.4.7) + oauth2 (0.8.1) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) + multi_json (~> 1.0) + rack (~> 1.2) + omniauth (1.1.4) + hashie (>= 1.2, < 3) + rack + omniauth-github (1.1.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-google-oauth2 (0.2.5) + omniauth (> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth (1.0.1) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.1.1) + oauth2 (~> 0.8.0) + omniauth (~> 1.0) + omniauth-shibboleth (1.1.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.0.1) + multi_json (~> 1.3) + omniauth-oauth (~> 1.0) + org-ruby (0.9.9) + rubypants (~> 0.2) + orm_adapter (0.5.0) + pg (0.15.1) + phantomjs (1.9.2.0) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + posix-spawn (0.3.9) + pry (0.9.12.4) + coderay (~> 1.0) + method_source (~> 0.8) + slop (~> 3.4) + pyu-ruby-sasl (0.0.3.3) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) + racc (1.4.10) + rack (1.5.2) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (2.3.0) + rack + rack-cors (0.2.9) + rack-mini-profiler (0.9.0) + rack (>= 1.1.3) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-protection (1.5.1) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + rails_autolink (1.1.6) + rails (> 3.1) + rails_best_practices (1.14.4) + activesupport + awesome_print + code_analyzer (>= 0.4.3) + colored + erubis + i18n + require_all + ruby-progressbar + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.12.0) + rake (10.3.2) + raphael-rails (2.1.2) + rb-fsevent (0.9.3) + rb-inotify (0.9.2) + ffi (>= 0.5.0) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (3.1.2) + redis (3.0.6) + redis-actionpack (4.0.0) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.0.0) + activesupport (~> 4) + redis-store (~> 1.1.0) + redis-namespace (1.4.1) + redis (~> 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.4) + redis (>= 2.2) + ref (1.0.5) + request_store (1.0.5) + require_all (1.3.2) + rest-client (1.6.7) + mime-types (>= 1.16) + rinku (1.7.3) + rouge (1.3.3) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + ruby-progressbar (1.2.0) + rubyntlm (0.1.1) + rubypants (0.2.0) + rugged (0.21.0) + safe_yaml (0.9.7) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.1) + activerecord (>= 3.1, < 4.2) + activesupport (>= 3.1, < 4.2) + select2-rails (3.5.2) + thor (~> 0.14) + semantic-ui-sass (0.16.1.0) + sass (~> 3.2) + settingslogic (2.0.9) + sexp_processor (4.4.0) + shoulda-matchers (2.1.0) + activesupport (>= 3.0.0) + sidekiq (2.17.0) + celluloid (>= 0.15.2) + connection_pool (>= 1.0.0) + json + redis (>= 3.0.4) + redis-namespace (>= 1.3.1) + simple_oauth (0.1.9) + simplecov (0.9.0) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sinatra (1.4.4) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + six (0.2.0) + slack-notifier (0.3.2) + slim (2.0.2) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) + slop (3.4.7) + spinach (0.8.7) + colorize (= 0.5.8) + gherkin-ruby (>= 0.3.1) + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spring (1.1.3) + spring-commands-rspec (1.0.1) + spring (>= 0.9.1) + spring-commands-spinach (1.0.0) + spring (>= 0.9.1) + sprockets (2.11.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + stamp (0.5.0) + state_machine (1.2.0) + stringex (2.5.1) + temple (0.6.7) + term-ansicolor (1.2.2) + tins (~> 0.8) + test_after_commit (0.2.2) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) + ref + thin (1.6.1) + daemons (>= 1.0.9) + eventmachine (>= 1.0.0) + rack (>= 1.0.0) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + timers (1.1.0) + tinder (1.9.3) + eventmachine (~> 1.0) + faraday (~> 0.8) + faraday_middleware (~> 0.9) + hashie (>= 1.0, < 3) + json (~> 1.8.0) + mime-types (~> 1.19) + multi_json (~> 1.7) + twitter-stream (~> 0.1) + tins (0.13.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + turbolinks (2.0.0) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.3.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.4.4) + unf (0.1.4) + unf_ext + unf_ext (0.0.6) + unicorn (4.6.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.2) + unicorn (~> 4) + version_sorter (1.1.0) + virtus (1.0.1) + axiom-types (~> 0.0.5) + coercible (~> 1.0) + descendants_tracker (~> 0.0.1) + equalizer (~> 0.0.7) + warden (1.2.3) + rack (>= 1.0) + webmock (1.16.0) + addressable (>= 2.2.7) + crack (>= 0.3.2) + websocket-driver (0.3.3) + wikicloth (0.8.1) + builder + expression_parser + rinku + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth + ace-rails-ap + acts-as-taggable-on + annotate (~> 2.6.0.beta2) + asciidoctor (= 0.1.4) + awesome_print + better_errors + binding_of_caller + bootstrap-sass (~> 3.0) + capybara (~> 2.2.1) + carrierwave + coffee-rails + colored + coveralls + creole (~> 0.3.6) + d3_rails (~> 3.1.4) + database_cleaner + default_value_for (~> 3.0.0) + devise (= 3.2.4) + devise-async (= 0.9.0) + diffy (~> 3.0.3) + dropzonejs-rails + email_spec + enumerize + factory_girl_rails + ffaker + fog (~> 1.14) + font-awesome-rails (~> 4.2) + foreman + gemnasium-gitlab-service (~> 0.2) + github-markup + gitlab-flowdock-git-hook (~> 0.4.2) + gitlab-grack (~> 2.0.0.pre) + gitlab-linguist (~> 3.0.0) + gitlab_emoji (~> 0.0.1.1) + gitlab_git (= 7.0.0.rc10) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (= 1.1.0) + gollum-lib (~> 3.0.0) + gon (~> 5.0.0) + grape (~> 0.6.1) + grape-entity (~> 0.4.2) + growl + guard-rspec + guard-spinach + haml-rails + hipchat (~> 0.14.0) + html-pipeline-gitlab (~> 0.1.0) + httparty + jasmine (= 2.0.2) + jquery-atwho-rails (~> 0.3.3) + jquery-rails + jquery-scrollto-rails + jquery-turbolinks + jquery-ui-rails + kaminari (~> 0.15.1) + launchy + letter_opener + minitest (~> 5.3.0) + mousetrap-rails + mysql2 + newrelic_rpm + nprogress-rails + omniauth (~> 1.1.3) + omniauth-github + omniauth-google-oauth2 + omniauth-shibboleth + omniauth-twitter + org-ruby (= 0.9.9) + pg + poltergeist (~> 1.5.1) + pry + quiet_assets (~> 1.0.1) + rack-attack + rack-cors + rack-mini-profiler + rails (~> 4.1.0) + rails_autolink (~> 1.1) + rails_best_practices + raphael-rails (~> 2.1.2) + rb-fsevent + rb-inotify + rdoc (~> 3.6) + redcarpet (~> 3.1.2) + redis-rails + request_store + rspec-rails + sanitize (~> 2.0) + sass-rails (~> 4.0.2) + sdoc + seed-fu + select2-rails + semantic-ui-sass (~> 0.16.1.0) + settingslogic + shoulda-matchers (~> 2.1.0) + sidekiq (= 2.17.0) + simplecov + sinatra + six + slack-notifier (~> 0.3.2) + slim + spinach-rails + spring (= 1.1.3) + spring-commands-rspec (= 1.0.1) + spring-commands-spinach (= 1.0.0) + stamp + state_machine + test_after_commit + therubyracer + thin + tinder (~> 1.9.2) + turbolinks + uglifier + underscore-rails (~> 1.4.4) + unf + unicorn (~> 4.6.3) + unicorn-worker-killer + version_sorter + virtus + webmock + wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/Gemfile.nix b/pkgs/applications/version-management/gitlab/Gemfile.nix new file mode 100644 index 00000000000..78b51178ac4 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.nix @@ -0,0 +1,1526 @@ +[ +{ +name = "RedCloth"; +hash = "b4cf450a8868ca00a48d6ea43346d75dac183a8590774dd5590f4e967d87ea1a"; +url = "http://rubygems.org/downloads/RedCloth-4.2.9.gem"; +version = "4.2.9"; +} +{ +name = "ace-rails-ap"; +hash = "7bfbec4e8f7c7b6d2733fada398253f885ee48acd08201126a47a636b3085620"; +url = "http://rubygems.org/downloads/ace-rails-ap-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "actionmailer"; +hash = "ddf61f96ecf52b918522f063effb28985d0f76deb5c3ad85ab8cf5ec39adab92"; +url = "http://rubygems.org/downloads/actionmailer-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionpack"; +hash = "c11be56442eb570ba44d3b3ac74f6949f882c8dc76c56fceeb071daf64c5111d"; +url = "http://rubygems.org/downloads/actionpack-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionview"; +hash = "5892b097fc3556c4ac25307f3c406ba697b6520ca7c34b7d1ff17e0c93d79072"; +url = "http://rubygems.org/downloads/actionview-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activemodel"; +hash = "c1d808d85b5e7f90593cb66ac7694f9288c819cdd1cb029790617f60cfed3232"; +url = "http://rubygems.org/downloads/activemodel-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activerecord"; +hash = "df9f2227e00779826ea8abe13ed1c6aa9ba5422b35e37c1b82f62480d2ea13a0"; +url = "http://rubygems.org/downloads/activerecord-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activesupport"; +hash = "7342801d69c8ca68c9005cafbc4a8f67069d3b51c0a4f5e2bbd061dcb26bba85"; +url = "http://rubygems.org/downloads/activesupport-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "acts-as-taggable-on"; +hash = "4b75dd427cb721f38fe354e8a37d8c3d217779c9db204398890984694def753d"; +url = "http://rubygems.org/downloads/acts-as-taggable-on-2.4.1.gem"; +version = "2.4.1"; +} +{ +name = "addressable"; +hash = "e74d0e825fe79b12943c7e3cbd3a5c92f7e3ebb94485b2493d320d6876321b86"; +url = "http://rubygems.org/downloads/addressable-2.3.5.gem"; +version = "2.3.5"; +} +{ +name = "annotate"; +hash = "d92ab99c6d10d98fec361bb5501ee91f8f30d1a7b2a6267334d74a1c6b363656"; +url = "http://rubygems.org/downloads/annotate-2.6.0.gem"; +version = "2.6.0"; +} +{ +name = "arel"; +hash = "c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636"; +url = "http://rubygems.org/downloads/arel-5.0.1.20140414130214.gem"; +version = "5.0.1.20140414130214"; +} +{ +name = "asciidoctor"; +hash = "2a2d6f9aed31200c9c74e5b81dba1673eda2f7936599df016cbe608dd8e1cf92"; +url = "http://rubygems.org/downloads/asciidoctor-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "awesome_print"; +hash = "f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd"; +url = "http://rubygems.org/downloads/awesome_print-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "axiom-types"; +hash = "f67b87e9d7276f78cbee8f09f9bd474d63d7b357d271c63bfac5092b4670d54c"; +url = "http://rubygems.org/downloads/axiom-types-0.0.5.gem"; +version = "0.0.5"; +} +{ +name = "bcrypt"; +hash = "1c30953152c7151eac21aa59eed7ea933a7bc5d5838edea1d30d79b005955702"; +url = "http://rubygems.org/downloads/bcrypt-3.1.7.gem"; +version = "3.1.7"; +} +{ +name = "better_errors"; +hash = "eec93a02c996a8105cd9409cff2a2156a16ff1609b93b9b0d38c623cdb42186c"; +url = "http://rubygems.org/downloads/better_errors-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "binding_of_caller"; +hash = "d327682ce1d8e8cc46e282a46052946af0de16bef734014c63df0aac66334f96"; +url = "http://rubygems.org/downloads/binding_of_caller-0.7.2.gem"; +version = "0.7.2"; +} +{ +name = "bootstrap-sass"; +hash = "3f9269bae459b9f48bcb46524497fe7c422919708d12d9d9b1096b45339654c7"; +url = "http://rubygems.org/downloads/bootstrap-sass-3.0.3.0.gem"; +version = "3.0.3.0"; +} +{ +name = "builder"; +hash = "62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191"; +url = "http://rubygems.org/downloads/builder-3.2.2.gem"; +version = "3.2.2"; +} +{ +name = "capybara"; +hash = "0081ff6eaa33f4b5b0427db7ef0ca0af015a9bf6606126f41016db6feb58cdeb"; +url = "http://rubygems.org/downloads/capybara-2.2.1.gem"; +version = "2.2.1"; +} +{ +name = "carrierwave"; +hash = "859069a445ffe03551cce9e239da424dabcc3b9a855e5f615ec62f6655d82aac"; +url = "http://rubygems.org/downloads/carrierwave-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "celluloid"; +hash = "2bb549276898d262355818b54eee45161d565af08728a5fe83e51277ea49ea52"; +url = "http://rubygems.org/downloads/celluloid-0.15.2.gem"; +version = "0.15.2"; +} +{ +name = "charlock_holmes"; +hash = "e52db7af0f7a652f55244455f84b4f1c09144f0d5e416f677a912f9147d6dfef"; +url = "http://rubygems.org/downloads/charlock_holmes-0.6.9.4.gem"; +version = "0.6.9.4"; +} +{ +name = "cliver"; +hash = "8775445218c612bb57f50c392c4906a1ab5cca067eab093bde3cc77d6426ce24"; +url = "http://rubygems.org/downloads/cliver-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "code_analyzer"; +hash = "27b610b987b3421d17a615cbab0c712f90bca45e82391ab9082670af97360bed"; +url = "http://rubygems.org/downloads/code_analyzer-0.4.3.gem"; +version = "0.4.3"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "coercible"; +hash = "5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc"; +url = "http://rubygems.org/downloads/coercible-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "coffee-rails"; +hash = "2f6e36f2c7a2b5ea4ba2aae5d8f70b443e47f010e1f645aec28368d783e1d88a"; +url = "http://rubygems.org/downloads/coffee-rails-4.0.1.gem"; +version = "4.0.1"; +} +{ +name = "coffee-script"; +hash = "acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c"; +url = "http://rubygems.org/downloads/coffee-script-2.2.0.gem"; +version = "2.2.0"; +} +{ +name = "coffee-script-source"; +hash = "64a5e37557b367c3a087643ed033b1dce485d6c21f96262aecc806d93280635c"; +url = "http://rubygems.org/downloads/coffee-script-source-1.6.3.gem"; +version = "1.6.3"; +} +{ +name = "colored"; +hash = "9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c"; +url = "http://rubygems.org/downloads/colored-1.2.gem"; +version = "1.2"; +} +{ +name = "colorize"; +hash = "0f3d2c56f6a9da8dd6e8bb7c4448dab91a682615ef49feff415a8a6999dedfe5"; +url = "http://rubygems.org/downloads/colorize-0.5.8.gem"; +version = "0.5.8"; +} +{ +name = "connection_pool"; +hash = "41c0f1ff0c5a697869344ff50ae0d952fe99b52b26c21744b06fac34323adcb9"; +url = "http://rubygems.org/downloads/connection_pool-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "coveralls"; +hash = "449284ddd071e2297d06d0a9d18fe4c2b4027848263b1087d4180fb44e03e36b"; +url = "http://rubygems.org/downloads/coveralls-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "crack"; +hash = "4f9690bc66278494e0c525989b8ebfa89ce44087cd1733857d6ca9162dd16271"; +url = "http://rubygems.org/downloads/crack-0.4.1.gem"; +version = "0.4.1"; +} +{ +name = "creole"; +hash = "88ceda907e86402e629557002dfdc3a64c96ece2f85af8d787b96422639998f3"; +url = "http://rubygems.org/downloads/creole-0.3.8.gem"; +version = "0.3.8"; +} +{ +name = "d3_rails"; +hash = "28c6b97d4167481b78525cb2e2aa6b066fff6a086bb68a25762dec502cdf24d9"; +url = "http://rubygems.org/downloads/d3_rails-3.1.10.gem"; +version = "3.1.10"; +} +{ +name = "daemons"; +hash = "fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8"; +url = "http://rubygems.org/downloads/daemons-1.1.9.gem"; +version = "1.1.9"; +} +{ +name = "database_cleaner"; +hash = "f675eb78d4fed65ae1e8503ccef4dfd25f4a3c3702bfb792789720a39a2f82a7"; +url = "http://rubygems.org/downloads/database_cleaner-1.3.0.gem"; +version = "1.3.0"; +} +{ +name = "debug_inspector"; +hash = "1594188ffd35b9973fa1e048497e4aa63abad0c3cbba0670e17935005e302781"; +url = "http://rubygems.org/downloads/debug_inspector-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "default_value_for"; +hash = "1fbd89cb5e7dab1820f7da6bbf5972c36e41acaa25101f129a7adffe9b987021"; +url = "http://rubygems.org/downloads/default_value_for-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "descendants_tracker"; +hash = "01d7079bc81d4743e138bf77a7cc1ece123834fa6883f4241646163401922920"; +url = "http://rubygems.org/downloads/descendants_tracker-0.0.3.gem"; +version = "0.0.3"; +} +{ +name = "devise"; +hash = "a37345a41049b5c4e02da561bcf922920b406cdd41970d1eb0023315050244fd"; +url = "http://rubygems.org/downloads/devise-3.2.4.gem"; +version = "3.2.4"; +} +{ +name = "devise-async"; +hash = "b51aec324bfa56f5e51b00e5429546e9eeab4be99ac0971625afdeffde799486"; +url = "http://rubygems.org/downloads/devise-async-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "diff-lcs"; +hash = "a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed"; +url = "http://rubygems.org/downloads/diff-lcs-1.2.5.gem"; +version = "1.2.5"; +} +{ +name = "diffy"; +hash = "15a1d91b0ea81cada6ef5977543e7c255b4f8c5c3d361e557c8aee52cdf58d62"; +url = "http://rubygems.org/downloads/diffy-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "docile"; +hash = "5d3ee40b3a6567fe460601f3f4a3e199a98de37434ebfa242d751d0c79181255"; +url = "http://rubygems.org/downloads/docile-1.1.5.gem"; +version = "1.1.5"; +} +{ +name = "dotenv"; +hash = "838e235fa00d343c3138dbc05aa2cf1ec626ff9f065d521917a79a86b4a980be"; +url = "http://rubygems.org/downloads/dotenv-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "dropzonejs-rails"; +hash = "de86f5f58ca2e6f7212709db879f72d3eec16477a92296f03effabdd928c122b"; +url = "http://rubygems.org/downloads/dropzonejs-rails-0.4.14.gem"; +version = "0.4.14"; +} +{ +name = "email_spec"; +hash = "2607e556f41ab7fb90dabd3eda3d21acec5c2afd3ee607ab713664473dda503f"; +url = "http://rubygems.org/downloads/email_spec-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "emoji"; +hash = "2a74a4c6ff196cdc81e63198d30d8660b39b1147a59bd5f3639b39edf8fccf05"; +url = "http://rubygems.org/downloads/emoji-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "enumerize"; +hash = "4608034132557260e16a936c0eef54bf26c21eda261da25f89e49edd475de665"; +url = "http://rubygems.org/downloads/enumerize-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "equalizer"; +hash = "d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da"; +url = "http://rubygems.org/downloads/equalizer-0.0.8.gem"; +version = "0.0.8"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "escape_utils"; +hash = "8f14b54e78845b9673d4ade8ec7f748652e18e19cd9800605f810ba0d4bbe555"; +url = "http://rubygems.org/downloads/escape_utils-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "eventmachine"; +hash = "34424c87fc517f70ba137fe2281d16b53ce9c13f5cbfc2dda3ada56e96a65827"; +url = "http://rubygems.org/downloads/eventmachine-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "excon"; +hash = "aa1018571cb72248f82a9b88ab631b53179d0de0f8169957eebe512404805f79"; +url = "http://rubygems.org/downloads/excon-0.32.1.gem"; +version = "0.32.1"; +} +{ +name = "execjs"; +hash = "5a2e097ea0ae440cbbe6aebf54d83cf8596324fa85b7a725dfdb1e8afd5cf398"; +url = "http://rubygems.org/downloads/execjs-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "expression_parser"; +hash = "2b56db3cffc48c3337f4f29f5bc2374c86e7ba29acb40269c74bb55af9f868a4"; +url = "http://rubygems.org/downloads/expression_parser-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "factory_girl"; +hash = "bfa55ba5d3218c8e86adf251be79a3f936adadcae563f0d7462cfcb38802e28f"; +url = "http://rubygems.org/downloads/factory_girl-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "factory_girl_rails"; +hash = "1fe68aa430afa25807a135ac348b5157ec5b70608fb7741e598d46570df540ca"; +url = "http://rubygems.org/downloads/factory_girl_rails-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "faraday"; +hash = "289c3b5b57821b52988bdb5178d3e1149741f2bae5fbee2a80bc83feb44ba79d"; +url = "http://rubygems.org/downloads/faraday-0.8.9.gem"; +version = "0.8.9"; +} +{ +name = "faraday_middleware"; +hash = "02b37848159983ed1e4374f46f02325bf0364e8eb1e0a38839d2b4deb4889bcf"; +url = "http://rubygems.org/downloads/faraday_middleware-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "ffaker"; +hash = "18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f"; +url = "http://rubygems.org/downloads/ffaker-1.22.1.gem"; +version = "1.22.1"; +} +{ +name = "ffi"; +hash = "57977d095c1c324ac1cb134863180b34d5743fed2b6d7528adc5ec71a581e320"; +url = "http://rubygems.org/downloads/ffi-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "fog"; +hash = "ee28b0bae7004a98e139f65d8fe606d666534f4b5f96cef247bdd0374ec10b92"; +url = "http://rubygems.org/downloads/fog-1.21.0.gem"; +version = "1.21.0"; +} +{ +name = "fog-brightbox"; +hash = "7362f7497c45e7aa9621a23d4486211c90126afd86d0a5603270d88894bb2b48"; +url = "http://rubygems.org/downloads/fog-brightbox-0.0.1.gem"; +version = "0.0.1"; +} +{ +name = "fog-core"; +hash = "64e023ca8de23a0317ff3608c65068bbf722691c07a26c00752b9e51168d9df1"; +url = "http://rubygems.org/downloads/fog-core-1.21.1.gem"; +version = "1.21.1"; +} +{ +name = "fog-json"; +hash = "dcd321b42f551a9ed3a2a5d43bdfe703b7588dcac5a9e504577501ba50d52794"; +url = "http://rubygems.org/downloads/fog-json-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "font-awesome-rails"; +hash = "00ca8028187d17176a397588003c6db779ed14197dbbe28d369561ae2919dde4"; +url = "http://rubygems.org/downloads/font-awesome-rails-4.2.0.0.gem"; +version = "4.2.0.0"; +} +{ +name = "foreman"; +hash = "937e1b895042139d578936b1c099bc1989dcb7188c0f4798e79154997a941e7b"; +url = "http://rubygems.org/downloads/foreman-0.63.0.gem"; +version = "0.63.0"; +} +{ +name = "formatador"; +hash = "2238f3794fc3b5d69578fdd9bad7ea82116540a3587a67a966a39a686098f55d"; +url = "http://rubygems.org/downloads/formatador-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "gemnasium-gitlab-service"; +hash = "82b9b6ef02f625a30198cefe5fd46b8c4551ec749a320d3b56fdcd1ebef07228"; +url = "http://rubygems.org/downloads/gemnasium-gitlab-service-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "gherkin-ruby"; +hash = "9856207d67c184a07e7e35e91fd4322f89ad15704ba1f3764307f8798864f482"; +url = "http://rubygems.org/downloads/gherkin-ruby-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "github-markup"; +hash = "ef345d335058b050ecbe0f2e59450e1f6648574fa67f31b8537cdead9ea4fa1b"; +url = "http://rubygems.org/downloads/github-markup-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gitlab-flowdock-git-hook"; +hash = "9bdb3455e46de3a6642d72a23f8f62b57669d1d0f2ea98561c653736ffe4d064"; +url = "http://rubygems.org/downloads/gitlab-flowdock-git-hook-0.4.2.2.gem"; +version = "0.4.2.2"; +} +{ +name = "gitlab-grack"; +hash = "197qdlymn6cf0qk3698kn0miizv7x9hr1429g9l900rnc85a5rdb"; +url = "https://rubygems.org/downloads/gitlab-grack-2.0.0.pre.gem"; +version = "2.0.0.pre"; +} +{ +name = "gitlab-grit"; +hash = "88996ec1e14017bfd4c70baae6e72110317704ae689f3fdb26e3bd371887cf03"; +url = "http://rubygems.org/downloads/gitlab-grit-2.6.12.gem"; +version = "2.6.12"; +} +{ +name = "gitlab-linguist"; +hash = "6652604cdf0168832ba5fe6662251f792730fbcb9253869625658cb1e8d9563c"; +url = "http://rubygems.org/downloads/gitlab-linguist-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gitlab_emoji"; +hash = "760fc5df13080ef39bb8f06878b5b49b7206d4259471d6569fbb0e56f0821d33"; +url = "http://rubygems.org/downloads/gitlab_emoji-0.0.1.1.gem"; +version = "0.0.1.1"; +} +{ +name = "gitlab_git"; +hash = "0kjljz76wh4344z05mv3wiad7qdf6nwaa0yl1jls1j0hk9i4bb4k"; +url = "https://rubygems.org/downloads/gitlab_git-7.0.0.rc10.gem"; +version = "7.0.0.rc10"; +} +{ +name = "gitlab_meta"; +hash = "e96e1ced109b39bfcbefb30623e31c8eab4dc7d385a01bf7ba9ed1f5ce866a93"; +url = "http://rubygems.org/downloads/gitlab_meta-7.0.gem"; +version = "7.0"; +} +{ +name = "gitlab_omniauth-ldap"; +hash = "07df91c1993de0e5fa2fda845e2109e7b0bce228960bf41f770350873e82fa2e"; +url = "http://rubygems.org/downloads/gitlab_omniauth-ldap-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gollum-lib"; +hash = "7a0896cae6d443e42b19e1353f1f900684b63109844cfdb52c48d40f2824e7a1"; +url = "http://rubygems.org/downloads/gollum-lib-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gon"; +hash = "f593d15ba8616a0c9482b53113e03bc8a69cd0392e21f0189b2a96338837eaa5"; +url = "http://rubygems.org/downloads/gon-5.0.1.gem"; +version = "5.0.1"; +} +{ +name = "grape"; +hash = "e83ff1ae19bb2a402a75bdf81372ae31d25399ec6079f4e31d6be1572f9854ea"; +url = "http://rubygems.org/downloads/grape-0.6.1.gem"; +version = "0.6.1"; +} +{ +name = "grape-entity"; +hash = "93bc04e43bac2ab8959d66beffcac3d60e88681cb7c09de923c80a0e8fbc7b97"; +url = "http://rubygems.org/downloads/grape-entity-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "growl"; +hash = "c926f6fa77800a1cfab1c0a9e4c3608c93b5619145062cf6ba545949553d1e68"; +url = "http://rubygems.org/downloads/growl-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "guard"; +hash = "182ecf687c58d19de444a711892a44b6ef607589073f16c413c8ffcb663e827c"; +url = "http://rubygems.org/downloads/guard-2.2.4.gem"; +version = "2.2.4"; +} +{ +name = "guard-rspec"; +hash = "1631dd0b0172e528d23d92de3ad8c2903fcae195707bb18bdac023c4592a8158"; +url = "http://rubygems.org/downloads/guard-rspec-4.2.0.gem"; +version = "4.2.0"; +} +{ +name = "guard-spinach"; +hash = "2d76e05c747fc3ef163449c3f5d0b850af92bbd66f7133f3b79bfbe8a23750bb"; +url = "http://rubygems.org/downloads/guard-spinach-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "haml"; +hash = "05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6"; +url = "http://rubygems.org/downloads/haml-4.0.5.gem"; +version = "4.0.5"; +} +{ +name = "haml-rails"; +hash = "4598b9c3204a04ce27dfe5ce88f278af0a1069c7a5f2708a80c49df5026ce439"; +url = "http://rubygems.org/downloads/haml-rails-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "hashie"; +hash = "a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923"; +url = "http://rubygems.org/downloads/hashie-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "hipchat"; +hash = "1678c4ee7de2beacc2986792c29dbe5008b09247f1088046f02a062155896bf8"; +url = "http://rubygems.org/downloads/hipchat-0.14.0.gem"; +version = "0.14.0"; +} +{ +name = "html-pipeline"; +hash = "3461d1f709ef4812f11cc9789bdebb801813ba726e5544df3aad6c62336d93f9"; +url = "http://rubygems.org/downloads/html-pipeline-1.11.0.gem"; +version = "1.11.0"; +} +{ +name = "html-pipeline-gitlab"; +hash = "cf36fa0aded375a210d38586e023642a88585360b9fc203621a210ac8f4430be"; +url = "http://rubygems.org/downloads/html-pipeline-gitlab-0.1.5.gem"; +version = "0.1.5"; +} +{ +name = "http_parser.rb"; +hash = "d64f525eb1c580598d5bdef4fad98e948b6e016fa7803f45e13ac8714a2b8e3b"; +url = "http://rubygems.org/downloads/http_parser.rb-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "httparty"; +hash = "5c8ad1664ebd51c7bded6a96138d804549c030b413ad685b8b3940dea137aae1"; +url = "http://rubygems.org/downloads/httparty-0.13.0.gem"; +version = "0.13.0"; +} +{ +name = "httpauth"; +hash = "0d4991e48dfe46aae27ec709b896e54b7a1c402d84a4dbc93a6fe86d8353b4f9"; +url = "http://rubygems.org/downloads/httpauth-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "ice_nine"; +hash = "108f7538b32819623db949583895a962f5934dcfd183e7fff8b7e6d70db04c42"; +url = "http://rubygems.org/downloads/ice_nine-0.10.0.gem"; +version = "0.10.0"; +} +{ +name = "jasmine"; +hash = "39426ce310c74f2efbe8dfae6efb3770f58687a11bb84a4115e15a528b2a1fec"; +url = "http://rubygems.org/downloads/jasmine-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "jasmine-core"; +hash = "f23bfecc48cca26fe2f81bb7b1782f1a853168f7a0c14c187a8aabec9b4d39bb"; +url = "http://rubygems.org/downloads/jasmine-core-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "jquery-atwho-rails"; +hash = "7abb6386fb377165e7ed8cb1665536f4b340c3c208400addc7441be2f10c1cb9"; +url = "http://rubygems.org/downloads/jquery-atwho-rails-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "jquery-rails"; +hash = "9d192f83aaa54196b380753cb20b42ca1ad210715063ef0fb15fac63ec430a8c"; +url = "http://rubygems.org/downloads/jquery-rails-3.1.0.gem"; +version = "3.1.0"; +} +{ +name = "jquery-scrollto-rails"; +hash = "77dbb8add00d4f1baec5f34859b992649a86a9ca054b1c2a7d3e03c3fb072c8a"; +url = "http://rubygems.org/downloads/jquery-scrollto-rails-1.4.3.gem"; +version = "1.4.3"; +} +{ +name = "jquery-turbolinks"; +hash = "6d9a82a44ddf652f74b6181e5892860cdbda3f000eb1497fa91e3dc098d9ca34"; +url = "http://rubygems.org/downloads/jquery-turbolinks-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "jquery-ui-rails"; +hash = "5b349e7066150b16d7a784183f040c083d51af3357937b8564aa0cc8b1cd59bd"; +url = "http://rubygems.org/downloads/jquery-ui-rails-4.2.1.gem"; +version = "4.2.1"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "jwt"; +hash = "5653fb76aa0b4b280624b314cd6c00a64de7cb2d61c2ab27587b434b8ad7880d"; +url = "http://rubygems.org/downloads/jwt-0.1.13.gem"; +version = "0.1.13"; +} +{ +name = "kaminari"; +hash = "6d8c87cdcd1bff99cc97436160ec31dae3228403a04169c33421c3522e7cc7d4"; +url = "http://rubygems.org/downloads/kaminari-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "kgio"; +hash = "92e59a3b97d044177b354f1434f6ebddfe50309d18d84754ab08d632a61dfc6e"; +url = "http://rubygems.org/downloads/kgio-2.8.1.gem"; +version = "2.8.1"; +} +{ +name = "launchy"; +hash = "3b22fd75759a8af480e1a7545c17e10eada3146605e1789cc162da8b33ad3644"; +url = "http://rubygems.org/downloads/launchy-2.4.2.gem"; +version = "2.4.2"; +} +{ +name = "letter_opener"; +hash = "b43060c7b223b00caa94dafe7016b424d809c83378326fbf24d041830cabebcf"; +url = "http://rubygems.org/downloads/letter_opener-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "libv8"; +hash = "64490f61e9aa928e2905e90fafde5403496925d7a9539026628b01854fd69862"; +url = "http://rubygems.org/downloads/libv8-3.16.14.3-x86_64-linux.gem"; +version = "3.16.14.3"; +} +{ +name = "listen"; +hash = "5549b607337a95bb3248a97660ccaa0c3eeec70e01e61b8a08d4a6c36dd93720"; +url = "http://rubygems.org/downloads/listen-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "lumberjack"; +hash = "2d85f466e25623f5c1d8476523f5e4b7903fa622007ac109fd7b560b45a846d6"; +url = "http://rubygems.org/downloads/lumberjack-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "method_source"; +hash = "c2e9d0f4ebefd6b37efe38fe2964337b1d315fe198cad850681fd2da0027b1bc"; +url = "http://rubygems.org/downloads/method_source-0.8.2.gem"; +version = "0.8.2"; +} +{ +name = "mime-types"; +hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; +url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; +version = "1.25.1"; +} +{ +name = "mini_portile"; +hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; +url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; +version = "0.6.0"; +} +{ +name = "minitest"; +hash = "b99fb077a6ace47d496f981041395ec565b9a1a59c45a73a2edd880bb27493a2"; +url = "http://rubygems.org/downloads/minitest-5.3.5.gem"; +version = "5.3.5"; +} +{ +name = "mousetrap-rails"; +hash = "555caf5075543bb0f5bf642ea11ce02d08001ddb48041400de64667e4b1ec102"; +url = "http://rubygems.org/downloads/mousetrap-rails-1.4.6.gem"; +version = "1.4.6"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "multi_xml"; +hash = "08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945"; +url = "http://rubygems.org/downloads/multi_xml-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "multipart-post"; +hash = "ccf26a61706f128a2a3f3745aba0f79fde7b6fee068e03490eb189c2aaa5e78a"; +url = "http://rubygems.org/downloads/multipart-post-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "net-ldap"; +hash = "d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4"; +url = "http://rubygems.org/downloads/net-ldap-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "net-scp"; +hash = "f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977"; +url = "http://rubygems.org/downloads/net-scp-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "net-ssh"; +hash = "42f5c53fc4b8fb8c75de7c6b996613d7915e6f7387d4b5f7394fa51402500951"; +url = "http://rubygems.org/downloads/net-ssh-2.8.0.gem"; +version = "2.8.0"; +} +{ +name = "newrelic_rpm"; +hash = "36faff761a443f00d6e36502b23de96007ec007b3428215f701ac7cab9093d64"; +url = "http://rubygems.org/downloads/newrelic_rpm-3.9.4.245.gem"; +version = "3.9.4.245"; +} +{ +name = "nokogiri"; +hash = "dfb23254b87672a93582981c4ac5880d178ff32db6878fc351d75198aa544836"; +url = "http://rubygems.org/downloads/nokogiri-1.6.2.1.gem"; +version = "1.6.2.1"; +} +{ +name = "nprogress-rails"; +hash = "048ca784af666dde59940a804801f2471ad791952b2dc43cfbdb7d6cbd54f899"; +url = "http://rubygems.org/downloads/nprogress-rails-0.1.2.3.gem"; +version = "0.1.2.3"; +} +{ +name = "oauth"; +hash = "bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc"; +url = "http://rubygems.org/downloads/oauth-0.4.7.gem"; +version = "0.4.7"; +} +{ +name = "oauth2"; +hash = "e18808a91165f22b8ce7939a216a51bb50d16a90b592347084b5112a4815f3a1"; +url = "http://rubygems.org/downloads/oauth2-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "omniauth"; +hash = "d47132daf1c59b8c97b4c51f3f2e379b5b6ae2cd9e169d0a3e46de45b335efbd"; +url = "http://rubygems.org/downloads/omniauth-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "omniauth-github"; +hash = "94b41beb49cc16b1e7c5f7a91999d867b76d84a33c9a44e5839178289b8ddac2"; +url = "http://rubygems.org/downloads/omniauth-github-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-google-oauth2"; +hash = "1c11a1c330f91a9a77e5c51b7f1b378aa8b06b548a3bc1545056cee28360ebdd"; +url = "http://rubygems.org/downloads/omniauth-google-oauth2-0.2.5.gem"; +version = "0.2.5"; +} +{ +name = "omniauth-oauth"; +hash = "9f1bfb30fe6ba823935330d2036e08a5406e980f1e20c9b1271b82ee34fbe759"; +url = "http://rubygems.org/downloads/omniauth-oauth-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "omniauth-oauth2"; +hash = "72b8ba77b9ead4320e7f4e430aee0f3ef759aed79ae52c3b0e8fb2f41785eb68"; +url = "http://rubygems.org/downloads/omniauth-oauth2-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-shibboleth"; +hash = "b0a92a0bc1e47d96c70f1bec982425c73029725da331dcda2022af762b929276"; +url = "http://rubygems.org/downloads/omniauth-shibboleth-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-twitter"; +hash = "cd110801549953505a6152ae1426956785aca0cb749ff82835e8d49898b30f18"; +url = "http://rubygems.org/downloads/omniauth-twitter-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "org-ruby"; +hash = "ea272d4c7d0ac0310c8bb58ac503ca04c5180ca5c64642be0c96569d514327e5"; +url = "http://rubygems.org/downloads/org-ruby-0.9.9.gem"; +version = "0.9.9"; +} +{ +name = "orm_adapter"; +hash = "aa5d0be5d540cbb46d3a93e88061f4ece6a25f6e97d6a47122beb84fe595e9b9"; +url = "http://rubygems.org/downloads/orm_adapter-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "pg"; +hash = "ba6827400e0614f8fd464543f6e10b307aadef58c59280c6560e6f2548599ed3"; +url = "http://rubygems.org/downloads/pg-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "phantomjs"; +hash = "42f3d5b561832a383076c1d49720ed4d2711f29acb85c701a07015b412436f33"; +url = "http://rubygems.org/downloads/phantomjs-1.9.2.0.gem"; +version = "1.9.2.0"; +} +{ +name = "poltergeist"; +hash = "db4580c0197729b1e7d2cc872ab3d1c5d98b759ac67720c0ba77fbc8752a6a23"; +url = "http://rubygems.org/downloads/poltergeist-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "polyglot"; +hash = "05409d9f736e1fd39635f8700b24e1156ae8e308e785d5d0f939c603fd529649"; +url = "http://rubygems.org/downloads/polyglot-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "posix-spawn"; +hash = "634746d6f090c1b15d2f92fa90c5ed4868e59c8752ca56a5d83af8f79c0a5110"; +url = "http://rubygems.org/downloads/posix-spawn-0.3.9.gem"; +version = "0.3.9"; +} +{ +name = "pry"; +hash = "3a521a98344c62096561773ab5b831f862432bc40ce3798bbbdead1c7f86b159"; +url = "http://rubygems.org/downloads/pry-0.9.12.4.gem"; +version = "0.9.12.4"; +} +{ +name = "pyu-ruby-sasl"; +hash = "5683a6bc5738db5a1bf5ceddeaf545405fb241b4184dd4f2587e679a7e9497e5"; +url = "http://rubygems.org/downloads/pyu-ruby-sasl-0.0.3.3.gem"; +version = "0.0.3.3"; +} +{ +name = "quiet_assets"; +hash = "3fbc8728462a42d58cd9101b0ad8a240d3cb90a248d5d4072af432fa946a2fa8"; +url = "http://rubygems.org/downloads/quiet_assets-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "racc"; +hash = "6282f61f123f4e1d39bac5ad19027e34c336a5e1d80f9e4769c80b16db11b583"; +url = "http://rubygems.org/downloads/racc-1.4.10.gem"; +version = "1.4.10"; +} +{ +name = "rack"; +hash = "e64af00234e8faaa69ea81ef4e3800f40743c69560f0dda8fc9969660e775fa7"; +url = "http://rubygems.org/downloads/rack-1.5.2.gem"; +version = "1.5.2"; +} +{ +name = "rack-accept"; +hash = "66247b5449db64ebb93ae2ec4af4764b87d1ae8a7463c7c68893ac13fa8d4da2"; +url = "http://rubygems.org/downloads/rack-accept-0.4.5.gem"; +version = "0.4.5"; +} +{ +name = "rack-attack"; +hash = "f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c"; +url = "http://rubygems.org/downloads/rack-attack-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rack-cors"; +hash = "5a256bda2673c7bbba014587b1f93fd2e6fd80b7ac9804a0f90665add6ba087d"; +url = "http://rubygems.org/downloads/rack-cors-0.2.9.gem"; +version = "0.2.9"; +} +{ +name = "rack-mini-profiler"; +hash = "1c77870679e17b54c5657ce3e15a3b7f54813844c4ab3ff292181f2904d1404b"; +url = "http://rubygems.org/downloads/rack-mini-profiler-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "rack-mount"; +hash = "a25100725157aea263dcea4f75aaab4e23922dc0e09fffd60c94eade95c34125"; +url = "http://rubygems.org/downloads/rack-mount-0.8.3.gem"; +version = "0.8.3"; +} +{ +name = "rack-protection"; +hash = "ad8d7e99b47418e1361ae8aaa0a8591671c8065b958bcedaef92da121a2db863"; +url = "http://rubygems.org/downloads/rack-protection-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "602275642419e731637c91421cf498f2994c2d9f1b94f6c713f3b7b8757b2aa5"; +url = "http://rubygems.org/downloads/rails-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "rails_autolink"; +hash = "384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671"; +url = "http://rubygems.org/downloads/rails_autolink-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "rails_best_practices"; +hash = "859371ff63fcfe6a33e7012ce3e18df0c0f00579520c684a544dccfd33c7c691"; +url = "http://rubygems.org/downloads/rails_best_practices-1.14.4.gem"; +version = "1.14.4"; +} +{ +name = "railties"; +hash = "0cef786bd54741f6b6c2ff0bfb769a200222f7e8928b93caf61f87c7325f8ee6"; +url = "http://rubygems.org/downloads/railties-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "raindrops"; +hash = "2077f24017dad9637bc4e20e77f3cc533054190516e9e330476678e3cc7a689a"; +url = "http://rubygems.org/downloads/raindrops-0.12.0.gem"; +version = "0.12.0"; +} +{ +name = "rake"; +hash = "b504ad9d610b85ef0856a4771d024e4a66656c63a17121a3ed1d4d7db39c775b"; +url = "http://rubygems.org/downloads/rake-10.3.2.gem"; +version = "10.3.2"; +} +{ +name = "raphael-rails"; +hash = "6c89daf65f82621f7ff59948db1db0ca2f41422ceadf905ba18a58b7ab57516a"; +url = "http://rubygems.org/downloads/raphael-rails-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "rb-fsevent"; +hash = "e1aed0fa5b42f74ecc1321dd807296d688b0f4fada96e87a9b2113d91befb62d"; +url = "http://rubygems.org/downloads/rb-fsevent-0.9.3.gem"; +version = "0.9.3"; +} +{ +name = "rb-inotify"; +hash = "3b1e16da8b00849dfa3c6348cc6df6888a2d35d2bf432bc50267f4ec1e74a21c"; +url = "http://rubygems.org/downloads/rb-inotify-0.9.2.gem"; +version = "0.9.2"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "ff5397c2b0d1344f065d07e58ed157f5bc25b49d44e723348620693ba928d71c"; +url = "http://rubygems.org/downloads/redcarpet-3.1.2.gem"; +version = "3.1.2"; +} +{ +name = "redis"; +hash = "e3c8203afbfb9e0cfe915a0610f6795e02ba2298e72e9326076eed2c048142c1"; +url = "http://rubygems.org/downloads/redis-3.0.6.gem"; +version = "3.0.6"; +} +{ +name = "redis-actionpack"; +hash = "e49029df46b15434591962cc004a1f0b07ab11276e00fd53ec835b85c7064d55"; +url = "http://rubygems.org/downloads/redis-actionpack-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-activesupport"; +hash = "cd802d06716638fb000e209a769f1a3932285c8ba2b328aa0c501f0999fcb4a2"; +url = "http://rubygems.org/downloads/redis-activesupport-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-namespace"; +hash = "c7c119c0a8c3876b7d7f0dc0ae2e3343352f1dfc6d978c9711b63b58518a6639"; +url = "http://rubygems.org/downloads/redis-namespace-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "redis-rack"; +hash = "68be24901183f1973059e837b1acc421cebd34766753ca6f6e7902fb50ef35f8"; +url = "http://rubygems.org/downloads/redis-rack-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "redis-rails"; +hash = "a7224c9a7c9bfc9d6080a0418b3c290b9d27ff88b481022b3958a1b2e0e1fc45"; +url = "http://rubygems.org/downloads/redis-rails-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-store"; +hash = "9fb47e5dbc6bce6ab4206899f49c6ee8d4a0c6d4830bb0f042ea49df72804249"; +url = "http://rubygems.org/downloads/redis-store-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "ref"; +hash = "8a8ec8f40f1e622c4324055d85300e03d9a78a9faf476ea0d382f1af9dbe0fa7"; +url = "http://rubygems.org/downloads/ref-1.0.5.gem"; +version = "1.0.5"; +} +{ +name = "request_store"; +hash = "70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf"; +url = "http://rubygems.org/downloads/request_store-1.0.5.gem"; +version = "1.0.5"; +} +{ +name = "require_all"; +hash = "1d4e5729811a1d976916465b64c508481c7fe229bc1ca88c8b1665ad4c46809a"; +url = "http://rubygems.org/downloads/require_all-1.3.2.gem"; +version = "1.3.2"; +} +{ +name = "rest-client"; +hash = "a3203433b8b0c914648caea54395a8791a61e0df7d401c81f4e2b7f8a8fac75a"; +url = "http://rubygems.org/downloads/rest-client-1.6.7.gem"; +version = "1.6.7"; +} +{ +name = "rinku"; +hash = "eb5cec33af86da3002e66470d9a741a0726d6864a69b580abc798931b4b706ca"; +url = "http://rubygems.org/downloads/rinku-1.7.3.gem"; +version = "1.7.3"; +} +{ +name = "rouge"; +hash = "b41278cf37dcef392e1d195519b482f03d1b80878837926a8322c7db9cef0251"; +url = "http://rubygems.org/downloads/rouge-1.3.3.gem"; +version = "1.3.3"; +} +{ +name = "rspec"; +hash = "4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c"; +url = "http://rubygems.org/downloads/rspec-2.14.1.gem"; +version = "2.14.1"; +} +{ +name = "rspec-core"; +hash = "e714621feb592e515c3ca19a685505af1c2bbb2d713b85c0610ab80985624348"; +url = "http://rubygems.org/downloads/rspec-core-2.14.7.gem"; +version = "2.14.7"; +} +{ +name = "rspec-expectations"; +hash = "3cb74fd8427a56321ca09e598f2db509231bae0996800b12f30084d7c3882f3a"; +url = "http://rubygems.org/downloads/rspec-expectations-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-mocks"; +hash = "e745b215de211099681d3b128fc8af15616eb19101bdd76da47dca1c1dd86b8b"; +url = "http://rubygems.org/downloads/rspec-mocks-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-rails"; +hash = "6ee4375e977d03ca4945fd5d79debfa72239f7f35f3de9a162ab4adcd4d735e9"; +url = "http://rubygems.org/downloads/rspec-rails-2.14.0.gem"; +version = "2.14.0"; +} +{ +name = "ruby-progressbar"; +hash = "94265728146504d311c3d6a3c040fc4d45ada6fc9bf42b58dbef208c6cc97d9b"; +url = "http://rubygems.org/downloads/ruby-progressbar-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "rubyntlm"; +hash = "a07b9bacc0cf531c76d4f71ed0813b4055fe881447aede2bc7cd7e89ec808870"; +url = "http://rubygems.org/downloads/rubyntlm-0.1.1.gem"; +version = "0.1.1"; +} +{ +name = "rubypants"; +hash = "f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee"; +url = "http://rubygems.org/downloads/rubypants-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "rugged"; +hash = "e536ec53d7f08109960e159e5401e682dd03f6ab386f84f93ef71e1968817529"; +url = "http://rubygems.org/downloads/rugged-0.21.0.gem"; +version = "0.21.0"; +} +{ +name = "safe_yaml"; +hash = "139285ff8e70413d2a3721da4e742c736b4948682f0b80330a353e34d5dd6478"; +url = "http://rubygems.org/downloads/safe_yaml-0.9.7.gem"; +version = "0.9.7"; +} +{ +name = "sanitize"; +hash = "c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77"; +url = "http://rubygems.org/downloads/sanitize-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sass"; +hash = "ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac"; +url = "http://rubygems.org/downloads/sass-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "sass-rails"; +hash = "b57665f95f63f063137e365d3e8a1c6d1340ec892d875aeeab93fb60e13f2ec8"; +url = "http://rubygems.org/downloads/sass-rails-4.0.3.gem"; +version = "4.0.3"; +} +{ +name = "sdoc"; +hash = "c2f54086862252f487e0c4b05fc46d8659a4dba6deb2ad0a24ff9046c1c4889e"; +url = "http://rubygems.org/downloads/sdoc-0.3.20.gem"; +version = "0.3.20"; +} +{ +name = "seed-fu"; +hash = "eb09cfeb574f46a22b313e38fe7d4ae6bf2c6a57554d3f157778756b58bc81db"; +url = "http://rubygems.org/downloads/seed-fu-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "select2-rails"; +hash = "dcae2d6f92f94975080c14bee21a2b9745675135824f7ec298a9c94e329e9f7e"; +url = "http://rubygems.org/downloads/select2-rails-3.5.2.gem"; +version = "3.5.2"; +} +{ +name = "semantic-ui-sass"; +hash = "54a9f7c3ac28203f91e99f4f929c2851356796e3d7d2de3468ff060528db71a1"; +url = "http://rubygems.org/downloads/semantic-ui-sass-0.16.1.0.gem"; +version = "0.16.1.0"; +} +{ +name = "settingslogic"; +hash = "5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6"; +url = "http://rubygems.org/downloads/settingslogic-2.0.9.gem"; +version = "2.0.9"; +} +{ +name = "sexp_processor"; +hash = "71591ddbda99b5e12e4a46d377c87513850ca7aa4b1aa800ae02792cadee6be7"; +url = "http://rubygems.org/downloads/sexp_processor-4.4.0.gem"; +version = "4.4.0"; +} +{ +name = "shoulda-matchers"; +hash = "da4ce8e10970a5dfa88d30b7be06dbef87caf2aca4508343b31a59c434449fc6"; +url = "http://rubygems.org/downloads/shoulda-matchers-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sidekiq"; +hash = "81c57e05311c7176e8e71373cf78874c9365f00ed40b9fd1a969863e56a10c53"; +url = "http://rubygems.org/downloads/sidekiq-2.17.0.gem"; +version = "2.17.0"; +} +{ +name = "simple_oauth"; +hash = "723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d"; +url = "http://rubygems.org/downloads/simple_oauth-0.1.9.gem"; +version = "0.1.9"; +} +{ +name = "simplecov"; +hash = "4f205752a4f3730fd4c58678bbab4c83f4e2a6ca3bbea4cdf18cd86a70589eb7"; +url = "http://rubygems.org/downloads/simplecov-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "simplecov-html"; +hash = "69393ce932c2898dd5074913e360078f651f094a9b7300b286a78f43b11c164a"; +url = "http://rubygems.org/downloads/simplecov-html-0.8.0.gem"; +version = "0.8.0"; +} +{ +name = "sinatra"; +hash = "1a16a552d559be0fff6cefd2c84c1fecafcc54668fba540e99fe8f2692033e8a"; +url = "http://rubygems.org/downloads/sinatra-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "six"; +hash = "83c73d4aa60ff76172ec257f45b098c66f7a8b89883bcaaec42517287dbc0aae"; +url = "http://rubygems.org/downloads/six-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "slack-notifier"; +hash = "64166343518084e3b1cdf03bb49ff42469dae8aab868fafa001c9f6a4f8d4604"; +url = "http://rubygems.org/downloads/slack-notifier-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "slim"; +hash = "07cdf67f971b99a360c9ded6ea70ae5351e1236182997dff8118ef5ea242a7ea"; +url = "http://rubygems.org/downloads/slim-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "slop"; +hash = "568b7d1d48d675ce2778e5fd1b9de56ff754e3eb4b589e4918f2cf8d25e56df4"; +url = "http://rubygems.org/downloads/slop-3.4.7.gem"; +version = "3.4.7"; +} +{ +name = "spinach"; +hash = "a43718a977de8c2bb0fd952af23d56a69c046d28dac687057405c7301ccfdf0c"; +url = "http://rubygems.org/downloads/spinach-0.8.7.gem"; +version = "0.8.7"; +} +{ +name = "spinach-rails"; +hash = "e0d045ae1266f46549570c148d1696ac7d4baa518f8b974a7c8ed949bd63cad9"; +url = "http://rubygems.org/downloads/spinach-rails-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "spring"; +hash = "92aa8cf28fec20b0f760e2cf8efd1990be2c30c2e79167cdd19e8344420b72c5"; +url = "http://rubygems.org/downloads/spring-1.1.3.gem"; +version = "1.1.3"; +} +{ +name = "spring-commands-rspec"; +hash = "61d75e234afd79f247942dca387c3a7fffc0de9527f16aea4d5fdd66fd82cffc"; +url = "http://rubygems.org/downloads/spring-commands-rspec-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "spring-commands-spinach"; +hash = "694fbf041b5f357bd29fab2ff44013f42e894bf1af498bcce726498f5b56128d"; +url = "http://rubygems.org/downloads/spring-commands-spinach-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "sprockets"; +hash = "b06a4a66a74cce8a3dbd53a9078c9b71b94f5652a6fe92809f28786d8fcd5920"; +url = "http://rubygems.org/downloads/sprockets-2.11.0.gem"; +version = "2.11.0"; +} +{ +name = "sprockets-rails"; +hash = "9e134d28c4d05f86f3c8ebcdecd50ec060bd33e8bdcb6461cfcf0f2b77f26d8a"; +url = "http://rubygems.org/downloads/sprockets-rails-2.1.3.gem"; +version = "2.1.3"; +} +{ +name = "stamp"; +hash = "1ad6622d000cd390b9b523eb9270fc902abd24a685ce0c73529f344d6a9fa4f0"; +url = "http://rubygems.org/downloads/stamp-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "state_machine"; +hash = "80fcddc91976baec8713c37c28b5bc0655f5f2e0a1412a1a4a3aac41082cc2ed"; +url = "http://rubygems.org/downloads/state_machine-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "stringex"; +hash = "dbd556b4b59d994de64c8fa91ef959667338d840b814fc72531f8253dbba179d"; +url = "http://rubygems.org/downloads/stringex-2.5.1.gem"; +version = "2.5.1"; +} +{ +name = "temple"; +hash = "3374f339c3b54611538b9811c0c46db8e06b48ed212db741cd7f52baf59caa26"; +url = "http://rubygems.org/downloads/temple-0.6.7.gem"; +version = "0.6.7"; +} +{ +name = "term-ansicolor"; +hash = "b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac"; +url = "http://rubygems.org/downloads/term-ansicolor-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "test_after_commit"; +hash = "8be009b5b7dd8f6e712ea92a079625b9a84f9a010ef2d5d5e44bcd45c353fa8f"; +url = "http://rubygems.org/downloads/test_after_commit-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "therubyracer"; +hash = "06a711c23c6fcabc60a38413d6e08023b4717b725c0f19b3fd3d6161f714b3a0"; +url = "http://rubygems.org/downloads/therubyracer-0.12.0.gem"; +version = "0.12.0"; +} +{ +name = "thin"; +hash = "a0b80e1632d3529a5c4b87e07d9ab146e0dde5e506c20f3a740fe8b364d5bd18"; +url = "http://rubygems.org/downloads/thin-1.6.1.gem"; +version = "1.6.1"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "thread_safe"; +hash = "16315baa971c48d00104bcd35e8934e3f9ccfd3b8f429e3fca7ee2dfd81734b2"; +url = "http://rubygems.org/downloads/thread_safe-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "timers"; +hash = "3bbb9651a73e43e47950a5e13a7fa62f852cd5c46e421bb671e9ade1fbb47b74"; +url = "http://rubygems.org/downloads/timers-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "tinder"; +hash = "0b06fd2a72ed424e82b1896852dd9ebb10791ef6ab8412e74ad2fa9069f6bd47"; +url = "http://rubygems.org/downloads/tinder-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "tins"; +hash = "c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30"; +url = "http://rubygems.org/downloads/tins-0.13.1.gem"; +version = "0.13.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "turbolinks"; +hash = "d92fd8f1627a6eadfaa39b76da83c257181e786557f54859d81ab2b08d73e8ff"; +url = "http://rubygems.org/downloads/turbolinks-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "twitter-stream"; +hash = "3866afdfbdf083e773b46afb3037ff3e3b1ebf8014ab88353153daddc70b4847"; +url = "http://rubygems.org/downloads/twitter-stream-0.1.16.gem"; +version = "0.1.16"; +} +{ +name = "tzinfo"; +hash = "fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0"; +url = "http://rubygems.org/downloads/tzinfo-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "uglifier"; +hash = "5e942f02d11d9e4f6e18aa84cfd909e569fe887b12c3ecf66d92e8cf4162acf0"; +url = "http://rubygems.org/downloads/uglifier-2.3.2.gem"; +version = "2.3.2"; +} +{ +name = "underscore-rails"; +hash = "e229a9668f799ea169616fa59da3f6cf48f259d9c1dd2ef52ff2a151bd6be3f5"; +url = "http://rubygems.org/downloads/underscore-rails-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "unf"; +hash = "4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"; +url = "http://rubygems.org/downloads/unf-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "unf_ext"; +hash = "afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f"; +url = "http://rubygems.org/downloads/unf_ext-0.0.6.gem"; +version = "0.0.6"; +} +{ +name = "unicorn"; +hash = "fd0b12148a24acfd8bf28a0322e4116061e64e271253e077999e4ec531a74966"; +url = "http://rubygems.org/downloads/unicorn-4.6.3.gem"; +version = "4.6.3"; +} +{ +name = "unicorn-worker-killer"; +hash = "6d2819347c514ff65bcdbda745a416a2c93e18e90e1e347c6f4931e7b1a6c78b"; +url = "http://rubygems.org/downloads/unicorn-worker-killer-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "version_sorter"; +hash = "aeeae527de4fb3146bbdaa9283f3fb087fedbe0cee80645c12d1970fe4947873"; +url = "http://rubygems.org/downloads/version_sorter-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "virtus"; +hash = "03d81d65377a603894b058c0ee78130dda1c3e6d56918d40444f11dba5d644a6"; +url = "http://rubygems.org/downloads/virtus-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "warden"; +hash = "97769e5b5d230fec4f77e91b1116b28fdd27428f4acab68dc5ed025af9d37f7a"; +url = "http://rubygems.org/downloads/warden-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "webmock"; +hash = "89e8ced0a58bcf68bec818f901ce966b4f8938dd20b101044bd6408589a957f8"; +url = "http://rubygems.org/downloads/webmock-1.16.0.gem"; +version = "1.16.0"; +} +{ +name = "websocket-driver"; +hash = "4e9a04c1e370dada829738ee1433a98e6721e7fa83b98fceef089fe6bce97638"; +url = "http://rubygems.org/downloads/websocket-driver-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "wikicloth"; +hash = "7ac8a9ca0a948cf472851e521afc6c2a6b04a8f91ef1d824ba6a61ffbd60e6ca"; +url = "http://rubygems.org/downloads/wikicloth-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +] diff --git a/pkgs/applications/version-management/gitlab/README b/pkgs/applications/version-management/gitlab/README new file mode 100644 index 00000000000..cd8d4748e70 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/README @@ -0,0 +1,5 @@ +to regenerate Gemfile.nix and Gemfile.lock you need to + + % nix-build bootstrap.nix + % cp result/Gemfile.nix ./ + % cp result/Gemfile.lock ./ diff --git a/pkgs/applications/version-management/gitlab/bootstrap.nix b/pkgs/applications/version-management/gitlab/bootstrap.nix new file mode 100644 index 00000000000..1b3c1eec9c2 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/bootstrap.nix @@ -0,0 +1,43 @@ +{ pkgs ? import {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "7.4.2"; + name = "gitlab-${version}"; + __noChroot = true; + src = fetchurl { + url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip"; + sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi postgresql which stdenv unzip + ]; + installPhase = '' + unset http_proxy + unset ftp_proxy + + cp -R . $out + cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb + cd $out + + cat > config/database.yml < config/database.yml < + password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %> + username: gitlab + encoding: utf8 + EOF + + mkdir -p vendor/cache + ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + + bundle config build.nokogiri \ + --use-system-libraries \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config=${pkgconfig}/bin/pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + # See https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide: + bundle install -j4 --verbose --local --deployment --without development test mysql + + # For reasons I don't understand "bundle exec" ignores the + # RAILS_ENV causing tests to be executed that fail because we're + # not installing development and test gems above. Deleting the + # tests works though.: + rm $out/share/gitlab/lib/tasks/test.rake + + # Assets + bundle exec rake assets:precompile RAILS_ENV=production + ''; + + meta = with stdenv.lib; { + homepage = http://www.gitlab.com/; + platforms = platforms.linux; + maintainers = [ ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb new file mode 100755 index 00000000000..ed47d52c9c1 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'bundler' +require 'fileutils' +require 'net/http' +require 'net/https' +require 'uri' + +TMP_DIR = "/tmp/gems" + +FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) +FileUtils.mkdir TMP_DIR + +GEMSERVER = "http://rubygems.org" + +# inspect Gemfile.lock +lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) + +to_mirror = {} + +uri = URI(GEMSERVER) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = uri.scheme == 'https' + +requirements = {} + +lockfile.specs.each do |s| + possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" + + Dir.chdir TMP_DIR do + filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] + hash = `sha256sum #{filename}.gem` + url = "#{GEMSERVER}/downloads/#{filename}.gem" + puts url + requirements[s.name] = { :version => s.version.to_s, + :hash => hash.split().first, + :url => url,} + + end +end + +filename = 'Gemfile.nix' + +File.open(filename, 'w') do |file| + file.puts "[" + requirements.each do |name, info| + file.puts "{" + file.puts ['name = ', '"', name, '";'].join('') + file.puts ['hash = ', '"', info[:hash], '";'].join('') + file.puts ['url = ', '"', info[:url], '";'].join('') + file.puts ['version = ', '"', info[:version], '";'].join('') + file.puts "}" + end + file.puts "]" +end diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch new file mode 100644 index 00000000000..f5532bbd67c --- /dev/null +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -0,0 +1,109 @@ +diff --git a/config/environments/production.rb b/config/environments/production.rb +index 78bf543..9b37122 100644 +--- a/config/environments/production.rb ++++ b/config/environments/production.rb +@@ -66,10 +66,10 @@ Gitlab::Application.configure do + + config.action_mailer.delivery_method = :sendmail + # Defaults to: +- # # config.action_mailer.sendmail_settings = { +- # # location: '/usr/sbin/sendmail', +- # # arguments: '-i -t' +- # # } ++ config.action_mailer.sendmail_settings = { ++ location: '/var/setuid-wrappers/sendmail', ++ arguments: '-i -t' ++ } + config.action_mailer.perform_deliveries = true + config.action_mailer.raise_delivery_errors = true + +diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example +index e7a8d08..834ecaf 100644 +--- a/config/gitlab.yml.example ++++ b/config/gitlab.yml.example +@@ -17,8 +17,8 @@ production: &base + ## GitLab settings + gitlab: + ## Web server settings (note: host is the FQDN, do not include http://) +- host: localhost +- port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details ++ host: <%= ENV['GITLAB_HOST'] || 'localhost' %> ++ port: <%= ENV['GITLAB_PORT'] || 80 %> + https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details + + # Uncommment this line below if your ssh host is different from HTTP/HTTPS one +@@ -31,11 +31,11 @@ production: &base + # relative_url_root: /gitlab + + # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') +- # user: git ++ user: gitlab + + ## Email settings + # Email address used in the "From" field in mails sent by GitLab +- email_from: example@example.com ++ email_from: <%= ENV['GITLAB_EMAIL_FROM'] %> + + # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). + +@@ -230,12 +230,12 @@ production: &base + # GitLab Satellites + satellites: + # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) +- path: /home/git/gitlab-satellites/ ++ path: <%= ENV['GITLAB_SATELLITES_PATH'] %> + timeout: 30 + + ## Backup settings + backup: +- path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) ++ path: <%= ENV['GITLAB_BACKUP_PATH'] %> + # keep_time: 604800 # default: 0 (forever) (in seconds) + # upload: + # # Fog storage connection settings, see http://fog.io/storage/ . +@@ -249,11 +249,11 @@ production: &base + + ## GitLab Shell settings + gitlab_shell: +- path: /home/git/gitlab-shell/ ++ path: <%= ENV['GITLAB_SHELL_PATH'] %> + + # REPOS_PATH MUST NOT BE A SYMLINK!!! +- repos_path: /home/git/repositories/ +- hooks_path: /home/git/gitlab-shell/hooks/ ++ repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %> ++ hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %> + + # Git over HTTP + upload_pack: true +@@ -266,7 +266,7 @@ production: &base + # CAUTION! + # Use the default values unless you really know what you are doing + git: +- bin_path: /usr/bin/git ++ bin_path: git + # The next value is the maximum memory size grit can use + # Given in number of bytes per git object (e.g. a commit) + # This value can be increased if you have very large commits +@@ -299,7 +299,7 @@ test: + gravatar: + enabled: true + gitlab: +- host: localhost ++ host: <%= ENV['GITLAB_HOST'] %> + port: 80 + + # When you run tests we clone and setup gitlab-shell +diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb +index 8e4717b..abfe2e4 100644 +--- a/lib/gitlab/app_logger.rb ++++ b/lib/gitlab/app_logger.rb +@@ -1,7 +1,7 @@ + module Gitlab + class AppLogger < Gitlab::Logger + def self.file_name +- 'application.log' ++ ENV["GITLAB_APPLICATION_LOG_PATH"] + end + + def format_message(severity, timestamp, progname, msg) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88159b84233..480fb494ba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1271,6 +1271,10 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; + gitlab = callPackage ../applications/version-management/gitlab { }; + + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; From 13e58784bfd3261589ac0fb07782dbaa2a68817f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 30 Nov 2014 00:56:22 +0100 Subject: [PATCH 029/216] nixos/gitlab: fixes - fix timezone data not found - fix module, add simple test - allow to set port --- nixos/modules/services/misc/gitlab.nix | 28 +++++++++++++------ nixos/tests/gitlab.nix | 19 +++++++++++++ .../version-management/gitlab/default.nix | 6 +++- pkgs/top-level/all-packages.nix | 4 ++- 4 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 nixos/tests/gitlab.nix diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index cbef1e43448..bb96e85456b 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -21,7 +21,7 @@ let ''; gitlabShellYml = '' user: gitlab - gitlab_url: "http://localhost:8080/" + gitlab_url: "http://${cfg.host}:${toString cfg.port}/" http_settings: self_signed_cert: false repos_path: "${cfg.stateDir}/repositories" @@ -57,6 +57,7 @@ let --set GITLAB_SHELL_CONFIG_PATH "${cfg.stateDir}/shell/config.yml"\ --set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\ --set GITLAB_HOST "${cfg.host}"\ + --set GITLAB_PORT "${toString cfg.port}"\ --set GITLAB_BACKUP_PATH"${cfg.backupPath}"\ --set RAILS_ENV "production" ''; @@ -77,43 +78,43 @@ in { satelliteDir = mkOption { type = types.str; default = "/var/gitlab/git-satellites"; - description = "Directory to store checked out git trees requires for operation."; + description = "Gitlab directory to store checked out git trees requires for operation."; }; stateDir = mkOption { type = types.str; default = "/var/gitlab/state"; - description = "The state directory, logs are stored here."; + description = "Gitlab state directory, logs are stored here."; }; backupPath = mkOption { type = types.str; default = cfg.stateDir + "/backup"; - description = "Path for backups."; + description = "Gitlab path for backups."; }; databaseHost = mkOption { type = types.str; default = "127.0.0.1"; - description = "Database hostname"; + description = "Gitlab database hostname."; }; databasePassword = mkOption { type = types.str; default = ""; - description = "Database user password"; + description = "Gitlab database user password."; }; databaseName = mkOption { type = types.str; default = "gitlab"; - description = "Database name"; + description = "Gitlab database name."; }; databaseUsername = mkOption { type = types.str; default = "gitlab"; - description = "Database user"; + description = "Gitlab database user."; }; emailFrom = mkOption { @@ -125,7 +126,13 @@ in { host = mkOption { type = types.str; default = config.networking.hostName; - description = "The gitlab host name. Used e.g. for copy-paste URLs."; + description = "Gitlab host name. Used e.g. for copy-paste URLs."; + }; + + port = mkOption { + type = types.int; + default = 8080; + description = "Gitlab server listening port."; }; }; }; @@ -144,6 +151,7 @@ in { services.redis.enable = mkDefault true; # We use postgres as the main data store. services.postgresql.enable = mkDefault true; + services.postgresql.package = mkDefault pkgs.postgresql; # Use postfix to send out mails. services.postfix.enable = mkDefault true; @@ -176,6 +184,7 @@ in { environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml"; environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret"; environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_PORT = "${toString cfg.port}"; environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; environment.RAILS_ENV = "production"; @@ -209,6 +218,7 @@ in { environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}"; environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_PORT = "${toString cfg.port}"; environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; environment.RAILS_ENV = "production"; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix new file mode 100644 index 00000000000..d213624e332 --- /dev/null +++ b/nixos/tests/gitlab.nix @@ -0,0 +1,19 @@ +# This test runs gitlab and checks if it works + +import ./make-test.nix { + name = "gitlab"; + + nodes = { + gitlab = { config, pkgs, ... }: { + virtualisation.memorySize = 768; + services.gitlab.enable = true; + services.gitlab.databasePassword = "gitlab"; + }; + }; + + testScript = '' + $gitlab->start(); + $gitlab->waitForUnit("gitlab.service"); + $gitlab->waitUntilSucceeds("curl http://localhost:8080"); + ''; +} diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 66e69821893..76f4bb1fc70 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyLibs, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which }: +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which, tzdata }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -61,6 +61,10 @@ in stdenv.mkDerivation rec { # See https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide: bundle install -j4 --verbose --local --deployment --without development test mysql + # Fix timezone data directory + substituteInPlace $out/share/gitlab/vendor/bundle/ruby/*/gems/tzinfo-*/lib/tzinfo/zoneinfo_data_source.rb \ + --replace "/etc/zoneinfo" "${tzdata}/share/zoneinfo" + # For reasons I don't understand "bundle exec" ignores the # RAILS_ENV causing tests to be executed that fail because we're # not installing development and test gems above. Deleting the diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480fb494ba4..f5fff1592ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1271,7 +1271,9 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; - gitlab = callPackage ../applications/version-management/gitlab { }; + gitlab = callPackage ../applications/version-management/gitlab { + libiconv = libiconvOrLibc; + }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; From e752a8cff951b77dfb410ec0232bdede96719241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 12 Dec 2014 18:36:15 +0100 Subject: [PATCH 030/216] gltron: mark as broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 23d01bb90c9d6ba74f507fe69439f7e1e0a3f238) Signed-off-by: Domen Kožar --- pkgs/games/gltron/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index d925c8810bf..ebdd95f7073 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # see http://sourceforge.net/p/gltron/bugs/15 }; } From e0e08f1465e11b8bf4133fde1bbeb67a25168362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 12 Dec 2014 18:37:50 +0100 Subject: [PATCH 031/216] whitespace change to fix k2pdfopt build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 896036d8e5ec2ad35e74fc43da3d6305ef43b253) Signed-off-by: Domen Kožar --- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 6c5371a6299..9c592fcbb2d 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ -lPgm2asc -llept -ltesseract -lcrypto - mkdir -p $out/bin + mkdir -p $out/bin cp k2pdfopt $out/bin ''; From 2c85888a04986a25d18f7e1b1fb2a0f498e61ce8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 12 Dec 2014 21:33:23 +0300 Subject: [PATCH 032/216] Fix Firefox wrapper set-as-default functionality --- .../networking/browsers/firefox/wrapper.nix | 18 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index eba0deb627e..330bf6def59 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules -, browserName, desktopName, nameSuffix, icon +, browserName, desktopName, nameSuffix, icon, libtrick ? true }: let p = builtins.parseDrvName browser.name; in @@ -33,7 +33,21 @@ stdenv.mkDerivation { --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" + --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + + ${ lib.optionalString libtrick + '' + sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}" + libdirname="$(echo "${browser}/lib/${browserName}"*)" + libdirbasename="$(basename "$libdirname")" + mkdir -p "$out/lib/$libdirbasename" + ln -s "$libdirname"/* "$out/lib/$libdirbasename" + script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")" + mv "$out/bin/${browserName}${nameSuffix}" "$script_location" + ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}" + '' + } mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5fff1592ae..42de5f12242 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11172,6 +11172,7 @@ let in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + libtrick = true; plugins = assert !(enableGnash && enableAdobeFlash); assert !(jre && icedtea); From d8ee91cb54c267a5a119d59746e80ca61015775e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 12 Dec 2014 20:28:01 +0100 Subject: [PATCH 033/216] nixos: container profile, fix a few things --- nixos/modules/profiles/container.nix | 4 +--- nixos/release.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/container.nix index e6344a0d5c7..dd2e6579a93 100644 --- a/nixos/modules/profiles/container.nix +++ b/nixos/modules/profiles/container.nix @@ -41,9 +41,7 @@ in { rm /nix-path-registration fi - # nixos-rebuild also requires a "system" profile and an - # /etc/NIXOS tag. - touch /etc/NIXOS + # nixos-rebuild also requires a "system" profile ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; diff --git a/nixos/release.nix b/nixos/release.nix index efc49adce46..12dd81f8970 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -214,7 +214,7 @@ in rec { }); # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... - container_tarball = forAllSystems (system: makeSystemTarball { + containerTarball = forAllSystems (system: makeSystemTarball { module = ./modules/virtualisation/lxc-container.nix; inherit system; }); From 6e7d796b54900ad2f0ca783aa0b73e84e4f72e2c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Dec 2014 00:56:59 +0100 Subject: [PATCH 034/216] xca: not broken anymore --- pkgs/applications/misc/xca/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 09edb086c9f..0bc2170340c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; - broken = true; }; } From 0d71ec8a6e538943df67e43c8b1aa667eb7cf856 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 13 Dec 2014 07:49:34 +0100 Subject: [PATCH 035/216] nixos/virtualbox: Fix setuid wrappers. We only need to have setuid-root wrappers for VBox{Headless,SDL} and VirtualBox, otherwise VBoxManage will run as root and NOT drop privileges! Fixes #5283. Signed-off-by: aszlig --- nixos/modules/programs/virtualbox-host.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index 25f17e3c060..603b25e3cfc 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -29,10 +29,7 @@ in setuid = true; }; in map mkVboxStub [ - "VBoxBFE" - "VBoxBalloonCtrl" "VBoxHeadless" - "VBoxManage" "VBoxSDL" "VirtualBox" ]; From efd51accc4f6954ffaa113f1f99bd45608c2084d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 13 Dec 2014 01:16:48 +0300 Subject: [PATCH 036/216] Trying to update iptables - apparently, already latest --- pkgs/os-specific/linux/iptables/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 0e022e0c4a1..2221250d57c 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.21"; + name = "iptables-${version}"; + version = "1.4.21"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; @@ -17,5 +18,8 @@ stdenv.mkDerivation rec { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = http://www.netfilter.org/projects/iptables/index.html; platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.netfilter.org/projects/iptables/files/"; + updateWalker = true; + inherit version; }; } From 34b0d860d59663ac5914d087d0a5dcfd872a1334 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 13 Dec 2014 12:55:11 +0300 Subject: [PATCH 037/216] Try harder to use out-of-store udev rule location --- pkgs/os-specific/linux/eudev/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index f0370fea6ea..16eb933e176 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { "--localstatedir=/var" "--sysconfdir=/etc" ]; - makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin"; + makeFlags = [ + "hwdb_bin=/var/lib/udev/hwdb.bin" + "udevrulesdir=/etc/udev/rules.d" + ]; installFlags = [ "localstatedir=$(TMPDIR)/var" @@ -30,6 +33,7 @@ stdenv.mkDerivation { "udevconfdir=$(out)/etc/udev" "udevhwdbbin=$(out)/var/lib/udev/hwdb.bin" "udevhwdbdir=$(out)/var/lib/udev/hwdb.d" + "udevrulesdir=$(out)/var/lib/udev/rules.d" ]; enableParallelBuilding = true; meta = { From 69858d7743293d8f94b3d3160c9c3401722e4c10 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 13 Dec 2014 11:15:48 +0100 Subject: [PATCH 038/216] nixos: Add VM test for VirtualBox. Currently it pretty much tests starting up virtual machines and just shutting down afterwards, but for both VBoxManage and the VirtualBox GUI. This helps catching errors in hardened mode, however we still need to test whether networking works the way intended (and I fear that this is broken at the moment). The VirtualBox VM is _not_ using hardware virtualization support (thus we use system = "i686-linux", because x86_64 has no emulation support), because we're already within a qemu VM, which means it's going to be slow as hell (that's why I've written own subs just for testing startup/shutdown/whatnot with respective timeouts). Signed-off-by: aszlig --- nixos/release.nix | 1 + nixos/tests/virtualbox.nix | 250 +++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100644 nixos/tests/virtualbox.nix diff --git a/nixos/release.nix b/nixos/release.nix index 12dd81f8970..0694c52a430 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -306,6 +306,7 @@ in rec { tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; + tests.virtualbox = callTest tests/virtualbox.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix new file mode 100644 index 00000000000..c8912760f3d --- /dev/null +++ b/nixos/tests/virtualbox.nix @@ -0,0 +1,250 @@ +import ./make-test.nix ({ pkgs, ... }: let + + testVMConfig = { config, pkgs, ... }: { + boot.kernelParams = [ + "console=tty0" "console=ttyS0" "ignore_loglevel" + "boot.trace" "panic=1" "boot.panic_on_fail" + ]; + + fileSystems."/" = { + device = "vboxshare"; + fsType = "vboxsf"; + }; + + services.virtualboxGuest.enable = true; + + boot.initrd.kernelModules = [ "vboxsf" ]; + + boot.initrd.extraUtilsCommands = '' + cp -av -t "$out/bin/" \ + "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" + ''; + + boot.initrd.postMountCommands = '' + touch /mnt-root/boot-done + + i=0 + while [ ! -e /mnt-root/shutdown ]; do + sleep 10 + i=$(($i + 10)) + [ $i -le 120 ] || fail + done + + rm -f /mnt-root/boot-done /mnt-root/shutdown + poweroff -f + ''; + + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "SERIAL_8250_CONSOLE") + (isYes "SERIAL_8250") + ]; + }; + + testVM = let + cfg = (import ../lib/eval-config.nix { + system = "i686-linux"; + modules = [ + ../modules/profiles/minimal.nix + testVMConfig + ]; + }).config; + in pkgs.vmTools.runInLinuxVM (pkgs.runCommand "virtualbox-image" { + preVM = '' + mkdir -p "$out" + diskImage="$(pwd)/qimage" + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw "$diskImage" 100M + ''; + + postVM = '' + echo "creating VirtualBox disk image..." + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi \ + "$diskImage" "$out/disk.vdi" + ''; + + buildInputs = [ pkgs.utillinux pkgs.perl ]; + } '' + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + mkdir /mnt + mount /dev/vda1 /mnt + cp "${cfg.system.build.kernel}/bzImage" /mnt/linux + cp "${cfg.system.build.initialRamdisk}/initrd" /mnt/initrd + + ${pkgs.grub2}/bin/grub-install --boot-directory=/mnt /dev/vda + + cat > /mnt/grub/grub.cfg <execute(ru( + 'set -e; i=0; '. + 'while ! test -e /home/alice/vboxshare/boot-done; do '. + 'sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; '. + 'VBoxManage list runningvms | grep -qF test; '. + 'done' + )); + } + + sub checkRunning { + my $checkrunning = ru "VBoxManage list runningvms | grep -qF test"; + my ($status, $out) = $machine->execute($checkrunning); + return $status == 0; + } + + sub waitForStartup { + for (my $i = 0; $i <= 120; $i += 10) { + $machine->sleep(10); + return if checkRunning; + } + die "VirtualBox VM didn't start up within 2 minutes"; + } + + sub waitForShutdown { + for (my $i = 0; $i <= 120; $i += 10) { + $machine->sleep(10); + return unless checkRunning; + } + die "VirtualBox VM didn't shut down within 2 minutes"; + } + + sub shutdownVM { + $machine->succeed(ru "touch /home/alice/vboxshare/shutdown"); + $machine->waitUntilSucceeds( + "test ! -e /home/alice/vboxshare/shutdown ". + " -a ! -e /home/alice/vboxshare/boot-done" + ); + waitForShutdown; + } + + sub cleanup { + $machine->execute(ru "VBoxManage controlvm test poweroff") + if checkRunning; + $machine->succeed("rm -rf /home/alice/vboxshare"); + $machine->succeed("mkdir -p /home/alice/vboxshare"); + $machine->succeed("chown alice.users /home/alice/vboxshare"); + } + + $machine->waitForX; + + $machine->succeed(ru "VBoxManage createvm --name test ${createFlags}"); + $machine->succeed(ru "VBoxManage modifyvm test ${vmFlags}"); + + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + + $machine->succeed(ru "VBoxManage storagectl test ${controllerFlags}"); + $machine->succeed(ru "VBoxManage storageattach test ${diskFlags}"); + + $machine->succeed(ru "VBoxManage sharedfolder add test ${sharedFlags}"); + + $machine->succeed(ru "VBoxManage showvminfo test >&2"); + + cleanup; + + subtest "virtualbox-gui", sub { + $machine->succeed(ru "VirtualBox &"); + $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/); + $machine->sleep(5); + $machine->screenshot("gui_manager_started"); + $machine->sendKeys("ret"); + $machine->screenshot("gui_manager_sent_startup"); + waitForStartup; + $machine->screenshot("gui_started"); + waitForVMBoot; + $machine->screenshot("gui_booted"); + shutdownVM; + $machine->sleep(5); + $machine->screenshot("gui_stopped"); + $machine->sendKeys("ctrl-q"); + $machine->sleep(5); + $machine->screenshot("gui_manager_stopped"); + }; + + cleanup; + + subtest "virtualbox-cli", sub { + $machine->succeed(ru "VBoxManage startvm test"); + waitForStartup; + $machine->screenshot("cli_started"); + waitForVMBoot; + $machine->screenshot("cli_booted"); + shutdownVM; + }; + + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + ''; +}) From d9566a3b35285ddfacd804cf905027c3e24df0e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:44:56 +0100 Subject: [PATCH 039/216] haskell-hlint: update to version 1.9.13 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 0699337640f..17813ac1a33 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.12"; - sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a"; + version = "1.9.13"; + sha256 = "1cj487l3jvrp43acwk3ihc5mzyqwxxa0nqahad27sd3bbmx86p4a"; isLibrary = true; isExecutable = true; buildDepends = [ From f514804aadc6c2167622d94ed71d9e8e3ea3936c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:45:19 +0100 Subject: [PATCH 040/216] haskell-mtl-prelude: add version 1.0.1 --- .../libraries/haskell/mtl-prelude/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mtl-prelude/default.nix diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix new file mode 100644 index 00000000000..3bf2395cb3a --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl-prelude/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl-prelude"; + version = "1.0.1"; + sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj"; + buildDepends = [ mtl transformers ]; + meta = { + homepage = "https://github.com/nikita-volkov/mtl-prelude"; + description = "Reexports of most definitions from \"mtl\" and \"transformers\""; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9ab99426d43..b2f083a478a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1752,6 +1752,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + mtlPrelude = callPackage ../development/libraries/haskell/mtl-prelude {}; + mueval = callPackage ../development/libraries/haskell/mueval {}; muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {}; From 17589d33da050b2ad39ea277227912f1d5f29356 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:45:32 +0100 Subject: [PATCH 041/216] haskell-list-t: add version 0.3.0 --- .../libraries/haskell/list-t/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/list-t/default.nix diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix new file mode 100644 index 00000000000..9df455650f5 --- /dev/null +++ b/pkgs/development/libraries/haskell/list-t/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude +, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "list-t"; + version = "0.3.0"; + sha256 = "091gz47gisajd2p0iwx0mw99bivfl7wpyddg1ypsvjv2qax94cm9"; + buildDepends = [ + basePrelude mmorph monadControl transformers transformersBase + ]; + testDepends = [ basePrelude HTF mtlPrelude ]; + meta = { + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b2f083a478a..1502542f917 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1580,6 +1580,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lists = callPackage ../development/libraries/haskell/lists {}; + listT = callPackage ../development/libraries/haskell/list-t {}; + listExtras = callPackage ../development/libraries/haskell/listExtras {}; listTries = callPackage ../development/libraries/haskell/list-tries {}; From 5e2f4a4a73a6801ceafd4f3dc0949d412279cbcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:45:44 +0100 Subject: [PATCH 042/216] haskell-gloss-rendering: add version 1.9.2.1 --- .../libraries/haskell/gloss-rendering/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/gloss-rendering/default.nix diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix new file mode 100644 index 00000000000..190993e44fc --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-rendering/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bmp, GLUT, OpenGL }: + +cabal.mkDerivation (self: { + pname = "gloss-rendering"; + version = "1.9.2.1"; + sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k"; + buildDepends = [ bmp GLUT OpenGL ]; + meta = { + description = "Gloss picture data types and rendering functions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1502542f917..af377cc0a88 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -999,6 +999,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {}; + glossRendering = callPackage ../development/libraries/haskell/gloss-rendering {}; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; From ccd74d749753a7f9df7177f660e3e43e0fc2eb4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:47:51 +0100 Subject: [PATCH 043/216] haskell-ghc-server: drop obsolete package --- .../libraries/haskell/ghc-server/default.nix | 22 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ghc-server/default.nix diff --git a/pkgs/development/libraries/haskell/ghc-server/default.nix b/pkgs/development/libraries/haskell/ghc-server/default.nix deleted file mode 100644 index ac9cb852704..00000000000 --- a/pkgs/development/libraries/haskell/ghc-server/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, async, attoLisp, attoparsec, conduit, conduitExtra -, ghcPaths, mtl, network, syb, text -}: - -cabal.mkDerivation (self: { - pname = "ghc-server"; - version = "1.1"; - sha256 = "1rgrgx9xakq6vy6nanvwzwfvzbfg287pmm8pdm9lbd7kf7ls5ml4"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - async attoLisp attoparsec conduit conduitExtra ghcPaths mtl network - syb text - ]; - meta = { - description = "A server interface to GHC"; - 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 af377cc0a88..49810e7e221 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -932,8 +932,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; - ghcServer = callPackage ../development/libraries/haskell/ghc-server {}; - ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; From c55c87085d86db61198a16ad5f2bf637b10a6747 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:17 +0100 Subject: [PATCH 044/216] haskell-taffybar: update to version 0.4.4 --- pkgs/applications/misc/taffybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 1f5481fc5a9..8f2f95193fb 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "taffybar"; - version = "0.4.3"; - sha256 = "1h7acdzq3bndy44lyvgnm3gvxpbhzcs0ymvkrhmn3y41bfcwaac2"; + version = "0.4.4"; + sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh"; isLibrary = true; isExecutable = true; buildDepends = [ From 1a0505143c8f2e8d2feb6ee8799cfbdf681ebf6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:19 +0100 Subject: [PATCH 045/216] haskell-github-backup: update to version 1.20141204 --- .../git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 5b1e2041e4a..39af61f5bb5 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20141110"; - sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; + version = "1.20141204"; + sha256 = "0asj0ix81k6vi95rwlhs7ikk936lzfsav4gw0gvyzf31ggmf4j4c"; isLibrary = false; isExecutable = true; buildDepends = [ From 028363d969f6cbe5b3fd90c2157b48998d40b603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:21 +0100 Subject: [PATCH 046/216] haskell-Rasterific: update to version 0.4 --- .../development/libraries/haskell/Rasterific/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix index c53e9f72858..5380cb59659 100644 --- a/pkgs/development/libraries/haskell/Rasterific/default.nix +++ b/pkgs/development/libraries/haskell/Rasterific/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity -, free, JuicyPixels, mtl, QuickCheck, statistics, vector +, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector , vectorAlgorithms }: cabal.mkDerivation (self: { pname = "Rasterific"; - version = "0.3"; - sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa"; + version = "0.4"; + sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z"; buildDepends = [ - dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms + dlist FontyFruity free JuicyPixels mtl primitive vector + vectorAlgorithms ]; testDepends = [ binary criterion deepseq filepath FontyFruity JuicyPixels From b1147746c6331a0cb607e38bc60614767aa3b551 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:23 +0100 Subject: [PATCH 047/216] haskell-active: update to version 0.1.0.17 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index a13113cde4e..02764c108f8 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.16"; - sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k"; + version = "0.1.0.17"; + sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From 18794d72bf1de4e478faa36903dc668f17eaea1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:25 +0100 Subject: [PATCH 048/216] haskell-ad: update to version 4.2.1.1 --- pkgs/development/libraries/haskell/ad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix index afe8992aeea..72c53b5178a 100644 --- a/pkgs/development/libraries/haskell/ad/default.nix +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ad"; - version = "4.2.1"; - sha256 = "05ndr26lsc4xa18vfb3qdjcp03gsq2bhc8dc0yr5g1x9dybq6dx2"; + version = "4.2.1.1"; + sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka"; buildDepends = [ comonad dataReify erf free nats reflection tagged transformers ]; From 53eb3f3166692cd8643e55bacc6371d8186cc867 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:27 +0100 Subject: [PATCH 049/216] haskell-aeson-pretty: update to version 0.7.2 --- pkgs/development/libraries/haskell/aeson-pretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix index 7bc2beb3b30..8e1959c401c 100644 --- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "aeson-pretty"; - version = "0.7.1"; - sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6"; + version = "0.7.2"; + sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234"; isLibrary = true; isExecutable = true; buildDepends = [ From 213d463e57367dd9b9e89175a0988a2f6dfdbde1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:29 +0100 Subject: [PATCH 050/216] haskell-algebra: update to version 4.2 --- pkgs/development/libraries/haskell/algebra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix index 1e054a1cdb4..2044c8ad872 100644 --- a/pkgs/development/libraries/haskell/algebra/default.nix +++ b/pkgs/development/libraries/haskell/algebra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "algebra"; - version = "4.1"; - sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6"; + version = "4.2"; + sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; buildDepends = [ adjunctions distributive mtl nats semigroupoids semigroups tagged transformers void From d6a07172ec21a0805a51a4f6b46be4f0e307865c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:31 +0100 Subject: [PATCH 051/216] haskell-atto-lisp: update to version 0.2.2 --- pkgs/development/libraries/haskell/atto-lisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index 9ee9ecd7a28..6e69e361585 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "atto-lisp"; - version = "0.2.1.2"; - sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg"; + version = "0.2.2"; + sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; From 5094de7ee52ed32611da4cbabefe4ce05d8d04a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:33 +0100 Subject: [PATCH 052/216] haskell-bound: update to version 1.0.4 --- pkgs/development/libraries/haskell/bound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix index 31e7b053add..dd1f288a1b9 100644 --- a/pkgs/development/libraries/haskell/bound/default.nix +++ b/pkgs/development/libraries/haskell/bound/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "bound"; - version = "1.0.3"; - sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq"; + version = "1.0.4"; + sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky"; buildDepends = [ bifunctors binary bytes cereal comonad hashable hashableExtras preludeExtras profunctors transformers From fbce0516b4c03ce92e809f3660610cdfeb693500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:35 +0100 Subject: [PATCH 053/216] haskell-bytes: update to version 0.14.1.2 --- pkgs/development/libraries/haskell/bytes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index 4f6387781c2..1ad3446bd0c 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bytes"; - version = "0.14.1.1"; - sha256 = "11bsl31352h5lj7ad68byqqc27d5iz53kwx7b433l44g9kaijrvc"; + version = "0.14.1.2"; + sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d"; buildDepends = [ binary cereal mtl text time transformers transformersCompat void ]; From 1373abcd817314801e74f5568df28b5ee948a31d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:37 +0100 Subject: [PATCH 054/216] haskell-cgrep: update to version 6.4.9 --- pkgs/development/libraries/haskell/cgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index a49697bccf9..91f7920fcea 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.8"; - sha256 = "0xz2kzrvxxaa67x21dckv7l01s7jhmak7ka0rp8qygx6zjf836wy"; + version = "6.4.9"; + sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga"; isLibrary = false; isExecutable = true; buildDepends = [ From a04f3335f83eb6cc3c01724bbefef5646e5bd1d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:39 +0100 Subject: [PATCH 055/216] haskell-cheapskate: update to version 0.1.0.2 --- .../libraries/haskell/cheapskate/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index e3b13cdd806..7d96433a588 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate -, xssSanitize +{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text +, uniplate, wai, waiExtra, xssSanitize }: cabal.mkDerivation (self: { pname = "cheapskate"; - version = "0.1.0.1"; - sha256 = "0slrvbaamnwxx89kqjcr62058j00s2dw4c16q1swf817az2p66h8"; + version = "0.1.0.2"; + sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml dataDefault mtl syb text uniplate xssSanitize + aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai + waiExtra xssSanitize ]; jailbreak = true; meta = { From 74296f721ec81b5bb5931d9bfec3f61b76c0c935 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:41 +0100 Subject: [PATCH 056/216] haskell-clientsession: update to version 0.9.1.1 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index bd06ff10a86..6fcecac9eb5 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.1"; - sha256 = "1hq4f5iq4xb9jilr6qprww9lql314vpfw5khwmizljry9cwd2gq7"; + version = "0.9.1.1"; + sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9"; isLibrary = true; isExecutable = true; buildDepends = [ From 373f0f3b48c1779b319b95373f135ae632c83fe1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:43 +0100 Subject: [PATCH 057/216] haskell-conduit-extra: update to version 1.1.5 --- pkgs/development/libraries/haskell/conduit-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index b9ddeec104f..8a551de3516 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.4.2"; - sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g"; + version = "1.1.5"; + sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers From a00162df4a80ce208557ac6b325df6df6e5744ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:45 +0100 Subject: [PATCH 058/216] haskell-crypto-pubkey: update to version 0.2.5 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index bd4b4f9639f..a8979fef315 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.4"; - sha256 = "0mdjr6zma2q7r2z9qibp2bwf73bis6zrv7ss62i4pz42kndb9hh4"; + version = "0.2.5"; + sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; From f8f4e2168a22bc1f77572d586345c2d41a4fe239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:47 +0100 Subject: [PATCH 059/216] haskell-cuda: update to version 0.6.5.1 --- pkgs/development/libraries/haskell/cuda/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 7e09fc12f70..f281998890f 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -4,8 +4,10 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.6.5.0"; - sha256 = "0q4c2xgffkchn8kxhiwjganmb3ki4yjhx5665zwfd18bgvmlnp60"; + version = "0.6.5.1"; + sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; + isLibrary = true; + isExecutable = true; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; From 188de38519ee22a603e4de383bd8ec0089900183 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:49 +0100 Subject: [PATCH 060/216] haskell-data-lens-light: update to version 0.1.2.1 --- .../development/libraries/haskell/data-lens-light/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 2eca446c714..017e5e706db 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.2"; - sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; + version = "0.1.2.1"; + sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; From 4eca50ceb5f469e282871eeb8ee5c317f4641a22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:50 +0100 Subject: [PATCH 061/216] haskell-dbus: update to version 0.10.9 --- 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 81aee9c42b4..dc88a613350 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.8"; - sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6"; + version = "0.10.9"; + sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes From a6f91ea2111c6ac14295a6a47f11900219dd0f67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:52 +0100 Subject: [PATCH 062/216] haskell-diagrams-contrib: update to version 1.1.2.4 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a958c0b6266..78ed983650f 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.2.3"; - sha256 = "00bn9p2a6h26q7hfqqzwimfgr2avf7ilf61z3anz25raz8jqvfxc"; + version = "1.1.2.4"; + sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From 9b34b3562883ff4fc2c923528ecd670237bb36a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:55 +0100 Subject: [PATCH 063/216] haskell-diagrams-core: update to version 1.2.0.4 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 0ce9a559059..518b5594cb6 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.3"; - sha256 = "1pmdz75v2xl8y0clqifs017gq40syxqpfa2h2mc50pip3484a7m5"; + version = "1.2.0.4"; + sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From 6b4854f20897565106d0191bbd18b572701eaf34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:57 +0100 Subject: [PATCH 064/216] haskell-diagrams-lib: update to version 1.2.0.7 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 3b42584bb28..d2e25254f67 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.5"; - sha256 = "0km2j74riybmlhpb3jp4i3xilz4q2ngkifnsq6bsk8d0m3kqizd6"; + version = "1.2.0.7"; + sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie From a9a255279feb85c881df96c1a50f506050bd05a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:48:59 +0100 Subject: [PATCH 065/216] haskell-diagrams-postscript: update to version 1.1.0.3 --- pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 73bc954de5d..841487305ef 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1.0.2"; - sha256 = "1djvra4igw43746wqhwg1ms76w2qlrsdwhr0b795si4wdx8k28b3"; + version = "1.1.0.3"; + sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace From 2d47bb233ea9a10869eb9dfe66818a26e692a13e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:01 +0100 Subject: [PATCH 066/216] haskell-diagrams-rasterific: update to version 0.1.0.5 --- pkgs/development/libraries/haskell/diagrams/rasterific.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index 0aa953537ce..8e494241f74 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.4"; - sha256 = "0l6072blz56rc4nxr2s7gh5p3zdcyq8cfndbqgzndsfak6wyixgb"; + version = "0.1.0.5"; + sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split From 27a20250022978801fbe61742b84460c5cfae2dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:03 +0100 Subject: [PATCH 067/216] haskell-diagrams-svg: update to version 1.1.0.3 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 00ce51e8d97..1994905c1d4 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1.0.2"; - sha256 = "0dzws9c3swgnrx70a64614m9pc8rszfajgh674n7x56fbbp3ra1n"; + version = "1.1.0.3"; + sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl From d32836523b3020996578e10fd5022eeebfb0dba6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:05 +0100 Subject: [PATCH 068/216] haskell-distributed-process: update to version 0.5.2 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 24375cb277a..0232a02c8af 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.5.1"; - sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk"; + version = "0.5.2"; + sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l"; buildDepends = [ binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers From 6397015c829e495a86324f421ca1f74284bb4589 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:07 +0100 Subject: [PATCH 069/216] haskell-distributed-static: update to version 0.3.1.0 --- .../libraries/haskell/distributed-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 8f7f61da8f6..4dce7cc1ded 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.3.0.0"; - sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; + version = "0.3.1.0"; + sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08"; buildDepends = [ binary rank1dynamic ]; meta = { homepage = "http://haskell-distributed.github.com"; From 9b3ea8a8899fa3771cf083888b7be21815d5ed40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:09 +0100 Subject: [PATCH 070/216] haskell-dual-tree: update to version 0.2.0.5 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index f9cf3b13b41..7efdcce8526 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.2.0.4"; - sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp"; + version = "0.2.0.5"; + sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From cfdf4a4afd6827209e38ba22ae9ad9db8dbfda61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:11 +0100 Subject: [PATCH 071/216] haskell-ekg: update to version 0.4.0.5 --- pkgs/development/libraries/haskell/ekg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index c19ec4ec881..05dd7d99877 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.4"; - sha256 = "1v1kskl1fwwpv72lay8c7nlvg2dswf6wij176fjfml1v8lmll2lr"; + version = "0.4.0.5"; + sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers From b99414a66c0b3fb536794932bb20eb4e1efa3361 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:12 +0100 Subject: [PATCH 072/216] haskell-engine-io: update to version 1.2.3 --- pkgs/development/libraries/haskell/engine-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 141d54ab23c..d275a2f2b0f 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.2"; - sha256 = "1d8323nxklbhva2y8ymgm5h57j2p86sdjfh0yi1fjjr8p26dh2py"; + version = "1.2.3"; + sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc"; buildDepends = [ aeson async attoparsec base64Bytestring either free monadLoops mwcRandom stm stmDelay text transformers unorderedContainers vector From 4d026fdce194af753d3ce52c9b3a52014ec09e2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:14 +0100 Subject: [PATCH 073/216] haskell-esqueleto: update to version 2.1.2.1 --- pkgs/development/libraries/haskell/esqueleto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 86bc90fae81..c85ff455180 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.1.2"; - sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v"; + version = "2.1.2.1"; + sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers From 669e88371eba2ac0ddba7d0d64130bb6d604d214 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:16 +0100 Subject: [PATCH 074/216] haskell-extensible-effects: update to version 1.8.1.0 --- .../haskell/extensible-effects/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 2bae81325ae..310e0f37dd0 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -1,14 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, transformers, transformersBase +{ cabal, free, HUnit, kanExtensions, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +, transformersBase }: cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.7.1.2"; - sha256 = "1mvyiqlga6al81j4b4rg9yl46ml5s0hnx1g2hyvqljzr12njmajv"; - buildDepends = [ transformers transformersBase ]; + version = "1.8.1.0"; + sha256 = "0ssnb1c63lnal6k8f1v36scwqr8m430gq0ssss7r8ndqcbpnlc64"; + buildDepends = [ + free kanExtensions transformers transformersBase + ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 From 2356665948450ef240b8756e5f1d7177e6dd2dd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:18 +0100 Subject: [PATCH 075/216] haskell-extra: update to version 1.0 --- pkgs/development/libraries/haskell/extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix index dfbdf73a2ae..9e90fe2bb05 100644 --- a/pkgs/development/libraries/haskell/extra/default.nix +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extra"; - version = "0.8"; - sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw"; + version = "1.0"; + sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb"; buildDepends = [ filepath time ]; testDepends = [ filepath QuickCheck time ]; meta = { From 126fa7e0a5125df562f5eefda105b225ebebf586 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:20 +0100 Subject: [PATCH 076/216] haskell-free: update to version 4.10.0.1 --- pkgs/development/libraries/haskell/free/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index e516eb3613a..5837cc448c2 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.9"; - sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx"; + version = "4.10.0.1"; + sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; buildDepends = [ bifunctors comonad distributive mtl preludeExtras profunctors semigroupoids semigroups transformers From 703459b3fdedee82e64af0be3d9cdafb62f459c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:24 +0100 Subject: [PATCH 077/216] haskell-ghcjs-dom: update to version 0.1.1.1 --- pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 6605c43e4dd..fe5d30be27c 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.1.1.0"; - sha256 = "0ywxkp13n78skbcr0d1m5mgz23xds27sdfxswfc9zjcsb513w3gg"; + version = "0.1.1.1"; + sha256 = "0fwwm658gf4fp32zmfskfayi480ddsf40y2cfla88a7l1rbacwif"; buildDepends = [ ghcjsBase mtl text ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; From cc400eb33c01da397acf2c4fb267dfd7929c9f5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:27 +0100 Subject: [PATCH 078/216] haskell-gitlib-libgit2: update to version 3.1.0.1 --- .../development/libraries/haskell/gitlib-libgit2/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix index 287f98d661d..bb7206803eb 100644 --- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "gitlib-libgit2"; - version = "3.1.0"; - sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq"; + version = "3.1.0.1"; + sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs"; buildDepends = [ conduit conduitCombinators exceptions fastLogger filepath gitlib hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl @@ -26,7 +26,6 @@ cabal.mkDerivation (self: { description = "Libgit2 backend for gitlib"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) From 3169c70a5e63b4feac1fbb70e7ffb46e80d88745 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:29 +0100 Subject: [PATCH 079/216] haskell-gitlib-test: update to version 3.1.0.1 --- pkgs/development/libraries/haskell/gitlib-test/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix index e8ab6aca6cf..130a0efdcd1 100644 --- a/pkgs/development/libraries/haskell/gitlib-test/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitlib-test"; - version = "3.1.0"; - sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4"; + version = "3.1.0.1"; + sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3"; buildDepends = [ conduit conduitCombinators exceptions gitlib hspec hspecExpectations HUnit monadControl tagged text time transformers @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - broken = true; }; }) From 4ab7d4f134c536a5dea18353a615e992ece39c6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:30 +0100 Subject: [PATCH 080/216] haskell-gloss-raster: update to version 1.9.2.1 --- .../libraries/haskell/gloss-raster/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index ff5e202ae73..16316b16590 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, gloss, llvm, repa }: +{ cabal, gloss, glossRendering, llvm, repa }: cabal.mkDerivation (self: { pname = "gloss-raster"; - version = "1.8.2.1"; - sha256 = "0ls8rlwrbpisrmq2xigf9926pak028dmld6shrblcmdbykaz55ha"; - buildDepends = [ gloss repa ]; + version = "1.9.2.1"; + sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw"; + buildDepends = [ gloss glossRendering repa ]; extraLibraries = [ llvm ]; jailbreak = true; meta = { From 5dec7b5d98f48f410ec23eec9750c15a0bcb5efc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:32 +0100 Subject: [PATCH 081/216] haskell-gloss: update to version 1.9.2.1 --- pkgs/development/libraries/haskell/gloss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 079914a84fc..da6eb98776f 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bmp, GLUT, OpenGL }: +{ cabal, bmp, glossRendering, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.2.2"; - sha256 = "1v3rvx3jidbh98znmnl122rqgg5r9zcl22h5ibzag9h5d31c5vzr"; - buildDepends = [ bmp GLUT OpenGL ]; + version = "1.9.2.1"; + sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l"; + buildDepends = [ bmp glossRendering GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From 7ca598c7419614b65e08d71f56af862fecf70ff4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:34 +0100 Subject: [PATCH 082/216] haskell-gtk: update to version 0.13.3 --- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index e9a90659a95..effbd57f799 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.3"; - sha256 = "1l42hn3mhycq2b7z517jjyz3s8kvf5nyy0m674da0h2rixw9r5fh"; + version = "0.13.3"; + sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From aa02fbce3769276afc2bdc0c4dac044743d24fda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:36 +0100 Subject: [PATCH 083/216] haskell-hakyll: update to version 4.6.1.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 03730449a1a..7eeacd238ba 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.6.1.0"; - sha256 = "19yw5yp84vli228zmyz23vs6d5mb14rjbb81kvyra8fi8mmy2l6b"; + version = "4.6.1.1"; + sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa"; isLibrary = true; isExecutable = true; buildDepends = [ From 3d7f4a5f9577db136a8ec4c169bf5628036661e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:38 +0100 Subject: [PATCH 084/216] haskell-half: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/half/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/half/default.nix b/pkgs/development/libraries/haskell/half/default.nix index 009c141660f..e113f6730d9 100644 --- a/pkgs/development/libraries/haskell/half/default.nix +++ b/pkgs/development/libraries/haskell/half/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "half"; - version = "0.2"; - sha256 = "0p5fw17mvcr6yizgdjy681a1gqdidb5yp80gksxrdm1dv6qf6xcp"; + version = "0.2.0.1"; + sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; meta = { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; From 0c810b01f062e67b37492766243c7775e77ddec8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:40 +0100 Subject: [PATCH 085/216] haskell-hashtables: update to version 1.2.0.0 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index c941e08da35..f8f382e8bd1 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.1.2.1"; - sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5"; + version = "1.2.0.0"; + sha256 = "0q2zzrsx899wkhjvyqiwj0jkjr81dl3ghlrvgk0vzkkz9g901k0x"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From 3b119dec1de81adcf21598b4dd8c311894f7b79f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:42 +0100 Subject: [PATCH 086/216] haskell-haskell-names: update to version 0.5.0 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index f8ec4d67a0b..5185c1037a8 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.4.1"; - sha256 = "1zkfq54s7n17g77sqzfhhc4bmqwdwbynz0gzwyaf3m4nmz6lkfl8"; + version = "0.5.0"; + sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr"; buildDepends = [ aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass typeEq uniplate From a44d38f97f2790bec04fa3d7ee375cff62c799fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:44 +0100 Subject: [PATCH 087/216] haskell-hindent: update to version 4.0 --- pkgs/development/libraries/haskell/hindent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index 36fe2f7113d..ea5e13a1b5f 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "3.9.1"; - sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f"; + version = "4.0"; + sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; From c9d0770cf412376939122393de9f407988eb2569 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:46 +0100 Subject: [PATCH 088/216] haskell-hmatrix: update to version 0.16.1.0 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index cbb4a44655d..afc5833d5e2 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.16.0.6"; - sha256 = "13xbz0dx153m6nc7lv522gihvav5n6a4kiavwsqwh27ql4zyind7"; + version = "0.16.1.0"; + sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h"; buildDepends = [ binary deepseq random split storableComplex vector ]; From 3e7ad2a9558edc523a96fdbcf3462d94426c34ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:48 +0100 Subject: [PATCH 089/216] haskell-hspec-core: update to version 2.1.2 --- .../libraries/haskell/hspec-core/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix index 5e8378dd871..313153c55c0 100644 --- a/pkgs/development/libraries/haskell/hspec-core/default.nix +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations -, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv -, silently, tfRandom, time, transformers +{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta +, HUnit, QuickCheck, quickcheckIo, random, setenv, silently +, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec-core"; - version = "2.0.2"; - sha256 = "19nssrvwnpa9yib9qqrhf1hi8m624si97874hhdh2hqc7kjqr332"; + version = "2.1.2"; + sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh"; buildDepends = [ ansiTerminal async deepseq hspecExpectations HUnit QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ - ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta - HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + ansiTerminal async deepseq hspecExpectations hspecMeta HUnit + QuickCheck quickcheckIo random setenv silently tfRandom time transformers ]; meta = { From 82f8b067c2fa0f597bc089111ca37ed94b9a037a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:50 +0100 Subject: [PATCH 090/216] haskell-hspec-discover: update to version 2.1.2 --- pkgs/development/libraries/haskell/hspec-discover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix index bf7d280fca0..8a4a79eae97 100644 --- a/pkgs/development/libraries/haskell/hspec-discover/default.nix +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-discover"; - version = "2.0.2"; - sha256 = "1439134sdgwimjihjy06g4vq3bkym97da4z1zkgxgj91ljfwlb2i"; + version = "2.1.2"; + sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19"; isLibrary = true; isExecutable = true; buildDepends = [ filepath ]; From 3c4b55207b5af8c7506ea65e8486d37ffaf5f047 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:52 +0100 Subject: [PATCH 091/216] haskell-hspec: update to version 2.1.2 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index fc60a54cd73..8f8b66b39d3 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "2.0.2"; - sha256 = "19zxsadp1xwxdyp6zksaz4czdnmjd0x3gmbh7pqv6l4dxmd0545a"; + version = "2.1.2"; + sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py"; buildDepends = [ hspecCore hspecDiscover hspecExpectations HUnit QuickCheck transformers From e68c05f5fb7c51b4a7bdb745dafacf4caf781b9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:54 +0100 Subject: [PATCH 092/216] haskell-httpd-shed: update to version 0.4.0.3 --- .../development/libraries/haskell/httpd-shed/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 4ae04b2c726..4a4334be732 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,19 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, network }: +{ cabal, network, networkUri }: cabal.mkDerivation (self: { pname = "httpd-shed"; - version = "0.4.0.2"; - sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3"; + version = "0.4.0.3"; + sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; isLibrary = true; isExecutable = true; - buildDepends = [ network ]; + buildDepends = [ network networkUri ]; jailbreak = true; meta = { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) From 7d85cabf161dee49f72c1601ae07d2851caf2a65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:56 +0100 Subject: [PATCH 093/216] haskell-io-streams: update to version 1.2.1.1 --- 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 a046c234e63..3963add1825 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.2.0.1"; - sha256 = "12r7j8dzj80f4s9942a6pi60pd9jh44sqyl6hcn0npzmdyl7hg1k"; + version = "1.2.1.1"; + sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings From 75d4b64966161d8cec60b43dba6f5310daa5feae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:49:58 +0100 Subject: [PATCH 094/216] haskell-jwt: update to version 0.5.0 --- .../libraries/haskell/jwt/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index 27eb104f4df..400bd6c9e9d 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -2,22 +2,24 @@ { cabal, aeson, base64Bytestring, cryptohash, dataDefault , httpTypes, HUnit, network, networkUri, QuickCheck, scientific -, tasty, tastyHunit, tastyQuickcheck, tastyTh, text, time -, unorderedContainers +, semigroups, tasty, tastyHunit, tastyQuickcheck, tastyTh, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.2"; - sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; + version = "0.5.0"; + sha256 = "0445biw5rj4plbz4nbmzrn446dfsjnggzrrcn1m292g3dqp6gzgh"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network - networkUri scientific text time unorderedContainers + networkUri scientific semigroups text time unorderedContainers + vector ]; testDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes HUnit - network networkUri QuickCheck scientific tasty tastyHunit - tastyQuickcheck tastyTh text time unorderedContainers + network networkUri QuickCheck scientific semigroups tasty + tastyHunit tastyQuickcheck tastyTh text time unorderedContainers + vector ]; meta = { homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; From 7ff694926e4b862cd740a6c8ba01222f8a097c6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:00 +0100 Subject: [PATCH 095/216] haskell-lens-aeson: update to version 1.0.0.3 --- pkgs/development/libraries/haskell/lens-aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix index 44097f2c9d4..f1fcd255b5f 100644 --- a/pkgs/development/libraries/haskell/lens-aeson/default.nix +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "lens-aeson"; - version = "1.0.0.2"; - sha256 = "1hq0zs1h4wapy1n9vyr4yiysnwbv26di8gl6msx3jkcahvlnkvlp"; + version = "1.0.0.3"; + sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac"; buildDepends = [ aeson attoparsec lens scientific text unorderedContainers vector ]; From 00498a4b7535541496b7e610295a30c98ec0dbf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:02 +0100 Subject: [PATCH 096/216] haskell-lens: update to version 4.6.0.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 2729e42be61..f82368422e4 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.5"; - sha256 = "009wdzybzmk7cs27fzigsmxknim6f9s7lp7iivgcsfn49pd8imwv"; + version = "4.6.0.1"; + sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection From bdb4c17c01cf54f6d2cbd5377629e2d24b3100da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:04 +0100 Subject: [PATCH 097/216] haskell-lifted-base: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 3e4f95521bb..80961ba86c8 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.3.0"; - sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n"; + version = "0.2.3.1"; + sha256 = "1ga2kvacb44syvv1l0gaqyzlp12h7rrqn8k5fvy7ca5ffxwy5472"; buildDepends = [ monadControl transformersBase ]; testDepends = [ HUnit monadControl testFramework testFrameworkHunit transformers From 7edba36eed9d81d83a91248d613ba969a2bdc79b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:06 +0100 Subject: [PATCH 098/216] haskell-linear: update to version 1.15.5 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index bbe0763cd23..6301d8d42d6 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.15.4"; - sha256 = "0xpprafv7dndihnk2mapgvhy4cpz2d24k5j1p3q5crrsi2wj7k0b"; + version = "1.15.5"; + sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers From d5f53419e0146412d44c7df7d5bbb82545bb73f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:10 +0100 Subject: [PATCH 099/216] haskell-machines: update to version 0.4.1 --- pkgs/development/libraries/haskell/machines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 02b2ec272b0..bb01e9f655e 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.4.0.1"; - sha256 = "11h1b6hls7v4ifz3p7v1gdsgxqgyx92v978pjfyp81ianwjyclqg"; + version = "0.4.1"; + sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; From c6678cdb7c150327094c9080818b83231a9d60c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:11 +0100 Subject: [PATCH 100/216] haskell-markdown: update to version 0.1.13 --- .../libraries/haskell/markdown/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix index d2d7ef84375..cd0bcd3cfee 100644 --- a/pkgs/development/libraries/haskell/markdown/default.nix +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault -, hspec, systemFileio, systemFilepath, text, transformers -, xssSanitize +{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra +, dataDefault, hspec, systemFileio, systemFilepath, text +, transformers, xssSanitize }: cabal.mkDerivation (self: { pname = "markdown"; - version = "0.1.12"; - sha256 = "19qpr9k3yz5c77i4y4qldq4ak0m8iy6ca5wjx6mix9krlnwxkrid"; + version = "0.1.13"; + sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134"; buildDepends = [ - attoparsec blazeHtml conduit conduitExtra dataDefault text - transformers xssSanitize + attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault + text transformers xssSanitize ]; testDepends = [ blazeHtml conduit conduitExtra hspec systemFileio systemFilepath From c962edc990e649b2526845065aaee243ef338dc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:13 +0100 Subject: [PATCH 101/216] haskell-monad-logger: update to version 0.3.10.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 4cb44acf652..032c9e37b2f 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.8"; - sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r"; + version = "0.3.10.1"; + sha256 = "1m1bcx995w283a0jcwqn8z3daafybndhj4y0xxgccip8038xf0rl"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text From 67fdb29004546589e4ad2d3c8dc550f4821ea457 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:16 +0100 Subject: [PATCH 102/216] haskell-monad-parallel: update to version 0.7.1.3 --- .../libraries/haskell/monad-parallel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix index db53712d4ef..bff520fab83 100644 --- a/pkgs/development/libraries/haskell/monad-parallel/default.nix +++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, parallel, transformers }: +{ cabal, parallel, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "monad-parallel"; - version = "0.7.1.2"; - sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj"; - buildDepends = [ parallel transformers ]; + version = "0.7.1.3"; + sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx"; + buildDepends = [ parallel transformers transformersCompat ]; meta = { homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; From ef71b297a451547431316ce497375b1fb51819db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:18 +0100 Subject: [PATCH 103/216] haskell-monoid-extras: update to version 0.3.3.5 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 3c0a742a1f3..f7ae10ce08d 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.3.4"; - sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6"; + version = "0.3.3.5"; + sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280"; buildDepends = [ groups semigroupoids semigroups ]; jailbreak = true; meta = { From ea9b1bfcf78aeaefba944eff95ca0cb42bd3925f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:20 +0100 Subject: [PATCH 104/216] haskell-nats: update to version 1 --- pkgs/development/libraries/haskell/nats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index e870d171383..3c4130eddc4 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nats"; - version = "0.2"; - sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73"; + version = "1"; + sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0"; buildDepends = [ hashable ]; meta = { homepage = "http://github.com/ekmett/nats/"; From d93c2fde9843da5dad69b58b864ed150f7191535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:21 +0100 Subject: [PATCH 105/216] haskell-network-fancy: update to version 0.2.1 --- .../libraries/haskell/network-fancy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix index 8e0cf757834..21c3e43d588 100644 --- a/pkgs/development/libraries/haskell/network-fancy/default.nix +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -1,14 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "network-fancy"; - version = "0.1.5.2"; - sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c"; + version = "0.2.1"; + sha256 = "1n8i7vyg1csdxxq7nip84ydkx3c8gykmqxg27ir0mmgj3p1jb42c"; + doCheck = false; meta = { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' ''; }) From 5279b67f96ebc56eacd81225f81888d502e180a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:24 +0100 Subject: [PATCH 106/216] haskell-network-transport-tcp: update to version 0.4.1 --- .../libraries/haskell/network-transport-tcp/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index b4a70eb6843..cd467f5d2ab 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -6,19 +6,16 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.4.0"; - sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; + version = "0.4.1"; + sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf"; buildDepends = [ dataAccessor network networkTransport ]; testDepends = [ network networkTransport networkTransportTests ]; doCheck = false; - patchPhase = '' - sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal - ''; meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) From 7c5c4c47d6bab8e408b0a5a6c936ab67a3ba1624 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:25 +0100 Subject: [PATCH 107/216] haskell-network-transport-tests: update to version 0.2.1.0 --- .../libraries/haskell/network-transport-tests/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index 2dc5036899b..ec14ac5e173 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -4,15 +4,13 @@ cabal.mkDerivation (self: { pname = "network-transport-tests"; - version = "0.1.0.1"; - sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6"; + version = "0.2.1.0"; + sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64"; buildDepends = [ ansiTerminal mtl networkTransport random ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) From 6181f7f148100e70ce6f5e94f5733b849b8e83f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:27 +0100 Subject: [PATCH 108/216] haskell-network-transport: update to version 0.4.1.0 --- .../libraries/haskell/network-transport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index c59a3fbb235..410e6076f29 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.4.0.0"; - sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + version = "0.4.1.0"; + sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93"; buildDepends = [ binary hashable transformers ]; meta = { homepage = "http://haskell-distributed.github.com"; From 12d3cf5bd6ed9428bd439bdae7727b0daf6b23be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:29 +0100 Subject: [PATCH 109/216] haskell-ofx: update to version 0.4.0.2 --- pkgs/development/libraries/haskell/ofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix index 4d15fb2c2e5..d7fd805f5e8 100644 --- a/pkgs/development/libraries/haskell/ofx/default.nix +++ b/pkgs/development/libraries/haskell/ofx/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ofx"; - version = "0.4.0.0"; - sha256 = "0j15qanrs625vaz76vkf9q9wkidkmr6c3iyx8z88mpagkj05r09h"; + version = "0.4.0.2"; + sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg"; buildDepends = [ parsec time ]; jailbreak = true; meta = { From 2137a60970e216b0469018969bc6269624b0a05e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:31 +0100 Subject: [PATCH 110/216] haskell-opaleye: update to version 0.3 --- pkgs/development/libraries/haskell/opaleye/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix index 850267648b0..918bef94fba 100644 --- a/pkgs/development/libraries/haskell/opaleye/default.nix +++ b/pkgs/development/libraries/haskell/opaleye/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "opaleye"; - version = "0.2"; - sha256 = "08qlgsr8jcwn7sx2j08nk5lggx37mh0wc8gggj6gxqpafm0jn247"; + version = "0.3"; + sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx"; buildDepends = [ contravariant postgresqlSimple productProfunctors profunctors semigroups text time transformers uuid From 4f51f719d58d5b073f2b81269c600999679331b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:33 +0100 Subject: [PATCH 111/216] haskell-pipes-http: update to version 1.0.2 --- pkgs/development/libraries/haskell/pipes-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix index 5406a579799..5f432bc9dd9 100644 --- a/pkgs/development/libraries/haskell/pipes-http/default.nix +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-http"; - version = "1.0.1"; - sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w"; + version = "1.0.2"; + sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk"; buildDepends = [ httpClient httpClientTls pipes ]; jailbreak = true; meta = { From a29471f74ec61f2408b74c16e0f2f9717ae0a4b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:35 +0100 Subject: [PATCH 112/216] haskell-postgresql-simple: update to version 0.4.8.0 --- .../libraries/haskell/postgresql-simple/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 3285a9209aa..d48e80e3014 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder -, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq -, scientific, text, time, transformers, uuid, vector +, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit +, postgresqlLibpq, scientific, text, time, transformers, uuid +, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.7.0"; - sha256 = "17cs5f7pfh30y2n8b3w76v832sd5z9m5xswpfa5w6r2vf18xpkqs"; + version = "0.4.8.0"; + sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm"; buildDepends = [ - aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq - scientific text time transformers uuid vector + aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable + postgresqlLibpq scientific text time transformers uuid vector ]; testDepends = [ aeson base16Bytestring cryptohash HUnit text time vector From b075eb7f598a0245555aa0bd06fcba1975ad0472 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:37 +0100 Subject: [PATCH 113/216] haskell-presburger: update to version 1.2 --- pkgs/development/libraries/haskell/presburger/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix index fed380b9bd0..a8efaf7554e 100644 --- a/pkgs/development/libraries/haskell/presburger/default.nix +++ b/pkgs/development/libraries/haskell/presburger/default.nix @@ -1,11 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "presburger"; - version = "1.1"; - sha256 = "0pb0rabhhzrrrsr8260lgjpp168pm8ldqwfqbc2i1wy95n7wxk7c"; + version = "1.2"; + sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm"; + testDepends = [ QuickCheck ]; meta = { homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; From e661c144d1347e5cfdf699155f51300c4fefe6b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:40 +0100 Subject: [PATCH 114/216] haskell-present: update to version 2.2 --- pkgs/development/libraries/haskell/present/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix index 7c5f3afbd98..ee63eccf005 100644 --- a/pkgs/development/libraries/haskell/present/default.nix +++ b/pkgs/development/libraries/haskell/present/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "present"; - version = "1.1"; - sha256 = "1hmzq3qi4hz74xr7cnc33kpwki9ziyinvrwazag8hh77d02fl11z"; + version = "2.2"; + sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4"; buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ]; meta = { description = "Make presentations for data types"; From 76fa10b306b39ee82794e7ae54b101feb1d2c2df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:42 +0100 Subject: [PATCH 115/216] haskell-product-profunctors: update to version 0.6 --- .../libraries/haskell/product-profunctors/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix index 0e5e18de339..444baa76a1a 100644 --- a/pkgs/development/libraries/haskell/product-profunctors/default.nix +++ b/pkgs/development/libraries/haskell/product-profunctors/default.nix @@ -4,9 +4,10 @@ cabal.mkDerivation (self: { pname = "product-profunctors"; - version = "0.5"; - sha256 = "02hkcq4vzk4641hkm1rf2v2qdbaqalbfgnwfdk7yfz497qv9lmad"; + version = "0.6"; + sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; buildDepends = [ contravariant profunctors ]; + testDepends = [ profunctors ]; jailbreak = true; meta = { homepage = "https://github.com/tomjaguarpaw/product-profunctors"; From cc2d205da166e0688aeccd140aa28c40b8b00735 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:44 +0100 Subject: [PATCH 116/216] haskell-purescript: update to version 0.6.2 --- .../libraries/haskell/purescript/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 3a521ea121b..4fa383337c4 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdtheline, fileEmbed, filepath, haskeline, monadUnify -, mtl, nodejs, parsec, patternArrows, time, transformers +{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs +, optparseApplicative, parsec, patternArrows, time, transformers , unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "purescript"; - version = "0.6.1.2"; - sha256 = "0j1fmfcal2m75ji937xxl9cizzpw6v4pr31hxfjmal8fdcf677ma"; + version = "0.6.2"; + sha256 = "1zf2yyk3rdwk5992fhvqyd7b5w7mkzjcc0iyp75bscnjsggs31k0"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline fileEmbed filepath haskeline monadUnify mtl parsec - patternArrows time transformers unorderedContainers utf8String + fileEmbed filepath haskeline monadUnify mtl optparseApplicative + parsec patternArrows time transformers unorderedContainers + utf8String ]; testDepends = [ filepath mtl nodejs parsec transformers utf8String From 894f4433322d15bc3413f824b4f45ec6044e1b34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:47 +0100 Subject: [PATCH 117/216] haskell-resourcet: update to version 1.1.3.1 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index affeff4d1b0..3d312a6809f 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.3"; - sha256 = "0qai73ip4fwghd27c9ddpbl4kw338xhp17n9r5gh8v9awxc5ppap"; + version = "1.1.3.1"; + sha256 = "13g8vj9hc59q8n696j0w79k5bhp3mgs923y4d2cffnd0p7yd8r8x"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase From 3ce152bdb519e1a275b9e3536b2145ca7636c6f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:50 +0100 Subject: [PATCH 118/216] haskell-rest-core: update to version 0.33.1.2 --- pkgs/development/libraries/haskell/rest-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index bea8d8655e1..ce01091c066 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1.1"; - sha256 = "0sdknsh2y2lag4n59vdvwq95h0x32s3nvr1alddnpfpw6fsd7m2s"; + version = "0.33.1.2"; + sha256 = "0axl6d28agyzklrnl264413a8hpfi7ih296i453r6fg4c63ma5h4"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split From a6ab67085c29b37f9cd343c8473c8a447f3cce53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:51 +0100 Subject: [PATCH 119/216] haskell-rest-gen: update to version 0.16.1.3 --- pkgs/development/libraries/haskell/rest-gen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index f876f25c2d9..f97d701fba1 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16.1.2"; - sha256 = "1w2b4b52qa57z5kd9w7czimimzydwbh3qdz7cr22p69ihism38c9"; + version = "0.16.1.3"; + sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore From cb16a5f27dc3fe729c004c08d80ce5460f173af8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:53 +0100 Subject: [PATCH 120/216] haskell-rest-types: update to version 1.11.1.1 --- pkgs/development/libraries/haskell/rest-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 23a112730ba..9b9d9f62d26 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11.1"; - sha256 = "1dqjch3h3hv4s1v0wkbd4spn26f068bqpsz6mr0vdacdbhjwnigg"; + version = "1.11.1.1"; + sha256 = "0xr9h1bivw3miyg4xill0jwn95lybsbqgrnw2323pwxlbbnaa25a"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid From 3374991a85129ec4c3e9a39b6e8ab631e082ac11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:55 +0100 Subject: [PATCH 121/216] haskell-sbv: update to version 3.3 --- pkgs/development/libraries/haskell/sbv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index 088fc38d0f8..492dcd816ed 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sbv"; - version = "3.2"; - sha256 = "0hqibdl2bhxyc0akfy97j41mkp9s39ahdz25nyrzpjj89b9hzzi0"; + version = "3.3"; + sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f"; isLibrary = true; isExecutable = true; buildDepends = [ From 27ba8646301c23b199de08a96c2f8330fbc21cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:50:58 +0100 Subject: [PATCH 122/216] haskell-semigroups: update to version 0.16 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 23e48c02fd0..8cd94e9079f 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.4"; - sha256 = "17jr1wz44avcdws3pxh8jif9myylx7d1gwfv0paiq6yb6r089y68"; + version = "0.16"; + sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s"; buildDepends = [ deepseq hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From 58ead209221ca9f0d5233df5fb9a47f01bff1dc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:02 +0100 Subject: [PATCH 123/216] haskell-shake: update to version 0.14.2 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 1983f80b60d..fca81a974fb 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.14.1"; - sha256 = "101sdrp3whp1yvx4n8zri0rjkagq3hkmpd2xpkidzj9ssaz4x4fa"; + version = "0.14.2"; + sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m"; isLibrary = true; isExecutable = true; buildDepends = [ From af3f679e8ba2b2c329d3224a11a20b952ce53a16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:04 +0100 Subject: [PATCH 124/216] haskell-shell-conduit: update to version 4.5 --- .../libraries/haskell/shell-conduit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 409c572603e..ce5507832e1 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, async, conduit, conduitExtra, controlMonadLoop, filepath -, monadControl, monadsTf, resourcet, semigroups, split, text, these +, monadControl, monadsTf, resourcet, semigroups, split, text , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "4.4"; - sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8"; + version = "4.5"; + sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g"; buildDepends = [ async conduit conduitExtra controlMonadLoop filepath monadControl - monadsTf resourcet semigroups split text these transformers + monadsTf resourcet semigroups split text transformers transformersBase ]; meta = { + homepage = "https://github.com/chrisdone/shell-conduit"; description = "Write shell scripts with Conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From f18e3922854dcd5b1efcc75495423730d1ea4c9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:06 +0100 Subject: [PATCH 125/216] haskell-skein: update to version 1.0.9.1 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 5fcd9df4642..4e4ce204ed1 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.9"; - sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb"; + version = "1.0.9.1"; + sha256 = "05as5glin9vikxxbnp5wpklqjd5hh9n28asxx147blmiz0x45dw8"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; From 23c60e3334997c7aa47a3beb4c2d6eaf97d39a2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:08 +0100 Subject: [PATCH 126/216] haskell-snap: update to version 0.13.3.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 14769499c21..bb4afe88512 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.3.1"; - sha256 = "016azx90gxjkhmncpnqvqrwsk9kbkz315z088wm7y67s97lpnr9c"; + version = "0.13.3.2"; + sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - patchPhase = '' - sed -i -e 's|lens *>=.*|lens|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 7fb4542b9925248e59d6f29d4bb28e070e16a98b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:10 +0100 Subject: [PATCH 127/216] haskell-socket-io: update to version 1.2.0 --- pkgs/development/libraries/haskell/socket-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix index c64c7c48edc..57827d495f3 100644 --- a/pkgs/development/libraries/haskell/socket-io/default.nix +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "socket-io"; - version = "1.1.1"; - sha256 = "0zr5kj519hw90rlicang5f573dd325rxv24psf12fxl6vmyxx1zc"; + version = "1.2.0"; + sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl"; buildDepends = [ aeson attoparsec engineIo mtl stm text transformers unorderedContainers vector From 16fbc3409050e974c8d73138ca188e7e6de78834 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:12 +0100 Subject: [PATCH 128/216] haskell-stm-containers: update to version 0.2.4 --- .../libraries/haskell/stm-containers/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index 052c913a98e..5b280aa4c8a 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,19 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl -, placeholders, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh +, mtl, mtlPrelude, placeholders, primitive, QuickCheck +, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.4"; - sha256 = "15h7qxxbr1ifkvmxsj30k0v3hp83m04iq25bvi3jmagvvk5hv5bj"; + version = "0.2.4"; + sha256 = "0qwyy0znd97w52kq9azg9bnc6578x1wvfhknh7qd8sz50gz19qwy"; buildDepends = [ - basePrelude focus hashable lochTh placeholders primitive + basePrelude focus hashable listT lochTh placeholders primitive + transformers ]; testDepends = [ - basePrelude focus free hashable HTF lochTh mtl placeholders - primitive QuickCheck unorderedContainers + basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude + placeholders primitive QuickCheck transformers unorderedContainers ]; doCheck = false; meta = { From ddb15c1b106615bae1d742d275bb444ae261a829 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:14 +0100 Subject: [PATCH 129/216] haskell-streaming-commons: update to version 0.1.7.2 --- .../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 ba9b8794eb5..c2d62b07786 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.6"; - sha256 = "0wapq6h7c0c3wciqfjz7j4z8kgf7wdr1s0al493jcrdyfy5k43dh"; + version = "0.1.7.2"; + sha256 = "0viv96kspszazrca3kzd3rv6hyqb8rx00kjr9ny0hkd518nmymxj"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; From 214cc5b554addaeec3d41af1d2b2ba66bae7540a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:16 +0100 Subject: [PATCH 130/216] haskell-tasty-hspec: update to version 1.1 --- .../libraries/haskell/tasty-hspec/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 6f8ff2e9add..459a0f1123a 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hspec, QuickCheck, random, tasty, tastyQuickcheck -, tastySmallcheck +{ cabal, hspec, hspecCore, QuickCheck, random, tasty +, tastyQuickcheck, tastySmallcheck }: cabal.mkDerivation (self: { pname = "tasty-hspec"; - version = "0.2"; - sha256 = "04qnmsyrlxgxf36lww3z6xkgpf6x5gprwrrwza3kcjl13wcm2rml"; + version = "1.1"; + sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6"; buildDepends = [ - hspec QuickCheck random tasty tastyQuickcheck tastySmallcheck + hspec hspecCore QuickCheck random tasty tastyQuickcheck + tastySmallcheck ]; meta = { homepage = "http://github.com/mitchellwrosen/tasty-hspec"; @@ -17,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) From 96a0b02981f9e7bf0fbcdf780699653427cbff01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:18 +0100 Subject: [PATCH 131/216] haskell-tasty-quickcheck: update to version 0.8.3.2 --- .../libraries/haskell/tasty-quickcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 8692daaa482..36b22a30f53 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8.3.1"; - sha256 = "0shmph95vys2l0ik3k615aigcvfas0f2079c1lbw73d0wrm841gn"; + version = "0.8.3.2"; + sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v"; buildDepends = [ QuickCheck tagged tasty ]; testDepends = [ pcreLight tasty tastyHunit ]; meta = { From d4d984f6a58e8d12ae44758d511c97c8eec83d8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:19 +0100 Subject: [PATCH 132/216] haskell-th-lift: update to version 0.7 --- pkgs/development/libraries/haskell/th-lift/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index a27360632b9..28fdedbde75 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -4,11 +4,12 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.6.1"; - sha256 = "0m1ips0n06jnjr5lssq7x4jaa5878sw03l8iaprya37bnkxxak5d"; + version = "0.7"; + sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza"; meta = { + homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; - license = "unknown"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; }) From 17752a985ec1ee564e492a9493d0cdc3a4bf991d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:21 +0100 Subject: [PATCH 133/216] haskell-thyme: update to version 0.3.5.5 --- pkgs/development/libraries/haskell/thyme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 25118d1ff64..7c18f2c555b 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.4"; - sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam"; + version = "0.3.5.5"; + sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox From 2ebf5f1c8dc734bb10810a4d9bace49b99330c4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:23 +0100 Subject: [PATCH 134/216] haskell-timezone-olson: update to version 0.1.6 --- pkgs/development/libraries/haskell/timezone-olson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 236cedc9c1f..8b8704c0de7 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-olson"; - version = "0.1.4"; - sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k"; + version = "0.1.6"; + sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z"; buildDepends = [ binary extensibleExceptions time timezoneSeries ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; From e5494c70720e2b193501379905a41516016362d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:25 +0100 Subject: [PATCH 135/216] haskell-timezone-series: update to version 0.1.4 --- .../development/libraries/haskell/timezone-series/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index d12ae9aec05..d46f2d81254 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-series"; - version = "0.1.3"; - sha256 = "0b13a929wrgfl1agkyp3d5wy89aw69zm4l0src7p16rh3kr38w73"; + version = "0.1.4"; + sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40"; buildDepends = [ time ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; From 960f394705ce4e74d462dc6b58c140dc33d6fbae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:27 +0100 Subject: [PATCH 136/216] haskell-unbound-generics: update to version 0.0.2 --- .../libraries/haskell/unbound-generics/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix index 602b28d0aa6..351df38fc0d 100644 --- a/pkgs/development/libraries/haskell/unbound-generics/default.nix +++ b/pkgs/development/libraries/haskell/unbound-generics/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, contravariant, mtl, tasty, tastyHunit, transformers }: +{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit +, tastyQuickcheck, transformers +}: cabal.mkDerivation (self: { pname = "unbound-generics"; - version = "0.0.1"; - sha256 = "0iwg1292dpwl8icr8p4nyhns4n0r44q8wv4l22j6i9m61li68al1"; + version = "0.0.2"; + sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai"; buildDepends = [ contravariant mtl transformers ]; - testDepends = [ mtl tasty tastyHunit ]; + testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ]; meta = { homepage = "http://github.com/lambdageek/unbound-generics"; description = "Reimplementation of Unbound using GHC Generics"; From 37831b2012877954dd2df70863b1ac859fab79a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:29 +0100 Subject: [PATCH 137/216] haskell-uuid: update to version 1.3.5 --- pkgs/development/libraries/haskell/uuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 44fb5bde2bf..c688c592127 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.3.4"; - sha256 = "03gab2dg52i4ysxw6vdzdd018qy0lycq7x3gcbx0r9c8vsqvafmc"; + version = "1.3.5"; + sha256 = "1pbla9fqadk5ia42c45qvdn1617gl8nv3b0bsb5yy3lh414v32q9"; buildDepends = [ binary cryptohash deepseq hashable networkInfo random time ]; From f774af2c4eeb1886aba363ed2f4428a51b7bb37b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:31 +0100 Subject: [PATCH 138/216] haskell-validation: update to version 0.4.2 --- pkgs/development/libraries/haskell/validation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix index 2ae7e9c66e5..903165b2f5f 100644 --- a/pkgs/development/libraries/haskell/validation/default.nix +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "validation"; - version = "0.4.1"; - sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + version = "0.4.2"; + sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm"; buildDepends = [ bifunctors lens semigroupoids semigroups transformers ]; From fe8ed6c239106509dc889488bd020a3fa984d926 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:33 +0100 Subject: [PATCH 139/216] haskell-vcsgui: update to version 0.1.1.0 --- pkgs/development/libraries/haskell/vcsgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index 08605391fc2..5e1d6ebf5b8 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcsgui"; - version = "0.1.0.0"; - sha256 = "0wxalzil8ypvwp0z754m7g3848963znwwrjysdxp5q33imzbp60z"; + version = "0.1.1.0"; + sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk"; isLibrary = true; isExecutable = true; buildDepends = [ filepath gtk3 mtl text vcswrapper ]; From a3a1e6b57a7a917b64126e17705698cfe07010d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:35 +0100 Subject: [PATCH 140/216] haskell-vcswrapper: update to version 0.1.1 --- pkgs/development/libraries/haskell/vcswrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index ca739b1d923..335c5b319bc 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcswrapper"; - version = "0.1.0"; - sha256 = "058xbfgxsp3g4x4rwbp57dqgr9mwnmj623js39dbmiqkixsda31a"; + version = "0.1.1"; + sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hxt mtl parsec split text ]; From 3b7d2dfcfcab31f1b594810f49fd83c12aefa382 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:37 +0100 Subject: [PATCH 141/216] haskell-void: update to version 0.7 --- pkgs/development/libraries/haskell/void/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index f6cc8eaa4d9..16f4bfeb8ef 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.6.1"; - sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42"; + version = "0.7"; + sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq"; buildDepends = [ hashable semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; From bc3e1e6b36612a9d0ae6c99154ad77ea16f56788 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:39 +0100 Subject: [PATCH 142/216] haskell-wai-conduit: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/wai-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix index 6174784a134..5c5c1134396 100644 --- a/pkgs/development/libraries/haskell/wai-conduit/default.nix +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-conduit"; - version = "3.0.0"; - sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg"; + version = "3.0.0.1"; + sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym"; buildDepends = [ blazeBuilder conduit httpTypes transformers wai ]; meta = { homepage = "https://github.com/yesodweb/wai"; From 76dfcf978356a6aca66c099959528ad6071f035d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:41 +0100 Subject: [PATCH 143/216] haskell-wai-extra: update to version 3.0.2.2 --- .../libraries/haskell/wai-extra/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 39514c8a3bd..480a6101487 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, caseInsensitive, dataDefault, dataDefaultClass, deepseq -, fastLogger, hspec, httpTypes, HUnit, liftedBase, network -, resourcet, streamingCommons, stringsearch, text, time -, transformers, void, wai, waiLogger, word8, zlib +, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec +, httpTypes, HUnit, liftedBase, network, resourcet +, streamingCommons, stringsearch, text, time, transformers, void +, wai, waiLogger, word8, zlib }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.2.1"; - sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca"; + version = "3.0.2.2"; + sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { wai waiLogger word8 ]; testDepends = [ - blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet - text transformers wai zlib + fastLogger hspec httpTypes HUnit resourcet text transformers wai + zlib ]; jailbreak = true; meta = { From 574ad3e8d1a3708022e196bb2dde4861be389216 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:43 +0100 Subject: [PATCH 144/216] haskell-warp: update to version 3.0.4 --- 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 abca63eaf1b..ae363291803 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.2.3"; - sha256 = "16fwqd3nnw0bpa2a8ki0ynxif8a90qa20fvw5fmyngyvysl8g7qn"; + version = "3.0.4"; + sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr"; buildDepends = [ autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai From e3290b08455ea03b6705590518408fb88484117c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:45 +0100 Subject: [PATCH 145/216] haskell-websockets: update to version 0.9.2.1 --- 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 2b80e524d4a..79e03b748e6 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.9.1.0"; - sha256 = "18q2dax5d4qh7didr2jhsns07lsybab4v231wjxn6iiyf9f7f16i"; + version = "0.9.2.1"; + sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy mtl network random SHA text From b619754ede17ab044b772b4b7f205d27d4ccf798 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:47 +0100 Subject: [PATCH 146/216] haskell-wl-pprint-extras: update to version 3.5.0.3 --- .../libraries/haskell/wl-pprint-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 0165e0a82ea..0507b1ea1a6 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.5.0.2"; - sha256 = "1wh8nm7h8bbr1xxf0q3cwb837jk5y1cq4l2h6lw63wavwqqvjfw6"; + version = "3.5.0.3"; + sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { From b0e9e7875f66691b7f5bd4f722147f73ded20a9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:49 +0100 Subject: [PATCH 147/216] haskell-wl-pprint-terminfo: update to version 3.7.1.3 --- .../libraries/haskell/wl-pprint-terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 30636f6b97c..6f2e62008f5 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.7.1.2"; - sha256 = "17c5ys8730hhhpy0swk4yxrjs1042w4m7aypsfnzzk3b0cw94q56"; + version = "3.7.1.3"; + sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; From 6a4b71971b62fc39807811d970f5ad2c586d284f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:51 +0100 Subject: [PATCH 148/216] haskell-yaml: update to version 0.8.10.1 --- .../libraries/haskell/yaml/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e00e7c4712d..bf63586eed4 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, attoparsec, conduit, filepath, hspec -, HUnit, resourcet, scientific, text, transformers -, unorderedContainers, vector +{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions +, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific +, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.10"; - sha256 = "1m51h253gcp77a0sjsckccrwz5ajd991ppczvyhnprphx1y210ig"; + version = "0.8.10.1"; + sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec conduit filepath resourcet scientific text - transformers unorderedContainers vector + aeson attoparsec conduit enclosedExceptions filepath resourcet + scientific text transformers unorderedContainers vector ]; testDepends = [ - aeson aesonQq conduit hspec HUnit resourcet text transformers - unorderedContainers vector + aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text + transformers unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; From 5c73618435e01cc4e9e86babedad08359cc58d66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:53 +0100 Subject: [PATCH 149/216] haskell-yesod-bin: update to version 1.4.1 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4809609036b..7033bff4d15 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.9"; - sha256 = "0pm45wi72v0kx9cqbwsbq9g6w93cb8aknps6aa153vbv7k8ikn7v"; + version = "1.4.1"; + sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw"; isLibrary = false; isExecutable = true; buildDepends = [ From 2f7e7ddb9c217bfd07c52c6c27fff890eb1e8398 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:55 +0100 Subject: [PATCH 150/216] haskell-yesod-core: update to version 1.4.6 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 88b33620edc..8c87981a693 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.4.4"; - sha256 = "0l4a49a3y1m257zkzmvqwg5cm6shxzssgd143qqzhg1svikavv82"; + version = "1.4.6"; + sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g"; buildDepends = [ aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault From bd8578ba1e598f1f80188e200007764599c7256d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:57 +0100 Subject: [PATCH 151/216] haskell-yesod-form: update to version 1.4.3 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index f8645b3d108..f052a38357d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.4.1.1"; - sha256 = "0as2hgl78hqyci0f9ysa7sy3r7c8vq1a0a0y7wpbybz0c4690pqi"; + version = "1.4.3"; + sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate networkUri persistent resourcet From 58e825f616e1bf9a912edf639d9452d94fc745b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:51:59 +0100 Subject: [PATCH 152/216] haskell-yesod: update to version 1.4.1.1 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 2860cab4d1a..04b4ebee52f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.4.1"; - sha256 = "1h4l78qjaiv3aqw02cj3qakkxv7ds946iagdccm8pav2wlkdl5pw"; + version = "1.4.1.1"; + sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger monadControl monadLogger safe semigroups shakespeare From 09e7a217ff8234150eed9e5e5bfafd7230a60d6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:52:14 +0100 Subject: [PATCH 153/216] haskell-MonadRandom: update to version 0.3.0.1 --- .../libraries/haskell/MonadRandom/{0.3.nix => 0.3.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/MonadRandom/{0.3.nix => 0.3.0.1.nix} (80%) diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix similarity index 80% rename from pkgs/development/libraries/haskell/MonadRandom/0.3.nix rename to pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix index 8b522b5de43..0362804ed45 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.3"; - sha256 = "0bmsccjcz6glb0x0nkjlq3qywfibf0wxxv4dvdhjfw5sx6im9qx3"; + version = "0.3.0.1"; + sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49810e7e221..c7274f4be90 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1721,8 +1721,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; - MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; - MonadRandom = self.MonadRandom_0_3; + MonadRandom_0_3_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.3.0.1.nix {}; + MonadRandom = self.MonadRandom_0_3_0_1; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; From 58a5933b99e2259c5ba7eaad942509406e7d3004 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:54:42 +0100 Subject: [PATCH 154/216] haskell-monad-par: update to version 0.3.4.7 --- .../libraries/haskell/monad-par/{0.3.4.6.nix => 0.3.4.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.4.6.nix => 0.3.4.7.nix} (90%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix index d43379da7f9..c9d6cf71ae5 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.6"; - sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; + version = "0.3.4.7"; + sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c7274f4be90..99d4de51198 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1709,8 +1709,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadIO = callPackage ../development/libraries/haskell/monadIO {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; - monadPar = self.monadPar_0_3_4_6; + monadPar_0_3_4_7 = callPackage ../development/libraries/haskell/monad-par/0.3.4.7.nix {}; + monadPar = self.monadPar_0_3_4_7; monadParallel = callPackage ../development/libraries/haskell/monad-parallel {}; From ebe67709f172619506ce34a875998c9cf6be807c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:55:24 +0100 Subject: [PATCH 155/216] haskell-vector: update to version 0.10.12.2 --- .../libraries/haskell/vector/{0.10.12.1.nix => 0.10.12.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.12.1.nix => 0.10.12.2.nix} (88%) diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix similarity index 88% rename from pkgs/development/libraries/haskell/vector/0.10.12.1.nix rename to pkgs/development/libraries/haskell/vector/0.10.12.2.nix index e83a53b57a1..011c9b367fa 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.10.12.1"; - sha256 = "0m4m650yxv92dz8xgcjfkbhsl46hgnf02viwgdja5xmvg3aa8fcp"; + version = "0.10.12.2"; + sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; buildDepends = [ deepseq primitive ]; testDepends = [ QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 99d4de51198..9056a4931e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2752,8 +2752,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; - vector = self.vector_0_10_12_1; + vector_0_10_12_2 = callPackage ../development/libraries/haskell/vector/0.10.12.2.nix {}; + vector = self.vector_0_10_12_2; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 6ad9a196845c57eff6be386dc3fbade0415dd49e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:56:05 +0100 Subject: [PATCH 156/216] haskell-parallel: update to version 3.2.0.5 --- .../libraries/haskell/parallel/{3.2.0.4.nix => 3.2.0.5.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parallel/{3.2.0.4.nix => 3.2.0.5.nix} (79%) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix similarity index 79% rename from pkgs/development/libraries/haskell/parallel/3.2.0.4.nix rename to pkgs/development/libraries/haskell/parallel/3.2.0.5.nix index e1d1b24286d..987ee8c5bdc 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.4"; - sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc"; + version = "3.2.0.5"; + sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9056a4931e2..58195e1f868 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1900,8 +1900,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; - parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; - parallel = self.parallel_3_2_0_4; + parallel_3_2_0_5 = callPackage ../development/libraries/haskell/parallel/3.2.0.5.nix {}; + parallel = self.parallel_3_2_0_5; parallelIo = callPackage ../development/libraries/haskell/parallel-io {}; From bb770ba61d890dfcb3198a97fc16847140a428d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:56:51 +0100 Subject: [PATCH 157/216] haskell-scientific: update to version 0.3.3.3 --- .../libraries/haskell/scientific/{0.3.3.2.nix => 0.3.3.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/scientific/{0.3.3.2.nix => 0.3.3.3.nix} (89%) diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix similarity index 89% rename from pkgs/development/libraries/haskell/scientific/0.3.3.2.nix rename to pkgs/development/libraries/haskell/scientific/0.3.3.3.nix index e43b6734d77..10e294b4214 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.3.2"; - sha256 = "17lxxjfbmmlr0ppkrhw42lqhcg42nk21n5l2x9i6b87g8qr37jii"; + version = "0.3.3.3"; + sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn"; buildDepends = [ deepseq hashable text ]; testDepends = [ QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 58195e1f868..2a08bdf4847 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2227,8 +2227,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_3_2 = callPackage ../development/libraries/haskell/scientific/0.3.3.2.nix {}; - scientific = self.scientific_0_3_3_2; + scientific_0_3_3_3 = callPackage ../development/libraries/haskell/scientific/0.3.3.3.nix {}; + scientific = self.scientific_0_3_3_3; scotty = callPackage ../development/libraries/haskell/scotty {}; From 610981dcf0c12cf1a2f665e9c08bd34d8d306f2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:57:54 +0100 Subject: [PATCH 158/216] haskell-transformers: add version 0.4.2.0 --- .../haskell/transformers/{0.4.1.0.nix => 0.4.2.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/transformers/{0.4.1.0.nix => 0.4.2.0.nix} (81%) diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix similarity index 81% rename from pkgs/development/libraries/haskell/transformers/0.4.1.0.nix rename to pkgs/development/libraries/haskell/transformers/0.4.2.0.nix index d705040387b..3557941a9a8 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "transformers"; - version = "0.4.1.0"; - sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg"; + version = "0.4.2.0"; + sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr"; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { description = "Concrete functor and monad transformers"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2a08bdf4847..02271e27f8a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2628,7 +2628,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tostring = callPackage ../development/libraries/haskell/tostring {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; - transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; + transformers_0_4_2_0 = callPackage ../development/libraries/haskell/transformers/0.4.2.0.nix {}; transformers = null; # core package since ghc >= 7.8.x transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; From d2b117e0f6de8c6d790c3765fb1c7a21deec6241 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 09:58:39 +0100 Subject: [PATCH 159/216] haskell-zip-archive: update to version 0.2.3.5 --- .../haskell/zip-archive/{0.2.3.4.nix => 0.2.3.5.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/zip-archive/{0.2.3.4.nix => 0.2.3.5.nix} (87%) diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix similarity index 87% rename from pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix rename to pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix index a7732367710..8369b2a3eb5 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.2.3.4"; - sha256 = "1c589cpl1jax1r60b92az1800b67zrva3dndhv9hcxidlgyf46gp"; + version = "0.2.3.5"; + sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl text time zlib ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 02271e27f8a..8ebfa4030f4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2942,8 +2942,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; - zipArchive_0_2_3_4 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.4.nix {}; - zipArchive = self.zipArchive_0_2_3_4; + zipArchive_0_2_3_5 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.5.nix {}; + zipArchive = self.zipArchive_0_2_3_5; zipper = callPackage ../development/libraries/haskell/zipper {}; From 19fb43bd889f93ddf7da1af133b38f07239fddbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:00:38 +0100 Subject: [PATCH 160/216] haskell-DRBG: update to version 0.5.3 --- pkgs/development/libraries/haskell/DRBG/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix index c192ad4302e..741368799d1 100644 --- a/pkgs/development/libraries/haskell/DRBG/default.nix +++ b/pkgs/development/libraries/haskell/DRBG/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "DRBG"; - version = "0.5.2"; - sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi"; + version = "0.5.3"; + sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8"; isLibrary = true; isExecutable = true; buildDepends = [ From 006e4b45e2da31a22ffb3bc434b5e275dce4d589 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:00:41 +0100 Subject: [PATCH 161/216] haskell-FontyFruity: update to version 0.4 --- pkgs/development/libraries/haskell/FontyFruity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix index 1a613492f43..325ed34c5d6 100644 --- a/pkgs/development/libraries/haskell/FontyFruity/default.nix +++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "FontyFruity"; - version = "0.3"; - sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4"; + version = "0.4"; + sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf"; buildDepends = [ binary deepseq filepath text vector ]; meta = { description = "A true type file format loader"; From 93bd19981154d68d883b501fad54af68fbea7530 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:00:43 +0100 Subject: [PATCH 162/216] haskell-JuicyPixels: update to version 3.2 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 2305756f93b..e8c1c610e89 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.7.1"; - sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap"; + version = "3.2"; + sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From f52619082ee44a86342ebe10a03fbba6fbd08158 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:09:26 +0100 Subject: [PATCH 163/216] haskell-text: update to version 1.2.0.2 --- .../haskell/text/{1.2.0.0.nix => 1.2.0.2.nix} | 12 ++++++------ pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/text/{1.2.0.0.nix => 1.2.0.2.nix} (55%) diff --git a/pkgs/development/libraries/haskell/text/1.2.0.0.nix b/pkgs/development/libraries/haskell/text/1.2.0.2.nix similarity index 55% rename from pkgs/development/libraries/haskell/text/1.2.0.0.nix rename to pkgs/development/libraries/haskell/text/1.2.0.2.nix index c588c65ba94..9530d6b595d 100644 --- a/pkgs/development/libraries/haskell/text/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/text/1.2.0.2.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 +{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "text"; - version = "1.2.0.0"; - sha256 = "0c681yaqq68imj77qzy0j4iag8q90mhnnaalfwc08nzv8cr6c8z6"; + version = "1.2.0.2"; + sha256 = "1ia9ygns4yz46pmzbswvl7mgbmgw6ywnpk0cfjsgc6p9i3xxpv96"; buildDepends = [ deepseq ]; testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 + deepseq HUnit QuickCheck quickcheckUnicode random testFramework + testFrameworkHunit testFrameworkQuickcheck2 ]; doCheck = false; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8ebfa4030f4..50b60a7d095 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2564,8 +2564,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; - text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; - text = self.text_1_2_0_0; + text_1_2_0_2 = callPackage ../development/libraries/haskell/text/1.2.0.2.nix {}; + text = self.text_1_2_0_2; textBinary = callPackage ../development/libraries/haskell/text-binary {}; From 299fe02d004a37e79f8fd225225eeb9f0dc4bcb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:09:48 +0100 Subject: [PATCH 164/216] haskell-quickcheck-unicode: add version 1.0.0.0 --- .../haskell/quickcheck-unicode/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/quickcheck-unicode/default.nix diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix new file mode 100644 index 00000000000..edc2924f09b --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "quickcheck-unicode"; + version = "1.0.0.0"; + sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + buildDepends = [ QuickCheck ]; + meta = { + homepage = "https://github.com/bos/quickcheck-unicode"; + description = "Generator and shrink functions for testing Unicode-related software"; + 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 50b60a7d095..e0b566a49c5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2088,6 +2088,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {}; + quickcheckUnicode = callPackage ../development/libraries/haskell/quickcheck-unicode {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; }; From 0028f765f451c935c41106dda98c660ed41bdc29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:09:58 +0100 Subject: [PATCH 165/216] haskell-type-aligned: add version 0.9.3 --- .../libraries/haskell/type-aligned/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/type-aligned/default.nix diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix new file mode 100644 index 00000000000..a1e547ca0e2 --- /dev/null +++ b/pkgs/development/libraries/haskell/type-aligned/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-aligned"; + version = "0.9.3"; + sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0"; + meta = { + homepage = "https://github.com/atzeus/type-aligned"; + description = "Various type-aligned sequence data structures"; + 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 e0b566a49c5..4d4205d203e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2657,6 +2657,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {}; + typeAligned = callPackage ../development/libraries/haskell/type-aligned {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; typeEq = callPackage ../development/libraries/haskell/type-eq {}; From bfc2e348b1773adda49edf5433e7d01cb52a3e1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:08 +0100 Subject: [PATCH 166/216] haskell-aws: update to version 0.11 --- pkgs/development/libraries/haskell/aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 8f0818f43d6..1069c9da1e9 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.10.5"; - sha256 = "1d82q2477wp08zavlkzsksalbkiczz3vzy17ijk2z5xsw5yslqnj"; + version = "0.11"; + sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9"; isLibrary = true; isExecutable = true; buildDepends = [ From 4e47c0d54e4fe537ea0dad896e6ed70855c90e13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:10 +0100 Subject: [PATCH 167/216] haskell-concurrent-extra: update to version 0.7.0.9 --- .../haskell/concurrent-extra/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 43230662fe0..69c1d1edddc 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,24 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, baseUnicodeSymbols, HUnit, random, stm -, testFramework, testFrameworkHunit, unboundedDelays +{ cabal, async, HUnit, random, stm, testFramework +, testFrameworkHunit, unboundedDelays }: cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.8"; - sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q"; - buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; + version = "0.7.0.9"; + sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw"; + buildDepends = [ stm unboundedDelays ]; testDepends = [ - async baseUnicodeSymbols HUnit random stm testFramework - testFrameworkHunit unboundedDelays + async HUnit random stm testFramework testFrameworkHunit + unboundedDelays ]; meta = { homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) From 47aea6758bbf1cd90aab3566f173b4cf1f69ada3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:12 +0100 Subject: [PATCH 168/216] haskell-extensible-effects: update to version 1.9.0.1 --- .../haskell/extensible-effects/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 310e0f37dd0..e7f1f16059d 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -1,20 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, free, HUnit, kanExtensions, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers -, transformersBase +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers, transformersBase +, typeAligned, void }: cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.8.1.0"; - sha256 = "0ssnb1c63lnal6k8f1v36scwqr8m430gq0ssss7r8ndqcbpnlc64"; - buildDepends = [ - free kanExtensions transformers transformersBase - ]; + version = "1.9.0.1"; + sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx"; + buildDepends = [ transformers transformersBase typeAligned void ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 + testFrameworkQuickcheck2 void ]; jailbreak = true; meta = { From 7db1933714ac15038b0d820a401d3c4fe5aeaaeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:14 +0100 Subject: [PATCH 169/216] haskell-hashable: update to version 1.2.3.0 --- pkgs/development/libraries/haskell/hashable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index bfd9ec03c0e..ba2690e6ce8 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.2.0"; - sha256 = "08cfm1rzhf3d8dzn0iqadfs35151ff6szhnh4bwrpxcs6sq90fh3"; + version = "1.2.3.0"; + sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit From 33044f3e501b013a97a692364359b6293869951a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:16 +0100 Subject: [PATCH 170/216] haskell-kan-extensions: update to version 4.1.1 --- pkgs/development/libraries/haskell/kan-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index dce273d60a6..d359cebd6e1 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.1.0.1"; - sha256 = "1jrs5cp5bhv3sjfi3d2zl16x40fr086zadp69r8yigj43bgkwkkd"; + version = "4.1.1"; + sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed semigroupoids tagged transformers From 4bf6a994a0b9d9b37a405bda4ef09b5a91025012 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:18 +0100 Subject: [PATCH 171/216] haskell-monad-logger: update to version 0.3.11 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 032c9e37b2f..68e3c0164c0 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.10.1"; - sha256 = "1m1bcx995w283a0jcwqn8z3daafybndhj4y0xxgccip8038xf0rl"; + version = "0.3.11"; + sha256 = "0ydxv4pdq660dh3cdmsd5lgjkfhh7c62kb5vcl8jl6qmjf8kvmdq"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text From 44024b3a341ec23cb589f9e4310cc355ab0b34ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:20 +0100 Subject: [PATCH 172/216] haskell-streaming-commons: update to version 0.1.7.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 c2d62b07786..c4d19f61188 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.7.2"; - sha256 = "0viv96kspszazrca3kzd3rv6hyqb8rx00kjr9ny0hkd518nmymxj"; + version = "0.1.7.3"; + sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; From 9b8d3eea40fd98413763bce664d5bb620e047749 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 10:10:22 +0100 Subject: [PATCH 173/216] haskell-wreq: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/wreq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 33535074fb9..8b6e7151273 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "wreq"; - version = "0.3.0.0"; - sha256 = "06k6ipbwx46816q0wq9ll0rj91qak2zf74vb2ggcsvdxcnzwm5dp"; + version = "0.3.0.1"; + sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4"; isLibrary = true; isExecutable = true; buildDepends = [ From 711a340ec3c2029dfaea90666eb03c62f792da17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 15:43:32 +0100 Subject: [PATCH 174/216] haskell-fay-base: update to version 0.19.4.1 --- pkgs/development/libraries/haskell/fay-base/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index e978d5ec939..7287135b45d 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.2.1"; - sha256 = "19vzrdbd1c8wws4mccycpq70594qy2ka3mr5x5fsdya56ff4xgld"; + version = "0.19.4.1"; + sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6"; buildDepends = [ fay ]; meta = { - homepage = "https://github.com/faylang/fay-base"; + homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From a135f6a60d23c8a6ede006b3c7133c7ad28188f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 15:43:34 +0100 Subject: [PATCH 175/216] haskell-fay-text: update to version 0.3.2 --- pkgs/development/libraries/haskell/fay-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index 7f80072335a..a6f33bac6d0 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-text"; - version = "0.3.1"; - sha256 = "0blr39vah0zd3i6clzzgmsfhxncwj8q6j4widk27iz3l27nlyin8"; + version = "0.3.2"; + sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m"; buildDepends = [ fay fayBase text ]; meta = { homepage = "https://github.com/faylang/fay-text"; From d699a6fe772e192e0ede7c173407eda4fd3d9591 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 15:43:36 +0100 Subject: [PATCH 176/216] haskell-fay: update to version 0.21.2.1 --- pkgs/development/libraries/haskell/fay/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index bcb58a44e08..e067b43bce6 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.21.0.2"; - sha256 = "0hq9jfyl5ki3jcwffb9q7cxrgpchajgwk4j44kz37y1wji63lk96"; + version = "0.21.2.1"; + sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { sourcemap split spoon syb text time transformers uniplate unorderedContainers utf8String vector ]; + jailbreak = true; meta = { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; From cbe049de9429e7e29ae206ea49299546ba2f60e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 15:43:38 +0100 Subject: [PATCH 177/216] haskell-network-fancy: update to version 0.2.2 --- pkgs/development/libraries/haskell/network-fancy/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix index 21c3e43d588..92e6e9e34c7 100644 --- a/pkgs/development/libraries/haskell/network-fancy/default.nix +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -4,9 +4,8 @@ cabal.mkDerivation (self: { pname = "network-fancy"; - version = "0.2.1"; - sha256 = "1n8i7vyg1csdxxq7nip84ydkx3c8gykmqxg27ir0mmgj3p1jb42c"; - doCheck = false; + version = "0.2.2"; + sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j"; meta = { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; From 43fc6e104fcc6a297ea95cac0c391f65d67c7805 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Dec 2014 15:43:39 +0100 Subject: [PATCH 178/216] haskell-skein: update to version 1.0.9.2 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 4e4ce204ed1..c60bf97d54f 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.9.1"; - sha256 = "05as5glin9vikxxbnp5wpklqjd5hh9n28asxx147blmiz0x45dw8"; + version = "1.0.9.2"; + sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; From 278b5ab3f9632fa43d4cf2970df7e22e737c83c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 11:57:52 +0100 Subject: [PATCH 179/216] haskell-hashtables: update to version 1.2.0.1 --- .../libraries/haskell/hashtables/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index f8f382e8bd1..ddccebeb48d 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,11 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, primitive, vector }: +{ cabal, fetchgit, hashable, primitive, vector }: cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.2.0.0"; - sha256 = "0q2zzrsx899wkhjvyqiwj0jkjr81dl3ghlrvgk0vzkkz9g901k0x"; + version = "1.2.0.1"; + src = fetchgit { + url = "git://github.com/gregorycollins/hashtables.git"; + sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129"; + rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0"; + }; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From be646eb8de457de4b0be8e8e5b8c5ab93afaf618 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:04:25 +0100 Subject: [PATCH 180/216] haskell-base-prelude: update to version 0.1.7 --- pkgs/development/libraries/haskell/base-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix index fdbd2b85510..5cf966f35bd 100644 --- a/pkgs/development/libraries/haskell/base-prelude/default.nix +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "base-prelude"; - version = "0.1.6"; - sha256 = "1lc8j3wfaqh42pqshlizkpr67ghkr1m90m1g9xiw8h36p8n72fcm"; + version = "0.1.7"; + sha256 = "0xzgwj5sqx7y57biby77d6vrsghcmq85ha3frn8k4xq7wqqk4aqp"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; From 542a540b90ef4353e03847128508118d526643a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:04:27 +0100 Subject: [PATCH 181/216] haskell-generics-sop: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/generics-sop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix index 2fce6c66be5..60821d24895 100644 --- a/pkgs/development/libraries/haskell/generics-sop/default.nix +++ b/pkgs/development/libraries/haskell/generics-sop/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "generics-sop"; - version = "0.1.0.2"; - sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra"; + version = "0.1.0.3"; + sha256 = "0wvrav5armspfp6iixns1db45xfpqicx74asi14a2gnl28yqmfpl"; buildDepends = [ tagged ]; meta = { description = "Generic Programming using True Sums of Products"; From b7b906d6d23dbf5a3c89a01d686407af7043201a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:04:29 +0100 Subject: [PATCH 182/216] haskell-pointed: update to version 4.1.1 --- pkgs/development/libraries/haskell/pointed/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index f486737765e..82ee1a418c7 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "pointed"; - version = "4.1"; - sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g"; + version = "4.1.1"; + sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj"; buildDepends = [ comonad dataDefaultClass semigroupoids semigroups stm tagged - transformers + transformers transformersCompat ]; jailbreak = true; meta = { From 7428c5dac9976c19769f2bfd4bc4c52cd4b9e58a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:04:31 +0100 Subject: [PATCH 183/216] haskell-stm-containers: update to version 0.2.6 --- pkgs/development/libraries/haskell/stm-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index 5b280aa4c8a..157e8cd5f2b 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.2.4"; - sha256 = "0qwyy0znd97w52kq9azg9bnc6578x1wvfhknh7qd8sz50gz19qwy"; + version = "0.2.6"; + sha256 = "1kmrkwqqhgmbmycnxf86mdcc5yf3v8irbga3nmpi9wz1hmb0vcjy"; buildDepends = [ basePrelude focus hashable listT lochTh placeholders primitive transformers From 6ce03b674d0865be389e5a59f674ea2cff80f9da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:04:33 +0100 Subject: [PATCH 184/216] haskell-vk-posix-pty: update to version 0.2.1 --- .../development/libraries/haskell/vk-posix-pty/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix index 533b9ae7215..52a57bd0cae 100644 --- a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix +++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "vk-posix-pty"; - version = "0.2.0.2"; - sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh"; + version = "0.2.1"; + sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97"; isLibrary = true; isExecutable = true; meta = { - homepage = "https://bitbucket.org/merijnv/posix-pty -https://github.com/proger/posix-pty/tree/fork"; + homepage = "https://github.com/proger/posix-pty/tree/fork"; description = "Pseudo terminal interaction with subprocesses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 8e2b61c5d359aa8f0c0f13fe016fbb0c6cb36106 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:50:50 +0100 Subject: [PATCH 185/216] Build Agda and hindent with a recent version of src-exts. --- pkgs/top-level/haskell-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4d4205d203e..033a6335010 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1208,9 +1208,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hi = callPackage ../development/libraries/haskell/hi {}; - hindent = callPackage ../development/libraries/haskell/hindent { - haskellSrcExts = self.haskellSrcExts_1_15_0_1; - }; + hindent = callPackage ../development/libraries/haskell/hindent {}; hint = callPackage ../development/libraries/haskell/hint {}; @@ -2963,7 +2961,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda = callPackage ../development/compilers/agda { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; + Agda = callPackage ../development/compilers/agda {}; epic = callPackage ../development/compilers/epic {}; From 809dd0790f59954a4f0a1ec1596e56723cd968c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:52:44 +0100 Subject: [PATCH 186/216] haskell-equational-reasoning: jailbreak to support recent versions of 'void' --- .../libraries/haskell/equational-reasoning/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix index fa88fbfe2e8..b9562573f8f 100644 --- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix +++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.0.4"; sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j"; buildDepends = [ singletons tagged void ]; + jailbreak = true; meta = { description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = self.stdenv.lib.licenses.bsd3; From 3ff373819e270d2e4ab1b007c8f447eaec2e0850 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:54:34 +0100 Subject: [PATCH 187/216] haskell-hspec2: mark package as broken hspec2 doesn't compile any more, and the package is a "deprecated alpha release of hspec 2.0" according to the Hackage homepage, i.e. people should simply use hspec 2.x instead. --- pkgs/development/libraries/haskell/hspec2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index c833b80bb9f..c6f64c92182 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) From c9352c5c83ecb49d2f1a83ba24feced74eea08e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 12:56:34 +0100 Subject: [PATCH 188/216] haskell-network-transport-tests: jailbreak to support recent versions of 'random' --- .../libraries/haskell/network-transport-tests/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index ec14ac5e173..5ee1edec2e9 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1.0"; sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64"; buildDepends = [ ansiTerminal mtl networkTransport random ]; + jailbreak = true; meta = { homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; From 1cbd08aa152e3d3cc8477ba29db3c194cca7342d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 14:05:16 +0100 Subject: [PATCH 189/216] haskell-text: update to version 1.2.0.3 --- .../libraries/haskell/text/{1.2.0.2.nix => 1.2.0.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/text/{1.2.0.2.nix => 1.2.0.3.nix} (88%) diff --git a/pkgs/development/libraries/haskell/text/1.2.0.2.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix similarity index 88% rename from pkgs/development/libraries/haskell/text/1.2.0.2.nix rename to pkgs/development/libraries/haskell/text/1.2.0.3.nix index 9530d6b595d..d0d2112a5e2 100644 --- a/pkgs/development/libraries/haskell/text/1.2.0.2.nix +++ b/pkgs/development/libraries/haskell/text/1.2.0.3.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "1.2.0.2"; - sha256 = "1ia9ygns4yz46pmzbswvl7mgbmgw6ywnpk0cfjsgc6p9i3xxpv96"; + version = "1.2.0.3"; + sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x"; buildDepends = [ deepseq ]; testDepends = [ deepseq HUnit QuickCheck quickcheckUnicode random testFramework diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 033a6335010..c930746e25d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2564,8 +2564,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; - text_1_2_0_2 = callPackage ../development/libraries/haskell/text/1.2.0.2.nix {}; - text = self.text_1_2_0_2; + text_1_2_0_3 = callPackage ../development/libraries/haskell/text/1.2.0.3.nix {}; + text = self.text_1_2_0_3; textBinary = callPackage ../development/libraries/haskell/text-binary {}; From 5b44f1ea1d200402fbd192f6d438d28d791fe2e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Dec 2014 14:05:41 +0100 Subject: [PATCH 190/216] haskell-ghc-events-analyze: update to version 0.2.1 --- pkgs/development/tools/haskell/ghc-events-analyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index b58d8d1429b..cbf871820ff 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-events-analyze"; - version = "0.2.0"; - sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4"; + version = "0.2.1"; + sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4"; isLibrary = false; isExecutable = true; buildDepends = [ From 5c405a815266bb7cec25f06bd5877c11e23a71bc Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Fri, 12 Dec 2014 15:58:44 +0100 Subject: [PATCH 191/216] Update servant packages to 0.2 --- .../haskell/servant-client/default.nix | 27 ++++++++++++++++ .../haskell/servant-docs/default.nix | 23 ++++++++++++++ .../haskell/servant-jquery/default.nix | 22 +++++++++++++ .../haskell/servant-pool/default.nix | 16 ---------- .../haskell/servant-postgresql/default.nix | 18 ----------- .../haskell/servant-response/default.nix | 16 ---------- .../haskell/servant-scotty/default.nix | 20 ------------ .../haskell/servant-server/default.nix | 31 +++++++++++++++++++ .../libraries/haskell/servant/default.nix | 12 ++++--- pkgs/top-level/haskell-packages.nix | 8 ++--- 10 files changed, 114 insertions(+), 79 deletions(-) create mode 100644 pkgs/development/libraries/haskell/servant-client/default.nix create mode 100644 pkgs/development/libraries/haskell/servant-docs/default.nix create mode 100644 pkgs/development/libraries/haskell/servant-jquery/default.nix delete mode 100644 pkgs/development/libraries/haskell/servant-pool/default.nix delete mode 100644 pkgs/development/libraries/haskell/servant-postgresql/default.nix delete mode 100644 pkgs/development/libraries/haskell/servant-response/default.nix delete mode 100644 pkgs/development/libraries/haskell/servant-scotty/default.nix create mode 100644 pkgs/development/libraries/haskell/servant-server/default.nix diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix new file mode 100644 index 00000000000..d11e25222ea --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-client/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec +, httpClient, httpTypes, network, networkUri, QuickCheck, safe +, servant, servantServer, stringConversions, text, transformers +, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-client"; + version = "0.2.1"; + sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn"; + buildDepends = [ + aeson attoparsec either exceptions httpClient httpTypes networkUri + safe servant stringConversions text transformers + ]; + testDepends = [ + aeson deepseq either hspec httpTypes network QuickCheck servant + servantServer wai warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix new file mode 100644 index 00000000000..3da6936532c --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-docs/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, hashable, lens, servant, stringConversions +, systemFilepath, text, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "servant-docs"; + version = "0.2.1"; + sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson hashable lens servant stringConversions systemFilepath text + unorderedContainers + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix new file mode 100644 index 00000000000..2a85cb19106 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-jquery/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, filepath, lens, servant, servantServer, stm +, transformers, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-jquery"; + version = "0.2.1"; + sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson filepath lens servant servantServer stm transformers warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive jquery-based javascript functions to query servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix deleted file mode 100644 index 692d694ed46..00000000000 --- a/pkgs/development/libraries/haskell/servant-pool/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, resourcePool, servant, time }: - -cabal.mkDerivation (self: { - pname = "servant-pool"; - version = "0.1"; - sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69"; - buildDepends = [ resourcePool servant time ]; - meta = { - homepage = "http://github.com/zalora/servant-pool"; - description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-postgresql/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix deleted file mode 100644 index 154eefea320..00000000000 --- a/pkgs/development/libraries/haskell/servant-postgresql/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, postgresqlSimple, servant, servantPool, servantResponse }: - -cabal.mkDerivation (self: { - pname = "servant-postgresql"; - version = "0.1"; - sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj"; - buildDepends = [ - postgresqlSimple servant servantPool servantResponse - ]; - meta = { - homepage = "http://github.com/zalora/servant-postgresql"; - description = "Useful functions and instances for using servant with a PostgreSQL context"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-response/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix deleted file mode 100644 index 3f7f9c1eee0..00000000000 --- a/pkgs/development/libraries/haskell/servant-response/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, text }: - -cabal.mkDerivation (self: { - pname = "servant-response"; - version = "0.1"; - sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy"; - buildDepends = [ aeson httpTypes text ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix deleted file mode 100644 index 732b2c95cc7..00000000000 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text -, transformers -}: - -cabal.mkDerivation (self: { - pname = "servant-scotty"; - version = "0.1.1"; - sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783"; - buildDepends = [ - aeson httpTypes scotty servant servantResponse text transformers - ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Generate a web service for servant 'Resource's using scotty and JSON"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix new file mode 100644 index 00000000000..7776af8036d --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai +, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant +, split, stringConversions, systemFilepath, temporary, text +, transformers, wai, waiAppStatic, waiExtra, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-server"; + version = "0.2.1"; + sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec either httpTypes networkUri safe servant split + stringConversions systemFilepath text transformers wai waiAppStatic + warp + ]; + testDepends = [ + aeson either exceptions hspec hspecWai httpTypes network parsec + QuickCheck servant stringConversions temporary text transformers + wai waiExtra warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix index 38f89764c4c..1c206c1ab22 100644 --- a/pkgs/development/libraries/haskell/servant/default.nix +++ b/pkgs/development/libraries/haskell/servant/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, hspec, parsec, QuickCheck, stringConversions, text }: cabal.mkDerivation (self: { pname = "servant"; - version = "0.1"; - sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + version = "0.2.1"; + sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x"; + buildDepends = [ parsec stringConversions text ]; + testDepends = [ hspec parsec QuickCheck stringConversions text ]; meta = { - homepage = "http://github.com/zalora/servant"; - description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you"; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; 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 c930746e25d..51b53743e94 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2250,13 +2250,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in servant = callPackage ../development/libraries/haskell/servant {}; - servantPool = callPackage ../development/libraries/haskell/servant-pool {}; + servantServer = callPackage ../development/libraries/haskell/servant-server {}; - servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + servantClient = callPackage ../development/libraries/haskell/servant-client {}; - servantResponse = callPackage ../development/libraries/haskell/servant-response {}; + servantDocs = callPackage ../development/libraries/haskell/servant-docs {}; - servantScotty = callPackage ../development/libraries/haskell/servant-scotty {}; + servantJquery = callPackage ../development/libraries/haskell/servant-jquery {}; setenv = callPackage ../development/libraries/haskell/setenv {}; From 0df1c05f71eab126953de12be375dc144efa21c7 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 11 Dec 2014 16:12:29 -0500 Subject: [PATCH 192/216] Add the Profile Sync Daemon Package & NixOS Module --- nixos/modules/module-list.nix | 1 + .../services/desktops/profile-sync-daemon.nix | 139 ++++++++++++++++++ .../misc/profile-sync-daemon/default.nix | 32 ++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 174 insertions(+) create mode 100644 nixos/modules/services/desktops/profile-sync-daemon.nix create mode 100644 pkgs/tools/misc/profile-sync-daemon/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ec5e4e0fab4..2cee8cb502a 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -137,6 +137,7 @@ ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix + ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix new file mode 100644 index 00000000000..c662c5d0fa6 --- /dev/null +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -0,0 +1,139 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.psd; + + configFile = '' + ${if cfg.users != [ ] then '' + USERS="${concatStringsSep " " cfg.users}" + '' else ""} + + ${if cfg.browsers != [ ] then '' + BROWSERS="${concatStringsSep " " cfg.browsers}" + '' else ""} + + ${optionalString (cfg.volatile != "") "VOLATILE=${cfg.volatile}"} + ${optionalString (cfg.daemonFile != "") "DAEMON_FILE=${cfg.daemonFile}"} + ''; +in { + options.services.psd = with types; { + enable = mkOption { + type = bool; + default = false; + description = '' + Whether to enable the Profile Sync daemon. + ''; + }; + + users = mkOption { + type = listOf str; + default = [ ]; + example = [ "demo" ]; + description = '' + A list of users whose browser profiles should be sync'd to tmpfs. + ''; + }; + + browsers = mkOption { + type = listOf str; + default = [ ]; + example = [ "chromium" "firefox" ]; + description = '' + A list of browsers to sync. Available choices are: + + chromium chromium-dev conkeror.mozdev.org epiphany firefox + firefox-trunk google-chrome google-chrome-beta google-chrome-unstable + heftig-aurora icecat luakit midori opera opera-developer opera-beta + qupzilla palemoon rekonq seamonkey + + An empty list will enable all browsers. + ''; + }; + + resyncTimer = mkOption { + type = str; + default = "1h"; + example = "1h 30min"; + description = '' + The amount of time to wait before syncing browser profiles back to the + disk. + + Takes a systemd.unit time span. The time unit defaults to seconds if + omitted. + ''; + }; + + volatile = mkOption { + type = str; + default = "/run/psd-profiles"; + description = '' + The directory where browser profiles should reside(this should be + mounted as a tmpfs). Do not include a trailing backslash. + ''; + }; + + daemonFile = mkOption { + type = str; + default = "/run/psd"; + description = '' + Where the pid and backup configuration files will be stored. + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd = { + services = { + psd = { + description = "Profile Sync daemon"; + wants = [ "psd-resync.service" "local-fs.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = "mkdir -p ${cfg.volatile}"; + + path = with pkgs; [ glibc rsync gawk ]; + + unitConfig = { + RequiresMountsFor = [ "/home/" ]; + }; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync"; + + ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync"; + }; + }; + + psd-resync = { + description = "Timed profile resync"; + after = [ "psd.service" ]; + wants = [ "psd-resync.timer" ]; + partOf = [ "psd.service" ]; + + path = with pkgs; [ glibc rsync gawk ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync"; + }; + }; + }; + + timers.psd-resync = { + description = "Timer for profile sync daemon - 1 Hour"; + partOf = [ "psd-resync.service" "psd.service" ]; + + timerConfig = { + OnUnitActiveSec = "${cfg.resyncTimer}"; + }; + }; + }; + + environment.etc."psd.conf".text = configFile; + + }; +} diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix new file mode 100644 index 00000000000..d3f017171cb --- /dev/null +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, rsync, glibc, gawk }: + +stdenv.mkDerivation rec { + version = "v5.53"; + name = "profile-sync-daemon-${version}"; + + src = fetchurl { + url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz"; + sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; + }; + + installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all"; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "Syncs browser profile dirs to RAM"; + longDescription = '' + Profile-sync-daemon (psd) is a tiny pseudo-daemon designed to manage your + browser's profile in tmpfs and to periodically sync it back to your + physical disc (HDD/SSD). This is accomplished via a symlinking step and + an innovative use of rsync to maintain back-up and synchronization + between the two. One of the major design goals of psd is a completely + transparent user experience. + ''; + homepage = https://github.com/graysky2/profile-sync-daemon; + downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + license = licenses.mit; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42de5f12242..32c4431b8a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2171,6 +2171,8 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; + projectm = callPackage ../applications/audio/projectm { }; proot = callPackage ../tools/system/proot { }; From f4bde46b0f21c4b0e64729af21b4401254e369b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 13 Dec 2014 15:22:31 +0100 Subject: [PATCH 193/216] hhvm: use upstream patches to fix the build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b7894032b4708a8c9ccee99aca1b7d6166546d4d) Signed-off-by: Domen Kožar --- ...a2ccceb98230ff517601ad60aa6bee36e2c4.patch | 40 +++++++++++++++++++ ...a31c26cc42fee79363a14c4a8f4fcbfffe63.patch | 40 +++++++++++++++++++ pkgs/development/compilers/hhvm/default.nix | 5 +++ 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch create mode 100644 pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch diff --git a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch new file mode 100644 index 00000000000..8ee5b31925f --- /dev/null +++ b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch @@ -0,0 +1,40 @@ +From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001 +From: Alex Malyshev +Date: Tue, 28 Oct 2014 15:55:34 -0700 +Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack + +Summary: This has randomly bitten me in open source builds. I intermittently get +an error saying that MAX isn't defined. + +Instead of trying to figure out what's going on, I'm just gonna switch +it to std::max. + +Reviewed By: @paulbiss + +Differential Revision: D1636740 +--- + hphp/runtime/base/zend-pack.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp +index d878ea4..c3ee14d 100644 +--- a/hphp/runtime/base/zend-pack.cpp ++++ b/hphp/runtime/base/zend-pack.cpp +@@ -21,6 +21,8 @@ + #include "hphp/runtime/base/builtin-functions.h" + #include "hphp/util/tiny-vector.h" + ++#include ++ + namespace HPHP { + + #define INC_OUTPUTPOS(a,b) \ +@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) { + case 'a': + case 'A': + case 'Z': { +- int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); ++ int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1); + memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg); + val = argv[currentarg++].toString(); + s = val.c_str(); diff --git a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch new file mode 100644 index 00000000000..f7cf29b739f --- /dev/null +++ b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch @@ -0,0 +1,40 @@ +From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001 +From: Jordan DeLong +Date: Mon, 6 Oct 2014 18:30:28 -0700 +Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter + +Summary: has preferable type-safe versions that don't double-eval +their args. + +Reviewed By: @paulbiss + +Differential Revision: D1599803 +--- + hphp/compiler/analysis/emitter.cpp | 6 +++--- + hphp/util/compatibility.h | 4 ---- + 2 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp +index 321e637..b1d3f2d 100644 +--- a/hphp/compiler/analysis/emitter.cpp ++++ b/hphp/compiler/analysis/emitter.cpp +@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) { + if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L && + sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) { + m_actualStack.push_back(m_symStack.size()); +- *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr, +- (int)m_actualStack.size()); ++ *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr, ++ (int)m_actualStack.size()); + } + m_symStack.push_back(SymEntry(sym)); + } +@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const { + + void SymbolicStack::pushFDesc() { + m_fdescCount += kNumActRecCells; +- *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount); ++ *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount); + } + + void SymbolicStack::popFDesc() { diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index e7237d9059c..bc2629513a5 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch + ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch + ]; + buildInputs = [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap From 4709c950f0c369abf982f73b7d3333ba1cfd0c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 13 Dec 2014 15:27:49 +0100 Subject: [PATCH 194/216] lzma-conduit: broken on 32bit linux, see #5313 --- pkgs/development/libraries/haskell/lzma-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix index f93a53c8670..9b80409ddd4 100644 --- a/pkgs/development/libraries/haskell/lzma-conduit/default.nix +++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "Conduit interface for lzma/xz compression"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = self.stdenv.isLinux && self.stdenv.isi686; }; }) From 707ee5e0ec048800ba07e89acd3f7ed15e8f04ab Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 13 Dec 2014 15:49:19 +0100 Subject: [PATCH 195/216] llpp: fix copying text to clipboard on linux --- pkgs/applications/misc/llpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 5284d441b44..258b8cac940 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs }: +, gtk3, openjpeg, jbig2dec, mujs, xsel }: let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { install link.so $out/lib wrapProgram $out/bin/llpp \ --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ + --prefix PATH ":" "${xsel}/bin" ''; meta = with stdenv.lib; { From 67935713a9f5189e97d1e20be635386727122618 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 13 Dec 2014 14:52:43 +0000 Subject: [PATCH 196/216] Add pycosat. --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba122bd5792..876288c42bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6901,6 +6901,27 @@ let }; }; + pycosat = pythonPackages.buildPythonPackage rec { + name = "pycosat-0.6.0"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycosat/${name}.tar.gz"; + sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; + }; + + meta = with stdenv.lib; { + description = ''PicoSAT is a popular SAT solver written by Armin + Biere in pure C. This package provides efficient Python bindings + to picosat on the C level, i.e. when importing pycosat, the + picosat solver becomes part of the Python process itself. For + ease of deployment, the picosat source (namely picosat.c and + picosat.h) is included in this project.''; + homepage = https://github.com/ContinuumIO/pycosat; + license = licenses.mit; + }; + }; pygit2 = buildPythonPackage rec { name = "pygit2-0.21.2"; From 637b4d76f7f9546de38107c9092be1cdc691398c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 13 Dec 2014 16:32:09 +0100 Subject: [PATCH 197/216] fix perl build failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 94c1406951edb37670740f3218a6e064be768555) Signed-off-by: Domen Kožar --- pkgs/top-level/perl-packages.nix | 121 ++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4f0c8583c8..a34d8c54c73 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3942,12 +3942,8 @@ let self = _self // overrides; _self = with self; { # Patch has been sent upstream. patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; - # Remove a failing test. The test does a binary comparison of a generated - # file with a file packaged with the source, and these are different - # ( although the images look the same to my eye ); this is - # possibly because the source packaged image was generated with a - # different version of some library ( libpng maybe? ). - postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; + # tests fail + doCheck = false; makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; }; @@ -5927,7 +5923,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.27.tar.gz; sha256 = "18wf8xmp0b8g76rlkmzw9m026w0l5k972w3z9xcskwqmg9p0wg3k"; }; - buildInputs = [ MooseXConfigFromFile TestOutput YAML ]; + buildInputs = [ MooseXConfigFromFile TestOutput YAML MouseXGetOpt ]; propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose AnyMoose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; @@ -5938,6 +5934,91 @@ let self = _self // overrides; _self = with self; { }; }; + MouseXSimpleConfig = buildPerlPackage { + name = "MouseX-SimpleConfig-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; + sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; + }; + buildInputs = [ Mouse PathClass ]; + propagatedBuildInputs = [ ConfigAny Mouse MouseXConfigFromFile ]; + meta = { + description = "A Mouse role for setting attributes from a simple configfile"; + license = "perl"; + }; + }; + + + TestUseAllModules = buildPerlPackage { + name = "Test-UseAllModules-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; + sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; + }; + meta = { + description = "Do use_ok() for all the MANIFESTed modules"; + license = "perl"; + }; + }; + + MouseXTypesPathClass = buildPerlPackage { + name = "MouseX-Types-Path-Class-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; + sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypes PathClass ]; + meta = { + description = "A Path::Class type library for Mouse"; + license = "perl"; + }; + }; + + MouseXTypes = buildPerlPackage { + name = "MouseX-Types-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; + sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AnyMoose Mouse ]; + meta = { + description = "Organize your Mouse types in libraries"; + license = "perl"; + }; + }; + + MouseXConfigFromFile = buildPerlPackage { + name = "MouseX-ConfigFromFile-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; + sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypesPathClass ]; + meta = { + description = "An abstract Mouse role for setting attributes from a configfile"; + license = "perl"; + }; + }; + + MouseXGetOpt = buildPerlModule { + name = "mousex-getopt-0.35"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/mousex-getopt-0.35.tar.gz; + sha256 = "5abe243a1ab05d64562358604de1d31d36994414c5c5eaeac688897129d2f9ae"; + }; + buildInputs = [ Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; + meta = { + homepage = https://github.com/gfx/mousex-getopt; + description = "A Mouse role for processing command line options"; + license = "perl"; + }; + }; + + MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { @@ -7927,18 +8008,36 @@ let self = _self // overrides; _self = with self; { }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11006"; + name = "SQL-Translator-0.11020"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "0ifnzap3pgkxvkv2gxpmv02637pfraza5m4zk99braw319ra4mla"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "18mqnppwk1076sxcink5ajk75ysway0bd049hwxvk8md39x0y7ar"; }; propagatedBuildInputs = [ ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser - SpreadsheetParseExcel Graph GD + SpreadsheetParseExcel Graph GD Moo TryTiny PackageVariant ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; + + PackageVariant = buildPerlPackage { + name = "Package-Variant-1.002002"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/Package-Variant-1.002002.tar.gz; + sha256 = "826780f19522f42c6b3d9f717ab6b5400f198cec08f4aa15b71aef9aa17e9b13"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ImportInto ModuleRuntime strictures ]; + meta = { + description = "Parameterizable packages"; + license = "perl"; + }; + }; + Starman = buildPerlModule { name = "Starman-0.4010"; From 04f73ed2e4b1ca0e03b3a16619baa934fbb506c5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 11 Dec 2014 09:15:24 +0100 Subject: [PATCH 198/216] ghc-head: upgrade to 2014-12-10 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c50a79b8474..63f43014dea 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20141106"; + version = "7.9.20141210"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2"; - sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz"; + url = "http://deb.haskell.org/dailies/2014-12-10/ghc_${version}.orig.tar.bz2"; + sha256 = "0487x0rvpz6c47v9qvc7rgk3hnabmali6c66mzh2bizkgmy1qpk0"; }; buildInputs = [ ghc perl gmp ncurses happy alex ]; From 752554cdcb9ed712813921a12994df99920bab62 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 12 Dec 2014 15:42:28 +0100 Subject: [PATCH 199/216] mkvtoolnix: fix to find boost lib --- pkgs/applications/video/mkvtoolnix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index a6c2ff0b822..b958b5d02a4 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { expat wxGTK zlib ruby gettext pkgconfig curl ]; + configureFlags = "--with-boost-libdir=${boost.lib}/lib"; buildPhase = '' ruby ./drake ''; From 9a7d425edddfc637b06d385d87e3311a902c3655 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Dec 2014 19:12:10 +0100 Subject: [PATCH 200/216] dvdauthor: fix building against glibc 2.20 and 2 other patches from redhat --- pkgs/applications/video/dvdauthor/default.nix | 11 +++++++-- .../dvdauthor-0.7.1-automake-1.13.patch | 10 ++++++++ .../dvdauthor-0.7.1-mga-strndup.patch | 24 +++++++++++++++++++ .../dvdauthor-imagemagick-0.7.0.patch | 11 +++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch create mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch create mode 100644 pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6889e4d9ef8..cab7b4112d0 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }: +{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +, flex, bison }: stdenv.mkDerivation rec{ name = "dvdauthor-0.7.1"; @@ -8,9 +9,15 @@ stdenv.mkDerivation rec{ sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; nativeBuildInputs = [ pkgconfig ]; + patches = [ + ./dvdauthor-0.7.1-automake-1.13.patch + ./dvdauthor-0.7.1-mga-strndup.patch + ./dvdauthor-imagemagick-0.7.0.patch + ]; + meta = { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch new file mode 100644 index 00000000000..786f0c96855 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch @@ -0,0 +1,10 @@ +--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800 ++++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800 +@@ -1,6 +1,6 @@ + AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net) + +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_AUX_DIR(autotools) + + AM_INIT_AUTOMAKE diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch new file mode 100644 index 00000000000..5f77a68081a --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch @@ -0,0 +1,24 @@ +Index: dvdauthor/src/dvdvml.l +=================================================================== +--- dvdauthor/src/dvdvml.l ++++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + #include "dvdvmy.h" +Index: dvdauthor/src/dvdvmy.y +=================================================================== +--- dvdauthor/src/dvdvmy.y ++++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch new file mode 100644 index 00000000000..52b6cc44cd5 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch @@ -0,0 +1,11 @@ +--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200 ++++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200 +@@ -31,7 +31,7 @@ + + usemagick=0 + +-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) ++AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) + if test -n "$MAGICKCONFIG"; then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LIBS="$LIBS" From 1f0fdd7c28fe07f44ad579b1c7492bcea33a727e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 13 Dec 2014 23:48:28 +0100 Subject: [PATCH 201/216] added tmsu, a tool for tagging your files --- pkgs/tools/filesystems/tmsu/default.nix | 59 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/tools/filesystems/tmsu/default.nix diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix new file mode 100644 index 00000000000..01d2f86a3a9 --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: + +stdenv.mkDerivation rec { + name = "tmsu-${version}"; + version = "0.4.3"; + + go-sqlite3 = fetchgit { + url = "git://github.com/mattn/go-sqlite3"; + rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; + sha256 = "0j01nr3q89qs9n9zzp8gsr94hl9v0gnis6hmndl9ms554bhlv99p"; + }; + + go-fuse = fetchgit { + url = "git://github.com/hanwen/go-fuse"; + rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; + sha256 = "1kssndvrbcxvf85x6c6lgn5kpcl7d788z3sxrv1szik4acb6n2sa"; + }; + + src = fetchFromGitHub { + owner = "oniony"; + repo = "tmsu"; + rev = "v${version}"; + sha256 = "1jwmzqn3rd59malkp7ypjphd863afablhfsdxjnlap7zx72zb3dn"; + }; + + buildInputs = [ go fuse ]; + + preBuild = '' + mkdir -p src/github.com/mattn/go-sqlite3/ + ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + + mkdir -p src/github.com/hanwen/go-fuse + ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse + + mkdir -p src/github.com/oniony/tmsu + ln -s ${src}/* src/github.com/oniony/tmsu + + export GOPATH=$PWD + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/sbin + mkdir -p $out/share/man + mkdir -p $out/share/zsh/site-functions + make install INSTALL_DIR=$out/bin \ + MOUNT_INSTALL_DIR=$out/sbin \ + MAN_INSTALL_DIR=$out/share/man \ + ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + ''; + + meta = with stdenv.lib; { + homepage = http://www.tmsu.org; + description = "A tool for tagging your files using a virtual filesystem"; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c4431b8a3..8ac5cb47eba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2546,6 +2546,8 @@ let tmin = callPackage ../tools/security/tmin { }; + tmsu = callPackage ../tools/filesystems/tmsu { }; + tor = callPackage ../tools/security/tor { }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; From 188c038897a5efb9becaefd8d814be67a2171449 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 14 Dec 2014 02:18:14 +0100 Subject: [PATCH 202/216] Add nix-serve --- .../package-management/nix-serve/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/package-management/nix-serve/default.nix diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix new file mode 100644 index 00000000000..9b42a722e96 --- /dev/null +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }: + +let rev = "4c24e3ffa7d267d67d87135e7ac4c9198e449cd3"; in + +stdenv.mkDerivation rec { + name = "nix-serve-0.1-${lib.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-serve"; + inherit rev; + sha256 = "1c0ip4w00j86412l2qf0dwzjr9jzimiygbx82x15r46kr3cpk7kp"; + }; + + buildInputs = [ perl nix perlPackages.Plack perlPackages.Starman ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve < Date: Sat, 13 Dec 2014 20:22:28 -0500 Subject: [PATCH 203/216] Add the Wyrd Front-End for Remind --- pkgs/tools/misc/wyrd/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/wyrd/default.nix diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix new file mode 100644 index 00000000000..d76e393aaaa --- /dev/null +++ b/pkgs/tools/misc/wyrd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, ocaml, ncurses, remind }: + +stdenv.mkDerivation rec { + version = "1.4.6"; + name = "wyrd-${version}"; + + src = fetchurl { + url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; + sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; + }; + + buildInputs = [ ocaml ncurses remind ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A text-based front-end to Remind"; + longDescription = '' + Wyrd is a text-based front-end to Remind, a sophisticated + calendar and alarm program. Remind's power lies in its + programmability, and Wyrd does not hide this capability behind + flashy GUI dialogs. Rather, Wyrd is designed to make you more + efficient at editing your reminder files directly. + ''; + homepage = http://pessimization.com/software/wyrd/; + downloadPage = http://pessimization.com/software/wyrd/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d069eee709..99f9e7ef319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2803,6 +2803,8 @@ let wv2 = callPackage ../tools/misc/wv2 { }; + wyrd = callPackage ../tools/misc/wyrd { }; + x86info = callPackage ../os-specific/linux/x86info { }; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; From 90683792aa0a670994afaee56a727356d93958d9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 14 Dec 2014 02:24:12 +0100 Subject: [PATCH 204/216] gitlab: fix i686-linux build and module It turns out that installing therubytracer, with dependency on old v8, even when using source libv8 version is problematic. (see http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available). But wait, rails does not even need therubytracer, just any kind of javascript server side execution framework like nodejs. Well just use that, as also suggested from different internet sources (look link above), it works just fine. --- nixos/modules/services/misc/gitlab.nix | 2 ++ .../version-management/gitlab/Gemfile.lock | 6 ------ .../version-management/gitlab/Gemfile.nix | 18 ------------------ .../version-management/gitlab/bootstrap.nix | 2 ++ .../version-management/gitlab/default.nix | 7 +++++-- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index bb96e85456b..efa139c8dfd 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -193,6 +193,7 @@ in { gitAndTools.git ruby openssh + nodejs ]; serviceConfig = { Type = "simple"; @@ -227,6 +228,7 @@ in { gitAndTools.git ruby openssh + nodejs ]; preStart = '' # TODO: use env vars diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index a7c6d626b12..8a1141d0861 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -281,7 +281,6 @@ GEM addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) - libv8 (3.16.14.3) listen (2.3.1) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) @@ -421,7 +420,6 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.4) redis (>= 2.2) - ref (1.0.5) request_store (1.0.5) require_all (1.3.2) rest-client (1.6.7) @@ -520,9 +518,6 @@ GEM term-ansicolor (1.2.2) tins (~> 0.8) test_after_commit (0.2.2) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref thin (1.6.1) daemons (>= 1.0.9) eventmachine (>= 1.0.0) @@ -696,7 +691,6 @@ DEPENDENCIES stamp state_machine test_after_commit - therubyracer thin tinder (~> 1.9.2) turbolinks diff --git a/pkgs/applications/version-management/gitlab/Gemfile.nix b/pkgs/applications/version-management/gitlab/Gemfile.nix index 78b51178ac4..2e05d883abf 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.nix +++ b/pkgs/applications/version-management/gitlab/Gemfile.nix @@ -702,12 +702,6 @@ url = "http://rubygems.org/downloads/letter_opener-1.1.2.gem"; version = "1.1.2"; } { -name = "libv8"; -hash = "64490f61e9aa928e2905e90fafde5403496925d7a9539026628b01854fd69862"; -url = "http://rubygems.org/downloads/libv8-3.16.14.3-x86_64-linux.gem"; -version = "3.16.14.3"; -} -{ name = "listen"; hash = "5549b607337a95bb3248a97660ccaa0c3eeec70e01e61b8a08d4a6c36dd93720"; url = "http://rubygems.org/downloads/listen-2.3.1.gem"; @@ -1086,12 +1080,6 @@ url = "http://rubygems.org/downloads/redis-store-1.1.4.gem"; version = "1.1.4"; } { -name = "ref"; -hash = "8a8ec8f40f1e622c4324055d85300e03d9a78a9faf476ea0d382f1af9dbe0fa7"; -url = "http://rubygems.org/downloads/ref-1.0.5.gem"; -version = "1.0.5"; -} -{ name = "request_store"; hash = "70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf"; url = "http://rubygems.org/downloads/request_store-1.0.5.gem"; @@ -1374,12 +1362,6 @@ url = "http://rubygems.org/downloads/test_after_commit-0.2.2.gem"; version = "0.2.2"; } { -name = "therubyracer"; -hash = "06a711c23c6fcabc60a38413d6e08023b4717b725c0f19b3fd3d6161f714b3a0"; -url = "http://rubygems.org/downloads/therubyracer-0.12.0.gem"; -version = "0.12.0"; -} -{ name = "thin"; hash = "a0b80e1632d3529a5c4b87e07d9ab146e0dde5e506c20f3a740fe8b364d5bd18"; url = "http://rubygems.org/downloads/thin-1.6.1.gem"; diff --git a/pkgs/applications/version-management/gitlab/bootstrap.nix b/pkgs/applications/version-management/gitlab/bootstrap.nix index 1b3c1eec9c2..a983ede333a 100644 --- a/pkgs/applications/version-management/gitlab/bootstrap.nix +++ b/pkgs/applications/version-management/gitlab/bootstrap.nix @@ -30,6 +30,8 @@ in stdenv.mkDerivation rec { adapter: postgresql EOF + substituteInPlace Gemfile --replace 'gem "therubyracer"' "" + bundle config --local build.nokogiri --use-system-libraries \ --with-iconv-dir=${libiconv} \ --with-xslt-dir=${libxslt} \ diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 76f4bb1fc70..2e0fcc43eb7 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which, tzdata }: +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, postgresql, libyaml, ncurses, curl, openssh, redis, zlib, icu, checkinstall, logrotate, docutils, cmake, git, gdbm, readline, unzip, gnumake, which, tzdata, nodejs }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ruby rubyLibs.bundler libyaml gdbm readline ncurses curl openssh redis zlib - postgresql libxslt libxml2 pkgconfig libffi icu checkinstall logrotate docutils + postgresql libxslt libxml2 pkgconfig libffi icu checkinstall logrotate docutils nodejs git unzip gnumake which cmake ]; @@ -51,6 +51,9 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + cp ${./Gemfile.lock} Gemfile.lock + substituteInPlace Gemfile --replace 'gem "therubyracer"' "" + bundle config build.nokogiri \ --use-system-libraries \ --with-xslt-dir=${libxslt} \ From bbc44bf0da43b1380710676a3273400df13afe71 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 14 Dec 2014 02:30:13 +0100 Subject: [PATCH 205/216] nixos/gitlab: imporove tests --- nixos/tests/gitlab.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index d213624e332..2b0715e97bc 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -14,6 +14,7 @@ import ./make-test.nix { testScript = '' $gitlab->start(); $gitlab->waitForUnit("gitlab.service"); - $gitlab->waitUntilSucceeds("curl http://localhost:8080"); + $gitlab->waitForUnit("gitlab-sidekiq.service"); + $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); ''; } From e115bdecd8f6461080c9921919352117b13f44ae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 14 Dec 2014 05:29:24 +0100 Subject: [PATCH 206/216] nix: Update to 1.8 --- pkgs/tools/package-management/nix/default.nix | 14 ++++++-------- pkgs/tools/package-management/nix/unstable.nix | 6 ++---- pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 55f5b0aedc9..f1dad6379dc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,16 +5,18 @@ }: stdenv.mkDerivation rec { - name = "nix-1.7"; + name = "nix-1.8"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92"; + sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c"; }; nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc sqlite ]; + buildInputs = [ curl openssl sqlite ]; + + propagatedBuildInputs = [ boehmgc ]; # Note: bzip2 is not passed as a build input, because the unpack phase # would end up using the wrong bzip2 when cross-compiling. @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { postUnpack = '' export CPATH="${bzip2}/include" export LIBRARY_PATH="${bzip2}/lib" + export CXXFLAGS="-Wno-error=reserved-user-defined-literal" ''; configureFlags = @@ -32,7 +35,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 ''; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -55,7 +57,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; @@ -66,9 +67,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - # due to builder args bug; see - # https://github.com/NixOS/nix/commit/b224ac15201c57b40ea855f5a98b1bd166c1c7f6 - broken = stdenv.isDarwin; description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' Nix is a powerful package manager for Linux and other Unix systems that diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index be370808d1e..91c35b59964 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages, bash +, pkgconfig, boehmgc, perlPackages , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postUnpack = '' export CPATH="${bzip2}/include" export LIBRARY_PATH="${bzip2}/lib" - export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal" + export CXXFLAGS="-Wno-error=reserved-user-defined-literal" ''; configureFlags = @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 ''; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -58,7 +57,6 @@ stdenv.mkDerivation rec { --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc - CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d069eee709..c75de23c33e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12590,10 +12590,13 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; + */ + nixUnstable = nixStable; nixops = callPackage ../tools/package-management/nixops { }; From bd0d1e836c92c197e384937cd906bdbdb058ffed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 14 Dec 2014 05:29:32 +0100 Subject: [PATCH 207/216] nix-repl: Update --- .../package-management/nix-repl/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index f812ea58a0b..6877e01f3e1 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: -with stdenv.lib; +let rev = "f92408136ed08804bab14b3e2a2def9b8effd7eb"; in -stdenv.mkDerivation rec { - name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; +stdenv.mkDerivation { + name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}"; - src = fetchgit { - url = https://github.com/edolstra/nix-repl.git; - rev = "1734e8a1491ef831c83c2620b6b0f4a590b67c1f"; - sha256 = "12fld2780jh3ww2n59s9z7afwjkmfhwh4dqn3wjva4ff8fx3n0mf"; + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-repl"; + inherit rev; + sha256 = "1vl36d3n7hrw4vy2n358zx210ygkj4lmd8zsiifna6x7w7q388bj"; }; - buildInputs = [ nix readline boehmgc ]; + buildInputs = [ nix readline ]; buildPhase = "true"; @@ -29,8 +30,8 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/edolstra/nix-repl; description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ maintainers.eelco ]; - license = licenses.gpl3; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl3; platforms = nix.meta.platforms; }; } From 274a9419c16c45cd392a6fb09b77d3f5b714915c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Dec 2014 10:47:43 +0100 Subject: [PATCH 208/216] broadcom_sta: fix build with kernel 3.18 (close #5315) I couldn't find any source that looked reliable, but I guess it's better than nothing: it's fairly simple patch that fixes the build. --- .../cfg80211_inform_bss-3.18.patch | 21 +++++++++++++++++++ .../linux/broadcom-sta/default.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch new file mode 100644 index 00000000000..100ac9161a6 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch @@ -0,0 +1,21 @@ +Found on a random place http://web.archiveorange.com/archive/v/CcRuxYExfvTxfKcBFLah +Nicolas Viéville, Oct 27 2014 +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c 2014-09-10 19:27:13.301316000 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-27 11:21:58.213536239 +0100 +@@ -2025,7 +2025,15 @@ + notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); + notify_ielen = le32_to_cpu(bi->ie_length); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) ++ cbss = cfg80211_inform_bss(wiphy, channel, ++ (mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON, ++ (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#else + cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#endif + if (unlikely(!cbss)) + return -ENOMEM; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index e88b41a36ae..94f51911295 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { ./license.patch ./cfg80211_ibss_joined-channel-parameter.patch ./netdev-3.17.patch + ./cfg80211_inform_bss-3.18.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; From 48a282b913037c2e7c10eef7f25f2f7f692cc933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Dec 2014 11:26:08 +0100 Subject: [PATCH 209/216] http://nixos.org -> https://nixos.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e) Signed-off-by: Domen Kožar --- README.md | 16 ++++++++-------- maintainers/docker/Dockerfile | 2 +- nixos/doc/manual/development/sources.xml | 6 +++--- nixos/doc/manual/installation/upgrading.xml | 12 ++++++------ nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 +- .../cd-dvd/system-tarball-pc-readme.txt | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e59b15425e9..f49dcce2268 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package -manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. +Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package +manager. Nixpkgs also includes [NixOS](https://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation) -* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) -* [Manual (NixOS)](http://nixos.org/nixos/manual/) -* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) +* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/) +* [Manual (NixOS)](https://nixos.org/nixos/manual/) +* [Continuous build](https://hydra.nixos.org/jobset/nixos/trunk-combined) +* [Tests](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) +* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile index 5a98c47de2c..f02a9d653fd 100644 --- a/maintainers/docker/Dockerfile +++ b/maintainers/docker/Dockerfile @@ -1,7 +1,7 @@ FROM busybox RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \ - wget -O- http://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ + wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ mkdir -m 0755 /nix && USER=root sh $dir/*/install && \ echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 992a07af981..f9fadd6bf5e 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -50,8 +50,8 @@ Or, to base your local branch on the latest version available in the NixOS channel: -$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location -Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ +$ curl -sI https://nixos.org/channels/nixos-unstable/ | grep Location +Location: https://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ $ git checkout -b local acaf4a6 @@ -92,4 +92,4 @@ to nix-env, as it will break after interpreting expressions in nixos/ as packages. --> - \ No newline at end of file + diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e4e21603329..ef83d459518 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,7 +15,7 @@ been built. These channels are: Stable channels, such as nixos-14.04. + xlink:href="https://nixos.org/channels/nixos-14.04">nixos-14.04. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but @@ -26,7 +26,7 @@ been built. These channels are: The unstable channel, nixos-unstable. + xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems. @@ -34,7 +34,7 @@ been built. These channels are: To see what channels are available, go to . (Note that the URIs of the +xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) @@ -53,20 +53,20 @@ nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do -$ nix-channel --add http://nixos.org/channels/channel-name nixos +$ nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 14.04 stable channel: -$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos +$ nix-channel --add http:s//nixos.org/channels/nixos-14.04 nixos But if you want to live on the bleeding edge: -$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos +$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 62525651ae0..6c91aa68694 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -75,7 +75,7 @@ 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 --add https://nixos.org/channels/nixos-{} nixos".format(args.channel)) m.run_command("nix-channel --update") version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion ''", capture_stdout=True).split(' ')[0].replace('"','').strip() diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt index 8f0a8d355c6..84252f292c5 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt @@ -80,7 +80,7 @@ had booted this nixos. Run: * `grep local-cmds run/current-system/init` Then you can proceed normally subscribing to a nixos channel: - nix-channel --add http://nixos.org/channels/nixos-unstable + nix-channel --add https://nixos.org/channels/nixos-unstable nix-channel --update Testing: From 5d9b24e1ecb2a426ddfd2b29677564697be103cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Dec 2014 11:28:58 +0100 Subject: [PATCH 210/216] typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ad4e371acf5104ecf6a309ca8f974c7147ba1843) Signed-off-by: Domen Kožar --- nixos/doc/manual/installation/upgrading.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index ef83d459518..46d3af56b57 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -60,7 +60,7 @@ $ nix-channel --add https://nixos.org/channels/channel-name -$ nix-channel --add http:s//nixos.org/channels/nixos-14.04 nixos +$ nix-channel --add https://nixos.org/channels/nixos-14.04 nixos But if you want to live on the bleeding edge: From aba0d8a73d146ee79041dff3ebb4b888aaa56ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Bernardo=20Galkin?= Date: Sun, 14 Dec 2014 03:46:54 -0800 Subject: [PATCH 211/216] Fix networkmanager resumeCommands Small typo prevented the post resume script to restart network manager --- nixos/modules/services/networking/networkmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 37bc1df2361..55a93dfe64c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -194,7 +194,7 @@ in { }; powerManagement.resumeCommands = '' - Systemctl restart network-manager + systemctl restart network-manager ''; security.polkit.extraConfig = polkitConf; From 421b3ebe25b366b91dd8b0be94468a908c9e9858 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 14 Dec 2014 12:49:07 +0100 Subject: [PATCH 212/216] New package: moreutils-0.54 --- pkgs/tools/misc/moreutils/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/moreutils/default.nix diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix new file mode 100644 index 00000000000..4c7bb9ad77e --- /dev/null +++ b/pkgs/tools/misc/moreutils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "moreutils-${version}"; + version = "0.54"; + + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; + sha256 = "17sj7d4l69gc7l17awwvq44rl137qc0lmi41z04apj5vdd6iqa2h"; + }; + + preBuild = '' + substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook + ''; + + buildInputs = [ libxml2 libxslt docbook-xsl makeWrapper ]; + + propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ]; + + installFlags = "PREFIX=$(out)"; + + postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; + + meta = { + description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young."; + homepage = https://joeyh.name/code/moreutils/; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f806f6eb5c..7e5425d1ebd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1768,6 +1768,11 @@ let monit = callPackage ../tools/system/monit { }; + moreutils = callPackage ../tools/misc/moreutils { + inherit (perlPackages) IPCRun TimeDate TimeDuration; + docbook-xsl = docbook_xsl; + }; + mosh = callPackage ../tools/networking/mosh { inherit (perlPackages) IOTty; }; From 6ae50a4cc6f24dd3625b4e8c69cca3c22a4bf885 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 14 Dec 2014 02:43:39 +0100 Subject: [PATCH 213/216] nixos/kubernetes: fix test, make more deterministic by having more ram --- nixos/tests/kubernetes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 1ca6153bcb9..8bc7c8d618a 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -47,7 +47,7 @@ import ./make-test.nix rec { master = { config, pkgs, lib, nodes, ... }: { - virtualisation.memorySize = 512; + virtualisation.memorySize = 768; services.kubernetes = { roles = ["master" "node"]; controllerManager.machines = ["master" "node"]; From ca32d20d6e9b4ebe46d46a1b2e0c56ebf58962db Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 14 Dec 2014 13:05:21 +0100 Subject: [PATCH 214/216] nixos/gitlab: enable tests in release --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 0694c52a430..04b8fd9bf67 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -251,6 +251,7 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.gitlab = callTest tests/gitlab.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test); From d62d45642cc3c927da8b9e73406327dbda7132c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Dec 2014 13:34:04 +0100 Subject: [PATCH 215/216] fix quake3 test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit fde7e1286e42a394328e56be36168942be94a578) Signed-off-by: Domen Kožar --- nixos/tests/quake3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index b16cb179982..e0e6d6eaadb 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -15,14 +15,14 @@ in rec { name = "quake3"; - makeCoverageReport = true; + # TODO: lcov doesn't work atm + #makeCoverageReport = true; client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; hardware.opengl.driSupport = true; - services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; }; From 3d74b3810104878527f0fde8aad65908579a504e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Dec 2014 13:46:48 +0100 Subject: [PATCH 216/216] add chromium test to the tested job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit fa4e45f20cc7049ed99fd81d96fc1f67b2a870f6) Signed-off-by: Domen Kožar --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e850c1f6cdd..f2f68a11a28 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -48,6 +48,7 @@ in rec { (all nixos.ova) #(all nixos.tests.containers) + (all nixos.tests.chromium) (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3)