From 19ea435cf8cd93d7dc096b648e5643bcca92a50b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 11 Sep 2014 13:39:48 +0200 Subject: [PATCH 001/323] nixos: add graphite api to graphite functionality --- .../modules/services/monitoring/graphite.nix | 97 +++++++++++++++---- pkgs/top-level/python-packages.nix | 9 +- 2 files changed, 86 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index dbfe0ee182a0..b2c46123d16a 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -8,6 +8,16 @@ let dataDir = cfg.dataDir; + graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' + time_zone: ${config.time.timeZone} + search_index: ${dataDir}/index + ${optionalString (cfg.api.finders != []) ''finders:''} + ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} + ${optionalString (cfg.api.functions != []) ''functions:''} + ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions} + ${cfg.api.extraConfig} + ''; + configDir = pkgs.buildEnv { name = "graphite-config"; paths = lists.filter (el: el != null) [ @@ -65,6 +75,40 @@ in { }; }; + api = { + enable = mkOption { + description = "Whether to enable graphite api."; + default = false; + type = types.uniq types.bool; + }; + + finders = mkOption { + description = "List of finder plugins load."; + default = []; + example = [ pkgs.python27Packages.graphite_influxdb ]; + type = types.listOf types.package; + }; + + functions = mkOption { + description = "List of functions to load."; + default = [ + "graphite_api.functions.SeriesFunctions" + "graphite_api.functions.PieFunctions" + ]; + type = types.listOf types.str; + }; + + extraConfig = mkOption { + description = "Extra configuration for graphite api."; + default = '' + whisper: + directories: + - ${dataDir}/whisper + ''; + type = types.str; + }; + }; + carbon = { config = mkOption { description = "Content of carbon configuration file."; @@ -176,7 +220,7 @@ in { ###### implementation - config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable) { + config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable) { systemd.services.carbonCache = { enable = cfg.carbon.enableCache; description = "Graphite Data Storage Backend"; @@ -189,10 +233,6 @@ in { Group = "graphite"; PermissionsStartOnly = true; }; - restartTriggers = [ - pkgs.pythonPackages.carbon - configDir - ]; preStart = '' mkdir -p ${cfg.dataDir}/whisper chmod 0700 ${cfg.dataDir}/whisper @@ -211,10 +251,6 @@ in { User = "graphite"; Group = "graphite"; }; - restartTriggers = [ - pkgs.pythonPackages.carbon - configDir - ]; }; systemd.services.carbonRelay = { @@ -228,10 +264,6 @@ in { User = "graphite"; Group = "graphite"; }; - restartTriggers = [ - pkgs.pythonPackages.carbon - configDir - ]; }; systemd.services.graphiteWeb = { @@ -243,7 +275,7 @@ in { environment = { PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages"; DJANGO_SETTINGS_MODULE = "graphite.settings"; - GRAPHITE_CONF_DIR = "/etc/graphite/"; + GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; }; serviceConfig = { @@ -271,9 +303,40 @@ in { chown -R graphite:graphite ${cfg.dataDir} fi ''; - restartTriggers = [ - pkgs.python27Packages.graphite_web - ]; + }; + + systemd.services.graphiteApi = { + enable = cfg.api.enable; + description = "Graphite Api Interface"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = { + PYTHONPATH = + "${pkgs.python27Packages.graphite_api}/lib/python2.7/site-packages:" + + concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; + GRAPHITE_API_CONFIG = graphiteApiConfig; + LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + }; + serviceConfig = { + ExecStart = '' + ${pkgs.python27Packages.waitress}/bin/waitress-serve \ + --host=${cfg.web.host} --port=${toString cfg.web.port} \ + graphite_api.app:app + ''; + User = "graphite"; + Group = "graphite"; + PermissionsStartOnly = true; + }; + preStart = '' + if ! test -e ${dataDir}/db-created; then + mkdir -p ${dataDir}/cache/ + chmod 0700 ${dataDir}/cache/ + + touch ${dataDir}/db-created + + chown -R graphite:graphite ${cfg.dataDir} + fi + ''; }; environment.systemPackages = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 712c64319db0..101e247976bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10372,9 +10372,10 @@ rec { graphite_api = buildPythonPackage rec { name = "graphite-api-1.0.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/g/graphite-api/${name}.tar.gz"; - md5 = "466c13a902744bed09a054da452140f0"; + src = fetchgit { + url = "https://github.com/brutasse/graphite-api.git"; + rev = "b6f75e8a08fae695c094fece6de611b893fc65fb"; + sha256 = "41b90d5f35e99a020a6b1b77938690652521d1841b3165574fcfcee807ce4e6a"; }; # ImportError: No module named tests @@ -10410,6 +10411,8 @@ rec { propagatedBuildInputs = [ influxdb graphite_api ]; + passthru.moduleName = "graphite_influxdb.InfluxdbFinder"; + meta = { description = "An influxdb backend for Graphite-web and graphite-api"; homepage = https://github.com/vimeo/graphite-influxdb; From ca02c60cb8f12df37e34d2928f9ed4c4338f0954 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Thu, 11 Sep 2014 23:35:40 +0200 Subject: [PATCH 002/323] Disable fuppes module fuppes has not been compiling for a long moment, and the ffmpeg version on which it depends is no longer listed in nixpkgs. --- nixos/modules/module-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e40d08c8ecfe..236534000fea 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -85,7 +85,8 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix - ./services/audio/fuppes.nix + # Disabled as fuppes it does no longer builds. + # ./services/audio/fuppes.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix ./services/backup/almir.nix From 5e367ec9d75061c00f6e3e0bd62344d4c6f20024 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 12 Sep 2014 12:20:45 +0700 Subject: [PATCH 003/323] dylan: Remove old gwydion-dylan package. The Gywdion Dylan compiler that was packaged here is old and this package no longer builds. The Gwydion Dylan compiler is no longer maintained, and has been replaced by the Open Dylan compiler which is already packaged in Nix (opendylan). --- .../compilers/gwydion-dylan/binary-builder.sh | 9 --------- pkgs/development/compilers/gwydion-dylan/binary.nix | 10 ---------- pkgs/development/compilers/gwydion-dylan/builder.sh | 8 -------- .../development/compilers/gwydion-dylan/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 44 deletions(-) delete mode 100644 pkgs/development/compilers/gwydion-dylan/binary-builder.sh delete mode 100644 pkgs/development/compilers/gwydion-dylan/binary.nix delete mode 100644 pkgs/development/compilers/gwydion-dylan/builder.sh delete mode 100644 pkgs/development/compilers/gwydion-dylan/default.nix diff --git a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh b/pkgs/development/compilers/gwydion-dylan/binary-builder.sh deleted file mode 100644 index a0e71c02ab93..000000000000 --- a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -set -e - -mkdir -p $out -cd $out -tar zxvf $src -mv ./usr/local/* . -rm -rf ./usr diff --git a/pkgs/development/compilers/gwydion-dylan/binary.nix b/pkgs/development/compilers/gwydion-dylan/binary.nix deleted file mode 100644 index 0ac942d14b89..000000000000 --- a/pkgs/development/compilers/gwydion-dylan/binary.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "binary-gwydion-dylan-2.4.0"; - builder = ./binary-builder.sh; - src = fetchurl { - url = http://www.gwydiondylan.org/downloads/binaries/linux/x86/tar/gwydion-dylan-2.4.0-x86-linux.tar.gz; - md5 = "52643ad51a455d21fd4d5bf82d98914c"; - }; -} diff --git a/pkgs/development/compilers/gwydion-dylan/builder.sh b/pkgs/development/compilers/gwydion-dylan/builder.sh deleted file mode 100644 index ea2e54243990..000000000000 --- a/pkgs/development/compilers/gwydion-dylan/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -export DYLANDIR=$dylan -export DYLANPATH=$dylan/lib/dylan/2.4.0/x86-linux-gcc -configureFlags="--with-existing-runtime=$dylan/lib/dylan/2.4.0/x86-linux-gcc" -export LD_LIBRARY_PATH="$dylan/lib/dylan/2.4.0/x86-linux-gcc:$LD_LIBRARY_PATH:$boehmgc/lib" - -genericBuild diff --git a/pkgs/development/compilers/gwydion-dylan/default.nix b/pkgs/development/compilers/gwydion-dylan/default.nix deleted file mode 100644 index 7c00e65d7ccd..000000000000 --- a/pkgs/development/compilers/gwydion-dylan/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, dylan, boehmgc, perl, flex, yacc, readline}: - -stdenv.mkDerivation { - name = "gwydion-dylan-2.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = http://www.gwydiondylan.org/downloads/src/tar/gwydion-dylan-2.4.0.tar.gz; - md5 = "7ed180bf4ef11e8e8da3bd78b45477a8"; - }; - - inherit boehmgc dylan perl; - buildInputs = [boehmgc dylan perl flex yacc readline]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7852f255d42b..10fba3f3c6b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2730,10 +2730,6 @@ let cython = pythonPackages.cython; cython3 = python3Packages.cython; - dylan = callPackage ../development/compilers/gwydion-dylan { - dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; - }; - ecl = callPackage ../development/compilers/ecl { }; eql = callPackage ../development/compilers/eql {}; From 99a46a0ecafb5119d4222502a310817a95675311 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Fri, 12 Sep 2014 13:49:51 +0200 Subject: [PATCH 004/323] set network manager as default true --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 049c96c54e71..5f46e2f1ef84 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -77,7 +77,7 @@ in { services.gnome3.tracker.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; services.telepathy.enable = mkDefault true; - networking.networkmanager.enable = true; + networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; services.upower.package = gnome3.upower; From 7f76092ffc6fc39f7ccdc03fe308e7f7c5d3dc09 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Fri, 12 Sep 2014 13:51:20 +0200 Subject: [PATCH 005/323] new package: cmst - qt gui for connman --- pkgs/tools/networking/cmst/default.nix | 37 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/cmst/default.nix diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix new file mode 100644 index 000000000000..52a1baa05a66 --- /dev/null +++ b/pkgs/tools/networking/cmst/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, qt5, makeWrapper, libX11 }: + +stdenv.mkDerivation rec { + name = "cmst-2014.08.23"; + rev = "refs/tags/${name}"; + src = fetchgit { + url = "git://github.com/andrew-bibb/cmst.git"; + inherit rev; + sha256 = "07g5i929jxlh6vm0ad8x33qmf2sryiichlv37x7fpn20h3xcsia0"; + }; + + buildInputs = [ qt5 makeWrapper ]; + + configurePhase = '' + substituteInPlace ./cmst.pro \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/share" "$out/usr/share" + ''; + + buildPhase = '' + qmake PREFIX=$out + make + ''; + + postInstall = '' + wrapProgram $out/bin/cmst \ + --prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale" + ''; + + meta = { + description = "QT GUI for Connman with system tray icon"; + homepage = "https://github.com/andrew-bibb/cmst"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7852f255d42b..8384f51b1e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -776,6 +776,8 @@ let ciopfs = callPackage ../tools/filesystems/ciopfs { }; + cmst = callPackage ../tools/networking/cmst { }; + colord = callPackage ../tools/misc/colord { }; colord-gtk = callPackage ../tools/misc/colord-gtk { }; From 8746d4b6bc4f784d1910d0a64066e08b5206821d Mon Sep 17 00:00:00 2001 From: wyvie Date: Fri, 12 Sep 2014 17:05:08 +0400 Subject: [PATCH 006/323] Added quazip-0.7 --- pkgs/development/libraries/quazip/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/quazip/default.nix diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix new file mode 100644 index 000000000000..398e942723be --- /dev/null +++ b/pkgs/development/libraries/quazip/default.nix @@ -0,0 +1,23 @@ +{ fetchurl, stdenv, zip, zlib, qt5 }: + +stdenv.mkDerivation rec { + name = "quazip-0.7"; + + src = fetchurl { + url = "mirror://sourceforge/quazip/${name}.tar.gz"; + sha256 = "8af5e7f9bff98b5a2982800a292eae0176c2b41a98a8deab14f4e1cbe07674a4"; + }; + + configurePhase = "cd quazip && qmake quazip.pro"; + + installPhase = "INSTALL_ROOT=$out make install"; + + buildInputs = [ zlib qt5 ]; + + meta = { + description = "A Qt/C++ wrapper for Gilles Vollant's ZIP/UNZIP C package (minizip). Provides access to ZIP archives from Qt programs using QIODevice API."; + license = [ "GPLv2+" ]; + homepage = http://quazip.sourceforge.net/; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7852f255d42b..193daf918786 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6143,6 +6143,8 @@ let qoauth = callPackage ../development/libraries/qoauth { }; + quazip = callPackage ../development/libraries/quazip { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; libpng = libpng12; From 26fd945151111681f0bc67db282b98bbe5bc3796 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:16:53 +0200 Subject: [PATCH 007/323] nixos/rabbitmq: wait for start --- nixos/modules/services/amqp/rabbitmq.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index a930098bfeec..77487ec1ab91 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -89,6 +89,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; + path = [ pkgs.rabbitmq_server ]; + environment = { RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia"; RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress; @@ -119,6 +121,8 @@ in { mkdir -p /var/log/rabbitmq && chmod 0700 /var/log/rabbitmq chown rabbitmq:rabbitmq /var/log/rabbitmq ''; + + postStart = mkBefore "until rabbitmqctl status; do sleep 1; done"; }; }; From 74122464da8b8a4ed6de5734963b25cd849c5f0e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:19:39 +0200 Subject: [PATCH 008/323] nixos/influxdb: wait for start --- nixos/modules/services/databases/influxdb.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 61fe96d5d641..b57ccebae16e 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -224,6 +224,11 @@ in mkdir -m 0770 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi ''; + postStart = mkBefore '' + until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do + sleep 1; + done + ''; }; users.extraUsers = optional (cfg.user == "influxdb") { From f7ba3d833fc4e4a06204d1102a21ed3eecca39c8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:20:32 +0200 Subject: [PATCH 009/323] nixos/znc: fix module, createUser option does not exist anymore --- nixos/modules/services/networking/znc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 9b26b2b32448..b39aea04521b 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -305,7 +305,6 @@ in uid = config.ids.uids.znc; home = cfg.dataDir; createHome = true; - createUser = true; }; users.extraGroups = optional (cfg.user == defaultUser) From d6f9878fbf59b621e209402d44156f497e05f55c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:21:31 +0200 Subject: [PATCH 010/323] nixos/elasticsearch: wait for start --- nixos/modules/services/search/elasticsearch.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index b74ef4370d76..12f163db463d 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -135,6 +135,11 @@ in { rm ${cfg.dataDir}/plugins || true ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins ''; + postStart = mkBefore '' + until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do + sleep 1 + done + ''; }; environment.systemPackages = [ pkgs.elasticsearch ]; From f5e5815236fa50e41b47870f2b156a17009137bf Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:22:26 +0200 Subject: [PATCH 011/323] elasticsearchPlugins: add elasticsearch_http_basic, plugin for basic http authentication --- pkgs/servers/search/elasticsearch/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index c03a2feae5f2..b40f9c8a0586 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -50,4 +50,23 @@ in { license = licenses.asl20; }; }; + + elasticsearch_http_basic = stdenv.mkDerivation rec { + name = "elasticsearch-http-basic-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar"; + sha256 = "0makhlsgxlawfscz70mc2ikh68vp6mdmmzz4ggcgwrravzvyw5vq"; + }; + + phases = ["installPhase"]; + installPhase = "install -D $src $out/plugins/http-basic/${name}.jar"; + + meta = { + homepage = https://github.com/Asquera/elasticsearch-http-basic; + description = "HTTP Basic Authentication for Elasticsearch"; + license = licenses.mit; + }; + }; } From be2fe360dbcaea6e942362b49b26fcc25b33ceb9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:24:48 +0200 Subject: [PATCH 012/323] elasticsearchPlugins.elasticsearch_http_basic: set platform to build on --- pkgs/servers/search/elasticsearch/plugins.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index b40f9c8a0586..568737b11385 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -67,6 +67,7 @@ in { homepage = https://github.com/Asquera/elasticsearch-http-basic; description = "HTTP Basic Authentication for Elasticsearch"; license = licenses.mit; + platforms = elasticsearch.meta.platforms; }; }; } From 35cd0ae1595b55bf13e668ff674b93886c03f3d2 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 13 Sep 2014 08:43:45 +0200 Subject: [PATCH 013/323] pharo-vm: 2014.06.25 -> 2014.08.14 --- pkgs/development/pharo/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 7022206c5cc6..361785374bb3 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "pharo-vm-core-i386-2014.06.25"; system = "x86_32-linux"; src = fetchurl { - url = http://files.pharo.org/vm/src/vm-unix-sources/pharo-vm-2014.06.25.tar.bz2; - md5 = "4d80d8169c2f2f0355c43ee90bbad23f"; + url = http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-2014.08.14.tar.bz2; + md5 = "8e9e8dfde4f4bb69aac4590ecf82dd3b"; }; sources10Zip = fetchurl { From 77fa9da425c77372805635b5eb6d7de7281fc82e Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 13 Sep 2014 10:01:01 +0200 Subject: [PATCH 014/323] properly patch nodewebkit --- .../development/tools/node-webkit/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index 1f1017760642..f79a5f562c03 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -9,8 +9,9 @@ let name = "node-webkit-env"; paths = [ xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage xlibs.libXext - xlibs.libXfixes nss nspr gconf expat dbus udev stdenv.gcc.gcc + freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage + xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.gcc.gcc + xlibs.libXtst xlibs.libXi ]; }; @@ -19,28 +20,27 @@ in stdenv.mkDerivation rec { version = "0.9.2"; src = fetchurl { - url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; + url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; }; - patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nw - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nwsnapshot - ''; - - installPhase = let - LD_LIBRARY_PATH = "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit"; - in '' - mkdir -p $out/bin + installPhase = '' mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 - makeWrapper $out/share/node-webkit/nw $out/bin/nw --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" - makeWrapper $out/share/node-webkit/nwsnapshot $out/bin/nwsnapshot --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot + + mkdir -p $out/bin + ln -s $out/share/node-webkit/nw $out/bin + ln -s $out/share/node-webkit/nwsnapshot $out/bin ''; buildInputs = [ makeWrapper ]; From 9241dd5671d466c8489378f51ece8f4a7620a2c6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 13 Sep 2014 10:09:19 +0200 Subject: [PATCH 015/323] Add myself to maintainers.nix. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1124d75d52a3..a6c41bbe17f1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -105,6 +105,7 @@ roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; rszibele = "Richard Szibele "; + rycee = "Robert Helgesson "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; From bca3e21d81200ddb769977d4a9a35b24c1f7446c Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Sat, 13 Sep 2014 10:03:01 +0200 Subject: [PATCH 016/323] remove nodewebkit patch code and upgrade zed to 0.13 --- pkgs/applications/editors/zed/default.nix | 29 +- pkgs/applications/editors/zed/node.nix | 925 +++++++++++++++++++++- 2 files changed, 907 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 585a3a58d5f0..4673029ed000 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -1,19 +1,9 @@ -{ stdenv, buildEnv, fetchgit, xlibs, glib, gtk2, atk, pango, gdk_pixbuf, - cairo, freetype, fontconfig, nss, nspr, gnome, alsaLib, expat, dbus, udev, - makeWrapper, writeScript, fetchurl, zip, pkgs, node_webkit }: +{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs +, node_webkit }: let name = "zed-${version}"; - version = "0.12"; - - rpath_env = buildEnv { - name = "rpath_env"; - paths = [ xlibs.libX11 xlibs.libXrender glib xlibs.libXtst gtk2 atk pango - gdk_pixbuf cairo freetype fontconfig xlibs.libXi xlibs.libXcomposite - nss nspr gnome.GConf xlibs.libXext xlibs.libXfixes alsaLib - xlibs.libXdamage expat dbus stdenv.gcc ]; - pathsToLink = [ "/lib" "/lib64" ]; - }; + version = "0.13"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -29,8 +19,10 @@ let node_env = buildEnv { name = "node_env"; - paths = [ nodePackages.tar nodePackages.request ]; + paths = [ nodePackages."body-parser" nodePackages.express + nodePackages.request nodePackages.tar nodePackages.ws ]; pathsToLink = [ "/lib" ]; + ignoreCollisions = true; }; zed = stdenv.mkDerivation rec { @@ -39,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "1l1adj4p916km626vxg1lv0bapzay4z5nq005pxsbjbcycrhds59"; + sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1"; }; buildInputs = [ makeWrapper zip ]; @@ -62,14 +54,7 @@ let ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/zed/zed-bin - patchelf --set-rpath "${rpath_env}/lib:${rpath_env}/lib64" $out/zed/zed-bin - - mkdir -p $out/lib - ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 - wrapProgram $out/zed/zed-bin \ - --prefix LD_LIBRARY_PATH : $out/lib \ --prefix NODE_PATH : ${node_env}/lib/node_modules ''; }; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index b4a7cec4269c..f2c08fde0cd4 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -1,6 +1,27 @@ { self, fetchurl, fetchgit ? null, lib }: { + by-spec."accepts"."~1.1.0" = + self.by-version."accepts"."1.1.0"; + by-version."accepts"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.0.tgz"; + name = "accepts-1.1.0.tgz"; + sha1 = "43ba6d946374c80f91823eaec6bb43dc4955500b"; + }) + ]; + buildInputs = + (self.nativeDeps."accepts" or []); + deps = [ + self.by-version."mime-types"."2.0.1" + self.by-version."negotiator"."0.4.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "accepts" ]; + }; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -97,6 +118,34 @@ ]; passthru.names = [ "block-stream" ]; }; + by-spec."body-parser"."^1.6.3" = + self.by-version."body-parser"."1.8.1"; + by-version."body-parser"."1.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.8.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.1.tgz"; + name = "body-parser-1.8.1.tgz"; + sha1 = "f9f96d221c435c95d18aeaad2bcdea1371902aad"; + }) + ]; + buildInputs = + (self.nativeDeps."body-parser" or []); + deps = [ + self.by-version."bytes"."1.0.0" + self.by-version."depd"."0.4.4" + self.by-version."iconv-lite"."0.4.4" + self.by-version."media-typer"."0.3.0" + self.by-version."on-finished"."2.1.0" + self.by-version."qs"."2.2.3" + self.by-version."raw-body"."1.3.0" + self.by-version."type-is"."1.5.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "body-parser" ]; + }; + "body-parser" = self.by-version."body-parser"."1.8.1"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -117,6 +166,46 @@ ]; passthru.names = [ "boom" ]; }; + by-spec."buffer-crc32"."0.2.3" = + self.by-version."buffer-crc32"."0.2.3"; + by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-buffer-crc32-0.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; + name = "buffer-crc32-0.2.3.tgz"; + sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; + }) + ]; + buildInputs = + (self.nativeDeps."buffer-crc32" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "buffer-crc32" ]; + }; + by-spec."bytes"."1" = + self.by-version."bytes"."1.0.0"; + by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-bytes-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + name = "bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; + by-spec."bytes"."1.0.0" = + self.by-version."bytes"."1.0.0"; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.5"; by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -137,6 +226,63 @@ ]; passthru.names = [ "combined-stream" ]; }; + by-spec."commander"."~2.1.0" = + self.by-version."commander"."2.1.0"; + by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-commander-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; + by-spec."cookie"."0.1.2" = + self.by-version."cookie"."0.1.2"; + by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + name = "cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie" ]; + }; + by-spec."cookie-signature"."1.0.5" = + self.by-version."cookie-signature"."1.0.5"; + by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-cookie-signature-1.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + name = "cookie-signature-1.0.5.tgz"; + sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie-signature" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie-signature" ]; + }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -176,6 +322,26 @@ ]; passthru.names = [ "ctype" ]; }; + by-spec."debug"."~2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-debug-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = [ + self.by-version."ms"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -195,6 +361,167 @@ ]; passthru.names = [ "delayed-stream" ]; }; + by-spec."depd"."0.4.4" = + self.by-version."depd"."0.4.4"; + by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-0.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; + name = "depd-0.4.4.tgz"; + sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; + by-spec."destroy"."1.0.3" = + self.by-version."destroy"."1.0.3"; + by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-destroy-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + name = "destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }) + ]; + buildInputs = + (self.nativeDeps."destroy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "destroy" ]; + }; + by-spec."ee-first"."1.0.5" = + self.by-version."ee-first"."1.0.5"; + by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-ee-first-1.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; + name = "ee-first-1.0.5.tgz"; + sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + }) + ]; + buildInputs = + (self.nativeDeps."ee-first" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ee-first" ]; + }; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-escape-html-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }) + ]; + buildInputs = + (self.nativeDeps."escape-html" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "escape-html" ]; + }; + by-spec."etag"."~1.3.0" = + self.by-version."etag"."1.3.0"; + by-version."etag"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-etag-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.3.0.tgz"; + name = "etag-1.3.0.tgz"; + sha1 = "c837debfbfe0baf7eb8e2f0bbb3d1d9cc3229697"; + }) + ]; + buildInputs = + (self.nativeDeps."etag" or []); + deps = [ + self.by-version."buffer-crc32"."0.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "etag" ]; + }; + by-spec."express"."^4.8.3" = + self.by-version."express"."4.9.0"; + by-version."express"."4.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.9.0.tgz"; + name = "express-4.9.0.tgz"; + sha1 = "9b2ea4ebce57c7ac710604c74f6c303ab344a7f3"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."accepts"."1.1.0" + self.by-version."buffer-crc32"."0.2.3" + self.by-version."cookie-signature"."1.0.5" + self.by-version."debug"."2.0.0" + self.by-version."depd"."0.4.4" + self.by-version."escape-html"."1.0.1" + self.by-version."etag"."1.3.0" + self.by-version."finalhandler"."0.2.0" + self.by-version."fresh"."0.2.4" + self.by-version."media-typer"."0.3.0" + self.by-version."methods"."1.1.0" + self.by-version."on-finished"."2.1.0" + self.by-version."parseurl"."1.3.0" + self.by-version."path-to-regexp"."0.1.3" + self.by-version."proxy-addr"."1.0.1" + self.by-version."qs"."2.2.3" + self.by-version."range-parser"."1.0.2" + self.by-version."send"."0.9.1" + self.by-version."serve-static"."1.6.1" + self.by-version."type-is"."1.5.1" + self.by-version."vary"."1.0.0" + self.by-version."cookie"."0.1.2" + self.by-version."merge-descriptors"."0.0.2" + self.by-version."utils-merge"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; + "express" = self.by-version."express"."4.9.0"; + by-spec."finalhandler"."0.2.0" = + self.by-version."finalhandler"."0.2.0"; + by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-finalhandler-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; + name = "finalhandler-0.2.0.tgz"; + sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; + }) + ]; + buildInputs = + (self.nativeDeps."finalhandler" or []); + deps = [ + self.by-version."debug"."2.0.0" + self.by-version."escape-html"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "finalhandler" ]; + }; by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -236,15 +563,34 @@ ]; passthru.names = [ "form-data" ]; }; - by-spec."fstream"."~0.1.28" = - self.by-version."fstream"."0.1.29"; - by-version."fstream"."0.1.29" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-0.1.29"; + by-spec."fresh"."0.2.4" = + self.by-version."fresh"."0.2.4"; + by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-fresh-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz"; - name = "fstream-0.1.29.tgz"; - sha1 = "34d04023ebc91a9df47bd31ab97e4704b4db413f"; + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + name = "fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }) + ]; + buildInputs = + (self.nativeDeps."fresh" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "fresh" ]; + }; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.31"; + by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-0.1.31"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + name = "fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; }) ]; buildInputs = @@ -252,7 +598,7 @@ deps = [ self.by-version."graceful-fs"."3.0.2" self.by-version."inherits"."2.0.1" - self.by-version."mkdirp"."0.3.5" + self.by-version."mkdirp"."0.5.0" self.by-version."rimraf"."2.2.8" ]; peerDependencies = [ @@ -342,6 +688,25 @@ ]; passthru.names = [ "http-signature" ]; }; + by-spec."iconv-lite"."0.4.4" = + self.by-version."iconv-lite"."0.4.4"; + by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-iconv-lite-0.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; + name = "iconv-lite-0.4.4.tgz"; + sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + }) + ]; + buildInputs = + (self.nativeDeps."iconv-lite" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "iconv-lite" ]; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -363,6 +728,25 @@ }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; + by-spec."ipaddr.js"."0.1.2" = + self.by-version."ipaddr.js"."0.1.2"; + by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ipaddr.js-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; + name = "ipaddr.js-0.1.2.tgz"; + sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + }) + ]; + buildInputs = + (self.nativeDeps."ipaddr.js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ipaddr.js" ]; + }; by-spec."json-stringify-safe"."~5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { @@ -382,7 +766,64 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; - by-spec."mime"."~1.2.11" = + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-media-typer-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }) + ]; + buildInputs = + (self.nativeDeps."media-typer" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "media-typer" ]; + }; + by-spec."merge-descriptors"."0.0.2" = + self.by-version."merge-descriptors"."0.0.2"; + by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-merge-descriptors-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + name = "merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }) + ]; + buildInputs = + (self.nativeDeps."merge-descriptors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "merge-descriptors" ]; + }; + by-spec."methods"."1.1.0" = + self.by-version."methods"."1.1.0"; + by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-methods-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; + name = "methods-1.1.0.tgz"; + sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; + by-spec."mime"."1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { name = "node-mime-1.2.11"; @@ -401,27 +842,147 @@ ]; passthru.names = [ "mime" ]; }; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mkdirp"."0.3" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "node-mkdirp-0.3.5"; + by-spec."mime-db"."~1.0.1" = + self.by-version."mime-db"."1.0.1"; + by-version."mime-db"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-db-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.1.tgz"; + name = "mime-db-1.0.1.tgz"; + sha1 = "35d99b0965967253bb30633a7d07a8de9975a952"; + }) + ]; + buildInputs = + (self.nativeDeps."mime-db" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime-db" ]; + }; + by-spec."mime-types"."~2.0.0" = + self.by-version."mime-types"."2.0.1"; + by-version."mime-types"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-types-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.1.tgz"; + name = "mime-types-2.0.1.tgz"; + sha1 = "7f5b4712592e7dd46ca733fd1c5f5d71356de615"; + }) + ]; + buildInputs = + (self.nativeDeps."mime-types" or []); + deps = [ + self.by-version."mime-db"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime-types" ]; + }; + by-spec."mime-types"."~2.0.1" = + self.by-version."mime-types"."2.0.1"; + by-spec."minimist"."0.0.8" = + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."mkdirp"."0.5" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; }) ]; buildInputs = (self.nativeDeps."mkdirp" or []); deps = [ + self.by-version."minimist"."0.0.8" ]; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ms-0.6.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }) + ]; + buildInputs = + (self.nativeDeps."ms" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ms" ]; + }; + by-spec."nan"."~1.0.0" = + self.by-version."nan"."1.0.0"; + by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-nan-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + name = "nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; + by-spec."negotiator"."0.4.7" = + self.by-version."negotiator"."0.4.7"; + by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; + name = "negotiator-0.4.7.tgz"; + sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + }) + ]; + buildInputs = + (self.nativeDeps."negotiator" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "negotiator" ]; + }; by-spec."node-uuid"."~1.4.0" = self.by-version."node-uuid"."1.4.1"; by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { @@ -460,15 +1021,114 @@ ]; passthru.names = [ "oauth-sign" ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.0"; - by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.0"; + by-spec."on-finished"."2.1.0" = + self.by-version."on-finished"."2.1.0"; + by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-on-finished-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"; - name = "punycode-1.3.0.tgz"; - sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; + name = "on-finished-2.1.0.tgz"; + sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + }) + ]; + buildInputs = + (self.nativeDeps."on-finished" or []); + deps = [ + self.by-version."ee-first"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "on-finished" ]; + }; + by-spec."on-finished"."~2.1.0" = + self.by-version."on-finished"."2.1.0"; + by-spec."options".">=0.0.5" = + self.by-version."options"."0.0.5"; + by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-options-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; + name = "options-0.0.5.tgz"; + sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + }) + ]; + buildInputs = + (self.nativeDeps."options" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "options" ]; + }; + by-spec."parseurl"."~1.3.0" = + self.by-version."parseurl"."1.3.0"; + by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-parseurl-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; + name = "parseurl-1.3.0.tgz"; + sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + }) + ]; + buildInputs = + (self.nativeDeps."parseurl" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "parseurl" ]; + }; + by-spec."path-to-regexp"."0.1.3" = + self.by-version."path-to-regexp"."0.1.3"; + by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-path-to-regexp-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + name = "path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; + }) + ]; + buildInputs = + (self.nativeDeps."path-to-regexp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "path-to-regexp" ]; + }; + by-spec."proxy-addr"."1.0.1" = + self.by-version."proxy-addr"."1.0.1"; + by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; + name = "proxy-addr-1.0.1.tgz"; + sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + }) + ]; + buildInputs = + (self.nativeDeps."proxy-addr" or []); + deps = [ + self.by-version."ipaddr.js"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "proxy-addr" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.1"; + by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; + name = "punycode-1.3.1.tgz"; + sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; }) ]; buildInputs = @@ -479,6 +1139,25 @@ ]; passthru.names = [ "punycode" ]; }; + by-spec."qs"."2.2.3" = + self.by-version."qs"."2.2.3"; + by-version."qs"."2.2.3" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-2.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz"; + name = "qs-2.2.3.tgz"; + sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { @@ -498,6 +1177,48 @@ ]; passthru.names = [ "qs" ]; }; + by-spec."range-parser"."~1.0.0" = + self.by-version."range-parser"."1.0.2"; + by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-range-parser-1.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; + name = "range-parser-1.0.2.tgz"; + sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + }) + ]; + buildInputs = + (self.nativeDeps."range-parser" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "range-parser" ]; + }; + by-spec."range-parser"."~1.0.2" = + self.by-version."range-parser"."1.0.2"; + by-spec."raw-body"."1.3.0" = + self.by-version."raw-body"."1.3.0"; + by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-raw-body-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; + name = "raw-body-1.3.0.tgz"; + sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = [ + self.by-version."bytes"."1.0.0" + self.by-version."iconv-lite"."0.4.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; by-spec."request"."~2.34.0" = self.by-version."request"."2.34.0"; by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { @@ -549,6 +1270,58 @@ ]; passthru.names = [ "rimraf" ]; }; + by-spec."send"."0.9.1" = + self.by-version."send"."0.9.1"; + by-version."send"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.9.1.tgz"; + name = "send-0.9.1.tgz"; + sha1 = "d93689f7c9ce36bd32f8ee572bb60bda032edc23"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = [ + self.by-version."debug"."2.0.0" + self.by-version."depd"."0.4.4" + self.by-version."destroy"."1.0.3" + self.by-version."escape-html"."1.0.1" + self.by-version."etag"."1.3.0" + self.by-version."fresh"."0.2.4" + self.by-version."mime"."1.2.11" + self.by-version."ms"."0.6.2" + self.by-version."on-finished"."2.1.0" + self.by-version."range-parser"."1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; + by-spec."serve-static"."~1.6.1" = + self.by-version."serve-static"."1.6.1"; + by-version."serve-static"."1.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz"; + name = "serve-static-1.6.1.tgz"; + sha1 = "2f257563afbe931d28cee4aa3dfeddc975a87193"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = [ + self.by-version."escape-html"."1.0.1" + self.by-version."parseurl"."1.3.0" + self.by-version."send"."0.9.1" + self.by-version."utils-merge"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -584,7 +1357,7 @@ (self.nativeDeps."tar" or []); deps = [ self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.29" + self.by-version."fstream"."0.1.31" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -592,6 +1365,25 @@ passthru.names = [ "tar" ]; }; "tar" = self.by-version."tar"."0.1.20"; + by-spec."tinycolor"."0.x" = + self.by-version."tinycolor"."0.0.1"; + by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-tinycolor-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }) + ]; + buildInputs = + (self.nativeDeps."tinycolor" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tinycolor" ]; + }; by-spec."tough-cookie".">=0.12.0" = self.by-version."tough-cookie"."0.12.1"; by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { @@ -606,7 +1398,7 @@ buildInputs = (self.nativeDeps."tough-cookie" or []); deps = [ - self.by-version."punycode"."1.3.0" + self.by-version."punycode"."1.3.1" ]; peerDependencies = [ ]; @@ -631,4 +1423,87 @@ ]; passthru.names = [ "tunnel-agent" ]; }; + by-spec."type-is"."~1.5.1" = + self.by-version."type-is"."1.5.1"; + by-version."type-is"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.5.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.1.tgz"; + name = "type-is-1.5.1.tgz"; + sha1 = "5c1e62d874f79199fb16b34d16972dba376ccbed"; + }) + ]; + buildInputs = + (self.nativeDeps."type-is" or []); + deps = [ + self.by-version."media-typer"."0.3.0" + self.by-version."mime-types"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "type-is" ]; + }; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-utils-merge-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }) + ]; + buildInputs = + (self.nativeDeps."utils-merge" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "utils-merge" ]; + }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.0"; + by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-vary-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; + name = "vary-1.0.0.tgz"; + sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7"; + }) + ]; + buildInputs = + (self.nativeDeps."vary" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "vary" ]; + }; + by-spec."ws"."~0.4.32" = + self.by-version."ws"."0.4.32"; + by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage { + name = "ws-0.4.32"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + name = "ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }) + ]; + buildInputs = + (self.nativeDeps."ws" or []); + deps = [ + self.by-version."commander"."2.1.0" + self.by-version."nan"."1.0.0" + self.by-version."tinycolor"."0.0.1" + self.by-version."options"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ws" ]; + }; + "ws" = self.by-version."ws"."0.4.32"; } From e68d97aa43e0fd3a6643ec1ba339ff6570aeeb1b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 11 Sep 2014 20:05:01 +0200 Subject: [PATCH 017/323] Add package for the STIX fonts. --- pkgs/data/fonts/stix-otf/default.nix | 30 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/stix-otf/default.nix diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix new file mode 100644 index 000000000000..f32d865c95c7 --- /dev/null +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "stix-otf-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; + sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q"; + }; + + buildInputs = [unzip]; + + phases = ["unpackPhase" "installPhase"]; + + sourceRoot = "Fonts/STIX-Word"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype + ''; + + meta = with stdenv.lib; { + homepage = http://www.stixfonts.org/; + description = "Fonts for Scientific and Technical Information eXchange"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [maintainers.rycee]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 415f7263e3e3..07f0c4ea74c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8265,6 +8265,8 @@ let stdmanpages = callPackage ../data/documentation/std-man-pages { }; + stix-otf = callPackage ../data/fonts/stix-otf { }; + symbola = callPackage ../data/fonts/symbola { }; iana_etc = callPackage ../data/misc/iana-etc { }; From f5c43d9f621fa71120be3d01ae55bd8cebe3717d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 13 Sep 2014 12:29:14 +0200 Subject: [PATCH 018/323] vanubi: new package Programming editor for GTK+ inspired by Emacs http://vanubi.github.io/vanubi --- pkgs/applications/editors/vanubi/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/editors/vanubi/default.nix diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix new file mode 100644 index 000000000000..692a728b12e4 --- /dev/null +++ b/pkgs/applications/editors/vanubi/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, vala, which, autoconf, automake +, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: + +stdenv.mkDerivation rec { + name = "vanubi-${version}"; + version = "0.0.14"; + + src = fetchurl { + url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz"; + sha256 = "0cd45zm54j6xz1a31qllg2w7l77sncv7mrpfx9bjzdiqpmzsdypl"; + }; + + buildInputs = [ pkgconfig vala which autoconf automake + libtool glib gtk3 libwnck3 asciidoc + gnome3.gtksourceview gnome3.vte python3Packages.pygments ]; + + configureScript = "./autogen.sh"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://vanubi.github.io/vanubi; + description = "Programming editor for GTK+ inspired by Emacs"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 415f7263e3e3..4de03527966f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10121,6 +10121,8 @@ let vanitygen = callPackage ../applications/misc/vanitygen { }; + vanubi = callPackage ../applications/editors/vanubi { }; + vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; From 8d67b9a240ebb7836b4c1532a4661c3d77eec795 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 13 Sep 2014 13:51:39 +0200 Subject: [PATCH 019/323] transformed meta.maintainers of some packages into lists --- pkgs/applications/audio/flac/default.nix | 2 +- pkgs/applications/audio/monkeys-audio/default.nix | 2 +- pkgs/applications/editors/scite/default.nix | 2 +- pkgs/applications/editors/sublime3/default.nix | 2 +- pkgs/applications/graphics/photivo/default.nix | 2 +- pkgs/applications/misc/pstree/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 4 ++-- pkgs/applications/misc/rxvt_unicode/default.nix | 2 +- pkgs/applications/networking/browsers/w3m/default.nix | 2 +- pkgs/applications/science/math/fricas/default.nix | 2 +- pkgs/applications/video/subtitleeditor/default.nix | 2 +- pkgs/applications/virtualization/virt-viewer/default.nix | 2 +- pkgs/applications/window-managers/bar/default.nix | 4 ++-- pkgs/applications/window-managers/bspwm/default.nix | 4 ++-- pkgs/data/documentation/pthread-man-pages/default.nix | 2 +- pkgs/data/fonts/wqy-microhei/default.nix | 4 ++-- pkgs/data/fonts/wqy-zenhei/default.nix | 4 ++-- pkgs/development/libraries/aterm/2.5.nix | 2 +- pkgs/development/libraries/aterm/2.8.nix | 2 +- pkgs/development/libraries/libc++/default.nix | 2 +- pkgs/development/libraries/libc++abi/default.nix | 2 +- pkgs/development/libraries/libresample/default.nix | 2 +- pkgs/development/libraries/openmpi/default.nix | 2 +- pkgs/development/tools/analysis/spin/default.nix | 2 +- pkgs/development/tools/misc/lsof/default.nix | 2 +- pkgs/development/tools/misc/strace/default.nix | 2 +- pkgs/development/tools/ocaml/opam/1.0.0.nix | 2 +- pkgs/games/stepmania/default.nix | 2 +- pkgs/misc/drivers/foomatic-filters/default.nix | 2 +- pkgs/os-specific/linux/acpi/default.nix | 2 +- pkgs/os-specific/linux/fuse/default.nix | 2 +- pkgs/os-specific/linux/pam_krb5/default.nix | 2 +- pkgs/servers/dict/default.nix | 2 +- pkgs/servers/dict/libmaa.nix | 2 +- pkgs/servers/nosql/riak/1.3.1.nix | 2 +- pkgs/servers/openafs-client/default.nix | 2 +- pkgs/servers/rippled/default.nix | 4 ++-- pkgs/tools/audio/gvolicon/default.nix | 4 ++-- pkgs/tools/misc/sutils/default.nix | 4 ++-- pkgs/tools/misc/xdo/default.nix | 4 ++-- pkgs/tools/misc/xtitle/default.nix | 4 ++-- pkgs/tools/networking/iftop/default.nix | 2 +- pkgs/tools/networking/socat/2.x.nix | 2 +- pkgs/tools/networking/socat/default.nix | 2 +- pkgs/tools/networking/tcpdump/default.nix | 2 +- pkgs/tools/package-management/dpkg/default.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/haveged/default.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 4 ++-- pkgs/tools/typesetting/pdfjam/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/beamer.nix | 2 +- 51 files changed, 62 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index fe4b43539d44..cb3ec1da97cf 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 08aa7e017b21..d1c6ed6379a8 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 234ee1f065e4..b2ac66c1e083 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation { description = "SCIntilla based Text Editor"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.rszibele; + maintainers = [ stdenv.lib.maintainers.rszibele ]; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 3ef557cef4b3..3bc815cc9548 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = { description = "Sophisticated text editor for code, markup and prose"; - maintainers = stdenv.lib.maintainers.wmertens; + maintainers = [ stdenv.lib.maintainers.wmertens ]; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 156966ac46c1..12816ba96af4 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index d4ffe2a4afd7..ec96ed76ce4e 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Show the set of running processes as a tree"; license = "GPL"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index abf55aa22b97..8ee006c5d7f1 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { temperature to allow your eyes to slowly adapt. ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = "http://jonls.dk/redshift"; + homepage = http://jonls.dk/redshift; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 7392123673ad..b0334dcd7ce9 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (rec { meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; }) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 5f046f7b7328..bf14e7e53414 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 6e187843404d..98012934f38d 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.sprock; + maintainers = [ stdenv.lib.maintainers.sprock ]; }; } diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index c1c11357ca03..7c42aebf2bcf 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://home.gna.org/subtitleeditor; license = stdenv.lib.licenses.gpl3; - maintainers = stdenv.lib.maintainers.plcplc; + maintainers = [ stdenv.lib.maintainers.plcplc ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index a5d7c7754125..1da4a521da75 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A viewer for remote virtual machines"; - maintainers = maintainers.raskin; + maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix index bee774d10da2..46a19b90b8bb 100644 --- a/pkgs/applications/window-managers/bar/default.nix +++ b/pkgs/applications/window-managers/bar/default.nix @@ -17,8 +17,8 @@ in meta = { description = "A lightweight xcb based bar"; - homepage = "https://github.com/LemonBoy/bar"; - maintainers = stdenv.lib.maintainers.meisternu; + homepage = https://github.com/LemonBoy/bar; + maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 24789f37ba7e..0b36d922df4c 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A tiling window manager based on binary space partitioning"; - homepage = "http://github.com/baskerville/bspwm"; - maintainers = stdenv.lib.maintainers.meisternu; + homepage = http://github.com/baskerville/bspwm; + maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "BSD"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix index 4cd5a5b8297b..cbd3234b2d44 100644 --- a/pkgs/data/documentation/pthread-man-pages/default.nix +++ b/pkgs/data/documentation/pthread-man-pages/default.nix @@ -43,6 +43,6 @@ in meta = { description = "POSIX threads (pthreads) manual pages from LinuxThreads"; homepage = http://www.gnu.org/software/libc/; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index 065bb4bc828f..c0665b2f0ccf 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = "http://wenq.org"; + homepage = http://wenq.org; license = stdenv.lib.licenses.asl20; - maintainers = stdenv.lib.maintainers.pkmx; + maintainers = [ stdenv.lib.maintainers.pkmx ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index d42665c69cca..92f043c7fc07 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = "http://wenq.org"; + homepage = http://wenq.org; license = stdenv.lib.licenses.gpl2; # with font embedding exceptions - maintainers = stdenv.lib.maintainers.pkmx; + maintainers = [ stdenv.lib.maintainers.pkmx ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index df509943ba27..10a22e00f650 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { license = "LGPL"; description = "Library for manipulation of term data structures in C"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = stdenv.lib.maintainers.eelco; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index a153443a54eb..3aa0e95305a9 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { license = "LGPL"; description = "Library for manipulation of term data structures in C"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = stdenv.lib.maintainers.eelco; + maintainers = [ stdenv.lib.maintainers.eelco ]; broken = true; }; } diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 32035709d8f9..21a07d6f7d4b 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = "BSD"; - maintainers = stdenv.lib.maintainers.shlevy; + maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 8218cbb966f0..dd1f46a9ab38 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; - maintainers = stdenv.lib.maintainers.shlevy; + maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 9ef1ada0a424..e8d4f98028f5 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { description = "A real-time library for sampling rate conversion library"; license = stdenv.lib.licenses.lgpl2Plus; homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html; - maintainers = stdenv.lib.maintainers.sander; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 15160d3afc49..14d88e381b3d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homePage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 06c04ca41b5d..a40215592f45 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Formal verification tool for distributed software systems"; homepage = http://spinroot.com/; license = "free"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ec3a5e9bcbf6..1ef292407a47 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 732423da5cd4..7cc878a28395 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix index f8f680ef4a54..4c74063d1165 100644 --- a/pkgs/development/tools/ocaml/opam/1.0.0.nix +++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - maintainers = stdenv.lib.maintainers.orbitz; + maintainers = [ stdenv.lib.maintainers.orbitz ]; description = "A package manager for OCaml"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 6a54dd7512f6..2379ac9ecd4e 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index f618a28b4d60..ffc5e093c218 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Foomatic printing filters"; - maintainers = stdenv.lib.maintainers.raskin; + maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 0fc799225153..b815cd778fa4 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/acpiclient/; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index d6513f7ebb53..036ece4627bc 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://fuse.sourceforge.net/; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index ad60e63c263b..0c182b5baa69 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV credentials and/or use them to set up AFS tokens for a user's session. ''; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 1fb7c24418f0..ee0477734c2f 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dict protocol server and client"; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index c63306e1ff4f..833aaa95b0ca 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dict protocol server and client"; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index 96315c52f6bf..e773f6ddcc36 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = stdenv.lib.maintainers.orbitz; + maintainers = [ stdenv.lib.maintainers.orbitz ]; description = "Dynamo inspired NoSQL DB by Basho"; longDescription = '' This patches the riak and riak-admin scripts to work better in Nix. diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 47c8c12edef6..162b12f8adc1 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://www.openafs.org; license = stdenv.lib.licenses.ipl10; platforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.z77z; + maintainers = [ stdenv.lib.maintainers.z77z ]; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 66a0743b367f..1325cebae405 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Ripple P2P payment network reference server"; - homepage = "https://ripple.com"; - maintainers = stdenv.lib.maintainers.emery; + homepage = https://ripple.com; + maintainers = [ stdenv.lib.maintainers.emery ]; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 69c62985154c..9bf9ee0d2245 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray."; - homepage = "https://github.com/Unia/gvolicon"; + homepage = https://github.com/Unia/gvolicon; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; - maintainers = stdenv.lib.maintainers.bennofs; + maintainers = [ stdenv.lib.maintainers.bennofs ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 6d2bee238130..53945113e7f2 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities."; - homepage = "https://github.com/baskerville/sutils"; - maintainers = stdenv.lib.maintainers.meisternu; + homepage = https://github.com/baskerville/sutils; + maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index 9a059c9dbb5a..e7a3d91967e6 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Small X utility to perform elementary actions on windows"; - homepage = "https://github.com/baskerville/xdo"; - maintainers = stdenv.lib.maintainers.meisternu; + homepage = https://github.com/baskerville/xdo; + maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index ca8be4c08eac..600f40a67b7d 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Outputs X window titles"; - homepage = "https://github.com/baskerville/xtitle"; - maintainers = stdenv.lib.maintainers.meisternu; + homepage = https://github.com/baskerville/xtitle; + maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index c40764866eb5..cb1bf546bf60 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index fbd249463812..9f9e8dbe3745 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { repositories.git = git://repo.or.cz/socat.git; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; - maintainers = stdenv.lib.maintainers.eelco; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 84ba2106a26a..e33edaa32da9 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { repositories.git = git://repo.or.cz/socat.git; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; - maintainers = stdenv.lib.maintainers.eelco; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index ed295e95a38b..2db270c3f666 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 01dea9c35e31..8ef32dab95a0 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index dbbdb8e57a66..2fad2fe29e69 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "AES encrypting or decrypting pipe"; homepage = http://loop-aes.sourceforge.net/aespipe.README; license = stdenv.lib.licenses.gpl2; - maintainers = stdenv.lib.maintainers.goibhniu; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index 1701d4cb46fd..91949cf0893a 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.issihosts.com/haveged/; license = stdenv.lib.licenses.gpl3; - maintainers = stdenv.lib.maintainers.iElectric; + maintainers = [ stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index d5f8bb9ff35f..9cef82e5e530 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation { line by line and field by field, ignoring small numeric differences or/and different numeric formats. ''; - homepage = "http://www.nongnu.org/numdiff/"; + homepage = http://www.nongnu.org/numdiff/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = stdenv.lib.maintainers.bbenoist; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix index 426cef3c85d1..1b8d7b5e8d8d 100644 --- a/pkgs/tools/typesetting/pdfjam/default.nix +++ b/pkgs/tools/typesetting/pdfjam/default.nix @@ -7,6 +7,6 @@ }; meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = maintainers.mornfall; + maintainers = [ maintainers.mornfall ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index 8b06cbb5a2bd..8afaf7b5f3ed 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -20,6 +20,6 @@ rec { meta = { description = "Extra components for TeXLive: beamer class"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } From 5349ff32a8f822a2c126083dd4283a9a3b4713ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 13 Sep 2014 14:02:41 +0200 Subject: [PATCH 020/323] shotcut: update from 14.08 to 14.09 --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 51baa32f61e8..79fd26204a90 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "14.08"; + version = "14.09"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "0klcvpgp2l6xcdjy1gg7a5s8mx0mm347zdf26q6kk685pldlvkyj"; + sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f"; }; buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; From f6b3de97bf347ef6e71c01980cfa146ce7d33d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 13 Sep 2014 14:05:53 +0200 Subject: [PATCH 021/323] python34Packages.zope_schema: update from 4.4.1 to 4.4.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3efb979e017..f7d4099cf542 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9779,11 +9779,11 @@ rec { zope_schema = buildPythonPackage rec { - name = "zope.schema-4.4.1"; + name = "zope.schema-4.4.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz"; - sha256 = "0wpwfggd736ai8bbrwbsnqf522sh5j57d1zxq8m8p6i5nwml0q02"; + sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; From cf8549da2fb852b95d6964bc6e464ef5a4691c23 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sat, 13 Sep 2014 14:23:09 +0200 Subject: [PATCH 022/323] dcfldd: added advanced dd replacement --- pkgs/tools/system/dcfldd/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/dcfldd/default.nix diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix new file mode 100644 index 000000000000..27ebbf3518fc --- /dev/null +++ b/pkgs/tools/system/dcfldd/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "dcfldd-1.3.4-1"; + + src = fetchurl { + url = "mirror://sourceforge/dcfldd/${name}.tar.gz"; + sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m"; + }; + + buildInputs = [ ]; + + meta = with stdenv.lib; { + description = "an enhanced version of GNU dd"; + + homepage = http://dcfldd.sourceforge.net/; + + license = licenses.gpl2; + + platforms = platforms.all; + maintainers = with maintainers; [ qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 200881c916a6..0709ee93fd65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -863,6 +863,8 @@ let dcraw = callPackage ../tools/graphics/dcraw { }; + dcfldd = callPackage ../tools/system/dcfldd { }; + debian_devscripts = callPackage ../tools/misc/debian-devscripts { inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; }; From f6d4d5907ec6f1dafff3b14d262f16f96f8ed6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 13 Sep 2014 14:52:47 +0200 Subject: [PATCH 023/323] ilixi: mark as broken It's broken since the directfb 1.6.3 -> 1.7.6 update, commit bb7138e9a983f8393116af192db38ec2954de401 ("directfb: Update to 1.7.6"). [...] building libilixi_graphics_la-Surface.lo CXX libilixi_graphics_la-Surface.lo Surface.cpp: In member function 'void ilixi::Surface::setGeometry(int, int, int, int)': Surface.cpp:157:44: error: in C++98 'r' must be initialized by constructor, not by '{...}' DFBRectangle r = { x, y, width, height }; --- pkgs/development/libraries/ilixi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index dd8ad8b35615..6fd204c236f7 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + broken = true; # broken by the directfb 1.6.3 -> 1.7.6 update }; } From 0047db47bd989e4928109289f583ee8f3ede1964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Sep 2014 16:15:22 +0200 Subject: [PATCH 024/323] flashplayer-11: update, including security fixes --- .../mozilla-plugins/flashplayer-11/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 55521a13f9cb..32baa0b6a868 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.400"; + version = "11.2.202.406"; src = if stdenv.system == "x86_64-linux" then @@ -47,18 +47,20 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "043bzjcqxjkjk68kba5nk77m59k6g71h32bypjpnwaigdgbhafyl"; + sha256 = "05akcw89kz0cnhan6wp72banz2asmvqfhb2cw1krn66qgd7bl0x0"; } else if stdenv.system == "i686-linux" then - if debug then { + if debug then + throw "flash debugging version is outdated and probably broken" /* { # The debug version also contains a player version = "11.1"; url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; - } else rec { + }*/ + else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1xvfzm926rj0l2mq2kybrvykrv7bjfl3m7p5mvhj1586a3x1gb6h"; + sha256 = "10f3842vi80kszj42f4c8sw7plrmvsin5k860cqvlzgdhndz8i4b"; } else throw "Flash Player is not supported on this platform"; From bee5cc43fb980d757b09b3b11b9c52fd2f6bd089 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Sat, 13 Sep 2014 10:40:44 -0400 Subject: [PATCH 025/323] xbmc: add libmad to LD_LIBRARY_PATH to enable mp3 file playback --- pkgs/applications/video/xbmc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 875ed48c102f..6d192c967f78 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${xdpyinfo}/bin" \ --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" done ''; From 4c4d4c78e98979585008a9aac5e5837bc94c478d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 13 Sep 2014 17:39:40 +0200 Subject: [PATCH 026/323] atftp: transformed meta.maintainers into a list and fixed indentation --- pkgs/tools/networking/atftp/default.nix | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index b6bdfc7fabc6..8524a964f153 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -4,31 +4,31 @@ assert stdenv.gcc.gcc != null; let version = "0.7"; debianPatch = fetchurl { -url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz"; -sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; + url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz"; + sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; }; in stdenv.mkDerivation { -name = "atftp"; -inherit version; -src = fetchurl { -url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; -sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; -}; -buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; -patches = [ debianPatch ]; -postInstall = '' -wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} -''; -meta = { -description = "Advanced tftp tools"; -maintainers = lib.maintainers.raskin; -platforms = lib.platforms.linux; -license = lib.licenses.gpl2Plus; -passthru = { -updateInfo = { -downloadPage = "http://packages.debian.org/source/wheezy/atftp"; -}; -}; + name = "atftp"; + inherit version; + src = fetchurl { + url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; + sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; + }; + buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; + patches = [ debianPatch ]; + postInstall = '' + wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} + ''; + meta = { + description = "Advanced tftp tools"; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + passthru = { + updateInfo = { + downloadPage = "http://packages.debian.org/source/wheezy/atftp"; + }; + }; }; } From 4031707138ca272f601e77bedaad2c5ea9b996ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Sep 2014 19:41:15 +0200 Subject: [PATCH 027/323] liferea: maintenance update --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index a5216b2902a6..fbf8955765aa 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.10"; + version = "1.10.11"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0y01lhw0fn5m0j9ykz8x7i0wchjqbxp33cvvprsfxfwzz4x31jm4"; + sha256 = "0mf5mpdj60j8if4qi5656l4pzhgwzhshf31yp0h53l1j442v109a"; }; buildInputs = with gst_all_1; [ From b9f7f19820f9dfd20519a8e38ec49147039cf33d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 20:03:44 +0200 Subject: [PATCH 028/323] R: Revert update to version 3.1.1 This reverts commit 6e803a684fff2db30f6e10e8dc5a830184a12b9e. The new version fails its test suite [1]. The issue has been reported upstream [2]. [1] http://hydra.cryp.to/build/191457/nixlog/1/raw [2] https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15975 --- pkgs/applications/science/math/R/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7bdfa2026e15..edba65146a66 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.1"; + name = "R-3.1.0"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "06bs5jk2bgib2wvd76yq9kf1vyim2j344midxkqyhk216ig4sp6f"; + sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt From 7bcd577bd1b486730c9973f16a4b51b4399b5a95 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 13 Sep 2014 20:32:07 +0200 Subject: [PATCH 029/323] mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 07dff1cf5855..7aded47dad18 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, apacheHttpd, python }: -stdenv.mkDerivation { - name = "mod_wsgi-3.4"; +stdenv.mkDerivation rec { + name = "mod_wsgi-${version}"; + version = "3.5"; src = fetchurl { - url = "http://modwsgi.googlecode.com/files/mod_wsgi-3.4.tar.gz"; - sha256 = "1s5nnjssvcl6lzy7kxmrk47yz6sgfzk90i1y7jml0s0lks7ck1df"; + url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; + sha256 = "14xz422jlakdhxzsl8xs9if86yf1fnkwdg0havjyqs7my0w4qrzh"; }; buildInputs = [ apacheHttpd python ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://code.google.com/p/modwsgi/"; + homepage = http://code.google.com/p/modwsgi/; description = "Host Python applications in Apache through the WSGI interface"; license = stdenv.lib.licenses.asl20; From 18e4197f872e23f287393cf243a540aa1b1e7bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 13 Sep 2014 20:43:04 +0200 Subject: [PATCH 030/323] pythonPackages: replace import with callPackage --- pkgs/top-level/python-packages.nix | 137 +++++++++-------------------- 1 file changed, 44 insertions(+), 93 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7d4099cf542..1ec5867eb299 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,5 +1,6 @@ { pkgs, python }: - with pkgs.lib; + +with pkgs.lib; let isPy26 = python.majorVersion == "2.6"; @@ -17,23 +18,29 @@ let if isPy34 then "python34" else if isPyPy then "pypy" else ""; - modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; }; - -pythonPackages = modules // import ./python-packages-generated.nix { - inherit pkgs python; - inherit (pkgs) stdenv fetchurl; - self = pythonPackages; -} // + modules = python.modules or { + readline = null; + sqlite3 = null; + curses = null; + curses_panel = null; + ssl = null; + crypt = null; + }; + pythonPackages = modules // import ./python-packages-generated.nix { + inherit pkgs python; + inherit (pkgs) stdenv fetchurl; + self = pythonPackages; + } # Python packages for all python versions -rec { +// rec { inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip; # helpers - callPackage = callPackageWith (pkgs // pythonPackages); + callPackage = pkgs.newScope pythonPackages; # global distutils config used by buildPythonPackage distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; @@ -49,23 +56,16 @@ rec { # specials - recursivePthLoader = import ../development/python-modules/recursive-pth-loader { - inherit (pkgs) stdenv; - inherit python; - }; + recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = import ../development/python-modules/setuptools { - inherit (pkgs) stdenv fetchurl; - inherit python wrapPython distutils-cfg; - }; + setuptools = callPackage ../development/python-modules/setuptools { }; # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; - dbus = import ../development/python-modules/dbus { - inherit (pkgs) stdenv fetchurl pkgconfig dbus dbus_glib dbus_tools; - inherit python isPyPy; + dbus = callPackage ../development/python-modules/dbus { + dbus = pkgs.dbus; }; discid = buildPythonPackage rec { @@ -91,8 +91,6 @@ rec { }; h5py = callPackage ../development/python-modules/h5py { - inherit (pkgs) stdenv fetchurl; - inherit python buildPythonPackage cython numpy; hdf5 = pkgs.hdf5.override { mpi = null; }; }; @@ -103,25 +101,19 @@ rec { inherit mpi4py; }; - ipython = import ../shells/ipython { - inherit (pkgs) stdenv fetchurl sip pyqt4; - inherit buildPythonPackage pythonPackages; + ipython = callPackage ../shells/ipython { qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin pylabQtSupport = !pkgs.stdenv.isDarwin; pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin }; - ipythonLight = lowPrio (import ../shells/ipython { - inherit (pkgs) stdenv fetchurl; - inherit buildPythonPackage pythonPackages; + ipythonLight = lowPrio (ipython.override { qtconsoleSupport = false; pylabSupport = false; pylabQtSupport = false; }); mpi4py = callPackage ../development/python-modules/mpi4py { - inherit (pkgs) stdenv fetchurl openssh; - inherit python buildPythonPackage; mpi = pkgs.openmpi; }; @@ -131,74 +123,37 @@ rec { # version of nixpart. nixpart0 = nixpart; - pitz = import ../applications/misc/pitz { - inherit (pkgs) stdenv fetchurl; - inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils; + pitz = callPackage ../applications/misc/pitz { }; + + pycairo = callPackage ../development/python-modules/pycairo { }; - pycairo = import ../development/python-modules/pycairo { - inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11; - inherit python isPyPy; + pycrypto = callPackage ../development/python-modules/pycrypto { }; + + pygobject = callPackage ../development/python-modules/pygobject { }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; + + pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; + + pyGtkGlade = pygtk.override { + libglade = pkgs.gnome.libglade; }; - pycrypto = import ../development/python-modules/pycrypto { - inherit (pkgs) fetchurl stdenv gmp; - inherit python buildPythonPackage; - }; - - pygobject = import ../development/python-modules/pygobject { - inherit (pkgs) stdenv fetchurl pkgconfig glib; - inherit python; - }; - - pygobject3 = import ../development/python-modules/pygobject/3.nix { - inherit (pkgs) stdenv fetchurl pkgconfig glib gobjectIntrospection cairo; - inherit python pycairo; - }; - - pygtk = import ../development/python-modules/pygtk { - inherit (pkgs) fetchurl stdenv pkgconfig gtk; - inherit python buildPythonPackage pygobject pycairo isPy3k; - }; - - # XXX: how can we get an override here? - #pyGtkGlade = pygtk.override { - # inherit (pkgs.gnome) libglade; - #}; - pyGtkGlade = import ../development/python-modules/pygtk { - inherit (pkgs) fetchurl stdenv pkgconfig gtk; - inherit (pkgs.gnome) libglade; - inherit python buildPythonPackage pygobject pycairo isPy3k; - }; - - pyqt4 = import ../development/python-modules/pyqt/4.x.nix { - inherit (pkgs) stdenv fetchurl pkgconfig qt4 makeWrapper; - inherit (pkgs.xorg) lndir; - inherit python sip; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonDBus = dbus; }; - pyqt5 = import ../development/python-modules/pyqt/5.x.nix { - inherit (pkgs) stdenv fetchurl pkgconfig qt5 makeWrapper; - inherit (pkgs.xorg) lndir; - inherit python; + pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { sip = sip_4_16; pythonDBus = dbus; }; - sip = import ../development/python-modules/sip { - inherit (pkgs) stdenv fetchurl; - inherit python isPyPy; - }; + sip = callPackage ../development/python-modules/sip { }; - sip_4_16 = import ../development/python-modules/sip/4.16.nix { - inherit (pkgs) stdenv fetchurl; - inherit python isPyPy; - }; + sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; - tables = import ../development/python-modules/tables { - inherit (pkgs) stdenv fetchurl bzip2 lzo; - inherit python buildPythonPackage cython numpy numexpr; + tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; @@ -9217,15 +9172,11 @@ rec { wxPython = wxPython28; - wxPython28 = import ../development/python-modules/wxPython/2.8.nix { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit pythonPackages isPyPy python; + wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { wxGTK = pkgs.wxGTK28; }; - wxPython30 = import ../development/python-modules/wxPython/3.0.nix { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit pythonPackages isPyPy python; + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; }; @@ -10810,4 +10761,4 @@ rec { -}); in pythonPackages +}); in pythonPackages \ No newline at end of file From 7d0a7ed62cf504bf1cc6665b63536b02200441aa Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sat, 13 Sep 2014 22:25:17 +0200 Subject: [PATCH 031/323] gitAndTools.tig: update from 2.0.2 to 2.0.3 --- .../version-management/git-and-tools/tig/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 239fa87d32c5..7e93893e7b1e 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "tig-2.0.2"; + name = "tig-2.0.3"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r"; + sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s"; + }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ]; From 83f40f7b5ec458ef24700aece599c57b2aa985b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:04 +0200 Subject: [PATCH 032/323] haskell-arbtt: update to version 0.8.1.4 --- pkgs/applications/misc/arbtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 27f6c1223741..cd3df455c38e 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "arbtt"; - version = "0.8.1.2"; - sha256 = "074vb84vkygxamvq7xnwlpgbch6qkbhyzbakc343230p1ryxf62q"; + version = "0.8.1.4"; + sha256 = "15ydb425nvqfzajx09q713wy5xa7awbzfjlsidk17vf7qbhfjn7z"; isLibrary = false; isExecutable = true; buildDepends = [ From 6c60e8efd18134edcbdb0524904dfdb12f3b89e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:11 +0200 Subject: [PATCH 033/323] haskell-Chart-cairo: update to version 1.3.1 --- pkgs/development/libraries/haskell/Chart-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 28480a4d27d3..95d346cd9f35 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.3"; - sha256 = "1d8v4imbb2g30gbxj3xlm1vqc17cnqbiysxp78n3vrxnalr8s98l"; + version = "1.3.1"; + sha256 = "15d52x0xr0klkfp9jh9i2aqki8gkm805mm6yk53f3ky92vdylg6q"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; From 1f19af6dcc1c08c7f61f19772ba843344d6ecc59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:13 +0200 Subject: [PATCH 034/323] haskell-Chart-diagrams: update to version 1.3.1 --- pkgs/development/libraries/haskell/Chart-diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index ff4898eb1e7d..6b90954c4a7a 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Chart-diagrams"; - version = "1.3"; - sha256 = "1lfdv2bn942w4b0bjd6aw59wdc2jfk305ym5vm88liy9127b65bp"; + version = "1.3.1"; + sha256 = "0p959m350rj0fl91f94c0gcxnzgy8yrz27naw9ciqi36za7sxl6j"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text From 9917e8813ae0db6570ff448bd5d7ef03283d4f42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:15 +0200 Subject: [PATCH 035/323] haskell-Chart-gtk: update to version 1.3.1 --- .../libraries/haskell/Chart-gtk/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 0ce13bd87378..7e6f7d794af3 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -1,12 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }: +{ cabal, cairo, Chart, ChartCairo, colour, dataDefaultClass, gtk +, mtl, time +}: cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.3"; - sha256 = "1bi7gim31w3xf6jsd2hkwhkhw1i9c4dmxnm3f46336k9rsxn59ph"; - buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; + version = "1.3.1"; + sha256 = "1bnhwiabwjhry6pfwi9xs4zg23vycqx3rpbc5qs7773sij93v7bj"; + buildDepends = [ + cairo Chart ChartCairo colour dataDefaultClass gtk mtl time + ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; From 54a7a49451da4b4cad743fee0d8295f8ed45c057 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:17 +0200 Subject: [PATCH 036/323] haskell-Chart: update to version 1.3.1 --- pkgs/development/libraries/haskell/Chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 557721007ed5..94e40a28afaf 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.3"; - sha256 = "1xvr90x1kmnjfmbap47ffzi3xbawcwz7q6b76v2gbqp4gjlhiyx7"; + version = "1.3.1"; + sha256 = "019q77hgv5hyhfpsfs2k1a4qn8fandk1nj7xkzn00z21jqhman2s"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; From 561fa4ded3962f59c1ae1cd20f1ced305fac82e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:19 +0200 Subject: [PATCH 037/323] haskell-DAV: update to version 1.0.2 --- pkgs/development/libraries/haskell/DAV/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 30289ed9d086..ce1b82ad5713 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "DAV"; - version = "1.0.1"; - sha256 = "0j8z7hi5dykimv6da584zgyn8xlvfhg1k9sbhj5ay7ncxszb134k"; + version = "1.0.2"; + sha256 = "0xbiq3q8w1cjnh71sfnincir8igvwig734r8schbsps993p2d24b"; isLibrary = true; isExecutable = true; buildDepends = [ From 2f282a4732aead059a5f43a1f014059ae3bec971 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:21 +0200 Subject: [PATCH 038/323] haskell-aeson-qq: update to version 0.7.3 --- pkgs/development/libraries/haskell/aeson-qq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index 2090a20fa8df..95452b913607 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson-qq"; - version = "0.7.2"; - sha256 = "1h4agwl8kr6qpy4775pxmaizhlzbwjqb23pxn2vvz9wbm2vnixwk"; + version = "0.7.3"; + sha256 = "1d5wl38gkqc2dbk626f7vdcc2i3faannac13zdc9py0kbcniw231"; buildDepends = [ aeson haskellSrcMeta parsec text vector ]; testDepends = [ aeson haskellSrcMeta hspec parsec text vector ]; meta = { From 10c7a3c6da226a7e5959d000e2800e6747a314af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:23 +0200 Subject: [PATCH 039/323] haskell-attoparsec: update to version 0.12.1.1 --- pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix index b8e2104f7390..6c617084a123 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From b8379f353fe6af631c97856d5166cfc69acb08c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:24 +0200 Subject: [PATCH 040/323] haskell-base-prelude: update to version 0.1.4 --- 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 824576293f45..1799fa6a6bae 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.3"; - sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx"; + version = "0.1.4"; + sha256 = "10xvzkzlmyrq0mi6056rl6hq4bga1k1c6671b1bxjhgzgqrzpjpz"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; From 63db029727a4acbfadf3ac1cf19d2b56cfdf33ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:26 +0200 Subject: [PATCH 041/323] haskell-blaze-builder: update to version 0.3.3.3 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index c031633c2331..478ec8355d99 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.3.2"; - sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40"; + version = "0.3.3.3"; + sha256 = "1kzm2crwan11wrg8ky2gc29c7xpi9fm34xhz5gf5xlc3vy423y8s"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From 9aad370b80472aea2be2bfc99bcc4f49e803e988 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:28 +0200 Subject: [PATCH 042/323] haskell-boundingboxes: update to version 0.2 --- pkgs/development/libraries/haskell/boundingboxes/0.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix index 686f4ffbbabe..382b2da95d2c 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "The type for 2D bounding box"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From 068a8e42d332b8f798a4619370b9cb9dc061ecef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:30 +0200 Subject: [PATCH 043/323] haskell-case-insensitive: update to version 1.2.0.0 --- pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix index c8c544610e3b..4e9b234ba167 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From 6211803085599376f7473afd553e4f019f8659de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:34 +0200 Subject: [PATCH 044/323] haskell-checkers: update to version 0.4.1 --- pkgs/development/libraries/haskell/checkers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix index fb7e86fc75f1..65f9d20a19af 100644 --- a/pkgs/development/libraries/haskell/checkers/default.nix +++ b/pkgs/development/libraries/haskell/checkers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "checkers"; - version = "0.3.2"; - sha256 = "0v8i6754syvjh2p5qdqh95j3swkar9077gidsnahwk9h6qfsx6r3"; + version = "0.4.1"; + sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr"; buildDepends = [ QuickCheck random ]; meta = { description = "Check properties on standard classes and data structures"; From f1442285ee3026efe005916e532e6c16578f71d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:40 +0200 Subject: [PATCH 045/323] haskell-criterion: update to version 1.0.1.0 --- pkgs/development/libraries/haskell/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 7cac43769f81..5a5ce89f732d 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "1.0.0.2"; - sha256 = "1r30vcrplilj3silnrmn0r5m0df27icdsgd5hx35li9yrs862n95"; + version = "1.0.1.0"; + sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll"; isLibrary = true; isExecutable = true; buildDepends = [ From 3c996e00c4716145faa70b1145a08ffa90e85f6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:42 +0200 Subject: [PATCH 046/323] haskell-cuda: update to version 0.6.5.0 --- pkgs/development/libraries/haskell/cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index c6daa8b5fdd5..7e09fc12f70f 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.6.0.1"; - sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51"; + version = "0.6.5.0"; + sha256 = "0q4c2xgffkchn8kxhiwjganmb3ki4yjhx5665zwfd18bgvmlnp60"; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; From db42a9a86f1b45dafa74e070675ac44a3aa8f13a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:44 +0200 Subject: [PATCH 047/323] haskell-diagrams-cairo: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 3a695fa82037..a350520bc502 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2.0.1"; - sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c"; + version = "1.2.0.2"; + sha256 = "0qm1s56kg7l96p5cvmdxc0g8r8ibh7vpyavp64178mdy62b6xavh"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split From 2d4118b21c23bcc90ec96a6e3db0531d507d1393 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:46 +0200 Subject: [PATCH 048/323] haskell-diagrams-lib: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index b15f05dbf27b..ea5b1aad27fa 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.2"; - sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p"; + version = "1.2.0.3"; + sha256 = "1rgyv7yywmqk3s2cmv5s923421ybj6mnii7jgxri56jzw0agfyq7"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie From a3cf7e86f51d7a17d7a4c2ba44e47875ec769e63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:48 +0200 Subject: [PATCH 049/323] haskell-diagrams-rasterific: update to version 0.1.0.2 --- 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 c2e85058a906..6d20bcd23766 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.1"; - sha256 = "1bgrwnrdhlnbcv5ra80x2nh5yr5bzz81f517zb0ws2y07l072gwm"; + version = "0.1.0.2"; + sha256 = "16pwpa34hxf8qd7mf3zn4k7sr6p2pkvag3c77iwcs5qwqf5vhyf9"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split From 29661328f0eeaae2e17fd3df1c29f21aaa5a090a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:49 +0200 Subject: [PATCH 050/323] haskell-djinn: update to version 2014.9.7 --- pkgs/development/libraries/haskell/djinn/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix index 12ff67c7f20d..e922d9ff7be4 100644 --- a/pkgs/development/libraries/haskell/djinn/default.nix +++ b/pkgs/development/libraries/haskell/djinn/default.nix @@ -4,20 +4,14 @@ cabal.mkDerivation (self: { pname = "djinn"; - version = "2011.7.23"; - sha256 = "14748pqzrd1r9jg2vc9v232pi38q99l9zdlia6ashm2v871hp1xv"; + version = "2014.9.7"; + sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g"; isLibrary = false; isExecutable = true; buildDepends = [ haskeline mtl ]; - preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin '' - sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal - ''; meta = { - homepage = "http://www.augustsson.net/Darcs/Djinn/"; description = "Generate Haskell code from a type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; }; }) From 4f57aabd7cf62f80e54abd7772f31030fb4b979b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:51 +0200 Subject: [PATCH 051/323] haskell-either: update to version 4.3.1 --- pkgs/development/libraries/haskell/either/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 72f3bff14df1..d2fb0964dd99 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "4.3.0.2"; - sha256 = "01n4jkf6py00841cyf3fiwiay736dpbhda8ia2qgm26q4r4h58gd"; + version = "4.3.1"; + sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x"; buildDepends = [ exceptions free monadControl MonadRandom mtl semigroupoids semigroups transformers transformersBase From a82e434d7ea84a9bdbd4f066085d581d11e3b238 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:53 +0200 Subject: [PATCH 052/323] haskell-fay: update to version 0.20.1.4 --- pkgs/development/libraries/haskell/fay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index c00b009c51d7..1e3ba43cb3eb 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.20.1.3"; - sha256 = "1r9a1my8wydxx92xg04kacw90s1r4bms84fvs1w52r73knp5kb6r"; + version = "0.20.1.4"; + sha256 = "022q9ac12hviamgl959v68k5mmr1i0wfisxxqa435l2y3g3yszb1"; isLibrary = true; isExecutable = true; buildDepends = [ From bb933868de7a389f418740015a4bf9da074f52fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:55 +0200 Subject: [PATCH 053/323] haskell-fb: update to version 1.0.5 --- pkgs/development/libraries/haskell/fb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 37d243097324..b35f994caaaf 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.4"; - sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2"; + version = "1.0.5"; + sha256 = "1y4i6w659v4zm6kxz8fnzrwm0gjv7siqlh1wdsm03rcadkicyxmr"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault From c1642c5cb71eec9baa549282ce3f319ad2d91154 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:57 +0200 Subject: [PATCH 054/323] haskell-file-location: update to version 0.4.5.3 --- pkgs/development/libraries/haskell/file-location/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix index 6cff9640cdf4..e027047a9ea5 100644 --- a/pkgs/development/libraries/haskell/file-location/default.nix +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "file-location"; - version = "0.4.5.2"; - sha256 = "0dyzf2lhh0n4hwbh44qfh6bw9snl4hha9sv76c4ndi7v1rvnx197"; + version = "0.4.5.3"; + sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9"; buildDepends = [ liftedBase transformers ]; testDepends = [ liftedBase transformers ]; meta = { From 96b0340ff5611c52255df6b47d2c1a962f75e842 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:39:59 +0200 Subject: [PATCH 055/323] haskell-generic-aeson: update to version 0.2.0.0 --- .../libraries/haskell/generic-aeson/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 9c18b511efc0..4ad9ab11fad5 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text -, vector +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.1.1.1"; - sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1"; + version = "0.2.0.0"; + sha256 = "0w7bwmbjsskynyfisnhp4piikdw2jkr4zg24c9ipsp28szy8qsb9"; buildDepends = [ - aeson attoparsec genericDeriving mtl tagged text vector + aeson attoparsec genericDeriving mtl tagged text + unorderedContainers vector ]; meta = { description = "Derivation of Aeson instances using GHC generics"; From 0a358f063cb4a6f0135eeca9a791c147e18d84b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:01 +0200 Subject: [PATCH 056/323] haskell-geniplate: update to version 0.6.0.5 --- pkgs/development/libraries/haskell/geniplate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix index 9ab6d2df7095..87e1296330aa 100644 --- a/pkgs/development/libraries/haskell/geniplate/default.nix +++ b/pkgs/development/libraries/haskell/geniplate/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "geniplate"; - version = "0.6.0.4"; - sha256 = "1sw1bs3nzbdmvphy5g65pl40y8wdqkgvszx1i6viqjymjq96xv20"; + version = "0.6.0.5"; + sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc"; buildDepends = [ mtl ]; meta = { - description = "Use template Haskell to generate Uniplate-like functions"; + description = "Use Template Haskell to generate Uniplate-like functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From ae8d3baab3d64017670abf454ddce81d7ffd9700 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:03 +0200 Subject: [PATCH 057/323] haskell-github: update to version 0.11.1 --- .../libraries/haskell/github/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index f20976b8dcfb..d912f1c56bb5 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault -, failure, hashable, HTTP, httpConduit, httpTypes, network, text -, time, unorderedContainers, vector +{ cabal, aeson, attoparsec, caseInsensitive, conduit, cryptohash +, dataDefault, failure, hashable, HTTP, httpConduit, httpTypes +, network, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "github"; - version = "0.11.0"; - sha256 = "13p0iplxr85fvgx5lird76xchmhh7xpddq900qr02kbvn5mqv607"; + version = "0.11.1"; + sha256 = "0s94ivp3c40zhwwfxa6nzzgwh2frfih8as81i0kidx4ca35wf92k"; buildDepends = [ - aeson attoparsec caseInsensitive conduit dataDefault failure - hashable HTTP httpConduit httpTypes network text time + aeson attoparsec caseInsensitive conduit cryptohash dataDefault + failure hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; meta = { From e809aabffe47d336c9b9e9bb620e19571ae26172 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:05 +0200 Subject: [PATCH 058/323] haskell-hakyll: update to version 4.5.5.0 --- .../libraries/haskell/hakyll/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 7ebc0de734a3..767f10b33f63 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -2,34 +2,32 @@ { cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash , dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes -, HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec -, QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer -, systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, utillinux +, HUnit, lrucache, mtl, network, networkUri, pandoc, pandocCiteproc +, parsec, QuickCheck, random, regexBase, regexTdfa, snapCore +, snapServer, systemFilepath, tagsoup, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, utillinux }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.5.4.0"; - sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c"; + version = "4.5.5.0"; + sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; isLibrary = true; isExecutable = true; buildDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq - filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc - pandocCiteproc parsec random regexBase regexTdfa snapCore - snapServer systemFilepath tagsoup text time + filepath fsnotify httpConduit httpTypes lrucache mtl network + networkUri pandoc pandocCiteproc parsec random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup text time ]; testDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network - pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa - snapCore snapServer systemFilepath tagsoup testFramework + networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase + regexTdfa snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc .*,|pandoc-citeproc,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 5c7732184d548fc0ce990e0b83800ecc775f36bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:15 +0200 Subject: [PATCH 059/323] haskell-leveldb-haskell: update to version 0.3.1 --- .../libraries/haskell/leveldb-haskell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index 8d4f854a9934..0b721be21519 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, dataDefault, filepath, leveldb, resourcet +{ cabal, async, dataDefault, filepath, leveldb, resourcet, snappy , transformers }: cabal.mkDerivation (self: { pname = "leveldb-haskell"; - version = "0.3.0"; - sha256 = "0hdxn6v7fzc0wlpkymlci60m2584h6fn78bxdnv2q18ra03r3ygs"; + version = "0.3.1"; + sha256 = "09pyji49sdl60xicd32ra7v72qf0jkjhnvpsfr9k698is7lcq06d"; isLibrary = true; isExecutable = true; buildDepends = [ async dataDefault filepath resourcet transformers ]; - extraLibraries = [ leveldb ]; + extraLibraries = [ leveldb snappy ]; meta = { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; From e8c21bf8e150a99519c92658ed8740d7c23f5861 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:17 +0200 Subject: [PATCH 060/323] haskell-managed: update to version 1.0.0 --- pkgs/development/libraries/haskell/managed/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/managed/default.nix b/pkgs/development/libraries/haskell/managed/default.nix index 5827038627c7..febb1f8c5741 100644 --- a/pkgs/development/libraries/haskell/managed/default.nix +++ b/pkgs/development/libraries/haskell/managed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { From f13950b74404f5fb506b082e1273559df98440d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:21 +0200 Subject: [PATCH 061/323] haskell-mono-traversable: update to version 0.6.2 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index dfc34cc2a6a6..5a5249657eb7 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.1"; - sha256 = "066yfffjkd0r6hg3y3zrs13jmyfgpl8ba9yvsbyawimvff7mfk5f"; + version = "0.6.2"; + sha256 = "17ipqxzpz1vnv2qlj7rl8iz3awk593z39c716bikx03z67h85qzr"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From 4f6f8f763becd244efbc72c6e97c6c342c330d0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:23 +0200 Subject: [PATCH 062/323] haskell-multipart: update to version 0.1.2 --- pkgs/development/libraries/haskell/multipart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix index 242005392c21..def73364e31d 100644 --- a/pkgs/development/libraries/haskell/multipart/default.nix +++ b/pkgs/development/libraries/haskell/multipart/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "multipart"; - version = "0.1.1"; - sha256 = "12sxi21baq1wsa3z6qrczyk47finw85yiql26l90wxk99smm90pj"; + version = "0.1.2"; + sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"; buildDepends = [ parsec ]; meta = { homepage = "http://www.github.com/silkapp/multipart"; - description = "A partial fork of the cgi package exposing the multipart module"; + description = "HTTP multipart split out of the cgi package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From de37e853ab300e17ae55a5cfa590aef584fad7c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:24 +0200 Subject: [PATCH 063/323] haskell-optparse-applicative: update to version 0.9.1.1 --- .../libraries/haskell/optparse-applicative/0.9.1.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix index 82bc0fa8a9ee..4660e7f37ba8 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.9.1.1.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "Utilities and combinators for parsing command line options"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From 500a7a81b33a62dc2027c373d1879d2d7715ba1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:26 +0200 Subject: [PATCH 064/323] haskell-pcap-enumerator: update to version 0.5 --- .../development/libraries/haskell/pcap-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix index f7480295f6d4..db35b2fe020d 100644 --- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pcap-enumerator"; - version = "0.4"; - sha256 = "0ka2n7740s02marvd1b11mrxc663kj0zcn7hksl5i13ls026hpb8"; + version = "0.5"; + sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb"; buildDepends = [ enumerator pcap transformers ]; meta = { homepage = "http://github.com/cutsea110/pcap-enumerator"; From f07cec10e29f1c7a5b2934f15584f6a39d759159 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:28 +0200 Subject: [PATCH 065/323] haskell-protobuf: update to version 0.2.0.4 --- pkgs/development/libraries/haskell/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/protobuf/default.nix b/pkgs/development/libraries/haskell/protobuf/default.nix index be437c7410de..3b0c1508ce02 100644 --- a/pkgs/development/libraries/haskell/protobuf/default.nix +++ b/pkgs/development/libraries/haskell/protobuf/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "protobuf"; - version = "0.2.0.3"; - sha256 = "0jcrnym0j8w4vjrdmvn88x8ddp8wf809wviy1vkz94p2nyp6l2hw"; + version = "0.2.0.4"; + sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j"; buildDepends = [ cereal dataBinaryIeee754 deepseq mtl text unorderedContainers ]; From 5b0b7b7686e581149b6d3d3025f297595c6d1011 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:30 +0200 Subject: [PATCH 066/323] haskell-quickcheck-instances: update to version 0.3.9 --- .../libraries/haskell/quickcheck-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 5aa1314f8e75..11bcb7aab6d5 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.8"; - sha256 = "0132a37zi1haz1aaggxa1hr421bcmxlbaa4m2l53m2rmr4z5mgkg"; + version = "0.3.9"; + sha256 = "1a0mbd1kga4qnamp80x2g4avjwcy8z0zrriqxdhb1525wyyb0656"; buildDepends = [ hashable QuickCheck text time unorderedContainers ]; From 17d9243bd787fb743c9be83233f7ce63ff2e7638 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:32 +0200 Subject: [PATCH 067/323] haskell-reducers: update to version 3.10.3 --- pkgs/development/libraries/haskell/reducers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index bfa8a063b8e9..5cf9535e1b2b 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.10.2.1"; - sha256 = "1wn6q6cw9is1gan9y5n3fzjkhmpjpria4p13zp4kqxmj881067vy"; + version = "3.10.3"; + sha256 = "0hi77mgc2f38y0xfykn7x6gdl6xg710skpx4z76s8c0wwnd28pr6"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers From 6044100af1a12d38b0436fb074851437a1290eb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:34 +0200 Subject: [PATCH 068/323] haskell-rest-gen: update to version 0.15.0.2 --- 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 148e8f1cc1ff..3a21393c210e 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.15"; - sha256 = "004rcxaw4xjsa1grz84wgik6nabd9c3nyp8s6ylfgwgcrvcc8li2"; + version = "0.15.0.2"; + sha256 = "1k33bhjy909ffc5bnk3fb8vi8pvylb7rh6m95f70x5h6wgq4lhjg"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore From fcd50bf099fe7754a9c41213225073b2e77c03dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:36 +0200 Subject: [PATCH 069/323] haskell-semigroups: update to version 0.15.3 --- pkgs/development/libraries/haskell/semigroups/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index ed9fa0bf3fb1..54df1ebe66b5 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, nats, text, unorderedContainers }: +{ cabal, deepseq, hashable, nats, text, unorderedContainers }: cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.2"; - sha256 = "1lh06d0mwivzbfjg635r3m39qcpyjvnwni7mspz96qb3zcm0c5kp"; - buildDepends = [ hashable nats text unorderedContainers ]; + version = "0.15.3"; + sha256 = "0bzrab88vvgv3bnbcc7gyc05b9h9zz1pnc6bv2d2mpg653pm97k3"; + buildDepends = [ deepseq hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Anything that associates"; From 5eb39687b5402652d543c2010d204e5fc1048633 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:38 +0200 Subject: [PATCH 070/323] haskell-setlocale: update to version 1.0.0.1 --- pkgs/development/libraries/haskell/setlocale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix index 05696176d903..a76a2f5cf325 100644 --- a/pkgs/development/libraries/haskell/setlocale/default.nix +++ b/pkgs/development/libraries/haskell/setlocale/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "setlocale"; - version = "1.0.0"; - sha256 = "1bnxh09jjac8gyjl87w6v86dqc1xr398l28ili8283im141anpzi"; + version = "1.0.0.1"; + sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0"; jailbreak = true; meta = { description = "Haskell bindings to setlocale"; From 263d94b279893445f0239ce75f844c67d22266dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:40 +0200 Subject: [PATCH 071/323] haskell-snap-cors: update to version 1.2.5.1 --- pkgs/development/libraries/haskell/snap-cors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index f62b484328c3..be9147d6c765 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.5"; - sha256 = "1zjvvi1prskkb26yp51j09gfkhpw0ggj69d89098yq0sl6d0vy1c"; + version = "1.2.5.1"; + sha256 = "1fijby8iryhcjdb7n95hdbjff4rnqyfx5s9x01nbmd9lxrch12dr"; buildDepends = [ attoparsec caseInsensitive hashable network snap text transformers unorderedContainers From f314e4c9c3bdc8ce9de00e078eea0c73f7c9bb10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:46 +0200 Subject: [PATCH 072/323] haskell-tuple: update to version 0.3.0.2 --- pkgs/development/libraries/haskell/tuple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index 974c2fe140b8..6997d2229ce3 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tuple"; - version = "0.2.0.1"; - sha256 = "1c4vf798rjwshnk04avyjp4rjzj8i9qx4yksv00m3rjy6psr57xg"; + version = "0.3.0.2"; + sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg"; buildDepends = [ OneTuple ]; meta = { description = "Various functions on tuples"; From 4531a7dcf2142d2cfb062deecbb8ca3fdbd6099a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:48 +0200 Subject: [PATCH 073/323] haskell-uuid: update to version 1.3.4 --- 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 eb36f5555aee..44fb5bde2bf8 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.3"; - sha256 = "12sfspmrnpqbwwscv3w41pkkdbfvy1aaa84y7is0d3ffk5rll80m"; + version = "1.3.4"; + sha256 = "03gab2dg52i4ysxw6vdzdd018qy0lycq7x3gcbx0r9c8vsqvafmc"; buildDepends = [ binary cryptohash deepseq hashable networkInfo random time ]; From 35460608b3d2d42967943cb19441b4a5008c7a3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:49 +0200 Subject: [PATCH 074/323] haskell-xlsx: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/xlsx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix index 779814c05dd8..e2fdfa0d1a75 100644 --- a/pkgs/development/libraries/haskell/xlsx/default.nix +++ b/pkgs/development/libraries/haskell/xlsx/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "xlsx"; - version = "0.1.0.2"; - sha256 = "0m9ph34mpnc6vj1d3x80y0gaya5bqdhfa193jn0a8clw4qz88sbr"; + version = "0.1.0.3"; + sha256 = "1i1dfb6gv4h3nc9ja7yxjzb8g207vzp58dnk4rgfcfglyvadn8kp"; isLibrary = true; isExecutable = true; buildDepends = [ From ae02e513847dc0a12d443cad9e7ad280f314dcd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:58 +0200 Subject: [PATCH 075/323] haskell-haskell-packages: update to version 0.2.4.2 --- .../libraries/haskell/haskell-packages/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 9c6997a9db93..0044d6aa0527 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts -, hseCpp, mtl, optparseApplicative, tagged +{ cabal, aeson, Cabal, deepseq, filepath, haskellSrcExts, hseCpp +, mtl, optparseApplicative, tagged, transformers +, transformersCompat }: cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4.1"; - sha256 = "014zcq27rwsgj3n4kdgswbppr5yzf3lnj5gnv45r3i5c3rd1mz6k"; + version = "0.2.4.2"; + sha256 = "03qg6b6vy9c8j9k91jajkjhswcks64vcdd28606aac0bw68lkjkg"; buildDepends = [ - aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl - optparseApplicative tagged + aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl + optparseApplicative tagged transformers transformersCompat ]; meta = { homepage = "http://documentup.com/haskell-suite/haskell-packages"; From 35d081a5add74648f2986407bdf0a0c9c7f518ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:00 +0200 Subject: [PATCH 076/323] haskell-haxr: update to version 3000.10.3.1 --- pkgs/development/libraries/haskell/haxr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 1aba1975a78e..4b9fc06cc86a 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network -, time, utf8String +, networkUri, time, utf8String }: cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.10.3"; - sha256 = "082w86vawjiqz589s3gmawssd0b43b1vcw0h6cndadwww8yc35bg"; + version = "3000.10.3.1"; + sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm"; buildDepends = [ - base64Bytestring blazeBuilder HaXml HTTP mtl network time - utf8String + base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri + time utf8String ]; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; From 9fcfe01a1753d93e66feaf87a6ac7c0a9b6f429f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:02 +0200 Subject: [PATCH 077/323] haskell-hindent: update to version 2.4 --- 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 cef49d0b2fac..3f8671f69ec5 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "2.1"; - sha256 = "0gvrh26d1d6d1fy4qfpwrghdrlvk82mkya8vaz0xnrs89p9gr9rz"; + version = "2.4"; + sha256 = "1hhfdcjxccgpiw4yj3738l97ajcmq4wm182s0m41wryrq0s4ai1g"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts mtl text ]; From 26bbee8175916e3f99722603a687ef25efdc6857 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:04 +0200 Subject: [PATCH 078/323] haskell-hmatrix: update to version 0.16.0.5 --- 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 806405208c5b..7a335fefb340 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.4"; - sha256 = "0n2h7vp8cyr4lm6yv6msvqr87d0dn7fm61p58wy7f230v692j1p4"; + version = "0.16.0.5"; + sha256 = "12019yd4hxqryxsrppijff6w0wmqj2l5cssldh1lyv4dbjaaxb5y"; buildDepends = [ binary deepseq random split storableComplex vector ]; From 551f104352148f6c1ab47b86843569a89492438b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:06 +0200 Subject: [PATCH 079/323] haskell-holy-project: update to version 0.1.1.1 --- .../haskell/holy-project/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix index 088bbe4d4ea8..708b740f64da 100644 --- a/pkgs/development/libraries/haskell/holy-project/default.nix +++ b/pkgs/development/libraries/haskell/holy-project/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, ansiTerminal, Cabal, filepath, hastache -, httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split -, syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text -, time -, fetchpatch}: +, httpConduit, HUnit, lens, lensAeson, QuickCheck, random +, smallcheck, split, syb, tasty, tastyHunit, tastyQuickcheck +, tastySmallcheck, text, time +}: cabal.mkDerivation (self: { pname = "holy-project"; - version = "0.1.1.0"; - sha256 = "1dsyhgjcp54199zfazzzwsggxpj2dsbzfb64v6l3jz7qaapxnj9i"; + version = "0.1.1.1"; + sha256 = "0vb4mlz6gb01aadm2b8kgvgnrwwvl6q4ndx6xldi0xi3rm22xkwj"; isLibrary = true; isExecutable = true; - patches = [ (fetchpatch { url = "https://github.com/yogsototh/holy-project/pull/3.patch"; sha256 = "1ndyhfrsvn94zxzyq1w4504gz91yfv33375933qmz3wdfkc3rqf0"; }) ]; buildDepends = [ aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens - QuickCheck random smallcheck split syb tasty tastyHunit + lensAeson QuickCheck random smallcheck split syb tasty tastyHunit tastyQuickcheck tastySmallcheck text time ]; testDepends = [ @@ -27,8 +26,6 @@ cabal.mkDerivation (self: { description = "Start your Haskell project with cabal, git and tests"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) From f73150a5b98f418db000e37ce97fad8265941185 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:08 +0200 Subject: [PATCH 080/323] haskell-hxt: update to version 9.3.1.7 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 131a01ed4326..1ca367a96c92 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.3.1.6"; - sha256 = "0k2i72ricxwnadagjbzyhfd7nfivay9gbf5f81sagr6j3wgnhz8f"; + version = "9.3.1.7"; + sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec From fd962f0968fefbd10a47b1fa15c80f2ba313d8e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:10 +0200 Subject: [PATCH 081/323] haskell-kan-extensions: update to version 4.1.0.1 --- .../libraries/haskell/kan-extensions/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index c0ffaed799d3..dce273d60a62 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, adjunctions, comonad, contravariant, distributive, free -, mtl, pointed, semigroupoids, transformers +, mtl, pointed, semigroupoids, tagged, transformers }: cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.1"; - sha256 = "1dg9q6rahgvsnsnd76r6a3harrllq3pzz9250cakgqip4n02dji1"; + version = "4.1.0.1"; + sha256 = "1jrs5cp5bhv3sjfi3d2zl16x40fr086zadp69r8yigj43bgkwkkd"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed - semigroupoids transformers + semigroupoids tagged transformers ]; meta = { homepage = "http://github.com/ekmett/kan-extensions/"; From 5e690a228870002576b556ae52ba07c6c81442c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:11 +0200 Subject: [PATCH 082/323] haskell-language-c-inline: update to version 0.7.6.0 --- .../libraries/haskell/language-c-inline/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index 435ffef45c32..e4cb4dec4ed0 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-inline"; - version = "0.6.0.0"; - sha256 = "08a22sr01kch365p5536fv32rxsfmdd6hkhcq1j7vhchjrsy3f6w"; + version = "0.7.6.0"; + sha256 = "01imdfjqkx49pcwplvmd5lqbal5hq1cx11zcig3na1x46ggiavah"; buildDepends = [ filepath languageCQuote mainlandPretty ]; testDepends = [ languageCQuote ]; doCheck = false; @@ -14,7 +14,5 @@ cabal.mkDerivation (self: { description = "Inline C & Objective-C code in Haskell for language interoperability"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) From 28b5518737576e3ff48a90faaf284d43c267d947 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:13 +0200 Subject: [PATCH 083/323] haskell-language-java: update to version 0.2.7 --- pkgs/development/libraries/haskell/language-java/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index 6811b0db547c..dc35a8867ba1 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "language-java"; - version = "0.2.6"; - sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27"; + version = "0.2.7"; + sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf"; buildDepends = [ cpphs parsec syb ]; testDepends = [ filepath HUnit mtl QuickCheck testFramework testFrameworkHunit From aa9eece18f02060f84b81ef5fa584d69f5f38808 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:41:15 +0200 Subject: [PATCH 084/323] haskell-lens: update to version 4.4.0.2 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 190dd3fd14ed..b6c68f3ce001 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.4.0.1"; - sha256 = "0d1z6jix58g7x9r1jvm335hg2psflqc7w6sq54q486wil55c5vrw"; + version = "4.4.0.2"; + sha256 = "03h1r6np1aas5nnw3nsqcvl9an9yriikcgapnfck82pmmdvg5l47"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection From 78442b00b1a6941aadc26f95411cd593f9ab7733 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:42:06 +0200 Subject: [PATCH 085/323] haskell-case-insensitive: update to version 1.2.0.1 --- .../haskell/case-insensitive/{1.2.0.0.nix => 1.2.0.1.nix} | 5 ++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/case-insensitive/{1.2.0.0.nix => 1.2.0.1.nix} (79%) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix similarity index 79% rename from pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix rename to pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix index 4e9b234ba167..96b5bc114a33 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.2.0.0"; - sha256 = "0ybdmqaqh9hdl3dl5kx8qhs4b67g78fhnkqnd3y2lpgqjvhnbzp4"; + version = "1.2.0.1"; + sha256 = "1hnckzi6yq3332fx4b140lwa9p6x69rlpaw6y1pmldj2h9nsxl6m"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 942e4be2ca7a..8af09a49f9c5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -372,8 +372,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; - caseInsensitive_1_2_0_0 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.0.nix {}; - caseInsensitive = self.caseInsensitive_1_2_0_0; + caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {}; + caseInsensitive = self.caseInsensitive_1_2_0_1; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; From 74d42b548aad2ff51900afba6a1ed904c555ead0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:42:58 +0200 Subject: [PATCH 086/323] haskell-parsec: update to version 3.1.6 --- .../libraries/haskell/parsec/{3.1.5.nix => 3.1.6.nix} | 7 ++++--- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/parsec/{3.1.5.nix => 3.1.6.nix} (64%) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.5.nix b/pkgs/development/libraries/haskell/parsec/3.1.6.nix similarity index 64% rename from pkgs/development/libraries/haskell/parsec/3.1.5.nix rename to pkgs/development/libraries/haskell/parsec/3.1.6.nix index b6a5d37e5312..5a8d83622f54 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.5.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.6.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, mtl, text }: +{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "parsec"; - version = "3.1.5"; - sha256 = "1f1wg4qxp1ss2160sa3vbqff18fabwhqjkyfj4sgyfmwf9fj8wn5"; + version = "3.1.6"; + sha256 = "12k2gzy7fi83929mr2s4vj3ipfyg7l74v1cb2vbi4613qmq5wrw4"; buildDepends = [ mtl text ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; jailbreak = true; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9a064212a40e..4fcab8e9d6de 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -131,6 +131,7 @@ network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; OpenGLRaw = self.OpenGLRaw_1_3_0_0; OpenGL = self.OpenGL_2_6_0_1; + parsec = super.parsec.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8af09a49f9c5..446f60cc95f3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1835,8 +1835,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; - parsec_3_1_5 = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {}; - parsec = self.parsec_3_1_5; + parsec_3_1_6 = callPackage ../development/libraries/haskell/parsec/3.1.6.nix {}; + parsec = self.parsec_3_1_6; parsers = callPackage ../development/libraries/haskell/parsers {}; From caf56dd59de9ac36afb0e74eba8a90c2200dfed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:47:51 +0200 Subject: [PATCH 087/323] haskell-boundingboxes: update to version 0.2.1 --- .../libraries/haskell/boundingboxes/0.1.1.nix | 24 ------------------- .../boundingboxes/{0.2.nix => default.nix} | 7 +++--- pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix rename pkgs/development/libraries/haskell/boundingboxes/{0.2.nix => default.nix} (75%) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix deleted file mode 100644 index 205b05f30d89..000000000000 --- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, lens, linear, QuickCheck, random, testFramework -, testFrameworkQuickcheck2, testFrameworkTh -}: - -cabal.mkDerivation (self: { - pname = "boundingboxes"; - version = "0.1.1"; - sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0"; - buildDepends = [ lens linear ]; - testDepends = [ - lens linear QuickCheck random testFramework - testFrameworkQuickcheck2 testFrameworkTh - ]; - doCheck = false; - meta = { - homepage = "https://github.com/fumieval/boundingboxes"; - description = "The type for 2D bounding box"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix similarity index 75% rename from pkgs/development/libraries/haskell/boundingboxes/0.2.nix rename to pkgs/development/libraries/haskell/boundingboxes/default.nix index 382b2da95d2c..25af90c078e3 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "boundingboxes"; - version = "0.2"; - sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp"; + version = "0.2.1"; + sha256 = "0c9kcgg8596q7wgzc7c2dqq37f16w3f6ilwfzqgdqc33p06x6pha"; buildDepends = [ lens ]; testDepends = [ lens linear QuickCheck random testFramework @@ -16,9 +16,8 @@ cabal.mkDerivation (self: { doCheck = false; meta = { homepage = "https://github.com/fumieval/boundingboxes"; - description = "The type for 2D bounding box"; + description = "A generic boundingbox for an arbitrary vector"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 446f60cc95f3..35f6835086b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -301,9 +301,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in boolExtras = callPackage ../development/libraries/haskell/bool-extras {}; - boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {}; - boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; - boundingboxes = self.boundingboxes_0_2; + boundingboxes = callPackage ../development/libraries/haskell/boundingboxes {}; BoundedChan = callPackage ../development/libraries/haskell/BoundedChan {}; From 47d02a94e57ab79dc8ee3e0c1d3b8cebbb506011 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:48:23 +0200 Subject: [PATCH 088/323] haskell-scientific: update to version 0.3.3.1 --- .../libraries/haskell/scientific/{0.3.3.0.nix => 0.3.3.1.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.0.nix => 0.3.3.1.nix} (89%) diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.1.nix similarity index 89% rename from pkgs/development/libraries/haskell/scientific/0.3.3.0.nix rename to pkgs/development/libraries/haskell/scientific/0.3.3.1.nix index 22bf663334c6..1eb719ed1171 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.3.0"; - sha256 = "1kj49ibq53m7cfs9pq396l4fbqnarqzay7a65rmsrzi2vz15parv"; + version = "0.3.3.1"; + sha256 = "1p1g9cj827hb1zsn6zip7vgiwrw2vxfali6qvhccd6j1p12drw0b"; 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 35f6835086b6..73f018486a73 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2158,8 +2158,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_0 = callPackage ../development/libraries/haskell/scientific/0.3.3.0.nix {}; - scientific = self.scientific_0_3_3_0; + scientific_0_3_3_1 = callPackage ../development/libraries/haskell/scientific/0.3.3.1.nix {}; + scientific = self.scientific_0_3_3_1; scotty = callPackage ../development/libraries/haskell/scotty {}; From 6b1ba06bac3284f884e8965e93d56cf0998cc47a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:49:25 +0200 Subject: [PATCH 089/323] haskell-attoparsec: update to version 0.12.1.2 --- .../haskell/attoparsec/{0.12.1.1.nix => 0.12.1.2.nix} | 9 ++++----- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/attoparsec/{0.12.1.1.nix => 0.12.1.2.nix} (71%) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix similarity index 71% rename from pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix rename to pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix index 6c617084a123..a60838662487 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix @@ -1,23 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, deepseq, QuickCheck, scientific, testFramework -, testFrameworkQuickcheck2, text +, testFrameworkQuickcheck2, text, vector }: cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.12.1.1"; - sha256 = "0whj2wscw9pdf6avnhnqiapsllh6228j4hifyfvr4v0w663plh7p"; + version = "0.12.1.2"; + sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc"; buildDepends = [ deepseq scientific text ]; testDepends = [ deepseq QuickCheck scientific testFramework - testFrameworkQuickcheck2 text + testFrameworkQuickcheck2 text vector ]; meta = { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 73f018486a73..fae3a3590af3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -202,8 +202,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec_0_12_1_1 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.1.nix {}; - attoparsec = self.attoparsec_0_12_1_1; + attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {}; + attoparsec = self.attoparsec_0_12_1_2; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; From ea88b6e4355d8b0dfb6dd59b82c936bef63e0343 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 16:16:02 +0200 Subject: [PATCH 090/323] haskell-DAV: drop jailbreak to see what update breaks this package --- pkgs/development/libraries/haskell/DAV/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index ce1b82ad5713..be383fd4143e 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { httpClientTls httpTypes lens mtl network optparseApplicative transformers transformersBase utf8String xmlConduit xmlHamlet ]; - jailbreak = true; meta = { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; From 9a96591db1fd59db55a563511c00cd58b40f0202 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 16:20:12 +0200 Subject: [PATCH 091/323] haskell-optparse-applicative: try what happens when we update to 0.10.x --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fae3a3590af3..87ad5d953edd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1800,7 +1800,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {}; optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {}; - optparseApplicative = self.optparseApplicative_0_9_1_1; # version 0.10.0 breaks too many builds + optparseApplicative = self.optparseApplicative_0_10_0; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; From 1f2f1a81dc752c75b6ef2aad8f04b6cd911818bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 16:20:46 +0200 Subject: [PATCH 092/323] haskell-checkers: build with latest quickcheck --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87ad5d953edd..819455c99025 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -405,7 +405,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cheapskate = callPackage ../development/libraries/haskell/cheapskate {}; - checkers = callPackage ../development/libraries/haskell/checkers { QuickCheck = self.QuickCheck_2_6; }; + checkers = callPackage ../development/libraries/haskell/checkers {}; chell = callPackage ../development/libraries/haskell/chell {}; From b27484fdcb134c818a00d825b9ab205d7b264993 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 17:02:46 +0200 Subject: [PATCH 093/323] haskell-tasty-ant-xml: update to version 1.0.0.10 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 2dbd8a17b941..1fa30cf368d7 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.9"; - sha256 = "0zl1gdm5cm3vpi551ysvcis17grb83q18y3c329bxynnizrm8q9f"; + version = "1.0.0.10"; + sha256 = "1qjpgbsj8fh5w3l9zap3wsrf1cp8bmsl1adcxy5z2j8yi3rsljii"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; From d590d8b77fb571b2d7e66b7bf550f6a6ebac32d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 17:02:49 +0200 Subject: [PATCH 094/323] haskell-tasty: update to version 0.10 --- pkgs/development/libraries/haskell/tasty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 6303320460fb..b06233771140 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative -, regexTdfaRc, stm, tagged, unboundedDelays +, regexTdfaRc, stm, tagged, time, unboundedDelays }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.1.3"; - sha256 = "0hc030ms89w3cl1k3r8nrym3g7sg2n66ch2ljg6d7fwhrsgxnagf"; + version = "0.10"; + sha256 = "1va9rj6k0v8mdkqbgjvn5rcaf2zp785ihfr4b5j87xzaiw32m1l6"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm - tagged unboundedDelays + tagged time unboundedDelays ]; meta = { homepage = "http://documentup.com/feuerbach/tasty"; From 9795888b3ecd1a8715b91f8e0ecc801984cc201c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:08:59 +0200 Subject: [PATCH 095/323] haskell-blaze-html: update to version 0.7.0.3 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index e29b4c025210..16c967d78a20 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.7.0.2"; - sha256 = "0yqgm5nrryx0qlz9qhpbfxvkwjdbl9876v4gnn0src81j9dzcx2v"; + version = "0.7.0.3"; + sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework From 8633bb7076cc78c1d95972d0db7412f0ee0e6a3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:04 +0200 Subject: [PATCH 096/323] haskell-blaze-markup: update to version 0.6.1.1 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index d4b52d544362..cdea333abcde 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.6.1.0"; - sha256 = "0ydk34y1j8bssdiqw6m70383dh4khbcac3jd7fpr37cx7ighlp7l"; + version = "0.6.1.1"; + sha256 = "1ah6fgfqsmarq8g4gw81yhckz4pclb2ifxv237cqz5zhy9il4j5d"; buildDepends = [ blazeBuilder text ]; testDepends = [ blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit From 2694bed8da90e0c3494712274b79a6a49aa2c17f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:07 +0200 Subject: [PATCH 097/323] haskell-cereal-conduit: update to version 0.7.2.3 --- pkgs/development/libraries/haskell/cereal-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index e15d10bd45b3..baad29433582 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cereal-conduit"; - version = "0.7.2.2"; - sha256 = "1syqilka5rv2j3yp419f2wdrcfw8js6i2p7qif4yxvlkm2hkvzzk"; + version = "0.7.2.3"; + sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s"; buildDepends = [ cereal conduit resourcet transformers ]; testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; meta = { From fcdc7d32955d3a8ef67be6f03c968ffc21e528e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:10 +0200 Subject: [PATCH 098/323] haskell-classy-prelude-conduit: update to version 0.9.5 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 286a20f2ba22..b2a85e356996 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.4"; - sha256 = "07ggdd3c47bs0pj4hl8vl19k2jlbka73pq7x0m4rsgrrjxc5pr1r"; + version = "0.9.5"; + sha256 = "1m26d463h5hxiyc4dm6fwbyjwzmd0bwl2blwpgp4wqnyvspz195m"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void From b75c5e681f76834c14deb479eaf538464aa651d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:12 +0200 Subject: [PATCH 099/323] haskell-classy-prelude: update to version 0.9.5 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 018a54f42d75..b3f94ea7bdfe 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.4"; - sha256 = "1pxg515dg174minvajaxl3sqpqjm862pgfpf7n2ynw5cqmaxngxa"; + version = "0.9.5"; + sha256 = "1gd5z4gd62v3k59psmrj41ca6mly4fjqgf4l80smv89kc2s2w809"; buildDepends = [ basicPrelude chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable mtl primitive semigroups stm From e3356d5a43e924ce3889df8cdb108739ed00e9fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:15 +0200 Subject: [PATCH 100/323] haskell-conduit-combinators: update to version 0.2.8.3 --- .../libraries/haskell/conduit-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 17598dda06bd..4c194279b4ed 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.8.2"; - sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha"; + version = "0.2.8.3"; + sha256 = "1a3dysrxg7mhm9naqj6vq45k0vxihar7pn650rb8aw22k85ifmkz"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet From c7a684be23c6a98d393160bff68419ee9a1baa25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:18 +0200 Subject: [PATCH 101/323] haskell-conduit-extra: update to version 1.1.3.4 --- 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 1cb2b0efe6cf..e0b3bdfa542b 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.3.2"; - sha256 = "15flywjw5ha8cgn4yznwlnx31ls4y82gfmvbniby0d51y4x8dmgq"; + version = "1.1.3.4"; + sha256 = "0j27lzdklyq2kv10yfpd16a9sl00iyalmcy8jj9r87r7jpvj949p"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers From 3c4a0ec9d6028248ee8c4a5dc96d764bb624d9da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:21 +0200 Subject: [PATCH 102/323] haskell-conduit: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index f3c27ebae955..5b82a2f26a08 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.7"; - sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6"; + version = "1.2.0.2"; + sha256 = "0gr4vqyvy3jdc1l7sinwr5dgmwzv7dq2z1npwvmbxz85bq89rmd9"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void From 9b805cf62292212dc8a5e40b8c9a5cb13d95e00b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:23 +0200 Subject: [PATCH 103/323] haskell-hspec-wai: update to version 0.4.1 --- .../libraries/haskell/hspec-wai/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 5937b0a417cc..9cf37d4622c0 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, caseInsensitive, hspec2, hspecMeta -, httpTypes, markdownUnlit, scotty, text, transformers, wai -, waiExtra +{ cabal, aeson, aesonQq, caseInsensitive, hspec2, httpTypes +, markdownUnlit, scotty, text, transformers, wai, waiExtra }: cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.3.0.2"; - sha256 = "13jf8vw1mx5zg8diklbc4hbil9mkjdbg2azdsdfxp286wh718mna"; + version = "0.4.1"; + sha256 = "1005qhzi561zc5kbdc55d3wjngdcal47him19fn5gk4389jdbln7"; buildDepends = [ aeson aesonQq caseInsensitive hspec2 httpTypes text transformers wai waiExtra ]; testDepends = [ - aeson caseInsensitive hspec2 hspecMeta httpTypes markdownUnlit - scotty text transformers wai waiExtra + aeson caseInsensitive hspec2 httpTypes markdownUnlit scotty text + transformers wai waiExtra ]; meta = { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; From 6cbc46b43c6d3ee681704b8fdc0e0a66edbef0a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:26 +0200 Subject: [PATCH 104/323] haskell-html-conduit: update to version 1.1.1 --- pkgs/development/libraries/haskell/html-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 4d13846175c5..8e9c0ff821b6 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0.5"; - sha256 = "1yxvaiklg90fsiv2sfzrr3hp1wjs0fhcg709b24lqm81aryaq2sn"; + version = "1.1.1"; + sha256 = "0xnndyjgyvh94a6smipl3pc9vswjfpywdyz4gfialdj7g2h3mqjj"; buildDepends = [ conduit conduitExtra resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes From a7ae67483496649fc6cc77790c76ad603146e547 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:31 +0200 Subject: [PATCH 105/323] haskell-http-conduit: update to version 2.1.4.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index fd7eb7dd64ae..11efa4968af7 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.4.1"; - sha256 = "1v65v2dky7vgyh5hfvih208zhbd2czxdrshw9zw0af1naq2m5hk2"; + version = "2.1.4.3"; + sha256 = "0318k4k4w1zpifalfa7vb33sd8ksa8jdyaxs4843idmwsz3ahwgq"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers From 9efb04797a8555afaa27812388bbf8850615f462 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:34 +0200 Subject: [PATCH 106/323] haskell-hxt-charproperties: update to version 9.2.0.0 --- .../libraries/haskell/hxt-charproperties/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index ffb298023b7d..45885432767f 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "hxt-charproperties"; - version = "9.1.1.1"; - sha256 = "1a8cmswqysd0fpq6bpszav5cqpibnad49mbcswvrwipk28x3j078"; + version = "9.2.0.0"; + sha256 = "01v3j0cg9pkp18iy4s8s582qqq98r4l9jzr84x5sa2rva4cg0gpi"; meta = { - homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + homepage = "https://github.com/UweSchmidt/hxt"; description = "Character properties and classes for XML and Unicode"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; From ef77bc70dfca4b25bce2473a83cf4eac9fc6e830 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:37 +0200 Subject: [PATCH 107/323] haskell-json-schema: update to version 0.7.0.1 --- .../libraries/haskell/json-schema/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 8ae6763d0a43..5dfe40089b7c 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit -, tagged, tasty, tastyHunit, tastyTh, text, time -, unorderedContainers, vector +{ cabal, aeson, aesonUtils, attoparsec, genericAeson +, genericDeriving, mtl, scientific, tagged, tasty, tastyHunit +, tastyTh, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "json-schema"; - version = "0.6.1.1"; - sha256 = "0hn1v2idra9sx1x5mr511h4qcvnhy7b80fgn58w9856w9cl7d34b"; + version = "0.7.0.1"; + sha256 = "1r8f0i3w2g5i5amqpvmi6ys3ax4rzpbvwnvwk9wy95bch3nlvsw0"; buildDepends = [ - aeson genericAeson genericDeriving tagged text time + aeson genericAeson genericDeriving mtl scientific tagged text time unorderedContainers vector ]; testDepends = [ - aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh - text + aeson aesonUtils attoparsec genericAeson tagged tasty tastyHunit + tastyTh text vector ]; jailbreak = true; meta = { From c6e7152a21919343b54d918f03f825bef344f7bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:39 +0200 Subject: [PATCH 108/323] haskell-minioperational: update to version 0.4.6 --- .../development/libraries/haskell/minioperational/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix index a426927e318c..d037645682f2 100644 --- a/pkgs/development/libraries/haskell/minioperational/default.nix +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "minioperational"; - version = "0.4.3"; - sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p"; + version = "0.4.6"; + sha256 = "0ir15l9ks4wik5wmhc9v23d2wlh4v499a52pzzsl8w40406lm5ln"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/fumieval/minioperational"; From 72072908c3a28b14dbfe1b26fe2bf4b86f7313ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:42 +0200 Subject: [PATCH 109/323] haskell-persistent-mysql: update to version 2.0.1 --- .../libraries/haskell/persistent-mysql/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index beb2ca94263a..c76624e52c39 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, blazeBuilder, conduit, monadControl, mysql -, mysqlSimple, persistent, resourcet, text, transformers +{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger +, mysql, mysqlSimple, persistent, resourcet, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-mysql"; - version = "1.3.0.2"; - sha256 = "0yv2f8zqypbp5swdpxmgnfmmfsr6lwhb27k0hl9bh7ya76anhvqy"; + version = "2.0.1"; + sha256 = "02hqklndyzff8swcll5n7ck6iy9ci50kj1s5l1r43kcgh7cqili3"; buildDepends = [ - aeson blazeBuilder conduit monadControl mysql mysqlSimple - persistent resourcet text transformers + aeson blazeBuilder conduit monadControl monadLogger mysql + mysqlSimple persistent resourcet text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From c40cc6e799d3b9311c2db5d6160d007975974e4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:45 +0200 Subject: [PATCH 110/323] haskell-persistent-postgresql: update to version 2.0.1 --- .../haskell/persistent-postgresql/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 207183db8469..3838d2e67adb 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent -, postgresqlLibpq, postgresqlSimple, resourcet, text, time -, transformers +{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger +, persistent, postgresqlLibpq, postgresqlSimple, resourcet, text +, time, transformers }: cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.3.1.1"; - sha256 = "1qi19fm7waxrbh795jvcny7aaj6b64jqcwv772xjzl9dbv3q9qhc"; + version = "2.0.1"; + sha256 = "1szvnakbg7bwyld3wcm9b0fn3083z95kpygqnx1hd7nc21hl6dch"; buildDepends = [ - aeson blazeBuilder conduit monadControl persistent postgresqlLibpq - postgresqlSimple resourcet text time transformers + aeson blazeBuilder conduit monadControl monadLogger persistent + postgresqlLibpq postgresqlSimple resourcet text time transformers ]; jailbreak = true; meta = { From a289f2baa8a29cf0f1cab288f21a06b49beb19c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:47 +0200 Subject: [PATCH 111/323] haskell-persistent-sqlite: update to version 2.0.1 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 288e91ab78d4..c2f2f341e5ea 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.3.0.5"; - sha256 = "05b7byc4z7mhni90cj2aan63f599wv0511zqbsm6kbylk1zpyizb"; + version = "2.0.1"; + sha256 = "1ygyghifss29fdkyk5fhq9f1nkw1wgmlcsdh18sff5vvvk7vfa2l"; isLibrary = true; isExecutable = true; buildDepends = [ From 6a1e66042c94ff0915c18ee3cd3e7ca8015f1ef4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:50 +0200 Subject: [PATCH 112/323] haskell-persistent-template: update to version 2.0.2.2 --- .../haskell/persistent-template/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 4b3c97c1a9cb..44e4d1f3246a 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, hspec, monadControl, monadLogger, persistent -, QuickCheck, text, transformers, unorderedContainers +{ cabal, aeson, hspec, monadControl, monadLogger, pathPieces +, persistent, QuickCheck, tagged, text, transformers +, unorderedContainers }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.3.2.2"; - sha256 = "0vcj0y2i423cz1iry5gsz5cvqynpnbhzl6basqcqn6k8ca7s876i"; + version = "2.0.2.2"; + sha256 = "1qar8xh4nbprnvqzgy4byc882hkfyxr7apbj0wzfs7smpla1ghlx"; buildDepends = [ - aeson monadControl monadLogger persistent text transformers - unorderedContainers + aeson monadControl monadLogger pathPieces persistent tagged text + transformers unorderedContainers ]; testDepends = [ aeson hspec persistent QuickCheck text transformers From 082aca60ad98a837f75baf1b8ebae1c1930ec6f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:53 +0200 Subject: [PATCH 113/323] haskell-persistent: update to version 2.0.2 --- .../libraries/haskell/persistent/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a5add651473d..8a1c16a63c57 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, base64Bytestring, blazeHtml -, blazeMarkup, conduit, exceptions, hspec, liftedBase, monadControl -, monadLogger, pathPieces, resourcePool, resourcet, scientific -, silently, sqlite, text, time, transformers, transformersBase -, unorderedContainers, vector +, blazeMarkup, conduit, exceptions, fastLogger, hspec, liftedBase +, monadControl, monadLogger, mtl, pathPieces, resourcePool +, resourcet, scientific, silently, sqlite, tagged, text, time +, transformers, transformersBase, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "1.3.3"; - sha256 = "1pz3xdbk46qprcyb0sll5zzr2vp6x08w7pd5glz2jf2242k7cdrd"; + version = "2.0.2"; + sha256 = "047k5bycpyvjyri7k6skc775m2akspzlr08ya2lv53q81yv912xi"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit - exceptions liftedBase monadControl monadLogger pathPieces - resourcePool resourcet scientific silently text time transformers - transformersBase unorderedContainers vector + exceptions fastLogger liftedBase monadControl monadLogger mtl + pathPieces resourcePool resourcet scientific silently tagged text + time transformers transformersBase unorderedContainers vector ]; testDepends = [ aeson attoparsec base64Bytestring blazeHtml conduit hspec From 3e863fcb4abe7104965eb4c49b660d72e47eddad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:56 +0200 Subject: [PATCH 114/323] haskell-postgresql-simple: update to version 0.4.4.1 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 0c4fea2da65f..f4d77d70560c 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.4.0"; - sha256 = "1rx0rcafiicdv4qbf68dbsfqwiayrl7205dm0c5bdjlvszv576r7"; + version = "0.4.4.1"; + sha256 = "0lqvy8nc2izwlv7z0n12cknsrb2dkmla84bvjis5z9f63ngs2580"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector From 11f057acb49cbdf8adaf916519e462dee6c0a7dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:09:58 +0200 Subject: [PATCH 115/323] haskell-stm-conduit: update to version 2.5.2 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index cebb79c3344f..da79b401fc6a 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.5.1"; - sha256 = "08cnr92c442b1in46xcklni35597hbsggw97arq2f9w5sfir341q"; + version = "2.5.2"; + sha256 = "1r8l9nznavxd0cg30mj7qdp9nq8jlcr0vcv8ljn6lfw67s0pk82x"; buildDepends = [ async cereal cerealConduit conduit conduitExtra liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans From 989b6fd6e357ca58b97353dc25f2b1d7348a77f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:01 +0200 Subject: [PATCH 116/323] haskell-tagstream-conduit: update to version 0.5.5.3 --- .../haskell/tagstream-conduit/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index ee7218362456..2e9393175040 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,19 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra -, dataDefault, hspec, HUnit, QuickCheck, resourcet, text -, transformers, xmlConduit +{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit +, conduitExtra, dataDefault, hspec, HUnit, QuickCheck, resourcet +, text, transformers, xmlConduit }: cabal.mkDerivation (self: { pname = "tagstream-conduit"; - version = "0.5.5.1"; - sha256 = "0bpxjhqqqigfnwcxx3h2am5zmgr1lyaxaac3lnz490j6zf8x9jn7"; + version = "0.5.5.3"; + sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj"; buildDepends = [ - attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - caseInsensitive conduit conduitExtra dataDefault resourcet text - transformers xmlConduit + attoparsec blazeBuilder caseInsensitive conduit conduitExtra + dataDefault resourcet text transformers xmlConduit ]; testDepends = [ conduit hspec HUnit QuickCheck resourcet text ]; meta = { From ff81f3c5c2f051011a3adc7e6031b523f2940b2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:04 +0200 Subject: [PATCH 117/323] haskell-text: update to version 1.1.1.3 --- pkgs/development/libraries/haskell/text/1.1.1.3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix index 7a61b4bbd3a3..3908a7a0caef 100644 --- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix +++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From 0215ee15c306ea53b2bcc5806bafce12d7645f7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:06 +0200 Subject: [PATCH 118/323] haskell-time: update to version 1.4.2 --- pkgs/development/libraries/haskell/time/1.4.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix index 5e8d967b8dc8..8710b65263ab 100644 --- a/pkgs/development/libraries/haskell/time/1.4.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From b9965ed1c73823914fbaa8a14052169325ccd0a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:09 +0200 Subject: [PATCH 119/323] haskell-tostring: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/tostring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix index eee617ffd2bb..0c181e2b0766 100644 --- a/pkgs/development/libraries/haskell/tostring/default.nix +++ b/pkgs/development/libraries/haskell/tostring/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tostring"; - version = "0.2.0.1"; - sha256 = "1gihls2xslr9fzad2659zv8af9k4cm84888nhx3z9bwasviyg448"; + version = "0.2.0.2"; + sha256 = "0gjc1576cb4cil55l2jki3y4zp8z6b1m04rf68f2fbc619wji5k6"; buildDepends = [ text utf8String ]; meta = { description = "The ToString class"; From edec0ee6e701f464b4c8d04ebb76ede1d8182198 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:12 +0200 Subject: [PATCH 120/323] haskell-wai-app-static: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 530f9828ae5f..055802ad04e8 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "3.0.0"; - sha256 = "117r2ps440i2i156k50b674fkny2ywwbbla6ry0km041604cl733"; + version = "3.0.0.1"; + sha256 = "1xqw7xvbq38m19337vpalnz5c5mvc57mfp53vqbah3lalxy9mqby"; isLibrary = true; isExecutable = true; buildDepends = [ From 16d1ac75f9f585004f985fde2a7d87072517ae89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:14 +0200 Subject: [PATCH 121/323] haskell-xmlhtml: update to version 0.2.3.3 --- pkgs/development/libraries/haskell/xmlhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 794808eed0d0..1f4b2474d75c 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.3.2"; - sha256 = "1djw9d0hff9ii0n1bgbjjsca9n0w7mxj3ivf9dslyr3kv3yb4013"; + version = "0.2.3.3"; + sha256 = "0n95284z24ddgw7v8zjqzanyrshxydcxs4ivchpj88gh5r3ryv5j"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; From ff74f615b51b247ab986add8c3f31ac323a452fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:17 +0200 Subject: [PATCH 122/323] haskell-yesod-auth: update to version 1.3.4.3 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 1224e105c3fe..b848aa5e80a1 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.4.2"; - sha256 = "0hf5x1qhpxil3na7f1vdjr5i5n7q41a23ikkra9avg3yss94k04d"; + version = "1.3.4.3"; + sha256 = "1praidas7a739bs2p6qrbxxjvqyx1hm9m9x8r747jkzb1w5qy20r"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable From 896cd216a049c25db2665a06678b512ddc114943 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:20 +0200 Subject: [PATCH 123/323] haskell-yesod-bin: update to version 1.2.12.8 --- 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 27a1c1522ef9..37c7e4e3b37c 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.12.4"; - sha256 = "1pg1zxixgsqz5da2dhs94zi77h63jz3llf0049fgdfg166c685vj"; + version = "1.2.12.8"; + sha256 = "0fxqwahk23c23l7qrwz3inf8xh8chfn9g8x2h7mn0dsj939l59ws"; isLibrary = false; isExecutable = true; buildDepends = [ From 59137104b68fa532c745c6ce7e567b1490d72311 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:22 +0200 Subject: [PATCH 124/323] haskell-yesod-core: update to version 1.2.20 --- 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 857b237ba428..f05477ab8f76 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.2.19.1"; - sha256 = "1021z0jrfbafbdybpj0jkacr9ljyap5cpmfk2911dsz3nz7sy6zg"; + version = "1.2.20"; + sha256 = "1gx0xbyx3mydmiwxypzgmpm5ywrxynqyb1myym0mdaxm6dd1v31k"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie From eb871e216d83503420ba8c082021c9978381d1ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:25 +0200 Subject: [PATCH 125/323] haskell-yesod-form: update to version 1.3.15.4 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 57f456823c2d..80347f5be6e0 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.15.2"; - sha256 = "05r7w65n63qrlvxlm2j4s0vin4p7gc4cqa8j83465mnl1dzxliy1"; + version = "1.3.15.4"; + sha256 = "0a3wrc16jxqan0is3nk015k32bgi9fdglzkxpyaqlig6iaafbpil"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet networkUri persistent resourcet From 7071d7b6de7557f25ac864f0ad5a1c68b39e3d81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Sep 2014 18:10:28 +0200 Subject: [PATCH 126/323] haskell-yesod-persistent: update to version 1.2.3.1 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 64a2bd7730f7..fdfd55272470 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.3"; - sha256 = "1kdspz6y32r8kl0qk89hgwi4n6dnxch7wriv829cnwqm0bzjfdpw"; + version = "1.2.3.1"; + sha256 = "1mmy1l91ksjvwi2zr1wnb50vshs4pdri9rcaracwrnrmdpbmyy3s"; buildDepends = [ blazeBuilder conduit persistent persistentTemplate resourcePool resourcet transformers yesodCore From d964aa83a09f3ba74c40064c7d9e0d2b60de13df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:11:39 +0200 Subject: [PATCH 127/323] haskell-xml-conduit: jailbreak to fix build with conduit --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 3df8c163d63e..d932303dc5d2 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { blazeMarkup conduit hspec HUnit resourcet text transformers xmlTypes ]; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; From a2da032807f50a0ed45951f1c813ce80c791b478 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:12:20 +0200 Subject: [PATCH 128/323] haskell-esqueleto: broken by latest version of persistent --- pkgs/development/libraries/haskell/esqueleto/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 637f32c39961..1d90a9269937 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -24,5 +24,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) From 51f31fd632e126fc3277c33db49f123441dcd94a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:12:50 +0200 Subject: [PATCH 129/323] haskell-json-rpc: jailbreak to fix build with conduit --- pkgs/development/libraries/haskell/json-rpc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix index 4bb33b628e33..bbf443f7145d 100644 --- a/pkgs/development/libraries/haskell/json-rpc/default.nix +++ b/pkgs/development/libraries/haskell/json-rpc/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { stm stmConduit testFramework testFrameworkQuickcheck2 text unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/xenog/json-rpc"; description = "Fully-featured JSON-RPC 2.0 library"; From 0be4d0442065138afee6f0e8eebdd8c93cb942ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:20:03 +0200 Subject: [PATCH 130/323] haskell-pipes: jailbreak to fix build with conduit --- pkgs/development/libraries/haskell/pipes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 9f723826dbb9..50039d4466b9 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers ]; + jailbreak = true; meta = { description = "Compositional pipelines"; license = self.stdenv.lib.licenses.bsd3; From 3f2c6833acc0226ed38c3f1048b4d9a21712c58c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:28:16 +0200 Subject: [PATCH 131/323] idris: remove unnecessary jailbreak --- pkgs/development/compilers/idris/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 7ff88017c055..2af8ec1b022a 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -26,7 +26,6 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; - jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; From 58d66807e4dedf75c471dd0a5e17a25a8dba9dfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:30:38 +0200 Subject: [PATCH 132/323] haskell-crypto-api: update to version 0.13.2 --- pkgs/development/libraries/haskell/crypto-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 7c1d6308131d..2a83b2486740 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.13"; - sha256 = "00zw9cymjhsdiy2p4prjvmmy7xnk12qggdpvxrp0hjnwlakfvyb2"; + version = "0.13.2"; + sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak"; buildDepends = [ cereal entropy tagged transformers ]; meta = { homepage = "https://github.com/TomMD/crypto-api"; From ce469d8015d15b6578a19da2e825aabeaf8c5dca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:30:44 +0200 Subject: [PATCH 133/323] haskell-hindent: update to version 3.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 3f8671f69ec5..5e8f55b373f2 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "2.4"; - sha256 = "1hhfdcjxccgpiw4yj3738l97ajcmq4wm182s0m41wryrq0s4ai1g"; + version = "3.0"; + sha256 = "1fvpyg8pb4g023v25lhizcsfd15zw5q4f23qq0ci9h7mg3axlsdx"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts mtl text ]; From 763908bde911ad4a7eb3cb2a9fe725e9e43efe9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:30:49 +0200 Subject: [PATCH 134/323] haskell-markdown: update to version 0.1.10 --- pkgs/development/libraries/haskell/markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix index 746bd1c74846..a19ecf0408c8 100644 --- a/pkgs/development/libraries/haskell/markdown/default.nix +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "markdown"; - version = "0.1.9"; - sha256 = "1bl86alrbl9i690sbqqlxb4hkdd0lv3x5aqc8zi55q9h0rfsi06l"; + version = "0.1.10"; + sha256 = "1n453xsarrrshn4pidlhknazjpsjh1nnygfir54z17rxcrvgprr1"; buildDepends = [ attoparsec blazeHtml conduit conduitExtra dataDefault text transformers xssSanitize From ecbb8061937ba9a233cd0364c94f32aaac46c924 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:30:55 +0200 Subject: [PATCH 135/323] haskell-snap: update to version 0.13.2.9 --- 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 189750bd4464..aab1a7bf89be 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.2.8"; - sha256 = "1jrnh1raw2jrl04l54f5w5xfp9yyb9bj0ly9v1baqkiggswacbzg"; + version = "0.13.2.9"; + sha256 = "1iv29mbbm1xjfrq3ys7zpskjpcwx6k08zrnrs1yj62yg5aa6bnim"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; - patchPhase = '' - sed -i -e 's|lens .*< 4.2|lens|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From f841e6da29b72ecde59b4d1c4d6e35e3987c1d03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:30:59 +0200 Subject: [PATCH 136/323] haskell-tasty-hspec: update to version 0.2 --- .../libraries/haskell/tasty-hspec/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 8c3083d07fe9..6afcdd67b948 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,12 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hspec, tasty }: +{ cabal, hspec, QuickCheck, random, tasty, tastyQuickcheck +, tastySmallcheck +}: cabal.mkDerivation (self: { pname = "tasty-hspec"; - version = "0.1.0.1"; - sha256 = "0m8v9kj557vfqzmrindwfcjl7wqmdix2xvmsb94n8hx9qv075s3v"; - buildDepends = [ hspec tasty ]; + version = "0.2"; + sha256 = "04qnmsyrlxgxf36lww3z6xkgpf6x5gprwrrwza3kcjl13wcm2rml"; + buildDepends = [ + hspec QuickCheck random tasty tastyQuickcheck tastySmallcheck + ]; meta = { homepage = "http://github.com/mitchellwrosen/tasty-hspec"; description = "Hspec support for the Tasty test framework"; From e6d483b02ab9f6c7d20acd5b7cf9108b0745887a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:31:03 +0200 Subject: [PATCH 137/323] haskell-xml-conduit: update to version 1.2.2 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index d932303dc5d2..ddd6129dd83c 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.1"; - sha256 = "1bh0d2fqcdbx2dq5ybipf7ws59blrb8yd98z1rnbvv1fj9r0xw10"; + version = "1.2.2"; + sha256 = "0rya11zzkqkq9jspd3q75b50l0p42aq3ka77by0wan373hw4ydan"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq From 5c3029eb0ba6662305aaa5a0ca0bde58033911c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:31:08 +0200 Subject: [PATCH 138/323] haskell-yesod-auth: update to version 1.3.4.4 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b848aa5e80a1..179ce9d3ad79 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.4.3"; - sha256 = "1praidas7a739bs2p6qrbxxjvqyx1hm9m9x8r747jkzb1w5qy20r"; + version = "1.3.4.4"; + sha256 = "0h2yk36w0yi303svg7jrlg12s05mbxn4l3pbk558wchgjgy8xaz4"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable From 30c918e4090f653b32f140b66e990473ab6628d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:31:38 +0200 Subject: [PATCH 139/323] haskell-hsimport: jailbreak to fix build with current tasty https://github.com/dan-t/hsimport/issues/7 --- pkgs/development/libraries/haskell/hsimport/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 3093cbb2038d..20f1d434864b 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { attoparsec cmdargs dyre haskellSrcExts lens mtl split text ]; testDepends = [ filepath haskellSrcExts tasty tastyGolden ]; + jailbreak = true; meta = { description = "A command line program for extending the import list of a Haskell source file"; license = self.stdenv.lib.licenses.bsd3; From 5a595e7119d5ce3321ace4b0c87f38d82e6faa7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:33:31 +0200 Subject: [PATCH 140/323] haskell-holy-project: disable the test suite to fix the build The test suite tries to access the network: | Test suite Tests: RUNNING... | All Tests | [...] | GithubAPI | Yann: FAIL | Exception: FailedConnectionException2 "api.github.com" 443 True getProtocolByName: does not exist (no such protocol name: tcp) | Jasper: FAIL | Exception: FailedConnectionException2 "api.github.com" 443 True getProtocolByName: does not exist (no such protocol name: tcp) | | 2 out of 16 tests failed (0.66s) | Test suite Tests: FAIL --- pkgs/development/libraries/haskell/holy-project/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix index 708b740f64da..1fa7c558731c 100644 --- a/pkgs/development/libraries/haskell/holy-project/default.nix +++ b/pkgs/development/libraries/haskell/holy-project/default.nix @@ -21,6 +21,7 @@ cabal.mkDerivation (self: { Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck tastySmallcheck ]; + doCheck = false; meta = { homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; From ba6ff635684148825bf9f0fb2ff2b4473a7a00e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:41:58 +0200 Subject: [PATCH 141/323] haskell-aws: jailbreak to fix build with conduit --- pkgs/development/libraries/haskell/aws/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 3df47d956186..1776d0b48d4f 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -27,6 +27,7 @@ cabal.mkDerivation (self: { tastyQuickcheck text transformers ]; doCheck = false; + jailbreak = true; meta = { homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; From 485283d648d64b247dfe8768cf609fd81c87cdb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:46:15 +0200 Subject: [PATCH 142/323] haskell-diagrams-cairo: jailbreak to fix build with latest lens library --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index a350520bc502..cd42f175b969 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { hashable JuicyPixels lens mtl optparseApplicative pango split statestack time transformers vector ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; From ab3ddfad9395f4eaf7521061069775481156ef8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:52:18 +0200 Subject: [PATCH 143/323] haskell-sloane: cannot compile with optparse-applicative 0.10.x https://github.com/akc/sloane/issues/1 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 819455c99025..e411d49e2597 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3008,7 +3008,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in nc-indicators = callPackage ../applications/misc/nc-indicators {}; - sloane = callPackage ../applications/science/math/sloane {}; + sloane = callPackage ../applications/science/math/sloane { + optparseApplicative = self.optparseApplicative_0_9_1_1; + }; taffybar = callPackage ../applications/misc/taffybar {}; From e9619ed23649d973fcd3e4ad6627ac56c6589f6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:55:19 +0200 Subject: [PATCH 144/323] haskell-tasty-rerun: broken by current version of 'tasty' https://github.com/ocharles/tasty-rerun/issues/2 --- pkgs/development/libraries/haskell/tasty-rerun/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index 326392718bad..a3f1755a3a22 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) From b7db46f0e020da485b29eb4aef2b33ee0f10709e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:56:16 +0200 Subject: [PATCH 145/323] haskell-pipes-http: jailbreak to fix build with latest http-client library --- pkgs/development/libraries/haskell/pipes-http/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix index 285d1405191d..b5b9a8859ad0 100644 --- a/pkgs/development/libraries/haskell/pipes-http/default.nix +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "1.0.1"; sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w"; buildDepends = [ httpClient httpClientTls pipes ]; + jailbreak = true; meta = { description = "HTTP client with pipes interface"; license = self.stdenv.lib.licenses.bsd3; From be9eb9fc8cf81927c94443b0683888f18a6fa2ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 10:58:20 +0200 Subject: [PATCH 146/323] haskell-language-c-inline: disable building of the documentation to fix the build https://github.com/mchakravarty/language-c-inline/issues/40 --- pkgs/development/libraries/haskell/language-c-inline/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index e4cb4dec4ed0..def6820be225 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ filepath languageCQuote mainlandPretty ]; testDepends = [ languageCQuote ]; doCheck = false; + noHaddock = true; meta = { homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; From d2b284436de42b27ea9ffc0048516d25da3d5d8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 11:01:23 +0200 Subject: [PATCH 147/323] haskell-implicit: build is broken by optparse-applicative 0.10.x https://github.com/colah/ImplicitCAD/issues/115 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e411d49e2597..b0e5a381a281 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1349,7 +1349,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in imm = callPackage ../development/libraries/haskell/imm {}; - implicit = callPackage ../development/libraries/haskell/implicit {}; + implicit = callPackage ../development/libraries/haskell/implicit { + optparseApplicative = self.optparseApplicative_0_9_1_1; + }; indents = callPackage ../development/libraries/haskell/indents {}; From 7783d1f14702a48f5d9015b90fc768aa524df416 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 11:03:15 +0200 Subject: [PATCH 148/323] haskell-yesod-auth-hashdb: build is broken by recent updates to persistent https://github.com/paul-rouse/yesod-auth-hashdb/issues/1 --- pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix index 9f577fc4520b..a47f3bed59da 100644 --- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + broken = true; }; }) From 686ea115a9987c4b3c93139d972f527acf967cbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:05:42 +0200 Subject: [PATCH 149/323] idris: broken by recent Haskell updates http://hydra.cryp.to/build/190927/nixlog/1/raw --- pkgs/development/compilers/idris/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 2af8ec1b022a..e60c4dd5b4b0 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -31,5 +31,6 @@ cabal.mkDerivation (self: { description = "Functional Programming Language with Dependent Types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) From dd9a432a7d89a545d28b4d13114f288df04275ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:07:17 +0200 Subject: [PATCH 150/323] haskell-cake3: requires optparse-Applicative < 0.10 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b0e5a381a281..7c5fe55940dc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2918,7 +2918,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in BNFC = callPackage ../development/tools/haskell/BNFC {}; - cake3 = callPackage ../development/tools/haskell/cake3 {}; + cake3 = callPackage ../development/tools/haskell/cake3 { + optparseApplicative = self.optparseApplicative_0_9_1_1; + }; cpphs = callPackage ../development/tools/misc/cpphs {}; From 8b3d5417e4f14e1f042100601a436e1cf7dac8fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:07:36 +0200 Subject: [PATCH 151/323] haskell-packages.nix: drop optparse-applicative override --- pkgs/top-level/haskell-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c5fe55940dc..85ee40a8936b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3005,7 +3005,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in idris_plain = callPackage ../development/compilers/idris { llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; - optparseApplicative = self.optparseApplicative_0_10_0; }; idris = callPackage ../development/compilers/idris/wrapper.nix {}; From dac81d6ac9c343bc36b0fad4d2ce95fae0581a60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:12:44 +0200 Subject: [PATCH 152/323] haskell-time: update to version 1.5 --- .../libraries/haskell/time/{1.4.2.nix => 1.5.nix} | 11 +++++------ pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/time/{1.4.2.nix => 1.5.nix} (54%) diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.5.nix similarity index 54% rename from pkgs/development/libraries/haskell/time/1.4.2.nix rename to pkgs/development/libraries/haskell/time/1.5.nix index 8710b65263ab..ba77c73874dc 100644 --- a/pkgs/development/libraries/haskell/time/1.4.2.nix +++ b/pkgs/development/libraries/haskell/time/1.5.nix @@ -1,23 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, deepseq, QuickCheck, testFramework +{ cabal, deepseq, QuickCheck, testFramework , testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "time"; - version = "1.4.2"; - sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h"; + version = "1.5"; + sha256 = "0vj82msx650z473inhr8yav7k38zj7096wam477y77wardx57pdc"; buildDepends = [ deepseq ]; testDepends = [ - Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 + deepseq QuickCheck testFramework testFrameworkQuickcheck2 ]; doCheck = false; meta = { - homepage = "http://semantic.org/TimeLib/"; + homepage = "https://github.com/haskell/time"; description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85ee40a8936b..d89226c6b2df 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2539,7 +2539,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; + time_1_5 = callPackage ../development/libraries/haskell/time/1.5.nix {}; time = null; # core package since ghc >= 6.12.x timerep = callPackage ../development/libraries/haskell/timerep {}; From 16a027cd5ae87b5bcf3321cb44432c29173fac3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:13:01 +0200 Subject: [PATCH 153/323] haskell-haxr: compile with latest version of network --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d89226c6b2df..d8d022dae590 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1157,7 +1157,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haxl = callPackage ../development/libraries/haskell/haxl {}; - haxr = callPackage ../development/libraries/haskell/haxr {}; + haxr = callPackage ../development/libraries/haskell/haxr { + HTTP = self.HTTP.override { network = self.network_2_6_0_2; }; + }; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; From 603c92c0784da573f4bb22321de3dc22cc0ea914 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:13:20 +0200 Subject: [PATCH 154/323] haskell-aws: re-generate with cabal2nix --- pkgs/development/libraries/haskell/aws/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 1776d0b48d4f..f527d9aac405 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -26,8 +26,8 @@ cabal.mkDerivation (self: { aeson errors mtl QuickCheck quickcheckInstances tagged tasty tastyQuickcheck text transformers ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; From 0f5a5a9fc9f075cfda37e68a9fc04db1b45ae056 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:13:41 +0200 Subject: [PATCH 155/323] language-c-inline: re-generate with cabal2nix --- .../development/libraries/haskell/language-c-inline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index def6820be225..fa1c8af96807 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { sha256 = "01imdfjqkx49pcwplvmd5lqbal5hq1cx11zcig3na1x46ggiavah"; buildDepends = [ filepath languageCQuote mainlandPretty ]; testDepends = [ languageCQuote ]; - doCheck = false; noHaddock = true; + doCheck = false; meta = { homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; From 341a6e9166013dea9be4b052cb29b3db40058c33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:13:56 +0200 Subject: [PATCH 156/323] haskell-auto-update: update to version 0.1.1.3 --- .../development/libraries/haskell/auto-update/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index 85f15b500ed1..edfcbe4e342b 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -1,13 +1,11 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hspec }: +{ cabal }: cabal.mkDerivation (self: { pname = "auto-update"; - version = "0.1.1.2"; - sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6"; - testDepends = [ hspec ]; - doCheck = false; + version = "0.1.1.3"; + sha256 = "06izsfd3xiragzac682vg3bmr6947y8s4yr2r7rip7qjvsja2yhy"; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; From 8daf8c103e2ca55dc69581fef2281b97214475e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:13:59 +0200 Subject: [PATCH 157/323] haskell-html-conduit: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/html-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 8e9c0ff821b6..f45fa6bb5346 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.1"; - sha256 = "0xnndyjgyvh94a6smipl3pc9vswjfpywdyz4gfialdj7g2h3mqjj"; + version = "1.1.1.1"; + sha256 = "1bsr0fsy7k606m477c4rxdh7j71nyrp86f1lg9wlwnbm31vrhw00"; buildDepends = [ conduit conduitExtra resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes From 8b897a49aabf0c5bac6c35eaf511636d441aca6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 13:14:45 +0200 Subject: [PATCH 158/323] haskell-async: update to version 2.0.1.6 --- .../libraries/haskell/async/{2.0.1.5.nix => 2.0.1.6.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/async/{2.0.1.5.nix => 2.0.1.6.nix} (85%) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.6.nix similarity index 85% rename from pkgs/development/libraries/haskell/async/2.0.1.5.nix rename to pkgs/development/libraries/haskell/async/2.0.1.6.nix index a4251e9e80b6..6c1aed15eab3 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.6.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.1.5"; - sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd"; + version = "2.0.1.6"; + sha256 = "06fzkqjliccxqiygms7v1xff3wlkg54n9xwzv7m1yxylkzlikjkz"; buildDepends = [ stm ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; jailbreak = true; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d8d022dae590..fd88674526f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -190,8 +190,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; - async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {}; - async = self.async_2_0_1_5; + async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {}; + async = self.async_2_0_1_6; atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {}; From 10ccc7ab1dfd6b510090ed80f030cb2fc8356da9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:52:54 +0200 Subject: [PATCH 159/323] haskell-bytes: update to version 0.14.1.1 --- 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 4a8877b6a59d..4f6387781c26 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"; - sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk"; + version = "0.14.1.1"; + sha256 = "11bsl31352h5lj7ad68byqqc27d5iz53kwx7b433l44g9kaijrvc"; buildDepends = [ binary cereal mtl text time transformers transformersCompat void ]; From 7e2132647395b291b6b73b862b090483739f5442 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:00 +0200 Subject: [PATCH 160/323] haskell-c2hs: update to version 0.18.2 --- pkgs/development/libraries/haskell/c2hs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index eaa91c51a239..a082a9ef2af1 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, dlist, filepath, HUnit, languageC, shelly, testFramework -, testFrameworkHunit, text, transformers, yaml +, testFrameworkHunit, text, transformers }: cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.18.1"; - sha256 = "17miqihfidzd1nqdswnd7j0580jlv2pj19wxlx8vb3dc5wga58xd"; + version = "0.18.2"; + sha256 = "0rkarj8y8sj83svjz9jivrr1dh2ryky4sb35cxlyxv623bl6sc1x"; isLibrary = false; isExecutable = true; - buildDepends = [ dlist filepath languageC shelly text yaml ]; + buildDepends = [ dlist filepath languageC ]; testDepends = [ filepath HUnit shelly testFramework testFrameworkHunit text transformers From cf71096aa511c0fa4ecbd567dd0ccf4b6731cbc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:02 +0200 Subject: [PATCH 161/323] haskell-diagrams-contrib: update to version 1.1.2.2 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index f1044870f3a4..832617d64b7c 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.1"; - sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki"; + version = "1.1.2.2"; + sha256 = "1a9ayqyffgwq8k9d8l12s6l1pqv27fvzngsklnh3y1bgp20d2z01"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From 345fa9142a266d54a74cb2031c63e740d88f83f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:03 +0200 Subject: [PATCH 162/323] haskell-dimensional: update to version 0.13.0.1 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 3435bf57d5c5..9be32b5596a1 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.13"; - sha256 = "1nj8h79iq7pirqlj8iw1p782nm05xgym3469x7hlzaz3ig9nwgrg"; + version = "0.13.0.1"; + sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From 617da985f6e56b5d121ebc4279d86e4b39bcd531 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:05 +0200 Subject: [PATCH 163/323] haskell-gloss: update to version 1.8.2.2 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index ce6357baaeb3..079914a84fcd 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.2.1"; - sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2"; + version = "1.8.2.2"; + sha256 = "1v3rvx3jidbh98znmnl122rqgg5r9zcl22h5ibzag9h5d31c5vzr"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From a39fef7e5145f76769163982ecc4db0fdbaa5b45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:07 +0200 Subject: [PATCH 164/323] haskell-hledger-lib: update to version 0.23.3 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 541b3ceb0dce..fafa47c28a05 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.23.2"; - sha256 = "1z9gxbah649r9vzq012mqnk07rfnd6c4ik82klksk0zzd4yxf07d"; + version = "0.23.3"; + sha256 = "0in61wrkbdllghdkxmwwn2b2k2g9w7kqijwl58szfx9h7w8g3dbi"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa safe split time transformers utf8String From c8caffbd90d40067ac80936ddf0d44d5d12c1971 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:09 +0200 Subject: [PATCH 165/323] haskell-hledger-web: update to version 0.23.3 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 70ba12e2398e..654a4c7a13ab 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.23.2"; - sha256 = "1n4n2zj6nqwvwmb6cxr16x2fnmzs7v21snjhq2nnvlik613rnnq7"; + version = "0.23.3"; + sha256 = "1d51gcyj5k4djllf0f2mny9l5i6gfh8cc3pgvjl8mxqi6ky6xarq"; isLibrary = true; isExecutable = true; buildDepends = [ From 90efae1dbdc02b51f81fa2ea4d7f23953b4163de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:11 +0200 Subject: [PATCH 166/323] haskell-hledger: update to version 0.23.3 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 8ac4d6d2e6bc..45a7d6243b34 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.23.2"; - sha256 = "1q57mb37qkngdvivaj4dykrkg4sb2pchg2ssdxx8ss4zhbsrk713"; + version = "0.23.3"; + sha256 = "10qrjwfmpddba6m3n5f527l77g3xf9d8fyxyhrl5593g6bgq9v7m"; isLibrary = true; isExecutable = true; buildDepends = [ From be41ba167a2f03f59b3be79842ff894f7ab09181 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:12 +0200 Subject: [PATCH 167/323] haskell-hplayground: update to version 0.1.0.5 --- pkgs/development/libraries/haskell/hplayground/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix index 4f71d28010a8..ed116058e92a 100644 --- a/pkgs/development/libraries/haskell/hplayground/default.nix +++ b/pkgs/development/libraries/haskell/hplayground/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hplayground"; - version = "0.1.0.4"; - sha256 = "12xqj7f9vqj2zsv3ipfmpkdnqagh2g0x4i4jsj98q91ynwhzg1am"; + version = "0.1.0.5"; + sha256 = "0hd4xmw4lfaaar7yxwhq4msg2qbn42q57rvaphl95pbr4x5a0h70"; buildDepends = [ dataDefault hasteCompiler hastePerch monadsTf transformers ]; From 435087d0602d324b3ce0b3ef1c971efa1849b387 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:14 +0200 Subject: [PATCH 168/323] haskell-hsimport: update to version 0.6 --- pkgs/development/libraries/haskell/hsimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 20f1d434864b..c9809d3eff04 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.5.2"; - sha256 = "00kzc7hiwsidwvjnbvc01yh6c8n135ypwsiyvcnf2g179pwmnzkc"; + version = "0.6"; + sha256 = "07nhymn4kww1c5f9sjbmdg8ng08wbgmpvf5hws4qpwmfw1yfgdpn"; isLibrary = true; isExecutable = true; buildDepends = [ From c498f9db960117897bf9218ca0ff4ad65859879e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:16 +0200 Subject: [PATCH 169/323] haskell-instant-generics: update to version 0.4.1 --- .../libraries/haskell/instant-generics/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index d5c0137a2c61..ecb9321686c4 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -4,15 +4,13 @@ cabal.mkDerivation (self: { pname = "instant-generics"; - version = "0.4"; - sha256 = "14z6135jvmry9b52p21cqnwgp2w0g6frh1fm7z5byph06xls9r7l"; + version = "0.4.1"; + sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq"; buildDepends = [ syb ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) From cf1fde21ff605fc482550d8feb5d4409eec428a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:18 +0200 Subject: [PATCH 170/323] haskell-parsers: update to version 0.12.1.1 --- pkgs/development/libraries/haskell/parsers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix index 5c49d144a10e..25f4a1370831 100644 --- a/pkgs/development/libraries/haskell/parsers/default.nix +++ b/pkgs/development/libraries/haskell/parsers/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.12.1"; - sha256 = "0g9grf713zhn23vgmb6mdrm8r5snq1xa8jqnj6pghydj6m4rh97v"; + version = "0.12.1.1"; + sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; From c64275a2c11160e54c1514ccd405eedd749c3fa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:19 +0200 Subject: [PATCH 171/323] haskell-tasty-rerun: update to version 1.1.3 --- pkgs/development/libraries/haskell/tasty-rerun/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index a3f1755a3a22..af251514b420 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tasty-rerun"; - version = "1.1.2"; - sha256 = "0vgx6l9yd21aiwivd6zp67rgjly1j2wwqdmx99p17prr430rm4id"; + version = "1.1.3"; + sha256 = "1pgm3h7kyg7q8ydgqqj9sn65ckl6i7cz6a8g1cfighf4gy5y0cj3"; buildDepends = [ mtl optparseApplicative reducers split stm tagged tasty transformers @@ -18,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 9067845ebc626c769da4d044b76182881676afd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:21 +0200 Subject: [PATCH 172/323] haskell-twitter-conduit: update to version 0.0.6 --- .../development/libraries/haskell/twitter-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 63a490202a89..8720fb3f2beb 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.5.8"; - sha256 = "0cpakiajrwgpg2f04nbfryajln281kgsi0ly9xnx370y5pn98r86"; + version = "0.0.6"; + sha256 = "1vm4wa3cdmyz2m45rnwkrjcx8wajc89395c28rz1q12hf856970j"; isLibrary = true; isExecutable = true; buildDepends = [ From c9c0205d6409d940615a58c9aa587528b83d953e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:23 +0200 Subject: [PATCH 173/323] haskell-wl-pprint-extras: update to version 3.5.0.2 --- .../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 ac8d69ebd3f9..0165e0a82ea9 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"; - sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7"; + version = "3.5.0.2"; + sha256 = "1wh8nm7h8bbr1xxf0q3cwb837jk5y1cq4l2h6lw63wavwqqvjfw6"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { From 5bb4806c189f2e539d10f962eb1ce0d06c8d761f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 19:53:25 +0200 Subject: [PATCH 174/323] haskell-wl-pprint-terminfo: update to version 3.7.1.2 --- .../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 37dc11b1f0f4..30636f6b97ca 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.1"; - sha256 = "1mjnbkk3cw2v7nda7qxdkl21pmclz6m17sviqp4qf3rc8rgin3zd"; + version = "3.7.1.2"; + sha256 = "17c5ys8730hhhpy0swk4yxrjs1042w4m7aypsfnzzk3b0cw94q56"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; From d1c721a8a0b39866061b90a420dc28436174dff9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 20:15:55 +0200 Subject: [PATCH 175/323] haskell-http-client: update to version 0.3.8.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 6e41fb85e681..020fd4973c81 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.8.1"; - sha256 = "1iy3wg88z1w0l5dzxkynlw0xd7np5xbxcrcdj3f2kzyfr39mw5v0"; + version = "0.3.8.2"; + sha256 = "06c34h7wvn3mbr8lrkcmjygj22d94mr5rxzqwpjfdjgimd98hw3s"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes From dd3a157b3f61224bb22ca3119677b547d7fc6857 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 20:20:26 +0200 Subject: [PATCH 176/323] haskell-boundingboxes: update to version 0.2.2 --- pkgs/development/libraries/haskell/boundingboxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/boundingboxes/default.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix index 25af90c078e3..ab5cfabad448 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/default.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "boundingboxes"; - version = "0.2.1"; - sha256 = "0c9kcgg8596q7wgzc7c2dqq37f16w3f6ilwfzqgdqc33p06x6pha"; + version = "0.2.2"; + sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx"; buildDepends = [ lens ]; testDepends = [ lens linear QuickCheck random testFramework From 8e4c563b145064b51bb4a7b9ed8165c96fc27ee8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 21:26:24 +0200 Subject: [PATCH 177/323] haskell-hakyll: broken by recent updates Hakyll requires network 2.6.x, which is newer than what we have, and pandoc-citeproc 0.4.x, which is older than what we have. --- pkgs/development/libraries/haskell/hakyll/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 767f10b33f63..d8ac50c85a0f 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -34,5 +34,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; }; }) From 70caf9d865832026f3bfd72e6247948e4d7bc44e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 23:16:09 +0200 Subject: [PATCH 178/323] git-annex: broken by optparse-applicative 0.10.x Bug has been reported upstream. --- .../version-management/git-and-tools/git-annex/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index f00ca9da046d..601e065bfff0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -48,5 +48,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; + broken = true; }; }) From f98eea30bf260d5fcda44576fe2b8a210600d06f Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 14 Sep 2014 00:58:57 +0200 Subject: [PATCH 179/323] Upgraded python-psutil to v2.1.1 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ec5867eb299..96f7b2f554b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5996,11 +5996,12 @@ let psutil = buildPythonPackage rec { - name = "psutil-1.0.1"; + name = "psutil-${version}"; + version = "2.1.1"; src = fetchurl { - url = "http://psutil.googlecode.com/files/${name}.tar.gz"; - sha256 = "1zrzh7hi0f79sf9axwrw3c2kl86qs72kvx8xbbrdwlp39rfa1i1f"; + url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz"; + sha256 = "14smqj57yjrm6hjz5n2annkgv0kmxckdhqvfx784f4d4lr52m0dz"; }; # failed tests: https://code.google.com/p/psutil/issues/detail?id=434 From dd87598615ae6e5ff9c3c97594853b54cb62ac9f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 19:13:43 -0700 Subject: [PATCH 180/323] snappy: 1.1.1 -> 1.1.2 --- pkgs/development/libraries/snappy/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index acba85ec43b9..90469508d0e5 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "snappy-1.1.1"; + name = "snappy-1.1.2"; - src = fetchurl { - url = "http://snappy.googlecode.com/files/${name}.tar.gz"; - sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp"; + src = fetchFromGitHub { + owner = "google"; + repo = "snappy"; + rev = "1ff9be9b8fafc8528ca9e055646f5932aa5db9c4"; + sha256 = "1zyjj13max0z42g3ii54n3qn7rbcga34dbi26lpm7v5ya752shx7"; }; - # -DNDEBUG for speed + buildInputs = [ pkgconfig autoreconfHook ]; + preConfigure = '' - configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2") + sh autogen.sh ''; + # -DNDEBUG for speed + configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; + doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://code.google.com/p/snappy/; - license = "BSD"; + license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } From 007be9f34c9b70a4cd2b105cbe4d8ec1746329e5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 18:55:29 -0700 Subject: [PATCH 181/323] gperftools: 2.1 -> 2.2.1 --- pkgs/development/libraries/gperftools/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 9ffccac1e0f4..cd8edcb1b265 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.1"; + name = "gperftools-2.2.1"; src = fetchurl { - url = "https://gperftools.googlecode.com/files/${name}.tar.gz"; - sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk"; + url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.2.1.tar.gz"; + sha256 = "04zkz5mh4vzcc7cx72b21bq70xy7y5kq9gsk4nbssxk5wlqggy2n"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/p/gperftools/; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = with platforms; linux ++ darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ wkennington ]; }; } From 7068828389390dca066fb1062bd27148d49339d4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 6 Sep 2014 02:52:39 +0200 Subject: [PATCH 182/323] rustcMaster: Update to a more recent commit --- .../compilers/rustc/hardcode_paths.patch | 6 +++--- pkgs/development/compilers/rustc/head.nix | 18 +++++++++--------- .../compilers/rustc/local_stage0.patch | 7 +++++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index 77e4c3f37887..fea35d24960c 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch @@ -2,7 +2,7 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 7a3e912..ced75fa 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs -@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { +@@ -856,24 +856,15 @@ pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -15,9 +15,9 @@ index 7a3e912..ced75fa 100644 - // In the future, FreeBSD will use clang as default compiler. - // It would be flexible to use cc (system's default C compiler) - // instead of hard-coded gcc. -- // For win32, there is no cc command, so we add a condition to make it use gcc. +- // For Windows, there is no cc command, so we add a condition to make it use gcc. - match sess.targ_cfg.os { -- abi::OsWin32 => "gcc", +- abi::OsWindows => "gcc", - _ => "cc", - }.to_string() } diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 4f512096a423..aeb6cd2afbd3 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -16,19 +16,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-79a5448f4"; }); let snapshot = if stdenv.system == "i686-linux" - then "a5e1bb723020ac35173d49600e76b0935e257a6a" + then "6f5464c9ab191d93bfea0894ca7c6f90c3506f2b" else if stdenv.system == "x86_64-linux" - then "1a2407df17442d93d1c34c916269a345658045d7" + then "72c92895fa9a1dba7880073f2b2b5d0e3e1a2ab6" else if stdenv.system == "i686-darwin" - then "6648fa88e41ad7c0991a085366e36d56005873ca" + then "545fc45a0071142714639c6be377e6d308c3a4e1" else if stdenv.system == "x86_64-darwin" - then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" + then "8b44fbbbd1ba519d2e83d0d5ce1f6053d3cab8c6" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-07-17"; - snapshotRev = "9fc8394"; + snapshotDate = "2014-09-10"; + snapshotRev = "6faa4f3"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -38,8 +38,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; - sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; + rev = "79a5448f41dcc6ab52663105a6b02fc5af4c503e"; + sha256 = "0v2ahwgb1ls3g4ch6005azjmfh8bs0v0nbmmfpn53zgiiywad2ji"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 1261b2d458da..2f38d7c1757c 100644 --- a/pkgs/development/compilers/rustc/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch @@ -2,12 +2,15 @@ diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index e78f231..6b6773b 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh -@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then +@@ -53,11 +53,6 @@ fi - + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ -cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 From 58be5387b8bc3de98fd95bbf3328a122abd2702f Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 14 Sep 2014 00:49:32 +0200 Subject: [PATCH 183/323] Upgraded mpc to v0.26 Closes #4072 Signed-off-by: Mateusz Kowalczyk --- pkgs/applications/audio/mpc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 54ae5476efdd..9224e21185bc 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, mpd_clientlib }: stdenv.mkDerivation rec { - version = "0.25"; + version = "0.26"; name = "mpc-${version}"; src = fetchurl { url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz"; - sha256 = "095gmik5vrnab5a1g92qiznn48w7499fr0gldp3s6xd26kvs9kvh"; + sha256 = "0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0"; }; - - buildInputs = [ mpd_clientlib ]; - + + buildInputs = [ mpd_clientlib ]; + preConfigure = '' export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} From cfbf651294a0ef2db67215b8200aa01b07bf24e4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 21:32:27 -0700 Subject: [PATCH 184/323] icu: 52.1 -> 53.1 --- pkgs/development/libraries/icu/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a029eab6f121..ee8dc5945987 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, fixDarwinDylibNames }: let - pname = "icu4c"; - version = "52.1"; + version = "53.1"; in stdenv.mkDerivation { name = pname + "-" + version; @@ -11,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g"; + sha256 = "0a4sg9w054640zncb13lhrcjqn7yg1qilwd1mczc4w60maslz9vg"; }; makeFlags = stdenv.lib.optionalString stdenv.isDarwin @@ -35,10 +34,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Unicode and globalization support library"; homepage = http://site.icu-project.org/; - maintainers = with stdenv.lib.maintainers; [raskin urkud]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ raskin urkud ]; + platforms = platforms.all; }; } From 87ee3d5d5ebd30e62a8fa5613b13f1896317926d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 21:33:37 -0700 Subject: [PATCH 185/323] libyaml: Add myself as a maintainer and add platforms meta --- pkgs/development/libraries/libyaml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index d0ad17048aa5..33376cbdad3d 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -14,5 +14,7 @@ stdenv.mkDerivation { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } From cd83ae0ad7eccb2b5f6cf8966c51db4dc53e8b36 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 21:34:24 -0700 Subject: [PATCH 186/323] gyp: 1944 -> 1977 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ec5867eb299..04f8a5d0f28f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3896,13 +3896,13 @@ let gyp = buildPythonPackage rec { - rev = "1944"; + rev = "1977"; name = "gyp-r${rev}"; src = fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; - sha256 = "15k3ivk3jyhx4rwdf1mn6qpyrwixvy01jpkir8d14c4g9hax1dx1"; + sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; }; patches = optionals pkgs.stdenv.isDarwin [ @@ -10761,4 +10761,4 @@ let -}); in pythonPackages \ No newline at end of file +}); in pythonPackages From f4e8f18c19caa25912db85ab1732bfd7e788e1ee Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 22:42:21 -0700 Subject: [PATCH 187/323] v8: 3.26.8 -> 3.26.31.15 --- pkgs/development/libraries/v8/default.nix | 17 +++++++----- .../v8/fix-GetLocalizedMessage-usage.patch | 27 ------------------- 2 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4c86de7fb56b..fda32a7ddbd3 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -8,17 +8,22 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "3.26.8"; + version = "3.26.31.15"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + "${name}.tar.bz2"; - sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz"; + sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l"; }; + patchPhase = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + ''; + configurePhase = '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - ${gyp}/bin/gyp \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ -f make \ --generator-output="out" \ -Dflock_index=0 \ @@ -26,9 +31,7 @@ stdenv.mkDerivation rec { -Duse_system_icu=1 \ -Dconsole=readline \ -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} \ - --depth=. -Ibuild/standalone.gypi \ - build/all.gyp + -Dv8_target_arch=${arch} ''; nativeBuildInputs = [ which ]; @@ -60,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's open source JavaScript engine"; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch deleted file mode 100644 index 3bc0fff4d509..000000000000 --- a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 -From: Timothy J Fontaine -Date: Thu, 23 May 2013 13:57:59 -0700 -Subject: [PATCH] v8: fix GetLocalizedMessage usage - -As is the backport of the abort on uncaught exception wouldn't compile -because we it was passing in `this` when it was unnecessary. ---- - deps/v8/src/isolate.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/isolate.cc b/src/isolate.cc -index 04a438b..5a5293e 100644 ---- a/src/isolate.cc -+++ b/src/isolate.cc -@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { - (report_exception || can_be_caught_externally)) { - fatal_exception_depth++; - fprintf(stderr, "%s\n\nFROM\n", -- *MessageHandler::GetLocalizedMessage(this, message_obj)); -+ *MessageHandler::GetLocalizedMessage(message_obj)); - PrintCurrentStackTrace(stderr); - OS::Abort(); - } --- -1.8.1.6 - From 28e1d2508436767347dcebc51cf22e5d17a48b8d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Sep 2014 08:50:39 +0200 Subject: [PATCH 188/323] super: fixed url to source and added patch for CVE-2014-0470 --- pkgs/tools/security/super/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 0d2e34a41253..c88efb23531b 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "super-3.30.0"; src = fetchurl { name = "${name}.tar.gz"; - url = "http://ftp.ucolick.org/pub/users/will/${name}-tar.gz"; - sha256 = "1sxgixx1yg7h8g9799v79rk15gb39gn7p7fx032c078wxx38qwq4"; + url = "http://www.ucolick.org/~will/RUE/super/${name}-tar.gz"; + sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; }; + patches = [ + (fetchpatch { url = http://anonscm.debian.org/cgit/users/robert/super.git/plain/debian/patches/14-Fix-unchecked-setuid-call.patch; + sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; + }) + ]; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; configureFlags = "--sysconfdir=/etc --localstatedir=/var"; @@ -16,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)"; meta = { - homepage = http://ftp.ucolick.org/pub/users/will/; + homepage = http://www.ucolick.org/~will/; description = "Allows users to execute scripts as if they were root"; longDescription = '' From bb97890cf3d609afd91aa7234bc721f79f17c203 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 14 Sep 2014 08:20:55 +0200 Subject: [PATCH 189/323] Add weboob 0.j --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04f8a5d0f28f..0006649f857b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10759,6 +10759,24 @@ let }; }; + weboob = buildPythonPackage rec { + name = "weboob-0.j"; + src = fetchurl { + url = "https://symlink.me/attachments/download/271/${name}.tar.gz"; + md5 = "9e11b1f376ccb87d35995ec87bba5b38"; + }; + + setupPyBuildFlags = ["--qt" "--xdg"]; + + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect ]; + + meta = { + homepage = http://weboob.org; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = stdenv.lib.licenses.agpl3; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + }; + }; }); in pythonPackages From 2f79a85767d6b1afcb1452e1ee0a660412773350 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Sun, 14 Sep 2014 11:23:05 +0200 Subject: [PATCH 190/323] VirtualBox: Fix ALSA audio. Use a sed replacement to ensure that dynamic loading of libasound works. --- pkgs/applications/virtualization/virtualbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f3e7bea3ca9a..422e8966bfaf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -76,6 +76,7 @@ in stdenv.mkDerivation { ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f | xargs sed 's/depmod -a/true/' -i + sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c export USER=nix set +x ''; From 958be357a55f7cef5f7ed4017e7b2afd498c142f Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Sun, 14 Sep 2014 22:05:15 +1000 Subject: [PATCH 191/323] keepass: Bump version to 2.27 --- pkgs/applications/misc/keepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 89f794850d27..b3fafbc40169 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "keepass-${version}"; - version = "2.22"; + version = "2.27"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; - sha256 = "0mman7r1jmirfwzix5qww0yn4rrgzcg7546basxjvvfc8flp43j0"; + sha256 = "1qi7pls5xrv7ma53bwka738idvnxk82dvhk06m1snc8c29dws7fa"; }; sourceRoot = "."; From 8818e63dcdfb1006f1b3bd375b5a4bbe7f63bf8d Mon Sep 17 00:00:00 2001 From: wyvie Date: Sun, 14 Sep 2014 17:53:12 +0200 Subject: [PATCH 192/323] Fixed quazip default.nix --- pkgs/development/libraries/quazip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 398e942723be..8899980affa9 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { configurePhase = "cd quazip && qmake quazip.pro"; - installPhase = "INSTALL_ROOT=$out make install"; + installFlags = "INSTALL_ROOT=$out"; buildInputs = [ zlib qt5 ]; meta = { - description = "A Qt/C++ wrapper for Gilles Vollant's ZIP/UNZIP C package (minizip). Provides access to ZIP archives from Qt programs using QIODevice API."; - license = [ "GPLv2+" ]; + description = "Provides access to ZIP archives from Qt programs"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://quazip.sourceforge.net/; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = stdenv.lib.platforms.linux; }; } From 5198f9bc29f6b8e9777e20edd31666a35135d2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Sep 2014 18:28:13 +0200 Subject: [PATCH 193/323] mailpile: dev -> 0.4.0 (beta release) --- .../mailreaders/mailpile/default.nix | 28 +++++++++++++------ pkgs/top-level/python-packages.nix | 19 +++++++++++-- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 2b1e9fc4fb34..0f51719e9791 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchgit, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, gnupg1orig, makeWrapper }: -buildPythonPackage rec { - name = "mailpile-dev"; +pythonPackages.buildPythonPackage rec { + name = "mailpile-${version}"; + version = "0.4.0"; - src = fetchgit { - url = "https://github.com/pagekite/Mailpile.git"; - rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb"; - sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs"; + src = fetchurl { + url = "https://github.com/pagekite/Mailpile/archive/${version}.zip"; + sha256 = "1di859lnhmlih4byfpsj8x6wjvzrddw0ng0w69bsj5f9bdy4rgq4"; }; + + patchPhase = '' + substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" + ''; propagatedBuildInputs = with pythonPackages; [ - pillow jinja2 spambayes pythonPackages.lxml python.modules.readline or null]; + makeWrapper pillow jinja2 spambayes pythonPackages.lxml + python.modules.readline pgpdump gnupg1orig + ]; + + postInstall = '' + wrapProgram $out/bin/mailpile --prefix PATH ":" "${gnupg1orig}/bin" + ''; meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; @@ -19,4 +29,4 @@ buildPythonPackage rec { platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; -} +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0006649f857b..9c4778979019 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7745,12 +7745,27 @@ let }; }; + pgpdump = pythonPackages.buildPythonPackage rec { + name = "pgpdump-1.5"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz"; + md5 = "040a451c8e63de3e61fc5b66efa7fca5"; + }; + + meta = with stdenv.lib; { + description = "Python library for parsing PGP packets"; + homepage = https://github.com/toofishes/python-pgpdump; + license = licenses.bsd3; + }; + }; + spambayes = buildPythonPackage rec { - name = "spambayes-1.1a6"; + name = "spambayes-1.1b1"; src = fetchurl { url = "mirror://sourceforge/spambayes/${name}.tar.gz"; - sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l"; + sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n"; }; propagatedBuildInputs = [ pydns lockfile ]; From 57f62dd2b4445f8aa42e6b9e3a7507f7bbb9faaf Mon Sep 17 00:00:00 2001 From: wyvie Date: Sun, 14 Sep 2014 21:13:27 +0200 Subject: [PATCH 194/323] Bumped version of sublime3 --- pkgs/applications/editors/sublime3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 3bc815cc9548..1ef28e0acd1b 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - build = "3059"; + build = "3065"; libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; in let # package with just the binaries @@ -15,13 +15,13 @@ in let fetchurl { name = "sublimetext-3.0.59.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "5ee7b42b5db057108e97b86fd408124fc3f7b56662b2851f59d91f8f0c288088"; + sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d"; } else fetchurl { name = "sublimetext-3.0.59.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "da3039687664d33a734cea0151b2291ece9c7f35e5b73df5b2b5eac28a20b972"; + sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea"; }; dontStrip = true; From 490dc64347bd94c43ba5684e7d701e8f744ac383 Mon Sep 17 00:00:00 2001 From: wyvie Date: Sun, 14 Sep 2014 21:19:38 +0200 Subject: [PATCH 195/323] Fixed file name with new version --- pkgs/applications/editors/sublime3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 1ef28e0acd1b..87310efc8754 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -13,13 +13,13 @@ in let src = if stdenv.system == "i686-linux" then fetchurl { - name = "sublimetext-3.0.59.tar.bz2"; + name = "sublimetext-3.0.65.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d"; } else fetchurl { - name = "sublimetext-3.0.59.tar.bz2"; + name = "sublimetext-3.0.65.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea"; }; From 9daaa163412ed6a8f1e570dfbbf8540e1cd5acc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Sep 2014 23:12:22 +0200 Subject: [PATCH 196/323] add python2nix --- .../package-management/python2nix/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/package-management/python2nix/default.nix diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix new file mode 100644 index 000000000000..3fabfd3f7212 --- /dev/null +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + + +pythonPackages.buildPythonPackage rec { + name = "python2nix-dev"; + + # TODO: change to upstream once https://github.com/proger/python2nix/pull/3 is merged + src = fetchFromGitHub { + owner = "iElectric"; + repo = "python2nix"; + rev = "734de5f680425c6298eff46481e5e717d6e141a9"; + sha256 = "09qpzml38rplbr7vhplhzy3iy5n9fd3ba5b9r9cp6d08sk5xidqf"; + }; + + propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b617c55359ca..444f1d4bac60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3778,6 +3778,8 @@ let inherit (python27Packages) recursivePthLoader; }; + python2nix = callPackage ../tools/package-management/python2nix { }; + pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs { inherit stdenv fetchurl lib; }); From 3523d484a672a2dff45fe99e1f8a8b00a6c4ced6 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 15 Sep 2014 01:15:59 +0200 Subject: [PATCH 197/323] haskell-pdf-toolbox-core: added --- .../haskell/pdf-toolbox-core/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix new file mode 100644 index 000000000000..bfccb645fbb2 --- /dev/null +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, errors, ioStreams, transformers, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "pdf-toolbox-core"; + version = "0.0.2.1"; + sha256 = "14jj6xprzh2k1njal0mgapkm3xivy8370p9kdjxha9gnwmc581df"; + buildDepends = [ + attoparsec errors ioStreams transformers zlibBindings + ]; + meta = { + homepage = "https://github.com/Yuras/pdf-toolbox"; + description = "A collection of tools for processing PDF files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fd88674526f6..d21157868551 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1858,6 +1858,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; + pdfToolboxCore = callPackage ../development/libraries/haskell/pdf-toolbox-core {}; + pem = callPackage ../development/libraries/haskell/pem {}; permutation = callPackage ../development/libraries/haskell/permutation {}; From 8a027d98279380b98539c2b4a2c529a50d4e1ca5 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 15 Sep 2014 02:31:08 +0200 Subject: [PATCH 198/323] haskell-pdf-toolbox-content: added --- .../haskell/pdf-toolbox-content/default.nix | 18 ++++++++++++++++++ .../haskell/pdf-toolbox-core/default.nix | 2 -- pkgs/top-level/haskell-packages.nix | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix new file mode 100644 index 000000000000..fd43a0452db8 --- /dev/null +++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, base16Bytestring, ioStreams, pdfToolboxCore +, text +}: + +cabal.mkDerivation (self: { + pname = "pdf-toolbox-content"; + version = "0.0.3.0"; + sha256 = "0glcm6mrgg8ixzhp09kfkk3ra3qblvrp1wcsa2nhqlypg3ca8r3h"; + buildDepends = [ + attoparsec base16Bytestring ioStreams pdfToolboxCore text + ]; + meta = { + description = "A collection of tools for processing PDF files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix index bfccb645fbb2..be55101fc2cb 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -1,5 +1,3 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - { cabal, attoparsec, errors, ioStreams, transformers, zlibBindings }: diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d21157868551..8ce5abceecef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1860,6 +1860,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pdfToolboxCore = callPackage ../development/libraries/haskell/pdf-toolbox-core {}; + pdfToolboxContent = callPackage ../development/libraries/haskell/pdf-toolbox-content {}; + pem = callPackage ../development/libraries/haskell/pem {}; permutation = callPackage ../development/libraries/haskell/permutation {}; From 6d01dddd6f58818c6c416bf7c1c42ac9465906f9 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 15 Sep 2014 02:42:03 +0200 Subject: [PATCH 199/323] haskell-pdf-toolbox-document added --- .../haskell/pdf-toolbox-document/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix new file mode 100644 index 000000000000..dc1e96823b35 --- /dev/null +++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix @@ -0,0 +1,20 @@ +{ cabal, cipherRc4, cryptohash, ioStreams, pdfToolboxContent +, pdfToolboxCore, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "pdf-toolbox-document"; + version = "0.0.3.0"; + sha256 = "0y1kb2hf420jx6r81c431avgar32wzx2xr747akcs4rypf6w53fn"; + buildDepends = [ + cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore + text transformers + ]; + meta = { + homepage = "https://github.com/Yuras/pdf-toolbox"; + description = "A collection of tools for processing PDF files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8ce5abceecef..ea010bf48a5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1858,9 +1858,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; + pdfToolboxContent = callPackage ../development/libraries/haskell/pdf-toolbox-content {}; + pdfToolboxCore = callPackage ../development/libraries/haskell/pdf-toolbox-core {}; - pdfToolboxContent = callPackage ../development/libraries/haskell/pdf-toolbox-content {}; + pdfToolboxDocument = callPackage ../development/libraries/haskell/pdf-toolbox-document {}; pem = callPackage ../development/libraries/haskell/pem {}; From 0511d49f2e2a977dff0fa3e4e4ea070a1b5d9065 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 14 Sep 2014 18:59:43 -0700 Subject: [PATCH 200/323] libibumad: Add derivation --- .../development/libraries/libibumad/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/libibumad/default.nix diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix new file mode 100644 index 000000000000..911c5c846125 --- /dev/null +++ b/pkgs/development/libraries/libibumad/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libibumad-1.3.9"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + sha256 = "0j52aiwfgasf7bzx65svd5h2ya7848c5racf191i8irsxa155q74"; + }; + + meta = with stdenv.lib; { + homepage = http://www.openfabrics.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 444f1d4bac60..f1465fce5ef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,6 +5405,8 @@ let libharu = callPackage ../development/libraries/libharu { }; + libibumad = callPackage ../development/libraries/libibumad { }; + libical = callPackage ../development/libraries/libical { }; libicns = callPackage ../development/libraries/libicns { }; From 9c27c33ea8c473c453e16a1ed3206bcea30b69fe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 14 Sep 2014 19:00:02 -0700 Subject: [PATCH 201/323] libibmad: Add derivation --- .../libraries/libibmad/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libibmad/default.nix diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix new file mode 100644 index 000000000000..8a4f27ad9c09 --- /dev/null +++ b/pkgs/development/libraries/libibmad/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libibumad }: + +stdenv.mkDerivation rec { + name = "libibmad-1.3.11"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + sha256 = "1d5lh2lhz7zzs7bbjjv9i0pj3v1xgp8sdmcr425h563v2c3bp53h"; + }; + + buildInputs = [ libibumad ]; + + meta = with stdenv.lib; { + homepage = http://www.openfabrics.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1465fce5ef1..d63e373bdd0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,6 +5405,8 @@ let libharu = callPackage ../development/libraries/libharu { }; + libibmad = callPackage ../development/libraries/libibmad { }; + libibumad = callPackage ../development/libraries/libibumad { }; libical = callPackage ../development/libraries/libical { }; From abc21d94642c8acc76038eccebaf00ddacb3e168 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 14 Sep 2014 19:00:25 -0700 Subject: [PATCH 202/323] mstflint: Add derivation --- pkgs/tools/misc/mstflint/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/misc/mstflint/default.nix diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix new file mode 100644 index 000000000000..32953483daae --- /dev/null +++ b/pkgs/tools/misc/mstflint/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib, libibmad }: + +stdenv.mkDerivation { + name = "mstflint-3.7.0-1.18"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/mstflint/mstflint-3.7.0-1.18.gcdb9f80.tar.gz"; + sha256 = "10x4l3i58ynnni18i8qq1gfbqd2028r4jd3frshiwrl9yrj7sxn2"; + }; + + buildInputs = [ zlib libibmad ]; + + meta = with stdenv.lib; { + homepage = http://www.openfabrics.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63e373bdd0a..673439260d22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,6 +657,8 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; + mstflint = callPackage ../tools/misc/mstflint { }; + mcelog = callPackage ../os-specific/linux/mcelog { }; apparix = callPackage ../tools/misc/apparix { }; From ff344624d612aad36c85aa1aeceda07c8c640ccd Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 14 Sep 2014 19:07:29 -0400 Subject: [PATCH 203/323] add go-repo-root, dependency of go2nix --- .../tools/misc/go-repo-root/default.nix | 33 +++++++++ .../tools/misc/go-repo-root/deps.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 102 insertions(+) create mode 100644 pkgs/development/tools/misc/go-repo-root/default.nix create mode 100644 pkgs/development/tools/misc/go-repo-root/deps.nix diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix new file mode 100644 index 000000000000..c4eaf03a3581 --- /dev/null +++ b/pkgs/development/tools/misc/go-repo-root/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, go, fetchgit, fetchhg, fetchFromGitHub }: + +let + version = "0.0.1"; +in + +with lib; +stdenv.mkDerivation { + name = "go-repo-root-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchhg fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o go-repo-root github.com/cstrahan/go-repo-root + ''; + + installPhase = '' + mkdir -p $out/bin + cp go-repo-root $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/cstrahan/go-repo-root"; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/go-repo-root/deps.nix b/pkgs/development/tools/misc/go-repo-root/deps.nix new file mode 100644 index 000000000000..585e9955ab23 --- /dev/null +++ b/pkgs/development/tools/misc/go-repo-root/deps.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchFromGitHub, fetchhg }: + +let + goDeps = [ + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "http://code.google.com/p/go.net"; + rev = "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"; + sha256 = "0s0aa8hxrpggn6wwx4x591k6abvawrmhsk8ji327pgj08fdy3ahq"; + }; + } + { + root = "code.google.com/p/go.text"; + src = fetchhg { + url = "http://code.google.com/p/go.text"; + rev = "12288f41f508af9490f03a9780afa295c9b0a063"; + sha256 = "17kr0h79pznb3nn5znbh1d7dinmqjwvg5iqqk4l05569q50gqwww"; + }; + } + { + root = "code.google.com/p/go.tools"; + src = fetchhg { + url = "http://code.google.com/p/go.tools"; + rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8"; + sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56"; + }; + } + { + root = "code.google.com/p/goauth2"; + src = fetchhg { + url = "http://code.google.com/p/goauth2"; + rev = "afe77d958c701557ec5dc56f6936fcc194d15520"; + sha256 = "0xgkgcb97hv2rvzvh21rvydq5cc83j7sdsdb1chrymq8k7l4dzc1"; + }; + } + { + root = "code.google.com/p/google-api-go-client"; + src = fetchhg { + url = "http://code.google.com/p/google-api-go-client"; + rev = "e1c259484b495133836706f46319f5897f1e9bf6"; + sha256 = "051dqhjhp3bz2xp7lv9v60xlmphbxj1vyc46wg8v74yjvqvsiwzd"; + }; + } + { + root = "github.com/cstrahan/go-repo-root"; + src = fetchFromGitHub { + owner = "cstrahan"; + repo = "go-repo-root"; + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 673439260d22..4beae3a46d5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3106,6 +3106,8 @@ let go = go_1_3; + go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; + gox = callPackage ../development/compilers/go/gox.nix { }; gprolog = callPackage ../development/compilers/gprolog { }; From d8858f8a25ffd064877488dc266c5dddd9a361dd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 00:55:31 -0700 Subject: [PATCH 204/323] ccid: 1.4.16 -> 1.4.18 --- pkgs/tools/security/ccid/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 42af2e0b57e8..c9a261ba97a8 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: + stdenv.mkDerivation rec { - version = "1.4.16"; + version = "1.4.18"; name = "ccid-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; - sha256 = "0a0e6aa38863c79e38673c085254fa94fd0aa040b9622304a8d6d4222b7e7ea0"; + sha256 = "1aj14lkmfaxkhk5swqfgn2x18j7fijxs0jnxnx9cdc9f5mxaknsz"; }; patchPhase = '' @@ -18,11 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ pcsclite pkgconfig libusb1 ]; - meta = { + meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric wkennington ]; + platforms = with platforms; linux; }; } From c27594d8b4a2f7e3cf035e0494322b7728f43a41 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 00:55:47 -0700 Subject: [PATCH 205/323] pcsclite: Add myself as maintainer --- pkgs/tools/security/pcsclite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 2737cc435752..fe459b2c4762 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = http://pcsclite.alioth.debian.org/; license = licenses.bsd3; - maintainers = with maintainers; [viric]; + maintainers = with maintainers; [ viric wkennington ]; platforms = with platforms; linux; }; } From 5c80997ebdea1572234925fb609cd89f7e0f9c6a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 01:30:42 -0700 Subject: [PATCH 206/323] radvd: 2.5 -> 2.6 --- pkgs/tools/networking/radvd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index e74106ec67f4..fa0a87099ae3 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.5"; + name = "radvd-2.6"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "0hsa647l236q9rhrwjb44xqmjfz4fxzcixlbf2chk4lzh8lzwjp0"; + sha256 = "1vp86a2jcrrbyc62rglby3nx11i8rz5bsxbh6bp6049a0s9m4k4r"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; From 66dbde4002b8ee64dd060ab06f9ecfbff9f2dd13 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 15 Sep 2014 11:55:23 +0200 Subject: [PATCH 207/323] New packages: pam_mount and libHX Add pam_mount package. Integration into NixOS is still missing. --- pkgs/development/libraries/libHX/default.nix | 29 ++++++++++++++++++++ pkgs/os-specific/linux/pam_mount/default.nix | 29 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/libHX/default.nix create mode 100644 pkgs/os-specific/linux/pam_mount/default.nix diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix new file mode 100644 index 000000000000..fb837748852f --- /dev/null +++ b/pkgs/development/libraries/libHX/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libHX-3.21"; + + src = fetchurl { + url = "mirror://sourceforge/libhx/libHX/3.21/${name}.tar.xz"; + sha256 = "0wcr6kbhsw6v4js7q4p7fhli37c39dv1rryjf768rkwshl2z8f6v"; + }; + + patches = []; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = '' + sh autogen.sh + ''; + + meta = { + homepage = http://libhx.sourceforge.net/; + description = '' + libHX is a C library (with some C++ bindings available) that provides data structures + and functions commonly needed, such as maps, deques, linked lists, string formatting + and autoresizing, option and config file parsing, type checking casts and more. + ''; + maintainers = []; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix new file mode 100644 index 000000000000..3a525d6d6aa0 --- /dev/null +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }: + +stdenv.mkDerivation rec { + name = "pam_mount-2.14"; + + src = fetchurl { + url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz"; + sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg"; + }; + + buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + + preConfigure = "sh autogen.sh --prefix=$out"; + + makeFlags = "DESTDIR=$(out)"; + + # Probably a hack, but using DESTDIR and PREFIX makes everything work! + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + + meta = { + homepage = http://pam-mount.sourceforge.net/; + description = "PAM module to mount volumes for a user session."; + maintainers = []; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d02ce6d9e5d7..659d51cb07c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5307,6 +5307,8 @@ let libharu = callPackage ../development/libraries/libharu { }; + libHX = callPackage ../development/libraries/libHX { }; + libical = callPackage ../development/libraries/libical { }; libicns = callPackage ../development/libraries/libicns { }; @@ -7742,6 +7744,8 @@ let pam_login = callPackage ../os-specific/linux/pam_login { }; + pam_mount = callPackage ../os-specific/linux/pam_mount { }; + pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; pam_usb = callPackage ../os-specific/linux/pam_usb { }; From 7e4c24af7afa0dfd5807b299ab3df62c91f77a92 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 15 Sep 2014 12:30:19 +0200 Subject: [PATCH 208/323] Fix description in pam_mount and libHX. Add tstrobel as maintainer. --- lib/maintainers.nix | 1 + pkgs/development/libraries/libHX/default.nix | 4 ++-- pkgs/os-specific/linux/pam_mount/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a6c41bbe17f1..9f06f92941e1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -117,6 +117,7 @@ the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; + tstrobel = "Thomas Strobel "; ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; urkud = "Yury G. Kudryashov "; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index fb837748852f..31dfe6085ee1 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meta = { homepage = http://libhx.sourceforge.net/; - description = '' + longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting and autoresizing, option and config file parsing, type checking casts and more. ''; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 3a525d6d6aa0..05438c6945ce 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://pam-mount.sourceforge.net/; - description = "PAM module to mount volumes for a user session."; - maintainers = []; + description = "PAM module to mount volumes for a user session"; + maintainers = [ stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; }; } From 83604fa0324a22ea23150c4a2a0bc8c4b2935de7 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 15 Sep 2014 12:54:39 +0200 Subject: [PATCH 209/323] pdf2svg: PDF converter utility to SVG format --- pkgs/tools/graphics/pdf2svg/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/graphics/pdf2svg/default.nix diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix new file mode 100644 index 000000000000..591a85c24472 --- /dev/null +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cairo, gtk, poppler }: + +stdenv.mkDerivation { + name = "pdf2svg-0.2.2"; + + src = fetchurl { + url = "http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/pdf2svg-0.2.2.tar.gz" ; + sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2"; + }; + + buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ]; + + meta = { + description = "PDF converter to SVG format"; + homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.ianwookim ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4beae3a46d5d..82e999058ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1883,6 +1883,8 @@ let pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; + pdfjam = callPackage ../tools/typesetting/pdfjam { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; From 63f6cc0f7b33dc47e63bcbbba8bdd383cad59d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 15 Sep 2014 08:34:16 -0300 Subject: [PATCH 210/323] New package: openbox-menu --- .../misc/openbox-menu/default.nix | 24 +++++++++++++++++++ .../misc/openbox-menu/with-svg.patch | 11 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/misc/openbox-menu/default.nix create mode 100644 pkgs/applications/misc/openbox-menu/with-svg.patch diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix new file mode 100644 index 000000000000..6055997b28ee --- /dev/null +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }: + +stdenv.mkDerivation rec { + name = "openbox-menu-0.5.1"; + + src = fetchurl { + url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2"; + sha256 = "11v3nlhqcnks5vms1a7rrvwvj8swc9axgjkp7z0r97lijsg6d3rj"; + }; + + buildInputs = [ pkgconfig glib gtk menu-cache ]; + + patches = [ ./with-svg.patch ]; + + installPhase = "make install prefix=$out"; + + meta = { + description = "Dynamic XDG menu generator for Openbox"; + homepage = "http://mimasgpc.free.fr/openbox-menu.html"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/pkgs/applications/misc/openbox-menu/with-svg.patch new file mode 100644 index 000000000000..dd6710f5cfc9 --- /dev/null +++ b/pkgs/applications/misc/openbox-menu/with-svg.patch @@ -0,0 +1,11 @@ +--- a/Makefile.old 2013-12-11 06:39:44.397358610 +0100 ++++ b/Makefile 2013-12-11 06:39:51.082275037 +0100 +@@ -7,7 +7,7 @@ + CFLAGS+=-DWITH_ICONS + # Uncomment this line if Openbox can display SVG icons + # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear.. +-# CFLAGS+=-DWITH_SVG ++CFLAGS+=-DWITH_SVG + + prefix= /usr/local + DESTDIR ?= $(prefix) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4beae3a46d5d..6793f7d5f6d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9671,6 +9671,8 @@ let openbox = callPackage ../applications/window-managers/openbox { }; + openbox-menu = callPackage ../applications/misc/openbox-menu { }; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; From 69446d14613a46ede5a966b018bc6de70faf930c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 15 Sep 2014 08:40:41 -0300 Subject: [PATCH 211/323] openbox window manager: add tool to set desktop layout --- pkgs/applications/window-managers/openbox/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index fad5b8010ea4..2756525b2b02 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -17,8 +17,16 @@ stdenv.mkDerivation rec { sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj"; }; + setlayoutSrc = fetchurl { + url = "http://openbox.org/dist/tools/setlayout.c"; + sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv"; + }; + + postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc"; + # Openbox needs XDG_DATA_DIRS set or it can't find its default theme postInstall = '' + cp -a setlayout "$out"/bin wrapProgram "$out/bin/openbox" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" From 8b955e62f5483eb79fc35ae643d7afb9ade7f160 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 15 Sep 2014 16:01:32 +0200 Subject: [PATCH 212/323] Update hipchat to 2.2.1163 --- .../networking/instant-messengers/hipchat/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index cf4c2e22ad6b..22e8a97466b3 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra -, makeWrapper, libredirect, xkeyboard_config }: +, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: let - version = "2.2.1107"; + version = "2.2.1163"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -40,18 +40,19 @@ let libvorbis xz libcanberra + xcbutilkeysyms ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa"; + sha256 = "0yafin8qfnv9kj61z9vxza42r7fv8b9j04qs50masbly0jg5xsg8"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv"; + sha256 = "1a0yvrnp41s53wpqv2jxsb3gd4vb49nfh89m6nwbw4qd85i5lfsp"; } else throw "HipChat is not supported on ${stdenv.system}"; From fe3c2a56c8dead02f3ab1283481f161fbc8bd55d Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 15 Sep 2014 16:27:14 +0200 Subject: [PATCH 213/323] New package: Solvespace. A parametric 2D/3D CAD application. --- .../graphics/solvespace/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/graphics/solvespace/default.nix diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix new file mode 100644 index 000000000000..95230291fe95 --- /dev/null +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchgit,autoconf, automake, gcc, fltk13 +, libjpeg, libpng, libtool, mesa, pkgconfig }: + +stdenv.mkDerivation { + name = "solvespace-2.0"; + src = fetchgit { + url = "https://gitorious.org/solvespace/solvespace.git"; + sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da"; + rev = "e587d0e"; + }; + + # e587d0e fails with undefined reference errors if make is called + # twice. Ugly workaround: Build while installing. + dontBuild = true; + enableParallelBuilding = false; + + buildInputs = [ + autoconf + automake + gcc + fltk13 + libjpeg + libpng + libtool + mesa + pkgconfig + stdenv + ]; + + preConfigure = '' + aclocal + libtoolize + + autoreconf -i + automake --add-missing + ''; + + meta = { + description = "A parametric 3d CAD program."; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.linux; + homepage = http://solvespace.com; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e999058ffd..32ff5ecc00f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2175,6 +2175,8 @@ let solr = callPackage ../servers/search/solr { }; + solvespace = callPackage ../applications/graphics/solvespace { }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spiped = callPackage ../tools/networking/spiped { }; From 5355c60e1895f8fdfc3d8d72a4846efcd724a407 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Mon, 15 Sep 2014 17:59:23 +0200 Subject: [PATCH 214/323] davmail: updated to 4.5.1 --- pkgs/applications/networking/davmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 3639f50c4393..f4f1e94438d8 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.5.0"; + name = "davmail-4.5.1"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/davmail/davmail/4.5.0/davmail-linux-x86_64-4.5.0-2292.tgz"; - sha256 = "0ixg26s8535b4xf4i8jr0v3acwvaslmi2dvcxg2nmzkicvh6rfd4"; + url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.5.1-2303.tgz"; + sha256 = "0y9dwxlfrfm6yf010fad1p5vsyz2ddci6vhz4sa1js2fq4rvyx7a"; }; buildInputs = [ makeWrapper ]; From f904ca14a20f6711e61de8720e848197e9e5f786 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 15 Sep 2014 12:07:00 -0400 Subject: [PATCH 215/323] kmod: bump --- pkgs/os-specific/linux/kmod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 380b4a35f1c2..9ee13135d631 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "kmod-17"; + name = "kmod-18"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv"; + sha256 = "e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e"; }; # Disable xz/zlib support to prevent needing them in the initrd. From ce0dd9e335c80662f8ab3ef9b2edc2f39964e2cb Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 13 Sep 2014 23:31:35 +0200 Subject: [PATCH 216/323] Added bashmount package. --- lib/maintainers.nix | 1 + pkgs/tools/filesystems/bashmount/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/tools/filesystems/bashmount/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a6c41bbe17f1..1bbd98d12b03 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -67,6 +67,7 @@ joelteon = "Joel Taylor "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; + koral = "Koral "; ktosiek = "Tomasz Kontusz "; lethalman = "Luca Bruno "; lhvwb = "Nathaniel Baxter "; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix new file mode 100644 index 000000000000..115b689adbc8 --- /dev/null +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "bashmount-${version}"; + version = "3.2.0"; + + src = fetchurl { + url = "https://github/jamielinux/bashmount/archive/${version}.tar.gz"; + sha256 = "08ncksz8xl0qg5y5qf64b9adfnsg6769wf5bw8lv8q0zjbhjiwrj"; + }; + + installPhase = '' + mkdir -p $out/bin + cp bashmount $out/bin + + mkdir -p $out/etc + cp bashmount.conf $out/etc + + mkdir -p $out/share/man/man1 + gzip -c -9 bashmount.1 > bashmount.1.gz + cp bashmount.1.gz $out/share/man/man1 + + mkdir -p $out/share/doc/bashmount + cp COPYING $out/share/doc/bashmount + cp NEWS $out/share/doc/bashmount + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/jamielinux/bashmount; + description = "A menu-driven bash script for the management of removable media with udisks"; + maintainers = maintainers.koral; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19ce6712f3ce..80d525f1c870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,6 +573,8 @@ let barcode = callPackage ../tools/graphics/barcode {}; + bashmount = callPackage ../tools/filesystems/bashmount {}; + bc = callPackage ../tools/misc/bc { }; bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; From 0c152324d2af3e222306cae0081d8bfe29f9d8fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Sep 2014 20:08:26 +0200 Subject: [PATCH 217/323] firefox: Update to 32.0.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3223f873bfba..b439fdfa3c44 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "32.0"; in +let version = "32.0.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "5cb7644af9741ebcdb3a21b777362913908c8f41"; + sha1 = "346754273e345e20f21b2d22cccb33e807507005"; }; buildInputs = From 82de6b87d6922b10adafc166a031c081157b0d3f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 15 Sep 2014 15:31:15 -0400 Subject: [PATCH 218/323] monero: intial expression for 0.8.8.3 http://monero.cc --- pkgs/applications/misc/monero/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/monero/default.nix diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix new file mode 100644 index 000000000000..9370844ffe9e --- /dev/null +++ b/pkgs/applications/misc/monero/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, boost }: + +let + version = "0.8.8.4"; +in +stdenv.mkDerivation { + name = "monero-${version}"; + + src = fetchurl { + url = "https://github.com/monero-project/bitmonero/archive/v${version}.tar.gz"; + sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy"; + }; + + buildInputs = [ cmake boost ]; + + # these tests take a long time and don't + # always complete in the build environment + postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt"; + doCheck = false; + checkTarget = "test-release"; # this would be the target + + installPhase = '' + installBin \ + src/bitmonerod \ + src/connectivity_tool \ + src/simpleminer \ + src/simplewallet + ''; + + meta = with stdenv.lib; { + description = "Private, secure, untraceable currency"; + homepage = http://monero.cc/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + 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 b617c55359ca..25ea536e1a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9437,6 +9437,8 @@ let moc = callPackage ../applications/audio/moc { }; + monero = callPackage ../applications/misc/monero { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monodevelop = callPackage ../applications/editors/monodevelop { From f19dec040456d2634170dce9539dbf53a55cf2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 15 Sep 2014 21:53:43 +0200 Subject: [PATCH 219/323] xf86_input_wacom: update from 0.25.99.1 to 0.26.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 962aca777532..a1d7edcd4486 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.25.99.1"; + name = "xf86-input-wacom-0.26.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "0vjl4m1w6j5j9yr2kw6f66n723ghq5jwxivbdjmacjw6r3ml4l9r"; + sha256 = "0rjpxr5nl0wxa17npm5zr0x0vkzz9hy3i1l4zfv1x011rbkkbpqm"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From 10afb382b713add8c4a590665b76696c82bbab21 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 15 Sep 2014 21:47:37 +0100 Subject: [PATCH 220/323] ott: 0.25 new expression --- .../science/logic/ott/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/science/logic/ott/default.nix diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix new file mode 100644 index 000000000000..afe827f3ad98 --- /dev/null +++ b/pkgs/applications/science/logic/ott/default.nix @@ -0,0 +1,43 @@ +# - coqide compilation can be disabled by setting lablgtk to null; + +{stdenv, fetchurl, pkgconfig, ocaml, camlp5}: + +stdenv.mkDerivation rec { + name = "ott-${version}"; + version = "0.25"; + + src = fetchurl { + url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz"; + sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd"; + }; + + buildInputs = [ pkgconfig ocaml camlp5 ]; + + installPhase = '' + mkdir -p $out/bin + cp src/ott.opt $out/bin + ln -s $out/bin/ott.opt $out/bin/ott + + mkdir -p $out/share/emacs/site-lisp + cp emacs/ottmode.el $out/share/emacs/site-lisp + ''; + + meta = { + description = "Ott: tool for the working semanticist"; + longDescription = '' + Ott is a tool for writing definitions of programming languages and + calculi. It takes as input a definition of a language syntax and + semantics, in a concise and readable ASCII notation that is close to + what one would write in informal mathematics. It generates LaTeX to + build a typeset version of the definition, and Coq, HOL, and Isabelle + versions of the definition. Additionally, it can be run as a filter, + taking a LaTeX/Coq/Isabelle/HOL source file with embedded (symbolic) + terms of the defined language, parsing them and replacing them by + target-system terms. + ''; + homepage = http://www.cl.cam.ac.uk/~pes20/ott; + license = "BSD3"; + maintainers = with stdenv.lib.maintainers; [ jwiegley ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c9fb7018c95..1d4a6b59a0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11264,6 +11264,10 @@ let opensmt = callPackage ../applications/science/logic/opensmt { }; + ott = callPackage ../applications/science/logic/ott { + camlp5 = ocamlPackages.camlp5_transitional; + }; + otter = callPackage ../applications/science/logic/otter {}; picosat = callPackage ../applications/science/logic/picosat {}; From 3e5bcdc327eb0347e15ffe2072b2b61f80218d32 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 15 Sep 2014 21:48:50 +0100 Subject: [PATCH 221/323] haskell-here: new expression --- .../libraries/haskell/here/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/here/default.nix diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix new file mode 100644 index 000000000000..5bb96384c882 --- /dev/null +++ b/pkgs/development/libraries/haskell/here/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, haskellSrcMeta, mtl, parsec }: + +cabal.mkDerivation (self: { + pname = "here"; + version = "1.2.5"; + sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb"; + buildDepends = [ haskellSrcMeta mtl parsec ]; + meta = { + homepage = "https://github.com/tmhedberg/here"; + description = "Here docs & interpolated strings via quasiquotation"; + 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 ea010bf48a5a..1d4990ec2220 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1105,6 +1105,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hedis = callPackage ../development/libraries/haskell/hedis {}; + here = callPackage ../development/libraries/haskell/here {}; + heredoc = callPackage ../development/libraries/haskell/heredoc {}; hexpat = callPackage ../development/libraries/haskell/hexpat {}; From 0bfd27535f7f646dcb99963ad05bd93eb0c55b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Sep 2014 23:03:20 +0200 Subject: [PATCH 222/323] nixos/libvirtd: refresh LXC emulator path on startup This fixes the issue when the LXC emulator binary is garbage collected and breaks libvirtd containers, because libvirtd XML file still refers to GC'ed store path. We already have a fix for QEMU, this commit extends the fix to cover LXC too. --- nixos/modules/virtualisation/libvirtd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 318460f4c2cf..2d03f0544b67 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -129,12 +129,12 @@ in # config file. But this path can unfortunately be garbage collected # while still being used by the virtual machine. So update the # emulator path on each startup to something valid (re-scan $PATH). - for file in /etc/libvirt/qemu/*.xml; do + for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do test -f "$file" || continue # get (old) emulator path from config file emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') # get a (definitely) working emulator path by re-scanning $PATH - new_emulator=$(command -v $(basename "$emulator")) + new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) # write back sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file" done From 1613d6cca6a6d550883dbef10c3c94f6b72b3baf Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 15 Sep 2014 21:54:02 +0200 Subject: [PATCH 223/323] Add package: Enlightenment E19! Wayland desktop shell is not enabled, yet. --- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/e19.nix | 94 +++++++++++++++++++ pkgs/desktops/e19/default.nix | 26 +++++ pkgs/desktops/e19/econnman.nix | 23 +++++ pkgs/desktops/e19/efl-setup-hook.sh | 8 ++ pkgs/desktops/e19/efl.nix | 33 +++++++ pkgs/desktops/e19/elementary.nix | 20 ++++ pkgs/desktops/e19/emotion.nix | 20 ++++ pkgs/desktops/e19/enlightenment.nix | 38 ++++++++ pkgs/desktops/e19/evas.nix | 17 ++++ pkgs/desktops/e19/terminology.nix | 23 +++++ pkgs/top-level/all-packages.nix | 5 + pkgs/top-level/python-packages.nix | 20 ++++ 13 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/e19.nix create mode 100644 pkgs/desktops/e19/default.nix create mode 100644 pkgs/desktops/e19/econnman.nix create mode 100755 pkgs/desktops/e19/efl-setup-hook.sh create mode 100644 pkgs/desktops/e19/efl.nix create mode 100644 pkgs/desktops/e19/elementary.nix create mode 100644 pkgs/desktops/e19/emotion.nix create mode 100644 pkgs/desktops/e19/enlightenment.nix create mode 100644 pkgs/desktops/e19/evas.nix create mode 100644 pkgs/desktops/e19/terminology.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index c62beca60d84..ebdb2ad06491 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix - ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix + ./e17.nix ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix new file mode 100644 index 000000000000..dd9becb0f6ca --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/e19.nix @@ -0,0 +1,94 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.e19; + e19_enlightenment = pkgs.e19.enlightenment.override { set_freqset_setuid = true; }; + +in + +{ + options = { + + services.xserver.desktopManager.e19.enable = mkOption { + default = false; + example = true; + description = "Enable the E19 desktop environment."; + }; + + }; + + config = mkIf (xcfg.enable && cfg.enable) { + + environment.systemPackages = [ + pkgs.e19.efl pkgs.e19.evas pkgs.e19.emotion pkgs.e19.elementary e19_enlightenment + pkgs.e19.terminology pkgs.e19.econnman + pkgs.xorg.xauth # used by kdesu + pkgs.gtk # To get GTK+'s themes. + pkgs.tango-icon-theme + pkgs.shared_mime_info + pkgs.gnome.gnomeicontheme + pkgs.xorg.xcursorthemes + ]; + + environment.pathsToLink = [ "/etc/enlightenment" "/etc/xdg" "/share/enlightenment" "/share/elementary" "/share/applications" "/share/locale" "/share/icons" "/share/themes" "/share/mime" "/share/desktop-directories" ]; + + services.xserver.desktopManager.session = [ + { name = "E19"; + start = '' + # Set GTK_DATA_PREFIX so that GTK+ can find the themes + export GTK_DATA_PREFIX=${config.system.path} + # find theme engines + export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 + export XDG_MENU_PREFIX=enlightenment + + # make available for D-BUS user services + #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${pkgs.e19.efl}/share + + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update + + ${e19_enlightenment}/bin/enlightenment_start + waitPID=$! + ''; + }]; + + security.setuidPrograms = [ "e19_freqset" ]; + + environment.etc = singleton + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; + + fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; + + services.udisks2.enable = true; + services.upower.enable = config.powerManagement.enable; + + #services.dbus.packages = [ pkgs.efl ]; # dbus-1 folder is not in /etc but in /share, so needs fixing first + + systemd.user.services.efreet = + { enable = true; + description = "org.enlightenment.Efreet"; + serviceConfig = + { ExecStart = "${pkgs.e19.efl}/bin/efreetd"; + StandardOutput = "null"; + }; + }; + + systemd.user.services.ethumb = + { enable = true; + description = "org.enlightenment.Ethumb"; + serviceConfig = + { ExecStart = "${pkgs.e19.efl}/bin/ethumbd"; + StandardOutput = "null"; + }; + }; + + + }; + +} diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix new file mode 100644 index 000000000000..5740337a11a1 --- /dev/null +++ b/pkgs/desktops/e19/default.nix @@ -0,0 +1,26 @@ +{ callPackage, pkgs }: +let + openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: { + name = "openjpeg-1.5.1"; + src = fetchurl { + url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz"; + sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b"; + }; + #passthru = { incDir = "openjpeg-1.5.1"; }; + }); +in +rec { + #### CORE EFL + efl = callPackage ./efl.nix { openjpeg=openjpeg_1; }; + evas = callPackage ./evas.nix { }; + emotion = callPackage ./emotion.nix { }; + elementary = callPackage ./elementary.nix { }; + + #### WINDOW MANAGER + enlightenment = callPackage ./enlightenment.nix { }; + + #### APPLICATIONS + econnman = callPackage ./econnman.nix { }; + terminology = callPackage ./terminology.nix { }; + +} diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix new file mode 100644 index 000000000000..1e42895b4e22 --- /dev/null +++ b/pkgs/desktops/e19/econnman.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, e19, python27, python27Packages, dbus, makeWrapper }: +stdenv.mkDerivation rec { + name = "econnman-${version}"; + version = "1.1"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; + sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; + }; + + buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_11 python27Packages.dbus e19.elementary ]; + postInstall = '' + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_11}/lib/python2.7/site-packages + ''; + + meta = { + description = "Econnman is a user interface for the connman network connection manager"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/desktops/e19/efl-setup-hook.sh b/pkgs/desktops/e19/efl-setup-hook.sh new file mode 100755 index 000000000000..d98f24b4c04b --- /dev/null +++ b/pkgs/desktops/e19/efl-setup-hook.sh @@ -0,0 +1,8 @@ +addDbusIncludePath () { + if test -d "$1/include/dbus-1.0" + then + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" + fi +} + +envHooks=(${envHooks[@]} addDbusIncludePath) diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix new file mode 100644 index 000000000000..2252bc919919 --- /dev/null +++ b/pkgs/desktops/e19/efl.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: + + +stdenv.mkDerivation rec { + name = "efl-${version}"; + version = "1.11.2"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; + sha256 = "123jrcifd7i0r9zh8qllqiz3d378fyy7fzkanyki9wbxlz91rk7k"; + }; + + buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; + + propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; + + configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ]; + + NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + + preConfigure = '' + export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" + ''; + + setupHook = ./efl-setup-hook.sh; + + meta = { + description = "Enlightenment Core libraries"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix new file mode 100644 index 000000000000..db335a156202 --- /dev/null +++ b/pkgs/desktops/e19/elementary.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: +stdenv.mkDerivation rec { + name = "elementary-${version}"; + version = "1.11.2"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; + sha256 = "041hwp81qyq4wsw483g2jh52gcanqg046f91pmd0vzgwcgxyixqq"; + }; + buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + ''; + meta = { + description = "Widget set/toolkit"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; + }; +} diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix new file mode 100644 index 000000000000..781d884fe3bd --- /dev/null +++ b/pkgs/desktops/e19/emotion.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, e19, vlc }: +stdenv.mkDerivation rec { + name = "emotion_generic_players-${version}"; + version = "1.11.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; + sha256 = "0x6aigsqnfn9vcaj1rj6055s0vh811svzhwz5zghksg4lqipjbjx"; + }; + buildInputs = [ pkgconfig e19.efl vlc ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" + ''; + meta = { + description = "Extra video decoders"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix new file mode 100644 index 000000000000..95c5abdfa58c --- /dev/null +++ b/pkgs/desktops/e19/enlightenment.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, set_freqset_setuid ? false }: + + + +stdenv.mkDerivation rec { + name = "enlightenment-${version}"; + version = "0.19.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; + sha256 = "0d9s8gwma32hj8h000k1bzibr3zj8qajcf14va3w81k87gkilxfp"; + }; + buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + export USER_SESSION_DIR=$prefix/lib/systemd/user + ''; + + # this is a hack and without this cpufreq module is not working: + # when set_freqset_setuid is true and "e19_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module), + # then this postInstall does the folowing: + # 1. moves the "freqset" binary to "e19_freqset", + # 2. linkes "e19_freqset" to enlightenment/bin so that, + # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e19_freqset, + # 4. and finaly, linkes /var/setuid-wrappers/e19_freqset to original destination where enlightenment wants it + postInstall = if set_freqset_setuid then '' + export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; + mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e19_freqset + ln -sv $CPUFREQ_DIRPATH/e19_freqset $out/bin/e19_freqset + ln -sv /var/setuid-wrappers/e19_freqset $CPUFREQ_DIRPATH/freqset + '' else ""; + meta = { + description = "The Compositing Window Manager and Desktop Shell"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix new file mode 100644 index 000000000000..98b035f94e40 --- /dev/null +++ b/pkgs/desktops/e19/evas.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: +stdenv.mkDerivation rec { + name = "evas_generic_loaders-${version}"; + version = "1.11.2"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; + sha256 = "03p6v7l2fxvldiymqk16pqnbm9llygp6i19qhn3rmrqy1hkjkry6"; + }; + buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; + meta = { + description = "Extra image decoders"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix new file mode 100644 index 000000000000..97bf07b298d5 --- /dev/null +++ b/pkgs/desktops/e19/terminology.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, e19 }: +stdenv.mkDerivation rec { + name = "terminology-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; + sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; + }; + buildInputs = [ pkgconfig e19.efl e19.elementary ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" + ''; + meta = { + description = "The best terminal emulator written with the EFL"; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32ff5ecc00f7..394e97318afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10871,6 +10871,11 @@ let import ../desktops/e18 { inherit callPackage pkgs; } ); + e19 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e19; in + import ../desktops/e19 { inherit callPackage pkgs; } + ); + gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c4778979019..4f4af56e0e87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10654,6 +10654,26 @@ let }; }; + pythonefl_1_11 = buildPythonPackage rec { + name = "python-efl-${version}"; + version = "1.11.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48"; + }; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" + ''; + buildInputs = [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; + meta = { + description = "Python bindings for EFL and Elementary."; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + }; + }; + pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; version = "1.10.0"; From 1f28161a41f4d9d78a9de953ae28f735b9f9c148 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 16 Sep 2014 00:33:25 +0200 Subject: [PATCH 224/323] Add configuration flag to chromium: hiDPISupport By default, hiDPISupport is disabled. --- pkgs/applications/networking/browsers/chromium/common.nix | 2 ++ pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 46dadd280c9a..2676104db3e0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -27,6 +27,7 @@ , proprietaryCodecs ? true , cupsSupport ? false , pulseSupport ? false, pulseaudio ? null +, hiDPISupport ? false , source , plugins @@ -162,6 +163,7 @@ let linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; clang = false; + enable_hidpi = hiDPISupport; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4dfdca882bc8..e02232162af1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,6 +12,7 @@ , enablePepperPDF ? false , cupsSupport ? false , pulseSupport ? false +, hiDPISupport ? false }: let @@ -27,7 +28,7 @@ let mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl useOpenSSL gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport - pulseSupport; + pulseSupport hiDPISupport; }; browser = callPackage ./browser.nix { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32ff5ecc00f7..fe930eeeffb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8522,6 +8522,7 @@ let pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enablePepperPDF = config.chromium.enablePepperPDF or false; + hiDPISupport = config.chromium.hiDPISupport or false; }; chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); From 87eb8fcf834b8b7fb0dd6871e2e912c98052ee7d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 16 Sep 2014 02:44:21 +0100 Subject: [PATCH 225/323] agda-categories: add package --- .../libraries/agda/categories/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/agda/categories/default.nix diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix new file mode 100644 index 000000000000..1a860496a4d3 --- /dev/null +++ b/pkgs/development/libraries/agda/categories/default.nix @@ -0,0 +1,23 @@ +{ stdenv, agda, fetchgit, AgdaStdlib }: + +agda.mkDerivation (self: rec { + version = "33409120d071656f5198c658145889ae2e86249c"; + name = "categories-${version}"; + + src = fetchgit { + url = "https://github.com/copumpkin/categories.git"; + rev = version; + sha256 = "cb7e8c911e10ab582c077208f5f6675711c0d65f0d9d679639d4b67a467cc4de"; + }; + + buildDepends = [ AgdaStdlib ]; + sourceDirectories = [ "Categories" "Graphs" ]; + + meta = { + homepage = "https://github.com/copumpkin/categories"; + description = "Categories parametrized by morphism equality, in Agda"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d4a6b59a0c9..b0780615c921 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6672,6 +6672,8 @@ let bitvector = callPackage ../development/libraries/agda/bitvector {}; + categories = callPackage ../development/libraries/agda/categories {}; + ### DEVELOPMENT / LIBRARIES / JAVA atermjava = callPackage ../development/libraries/java/aterm { From 4d193b7262b7302e29322c41de70eb700323ed96 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 20:03:20 -0700 Subject: [PATCH 226/323] systemd: Support reload scripts --- nixos/modules/system/boot/systemd-unit-options.nix | 9 +++++++++ nixos/modules/system/boot/systemd.nix | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index a6183c47eb1b..48c3564ba078 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -230,6 +230,15 @@ in rec { ''; }; + reload = mkOption { + type = types.lines; + default = ""; + description = '' + Shell commands executed when the service's main process + is reloaded. + ''; + }; + preStop = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e353e9246b0e..f2f7989ab4de 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -245,6 +245,12 @@ let ${config.postStart} ''; }) + (mkIf (config.reload != "") + { serviceConfig.ExecReload = makeJobScript "${name}-reload" '' + #! ${pkgs.stdenv.shell} -e + ${config.reload} + ''; + }) (mkIf (config.preStop != "") { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' #! ${pkgs.stdenv.shell} -e From fd7b9b42912c4b2be3320f22f6e6e7d2a83e01b6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 20:04:31 -0700 Subject: [PATCH 227/323] nixos/firewall: Don't allow traffic during reload --- nixos/modules/services/networking/firewall.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 42914bfe5d62..b97ec8b4d43a 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -264,7 +264,7 @@ in message = "This kernel does not support disabling conntrack helpers"; } ]; - systemd.services.firewall = + systemd.services.firewall = rec { description = "Firewall"; wantedBy = [ "network.target" ]; @@ -277,8 +277,12 @@ in # better have all necessary modules already loaded. unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; + reloadIfChanged = true; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; script = '' @@ -417,11 +421,17 @@ in ip46tables -A INPUT -j nixos-fw ''; + reload = '' + ${helpers} + ip46tables -A INPUT -j DROP + ${script} + ip46tables -D INPUT -j DROP || true # extraCommands might delete the above rule and cause this to fail + ''; + postStop = '' ${helpers} ip46tables -D INPUT -j nixos-fw || true - #ip46tables -P INPUT ACCEPT ''; }; From c27a653bba516095835531d9066e34c6c22498a2 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 9 Aug 2014 00:00:08 -0400 Subject: [PATCH 228/323] improve ruby support * add the 2.1.x versions * include teeny version in passthru * by default, apply the same patches used by RVM * clean up file names and attribute names --- .../interpreters/ruby/ruby-1.8.7.nix | 94 +++++++++++++++ .../interpreters/ruby/ruby-1.9.3.nix | 112 ++++++++++++++++++ .../development/interpreters/ruby/ruby-18.nix | 63 ---------- .../development/interpreters/ruby/ruby-19.nix | 80 ------------- .../ruby/{ruby-2.0.nix => ruby-2.0.0.nix} | 43 +++++-- .../interpreters/ruby/ruby-2.1.0.nix | 102 ++++++++++++++++ .../interpreters/ruby/ruby-2.1.1.nix | 101 ++++++++++++++++ .../interpreters/ruby/ruby-2.1.2.nix | 48 ++++++-- .../interpreters/ruby/rvm-patchsets.nix | 8 ++ pkgs/top-level/all-packages.nix | 23 ++-- 10 files changed, 501 insertions(+), 173 deletions(-) create mode 100644 pkgs/development/interpreters/ruby/ruby-1.8.7.nix create mode 100644 pkgs/development/interpreters/ruby/ruby-1.9.3.nix delete mode 100644 pkgs/development/interpreters/ruby/ruby-18.nix delete mode 100644 pkgs/development/interpreters/ruby/ruby-19.nix rename pkgs/development/interpreters/ruby/{ruby-2.0.nix => ruby-2.0.0.nix} (56%) create mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.0.nix create mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.1.nix create mode 100644 pkgs/development/interpreters/ruby/rvm-patchsets.nix diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix new file mode 100644 index 000000000000..9b43368c6173 --- /dev/null +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchurl, fetchFromGitHub +, zlib, zlibSupport ? true +, openssl, opensslSupport ? true +, gdbm, gdbmSupport ? true +, ncurses, readline, cursesSupport ? false +, groff, docSupport ? false +, ruby_1_8_7, autoreconfHook, bison, useRailsExpress ? true +}: + +let + op = stdenv.lib.optional; + ops = stdenv.lib.optionals; + patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; + baseruby = ruby_1_8_7.override { useRailsExpress = false; }; +in + +stdenv.mkDerivation rec { + version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}"; + + name = "ruby-${version}"; + + src = if useRailsExpress then fetchFromGitHub { + owner = "ruby"; + repo = "ruby"; + rev = "v1_8_7_${passthru.patchLevel}"; + sha256 = "1xddhxr0j26hpxfixvhqdscwk2ri846w2129fcfwfjzvy19igswx"; + } else fetchurl { + url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.bz2"; + sha256 = "1qq7khilwkayrhwmzlxk83scrmiqfi7lgsn4c63znyvz2c1lgqxl"; + }; + + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + + buildInputs = ops useRailsExpress [ autoreconfHook bison ] + ++ (ops cursesSupport [ ncurses readline ] ) + ++ (op docSupport groff ) + ++ (op zlibSupport zlib) + ++ (op opensslSupport openssl) + ++ (op gdbmSupport gdbm); + + patches = ops useRailsExpress [ + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/01-ignore-generated-files.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/02-fix-tests-for-osx.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/03-sigvtalrm-fix.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/04-railsbench-gc-patch.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/05-display-full-stack-trace.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/06-better-source-file-tracing.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/07-heap-dump-support.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/08-fork-support-for-gc-logging.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/09-track-malloc-size.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/10-track-object-allocation.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/11-expose-heap-slots.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/12-fix-heap-size-growth-logic.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/13-heap-slot-size.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/14-add-trace-stats-enabled-methods.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/15-track-live-dataset-size.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/16-add-object-size-information-to-heap-dump.patch" + "${patchSet}/patches/ruby/1.8.7/p374/railsexpress/17-caller-for-all-threads.patch" + ]; + + configureFlags = [ "--enable-shared" "--enable-pthread" ] + ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"; + + installFlags = stdenv.lib.optionalString docSupport "install-doc"; + + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < $out/nix-support/setup-hook < Date: Tue, 16 Sep 2014 00:22:55 -0400 Subject: [PATCH 229/323] update camlistore to 0.8 --- pkgs/applications/misc/camlistore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 9adac335c0c7..a39a46222f1b 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, go, fetchurl }: stdenv.mkDerivation rec { - version = "0.7"; + version = "0.8"; name = "camlistore-${version}"; src = fetchurl { - url = "https://github.com/bradfitz/camlistore/archive/0.7.tar.gz"; - sha256 = "0lc35x2b9llrnma0m5czivly0c3l4lh3ldw9hwn83lkh8n0bzn11"; + url = "https://github.com/bradfitz/camlistore/archive/${version}.tar.gz"; + sha256 = "03y5zs4i9lx93apqqqfgmbxamk06z3w1q763qp0lvb15mq45gdv1"; }; buildInputs = [ go ]; From 6a43d512918e6449cb55fd10cdf7baf634e0ed87 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 21:29:46 -0700 Subject: [PATCH 230/323] nixos/firewall: Support extraStopCommands --- nixos/modules/services/networking/firewall.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index b97ec8b4d43a..eaf48b9c6e5b 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -240,6 +240,18 @@ in ''; }; + networking.firewall.extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -P INPUT ACCEPT"; + description = + '' + Additional shell commands executed as part of the firewall + shutdown script. These are executed just after the removal + of the nixos input rule. + ''; + }; + }; @@ -432,6 +444,7 @@ in '' ${helpers} ip46tables -D INPUT -j nixos-fw || true + ${cfg.extraStopCommands} ''; }; From 1321fd175d850052b6e76ed5724d30d7716c1bda Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 15 Sep 2014 19:03:47 -0700 Subject: [PATCH 231/323] nixos/nat: Leverage firewall module --- nixos/modules/services/networking/nat.nix | 114 ++++++++++++---------- 1 file changed, 63 insertions(+), 51 deletions(-) diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 4a4c06503c29..35e376e7b3a6 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -12,6 +12,41 @@ let dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}"; + flushNat = '' + iptables -w -t nat -F PREROUTING + iptables -w -t nat -F POSTROUTING + iptables -w -t nat -X + ''; + + setupNat = '' + # We can't match on incoming interface in POSTROUTING, so + # mark packets coming from the external interfaces. + ${concatMapStrings (iface: '' + iptables -w -t nat -A PREROUTING \ + -i '${iface}' -j MARK --set-mark 1 + '') cfg.internalInterfaces} + + # NAT the marked packets. + ${optionalString (cfg.internalInterfaces != []) '' + iptables -w -t nat -A POSTROUTING -m mark --mark 1 \ + -o ${cfg.externalInterface} ${dest} + ''} + + # NAT packets coming from the internal IPs. + ${concatMapStrings (range: '' + iptables -w -t nat -A POSTROUTING \ + -s '${range}' -o ${cfg.externalInterface} ${dest} + '') cfg.internalIPs} + + # NAT from external ports to internal ports. + ${concatMapStrings (fwd: '' + iptables -w -t nat -A PREROUTING \ + -i ${cfg.externalInterface} -p tcp \ + --dport ${builtins.toString fwd.sourcePort} \ + -j DNAT --to-destination ${fwd.destination} + '') cfg.forwardPorts} + ''; + in { @@ -109,57 +144,34 @@ in environment.systemPackages = [ pkgs.iptables ]; - boot.kernelModules = [ "nf_nat_ftp" ]; - - jobs.nat = - { description = "Network Address Translation"; - - startOn = "started network-interfaces"; - - path = [ pkgs.iptables ]; - - preStart = - '' - iptables -w -t nat -F PREROUTING - iptables -w -t nat -F POSTROUTING - iptables -w -t nat -X - - # We can't match on incoming interface in POSTROUTING, so - # mark packets coming from the external interfaces. - ${concatMapStrings (iface: '' - iptables -w -t nat -A PREROUTING \ - -i '${iface}' -j MARK --set-mark 1 - '') cfg.internalInterfaces} - - # NAT the marked packets. - ${optionalString (cfg.internalInterfaces != []) '' - iptables -w -t nat -A POSTROUTING -m mark --mark 1 \ - -o ${cfg.externalInterface} ${dest} - ''} - - # NAT packets coming from the internal IPs. - ${concatMapStrings (range: '' - iptables -w -t nat -A POSTROUTING \ - -s '${range}' -o ${cfg.externalInterface} ${dest} - '') cfg.internalIPs} - - # NAT from external ports to internal ports. - ${concatMapStrings (fwd: '' - iptables -w -t nat -A PREROUTING \ - -i ${cfg.externalInterface} -p tcp \ - --dport ${builtins.toString fwd.sourcePort} \ - -j DNAT --to-destination ${fwd.destination} - '') cfg.forwardPorts} - - echo 1 > /proc/sys/net/ipv4/ip_forward - ''; - - postStop = - '' - iptables -w -t nat -F PREROUTING - iptables -w -t nat -F POSTROUTING - iptables -w -t nat -X - ''; + boot = { + kernelModules = [ "nf_nat_ftp" ]; + kernel.sysctl = mkOverride 99 { + "net.ipv4.conf.all.forwarding" = true; + "net.ipv4.conf.default.forwarding" = true; }; + }; + + networking.firewall = mkIf config.networking.firewall.enable { + extraCommands = mkMerge [ (mkBefore flushNat) setupNat ]; + extraStopCommands = flushNat; + }; + + systemd.services = mkIf (!config.networking.firewall.enable) { nat = { + description = "Network Address Translation"; + wantedBy = [ "network.target" ]; + after = [ "network-interfaces.target" "systemd-modules-load.service" ]; + path = [ pkgs.iptables ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + script = flushNat + setupNat; + + postStop = flushNat; + }; }; }; } From cc664a46407fa20f216bda7322a57810e2b3e6f1 Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 16 Sep 2014 08:58:00 +0200 Subject: [PATCH 232/323] Fixed URL in bashmount package. --- pkgs/tools/filesystems/bashmount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 115b689adbc8..0c8119edff18 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0"; src = fetchurl { - url = "https://github/jamielinux/bashmount/archive/${version}.tar.gz"; + url = "https://github.com/jamielinux/bashmount/archive/${version}.tar.gz"; sha256 = "08ncksz8xl0qg5y5qf64b9adfnsg6769wf5bw8lv8q0zjbhjiwrj"; }; From bba65ab7a59310c90ae92938edf2951595d6c8a0 Mon Sep 17 00:00:00 2001 From: Bernerd Schaefer Date: Tue, 16 Sep 2014 09:04:55 +0200 Subject: [PATCH 233/323] fishshell builds on unix platforms --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index adfe44b3bac1..03ecc290d14c 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Smart and user-friendly command line shell"; homepage = "http://fishshell.com/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ocharles ]; }; } From b8848c070cd2d9b54a27443ba64a0d477051688a Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Mon, 15 Sep 2014 23:16:21 +0200 Subject: [PATCH 234/323] added alock package --- lib/maintainers.nix | 1 + pkgs/misc/screensavers/alock/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/misc/screensavers/alock/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1bbd98d12b03..8ba929f563b0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -50,6 +50,7 @@ ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; + ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; gal_bolle = "Florent Becker "; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix new file mode 100644 index 000000000000..2b8042ba9ab2 --- /dev/null +++ b/pkgs/misc/screensavers/alock/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchgit, pkgconfig, autoconf, automake +, libX11, pam, libgcrypt, libXrender, imlib2 }: + +stdenv.mkDerivation rec { + date = "20140724"; + name = "alock-${date}"; + + src = fetchgit { + url = https://github.com/Arkq/alock; + rev = "928ae09a85627570b7f6986fe161b71327405fc0"; + sha256 = "0z605w2cf0pc988qq931b2zis6dqavm0wcjfdmr6q4vamvinjfv0"; + }; + + preConfigure = "autoreconf -fvi"; + configureFlags = [ + "--enable-pam" + "--enable-hash" + "--enable-xrender" + "--enable-imlib2" + ]; + buildInputs = [ + pkgconfig autoconf automake libX11 + pam libgcrypt libXrender imlib2 + ]; + + meta = { + homepage = https://github.com/Arkq/alock; + description = "Simple screen lock application for X server"; + longDescription = '' + alock locks the X server until the user enters a password + via the keyboard. If the authentification was successful + the X server is unlocked and the user can continue to work. + + alock does not provide any fancy animations like xlock or + xscreensaver and never will. Its just for locking the current + X session. + ''; + platforms = with stdenv.lib.platforms; allBut cygwin; + maintainers = stdenv.lib.maintainers.ftrvxmtrx; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d4a6b59a0c9..5d8c08402c40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8378,6 +8378,8 @@ let alchemy = callPackage ../applications/graphics/alchemy { }; + alock = callPackage ../misc/screensavers/alock { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; From 3594a6104f39de0f0f541997d6238068f3770181 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 15 Sep 2014 10:37:17 -0400 Subject: [PATCH 235/323] update ngrok to 1.7 --- pkgs/tools/misc/go-bindata/default.nix | 29 +++++ pkgs/tools/misc/go-bindata/deps.nix | 28 +++++ pkgs/tools/misc/ngrok/default.nix | 98 ++++------------- pkgs/tools/misc/ngrok/deps.nix | 141 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 220 insertions(+), 78 deletions(-) create mode 100644 pkgs/tools/misc/go-bindata/default.nix create mode 100644 pkgs/tools/misc/go-bindata/deps.nix create mode 100644 pkgs/tools/misc/ngrok/deps.nix diff --git a/pkgs/tools/misc/go-bindata/default.nix b/pkgs/tools/misc/go-bindata/default.nix new file mode 100644 index 000000000000..339126f7c981 --- /dev/null +++ b/pkgs/tools/misc/go-bindata/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "go-bindata"; + + src = import ./deps.nix { + inherit stdenv lib fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o go-bindata github.com/jteeuwen/go-bindata/go-bindata + ''; + + installPhase = '' + mkdir -p $out/bin + cp go-bindata $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/jteeuwen/go-bindata"; + description = "A small utility which generates Go code from any file. Useful for embedding binary data in a Go program."; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.cc0 ; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/go-bindata/deps.nix b/pkgs/tools/misc/go-bindata/deps.nix new file mode 100644 index 000000000000..617f7dc6abe1 --- /dev/null +++ b/pkgs/tools/misc/go-bindata/deps.nix @@ -0,0 +1,28 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/jteeuwen/go-bindata"; + src = fetchFromGitHub { + owner = "jteeuwen"; + repo = "go-bindata"; + rev = "93b909d1499a38620121b0a5eb43a18f3bccb083"; + sha256 = "1v4jl9lnzy0p4nvjfkh96yy0w181n5mkr0kamh743911gfbpq4sh"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index 6435923b48a7..3f39f6ab4e82 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -1,87 +1,29 @@ -{ stdenv, fetchurl, go, fetchgit, fetchbzr, fetchhg }: +{ stdenv, lib, go, go-bindata, fetchgit, fetchbzr, fetchhg, fetchFromGitHub }: -let - go-websocket = fetchgit { - url = "git://github.com/garyburd/go-websocket"; - rev = "4bad98c955"; - sha256 = "1zh1r1xqar47awgv8a883zmxyvj65m0mbdm17d1xf74nkkrcykqy"; - }; - go-metrics = fetchgit { - url = "https://github.com/inconshreveable/go-metrics"; - rev = "60ba4ca70c"; - sha256 = "3dc8c229ce5123d86269c0c48401a9cdd2cde7558d85374c9dbc4bbd531e86d5"; - }; - termbox-go = fetchgit { - url = "https://github.com/nsf/termbox-go"; - rev = "cea198fce7"; - sha256 = "bde4190ae83d5c5870b8e11e16387cf03f2d44a8369f94674d4b9d0960c40693"; - }; - go-bindata = fetchgit { - url = "https://github.com/inconshreveable/go-bindata"; - rev = "99016b3cc0"; - sha256 = "518a5b61cfbe58f8bc55bd6139adcd69997b6ba474536a70b538879aaf118578"; - }; - go-update = fetchgit { - url = "https://github.com/inconshreveable/go-update"; - rev = "3f04666667"; - sha256 = "34647689a50b9d12e85a280d9034cc1772079163481c4778ee4b3e6c4b41e2f4"; - }; - goyaml = fetchbzr { - url = "https://launchpad.net/goyaml"; - sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj"; - # Branch: "branch:lp:goyaml" - rev = 47; - }; - log4go = fetchhg { - url = "https://code.google.com/p/log4go/"; - rev = "c3294304d93f"; - sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; - }; - osext = fetchhg { - url = "https://bitbucket.org/kardianos/osext"; - rev = "364fb57"; - sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws"; - }; +let deps = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; +}; in stdenv.mkDerivation rec { name = "ngrok-${version}"; - version = "1.6"; + version = "1.7"; - src = fetchurl { - url = "https://github.com/inconshreveable/ngrok/archive/${version}.tar.gz"; - sha256 = "0w54ck00ma8wd87gc3dligypdjs7vrzbi9py46sqphsid3rihkjr"; - }; + buildInputs = [ go go-bindata ]; - buildInputs = [ go ]; + unpackPhase = '' + export GOPATH=$(pwd) + cp -LR ${deps}/src src + chmod u+w -R src + sourceRoot=src/github.com/inconshreveable/ngrok + ''; preBuild = '' - export HOME="$PWD" - - mkdir -p src/github.com/garyburd/go-websocket/ - ln -s ${go-websocket}/* src/github.com/garyburd/go-websocket - - mkdir -p src/github.com/inconshreveable/go-metrics/ - ln -s ${go-metrics}/* src/github.com/inconshreveable/go-metrics - - mkdir -p src/github.com/inconshreveable/go-bindata - ln -s ${go-bindata}/* src/github.com/inconshreveable/go-bindata - - mkdir -p src/github.com/inconshreveable/go-update - ln -s ${go-update}/* src/github.com/inconshreveable/go-update - - mkdir -p src/github.com/nsf/termbox-go/ - ln -s ${termbox-go}/* src/github.com/nsf/termbox-go - - mkdir -p src/launchpad.net/goyaml - ln -s ${goyaml}/* src/launchpad.net/goyaml - - mkdir -p src/code.google.com/p/log4go - ln -s ${log4go}/* src/code.google.com/p/log4go - - mkdir -p src/bitbucket.org/kardianos/osext - ln -s ${osext}/* src/bitbucket.org/kardianos/osext + export HOME=$(pwd) + export GOPATH=$(pwd):$GOPATH # don't download dependencies as we already have them - sed -i '/go get/d' Makefile + sed -i '/jteeuwen\/go-bindata/d' Makefile + sed -i '/export GOPATH/d' Makefile + sed -i 's|bin/go-bindata|go-bindata|' Makefile ''; installPhase = '' @@ -91,11 +33,11 @@ in stdenv.mkDerivation rec { cp -R assets $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Reverse proxy that creates a secure tunnel between from a public endpoint to a locally running web service"; homepage = https://ngrok.com/; license = licenses.asl20; - maintainers = with maintainers; [ iElectric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ iElectric cstrahan ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/misc/ngrok/deps.nix b/pkgs/tools/misc/ngrok/deps.nix new file mode 100644 index 000000000000..9b2b5053fb7f --- /dev/null +++ b/pkgs/tools/misc/ngrok/deps.nix @@ -0,0 +1,141 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }: + +let + goDeps = [ + { + root = "bitbucket.org/kardianos/osext"; + src = fetchhg { + url = "https://bitbucket.org/kardianos/osext"; + rev = "10"; + sha256 = ""; + }; + } + { + root = "code.google.com/p/log4go"; + src = fetchhg { + url = "https://code.google.com/p/log4go"; + rev = "48"; + sha256 = ""; + }; + } + { + root = "github.com/gorilla/websocket"; + src = fetchFromGitHub { + owner = "gorilla"; + repo = "websocket"; + rev = "f4076986b69612ecb8bc7ce06d742eda6286200d"; + sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq"; + }; + } + { + root = "github.com/inconshreveable/go-update"; + src = fetchFromGitHub { + owner = "inconshreveable"; + repo = "go-update"; + rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d"; + sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn"; + }; + } + { + root = "github.com/inconshreveable/go-vhost"; + src = fetchFromGitHub { + owner = "inconshreveable"; + repo = "go-vhost"; + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + } + { + root = "github.com/inconshreveable/mousetrap"; + src = fetchFromGitHub { + owner = "inconshreveable"; + repo = "mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + root = "github.com/inconshreveable/ngrok"; + src = fetchFromGitHub { + owner = "inconshreveable"; + repo = "ngrok"; + rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8"; + sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4"; + }; + } + { + root = "github.com/influxdb/influxdb-go"; + src = fetchFromGitHub { + owner = "influxdb"; + repo = "influxdb-go"; + rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7"; + sha256 = "16in1xhx94pir06aw166inn0hzpb7836xbws16laabs1p2np7bld"; + }; + } + { + root = "github.com/kr/binarydist"; + src = fetchFromGitHub { + owner = "kr"; + repo = "binarydist"; + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + } + { + root = "github.com/nsf/termbox-go"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } + { + root = "github.com/rcrowley/go-metrics"; + src = fetchFromGitHub { + owner = "rcrowley"; + repo = "go-metrics"; + rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; + sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f"; + }; + } + { + root = "github.com/stathat/go"; + src = fetchFromGitHub { + owner = "stathat"; + repo = "go"; + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + } + { + root = "gopkg.in/check.v1"; + src = fetchgit { + url = "https://github.com/go-check/check.git"; + rev = "871360013c92e1c715c2de6d06b54899468a8a2d"; + sha256 = "0i83qjmd4ri9mrfddhsbpj9nb43rf2j9803k030fj155j31klwcx"; + }; + } + { + root = "gopkg.in/yaml.v1"; + src = fetchgit { + url = "https://github.com/go-yaml/yaml.git"; + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02c6e11a8b67..45fca73af1b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3116,6 +3116,8 @@ let go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; + go-bindata = callPackage ../tools/misc/go-bindata { }; + gox = callPackage ../development/compilers/go/gox.nix { }; gprolog = callPackage ../development/compilers/gprolog { }; From ecfe8ba48c30e6cf0e45642de835f0269da65e2d Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 15 Sep 2014 18:19:34 -0400 Subject: [PATCH 236/323] fix empty sha256's --- pkgs/tools/misc/ngrok/deps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ngrok/deps.nix b/pkgs/tools/misc/ngrok/deps.nix index 9b2b5053fb7f..cc1ed2f3d486 100644 --- a/pkgs/tools/misc/ngrok/deps.nix +++ b/pkgs/tools/misc/ngrok/deps.nix @@ -8,7 +8,7 @@ let src = fetchhg { url = "https://bitbucket.org/kardianos/osext"; rev = "10"; - sha256 = ""; + sha256 = "1sj9r5pm28l9sqx6354fwp032n53znx9k8495k3dfnyqjrkvlw6n"; }; } { @@ -16,7 +16,7 @@ let src = fetchhg { url = "https://code.google.com/p/log4go"; rev = "48"; - sha256 = ""; + sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; }; } { From 0fe76c441a08e22ec5570a22382cca50e74836af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 16 Sep 2014 10:19:43 +0200 Subject: [PATCH 237/323] ngrok: enable ngrokd --- pkgs/tools/misc/ngrok/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index 3f39f6ab4e82..b8bdfd5c896b 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -27,10 +27,9 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - make release-client + make release-client release-server mkdir -p $out/bin - cp bin/ngrok $out/bin - cp -R assets $out + cp bin/ngrok{d,} $out/bin ''; meta = with lib; { From 79a6bddc1eafe3cce02fbe5f0b9ddeda51eb48c4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 15 Sep 2014 11:33:07 +0200 Subject: [PATCH 238/323] Add kibana, visualize logs and time-stamped data --- .../development/tools/misc/kibana/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/kibana/default.nix diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix new file mode 100644 index 000000000000..42e5c2209f1c --- /dev/null +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, unzip, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "https://download.elasticsearch.org/kibana/kibana/${name}.zip"; + sha256 = "05i97zi08rxwx951hgs92fbhk6cchpvdlikrfz07v1dpn787xz8j"; + }; + + buildInputs = [ unzip ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + mkdir -p $out && cp -R * $out + ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + + maintainers = [ maintainers.offline ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45fca73af1b8..7549d39db257 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1429,6 +1429,8 @@ let keychain = callPackage ../tools/misc/keychain { }; + kibana = callPackage ../development/tools/misc/kibana { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; less = callPackage ../tools/misc/less { }; From de5080268438cb2452b46dd3f2b5d4635f78f810 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 15 Sep 2014 11:34:02 +0200 Subject: [PATCH 239/323] pythonPackages.graphite_influxdb: use latest version from master Latest version is needed if you want to run this in production, because of some fixed performance bugs. --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45a1891c675a..de52efff20b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10362,9 +10362,10 @@ let graphite_influxdb = buildPythonPackage rec { name = "graphite-influxdb-0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/g/graphite-influxdb/${name}.tar.gz"; - md5 = "5ce64ff6bb0b41c99e57486d6ec86eb7"; + src = fetchgit { + url = "https://github.com/vimeo/graphite-influxdb.git"; + rev = "2273d12a24e1d804685a36debfd4224b7416b62f"; + sha256 = "e386eaf190793d3ad0a42a74b9e137a968a51fc3806f602ff756e09c0c0648a8"; }; propagatedBuildInputs = [ influxdb graphite_api ]; From 6f30a55f278e2628af3c02c9ac700acf221c1129 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 15 Sep 2014 11:36:18 +0200 Subject: [PATCH 240/323] grafana: update 1.5.4 -> 1.8.0-rc1 --- pkgs/development/tools/misc/grafana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix index b1566684cf0b..9337bf4052fe 100644 --- a/pkgs/development/tools/misc/grafana/default.nix +++ b/pkgs/development/tools/misc/grafana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "grafana-${version}"; - version = "1.5.4"; + version = "1.8.0-rc1"; src = fetchurl { url = "http://grafanarel.s3.amazonaws.com/${name}.zip"; - sha256 = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d"; + sha256 = "1wx4zwkpgvb8lxcrkp67zgqd8aqms4bnxzwz3i9190sl55j1yf4i"; }; buildInputs = [ unzip ]; From 271e0f7488925baa21f58bfb0742dd6391e5dad8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 15 Sep 2014 11:38:39 +0200 Subject: [PATCH 241/323] nixos/graphite: add host and port options for graphiteApi --- nixos/modules/services/monitoring/graphite.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index b2c46123d16a..ecf144aeee0a 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -98,6 +98,18 @@ in { type = types.listOf types.str; }; + host = mkOption { + description = "Graphite web service listen address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Graphite api service port."; + default = 8080; + type = types.int; + }; + extraConfig = mkOption { description = "Extra configuration for graphite api."; default = '' @@ -320,7 +332,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.web.host} --port=${toString cfg.web.port} \ + --host=${cfg.api.host} --port=${toString cfg.api.port} \ graphite_api.app:app ''; User = "graphite"; From 996da030b6665d84c46902de5aadcd20c046f063 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 16 Sep 2014 10:24:35 +0200 Subject: [PATCH 242/323] nixos/mongodb: service fixes - Log to syslog, so journal picks-up logs - Start as foring service, so systemd will wait for service to start - Add extraConfig option --- nixos/modules/services/databases/mongodb.nix | 54 ++++++++++---------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index fe82ca430e13..02e44ad88704 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -15,9 +15,11 @@ let bind_ip = ${cfg.bind_ip} ${optionalString cfg.quiet "quiet = true"} dbpath = ${cfg.dbpath} - logpath = ${cfg.logpath} - logappend = ${b2s cfg.logappend} + syslog = true + fork = true + pidfilepath = ${cfg.pidFile} ${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"} + ${cfg.extraConfig} ''; in @@ -65,14 +67,9 @@ in description = "Location where MongoDB stores its files"; }; - logpath = mkOption { - default = "/var/log/mongodb/mongod.log"; - description = "Location where MongoDB stores its logfile"; - }; - - logappend = mkOption { - default = true; - description = "Append logfile instead over overwriting"; + pidFile = mkOption { + default = "/var/run/mongodb.pid"; + description = "Location of MongoDB pid file"; }; replSetName = mkOption { @@ -82,6 +79,14 @@ in Otherwise, leave empty to run as single node. ''; }; + + extraConfig = mkOption { + default = ""; + example = '' + nojournal = true + ''; + description = "MongoDB extra configuration"; + }; }; }; @@ -99,22 +104,6 @@ in environment.systemPackages = [ mongodb ]; - systemd.services.mongodb_init = - { description = "MongoDB server initialisation"; - - wantedBy = [ "mongodb.service" ]; - before = [ "mongodb.service" ]; - - serviceConfig.Type = "oneshot"; - - script = '' - if ! test -e ${cfg.dbpath}; then - install -d -m0700 -o ${cfg.user} ${cfg.dbpath} - install -d -m0755 -o ${cfg.user} `dirname ${cfg.logpath}` - fi - ''; - }; - systemd.services.mongodb = { description = "MongoDB server"; @@ -124,7 +113,20 @@ in serviceConfig = { ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}"; User = cfg.user; + PIDFile = cfg.pidFile; + Type = "forking"; + TimeoutStartSec=120; # intial creating of journal can take some time + PermissionsStartOnly = true; }; + + preStart = '' + if ! test -e ${cfg.dbpath}; then + install -d -m0700 -o ${cfg.user} ${cfg.dbpath} + fi + if ! test -e ${cfg.pidFile}; then + install -D -o ${cfg.user} /dev/null ${cfg.pidFile} + fi + ''; }; }; From 782c85ad27300ddc5ed1ff60ce1197d8cd40c4ed Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 16 Sep 2014 10:27:18 +0200 Subject: [PATCH 243/323] rubyLibs: add compass, regenerate --- .../interpreters/ruby/generated.nix | 112 +++++++++++++++--- 1 file changed, 94 insertions(+), 18 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index b652321a9fc3..ea54cad2d953 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -20,11 +20,15 @@ g: # Get dependencies from patched gems bitbucket_backup = g.bitbucket_backup_0_3_1; builder = g.builder_3_2_2; buildr = g.buildr_1_4_20; - bundler = g.bundler_1_7_2; + bundler = g.bundler_1_7_3; childprocess = g.childprocess_0_5_3; chronic = g.chronic_0_10_2; + chunky_png = g.chunky_png_1_3_1; coderay = g.coderay_1_1_0; - cucumber = g.cucumber_1_3_16; + compass = g.compass_1_0_1; + compass_core = g.compass_core_1_0_1; + compass_import_once = g.compass_import_once_1_0_5; + cucumber = g.cucumber_1_3_17; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_2_5; dimensions = g.dimensions_1_2_0; @@ -90,6 +94,7 @@ g: # Get dependencies from patched gems railties = g.railties_4_1_6; rake = g.rake_10_3_2; rb_fsevent = g.rb_fsevent_0_9_4; + rb_inotify = g.rb_inotify_0_9_5; rdiscount = g.rdiscount_2_1_7_1; rdoc = g.rdoc_4_1_2; remote_syslog = g.remote_syslog_1_6_14; @@ -104,7 +109,7 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_14_5; rspec_mocks = g.rspec_mocks_2_14_6; rubyzip = g.rubyzip_1_1_6; - sass = g.sass_3_4_3; + sass = g.sass_3_4_4; selenium_webdriver = g.selenium_webdriver_2_43_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_4_5; @@ -138,7 +143,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_2; yajl_ruby = g.yajl_ruby_1_2_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; gems = { ZenTest_4_10_1 = { basename = ''ZenTest''; @@ -365,7 +370,7 @@ simple to do. Currently the following builder objects are supported: }; name = ''builder-3.2.2''; requiredGems = [ ]; - sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; + sha256 = ''no hash''; }; buildr_1_4_20 = { basename = ''buildr''; @@ -380,19 +385,19 @@ for those one-off tasks, with a language that's a joy to use. ''; }; name = ''buildr-1.4.20''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_2 g.orderedhash_0_0_6 ]; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_3 g.orderedhash_0_0_6 ]; sha256 = ''0x4ffblw7jg0z49ywfm5abfxgg23di3d661czndwi904cvmghrkv''; }; - bundler_1_7_2 = { + bundler_1_7_3 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.7.2''; + name = ''bundler-1.7.3''; requiredGems = [ ]; - sha256 = ''1xfacbivyi40ig9jzpsv2z42vwghf77n4r65ls0pcnbqn4ypqyhc''; + sha256 = ''00r3b4bchiqbd12y896hmrp5sa6n4391fygg1jmvljx1635x5kyj''; }; childprocess_0_5_3 = { basename = ''childprocess''; @@ -416,6 +421,33 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn''; }; + chunky_png_1_3_1 = { + basename = ''chunky_png''; + meta = { + description = ''Pure ruby library for read/write, chunk-level access to PNG files''; + homepage = ''http://wiki.github.com/wvanbergen/chunky_png''; + longDescription = '' This pure Ruby library can read and write PNG images without depending on an external + image library, like RMagick. It tries to be memory efficient and reasonably fast. + + It supports reading and writing all PNG variants that are defined in the specification, + with one limitation: only 8-bit color depth is supported. It supports all transparency, + interlacing and filtering options the PNG specifications allows. It can also read and + write textual metadata from PNG files. Low-level read/write access to PNG chunks is + also possible. + + This library supports simple drawing on the image canvas and simple operations like + alpha composition and cropping. Finally, it can import from and export to RMagick for + interoperability. + + Also, have a look at OilyPNG at http://github.com/wvanbergen/oily_png. OilyPNG is a + drop in mixin module that implements some of the ChunkyPNG algorithms in C, which + provides a massive speed boost to encoding and decoding. +''; + }; + name = ''chunky_png-1.3.1''; + requiredGems = [ ]; + sha256 = ''1kpcv2wrx3zyfi5jbsnd9da1wmkjwidnmpshq6vhzz0r8hp7ai8a''; + }; coderay_1_1_0 = { basename = ''coderay''; meta = { @@ -427,16 +459,49 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s''; }; - cucumber_1_3_16 = { + compass_1_0_1 = { + basename = ''compass''; + meta = { + description = ''A Real Stylesheet Framework''; + homepage = ''http://compass-style.org''; + longDescription = ''Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.''; + }; + name = ''compass-1.0.1''; + requiredGems = [ g.sass_3_4_4 g.compass_core_1_0_1 g.compass_import_once_1_0_5 g.chunky_png_1_3_1 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ]; + sha256 = ''0cxb6nbj37wz2zwwb4pkbvg9pg0ymamxx9v400h9ibvlb5n0ri40''; + }; + compass_core_1_0_1 = { + basename = ''compass_core''; + meta = { + description = ''The Compass core stylesheet library''; + homepage = ''http://compass-style.org/reference/compass/''; + longDescription = ''The Compass core stylesheet library and minimum required ruby extensions. This library can be used stand-alone without the compass ruby configuration file or compass command line tools.''; + }; + name = ''compass-core-1.0.1''; + requiredGems = [ g.sass_3_4_4 g.multi_json_1_10_1 ]; + sha256 = ''0zhbmgjq6s9j2qdx3cz0v8s216mh8g0ymk4fzmq3c4an9rryl1zx''; + }; + compass_import_once_1_0_5 = { + basename = ''compass_import_once''; + meta = { + description = ''Speed up your Sass compilation by making @import only import each file once.''; + homepage = ''https://github.com/chriseppstein/compass/tree/master/import-once''; + longDescription = ''Changes the behavior of Sass's @import directive to only import a file once.''; + }; + name = ''compass-import-once-1.0.5''; + requiredGems = [ g.sass_3_4_4 ]; + sha256 = ''0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq''; + }; + cucumber_1_3_17 = { basename = ''cucumber''; meta = { - description = ''cucumber-1.3.16''; + description = ''cucumber-1.3.17''; homepage = ''http://cukes.info''; longDescription = ''Behaviour Driven Development with elegance and joy''; }; - name = ''cucumber-1.3.16''; + name = ''cucumber-1.3.17''; requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ]; - sha256 = ''11cjw2d03r41b5pn5in6q822s3v6bpd8isxc9dl7by01jrzi0662''; + sha256 = ''1gjnxxrcf43mzs5qlg1m0b61g8vwfzjkj1wwi6xbpsqlhcwjjq1x''; }; daemons_1_1_9 = { basename = ''daemons''; @@ -1325,7 +1390,7 @@ request helpers feature.''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; name = ''rails-4.1.6''; - requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.actionview_4_1_6 g.activemodel_4_1_6 g.activerecord_4_1_6 g.actionmailer_4_1_6 g.railties_4_1_6 g.bundler_1_7_2 g.sprockets_rails_2_1_4 ]; + requiredGems = [ g.activesupport_4_1_6 g.actionpack_4_1_6 g.actionview_4_1_6 g.activemodel_4_1_6 g.activerecord_4_1_6 g.actionmailer_4_1_6 g.railties_4_1_6 g.bundler_1_7_3 g.sprockets_rails_2_1_4 ]; sha256 = ''187g903gmni3prd5i768yfgszc4ak5kmrazavr93d0ybfdbcjlgk''; }; railties_4_1_6 = { @@ -1393,6 +1458,17 @@ Rake has the following features: requiredGems = [ ]; sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7''; }; + rb_inotify_0_9_5 = { + basename = ''rb_inotify''; + meta = { + description = ''A Ruby wrapper for Linux's inotify, using FFI''; + homepage = ''http://github.com/nex3/rb-inotify''; + longDescription = ''A Ruby wrapper for Linux's inotify, using FFI''; + }; + name = ''rb-inotify-0.9.5''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9''; + }; rdiscount_2_1_7_1 = { basename = ''rdiscount''; meta = { @@ -1435,7 +1511,7 @@ from the command-line.''; longDescription = ''HTTP dashboard for the distributed event system Riemann.''; }; name = ''riemann-dash-0.2.9''; - requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_3 g.webrick_1_3_1 g.multi_json_1_3_6 ]; + requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_4 g.webrick_1_3_1 g.multi_json_1_3_6 ]; sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3''; }; right_aws_3_1_0 = { @@ -1637,7 +1713,7 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; requiredGems = [ ]; sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; - sass_3_4_3 = { + sass_3_4_4 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1648,9 +1724,9 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.4.3''; + name = ''sass-3.4.4''; requiredGems = [ ]; - sha256 = ''0k9qv35wf28qjlv8a1nmvv8n71wxnqim1kwf95igvngys6kih7ds''; + sha256 = ''0xvdj5lb062z1byq7s8f8zmp5kkjhghih5rfdb1q61mmmbmy9lw7''; }; selenium_webdriver_2_43_0 = { basename = ''selenium_webdriver''; From bfa3b285903172ffdbc6179e705cc1da8493add9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 16 Sep 2014 10:27:40 +0200 Subject: [PATCH 244/323] rubyLibs: fix bundler --- pkgs/development/interpreters/ruby/patches.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 9d694eac1e42..438aaf7ba547 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -132,4 +132,6 @@ in zcat ${patch} | patch -p 1 ''; # */ }; + + bundler = { dontPatchShebangs=1; }; } From 1770272775ec416bc7489e0ccc76e0761dd77d60 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 16 Sep 2014 10:34:02 +0200 Subject: [PATCH 245/323] s3sync: fix input ruby attribute name --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7549d39db257..fb6a3210bef8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2097,7 +2097,7 @@ let s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); s3sync = callPackage ../tools/networking/s3sync { - ruby = ruby18; + ruby = ruby_1_8; }; s6Dns = callPackage ../tools/networking/s6-dns { }; From 9bd66b24d9d0afbc2b9f96011e1dcdb03dd01563 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 16 Sep 2014 10:41:27 +0200 Subject: [PATCH 246/323] nixos/graphiteApi: add example config for influxdb backend --- nixos/modules/services/monitoring/graphite.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index ecf144aeee0a..ff5951afb4c4 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -117,6 +117,20 @@ in { directories: - ${dataDir}/whisper ''; + example = literalExample '' + allowed_origins: + - dashboard.example.com + cheat_times: true + influxdb: + host: localhost + port: 8086 + user: influxdb + pass: influxdb + db: metrics + cache: + CACHE_TYPE: 'filesystem' + CACHE_DIR: '/tmp/graphite-api-cache' + ''; type = types.str; }; }; From 79f605079ea887dfa71de25b2ccc75728fcd7908 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 16 Sep 2014 12:42:24 +0200 Subject: [PATCH 247/323] haskell-lens-family: new expression --- .../libraries/haskell/lens-family/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lens-family/default.nix diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix new file mode 100644 index 000000000000..582f0c52dafc --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-family/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, lensFamilyCore, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "lens-family"; + version = "1.1.0"; + sha256 = "0cr4wdnix138iklh4l8nrzp52m7qrrgrq9ngr61zs02gbww46sz3"; + buildDepends = [ lensFamilyCore mtl transformers ]; + meta = { + description = "Lens Families"; + 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 1d4990ec2220..3b5e4c6f9863 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1478,6 +1478,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; + lensFamily = callPackage ../development/libraries/haskell/lens-family {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {}; From 735a478db6888db7ff0477de46cbe4f979b73891 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 16 Sep 2014 12:51:03 +0200 Subject: [PATCH 248/323] haskell-lens-family-th: new expression --- .../libraries/haskell/lens-family-th/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lens-family-th/default.nix diff --git a/pkgs/development/libraries/haskell/lens-family-th/default.nix b/pkgs/development/libraries/haskell/lens-family-th/default.nix new file mode 100644 index 000000000000..41b08ce9b447 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-family-th/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "lens-family-th"; + version = "0.3.0.0"; + sha256 = "0p9z278rpr9mqdpxa5izllplfrbxwzdziqjzjn4x1j2g9f3q5f8s"; + meta = { + homepage = "http://github.com/DanBurton/lens-family-th#readme"; + description = "Generate lens-family style lenses"; + 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 3b5e4c6f9863..02b38c5f86fc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1480,6 +1480,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lensFamily = callPackage ../development/libraries/haskell/lens-family {}; + lensFamilyTh = callPackage ../development/libraries/haskell/lens-family-th {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; leveldbHaskell = callPackage ../development/libraries/haskell/leveldb-haskell {}; From 58c4bf5f20e0822c41c40fbeb2a4afedf9f570de Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Tue, 16 Sep 2014 13:51:57 +0200 Subject: [PATCH 249/323] rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4 That commit changed the patch to work for the new HEAD, but that new patch breaks 0.11. I made two patch for the two versions. --- .../compilers/rustc/hardcode_paths.HEAD.patch | 32 +++++++++++++++++++ .../compilers/rustc/hardcode_paths.patch | 6 ++-- pkgs/development/compilers/rustc/head.nix | 2 +- .../compilers/rustc/local_stage0.HEAD.patch | 16 ++++++++++ .../compilers/rustc/local_stage0.patch | 7 ++-- 5 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch create mode 100644 pkgs/development/compilers/rustc/local_stage0.HEAD.patch diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch new file mode 100644 index 000000000000..fea35d24960c --- /dev/null +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -0,0 +1,32 @@ +diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs +index 7a3e912..ced75fa 100644 +--- a/src/librustc/back/link.rs ++++ b/src/librustc/back/link.rs +@@ -856,24 +856,15 @@ + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => {} ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string() + } +- +- // In the future, FreeBSD will use clang as default compiler. +- // It would be flexible to use cc (system's default C compiler) +- // instead of hard-coded gcc. +- // For Windows, there is no cc command, so we add a condition to make it use gcc. +- match sess.targ_cfg.os { +- abi::OsWindows => "gcc", +- _ => "cc", +- }.to_string() + } + + pub fn get_ar_prog(sess: &Session) -> String { + match sess.opts.cg.ar { + Some(ref ar) => (*ar).clone(), +- None => "ar".to_string() ++ None => "@arPath@".to_string() + } + } + diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index fea35d24960c..77e4c3f37887 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch @@ -2,7 +2,7 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 7a3e912..ced75fa 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs -@@ -856,24 +856,15 @@ +@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -15,9 +15,9 @@ index 7a3e912..ced75fa 100644 - // In the future, FreeBSD will use clang as default compiler. - // It would be flexible to use cc (system's default C compiler) - // instead of hard-coded gcc. -- // For Windows, there is no cc command, so we add a condition to make it use gcc. +- // For win32, there is no cc command, so we add a condition to make it use gcc. - match sess.targ_cfg.os { -- abi::OsWindows => "gcc", +- abi::OsWin32 => "gcc", - _ => "cc", - }.to_string() } diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index aeb6cd2afbd3..f3dd7ef3c750 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; # The compiler requires cc, so we patch the source to tell it where to find it - patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ]; postPatch = '' substituteInPlace src/librustc/back/link.rs \ --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ diff --git a/pkgs/development/compilers/rustc/local_stage0.HEAD.patch b/pkgs/development/compilers/rustc/local_stage0.HEAD.patch new file mode 100644 index 000000000000..2f38d7c1757c --- /dev/null +++ b/pkgs/development/compilers/rustc/local_stage0.HEAD.patch @@ -0,0 +1,16 @@ +diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh +index e78f231..6b6773b 100755 +--- a/src/etc/local_stage0.sh ++++ b/src/etc/local_stage0.sh +@@ -53,11 +53,6 @@ + fi + + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ +-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 2f38d7c1757c..1261b2d458da 100644 --- a/pkgs/development/compilers/rustc/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch @@ -2,15 +2,12 @@ diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index e78f231..6b6773b 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh -@@ -53,11 +53,6 @@ +@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then fi - + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ -cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ - - # do not fail if one of the above fails, as all we need is a working rustc! - exit 0 From 56d9f10682b736519a1240d19e97c7f11599a898 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 10:48:38 +0200 Subject: [PATCH 250/323] mopdiy: Update from 0.19.3 to 0.19.4 --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index bbdd1f05fde5..a0a3af0e9585 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,11 +5,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.19.3"; + version = "0.19.4"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0rjq69vqak1d6fhvih259wmwp50xgr6x0x5nd0hl6hlkbbysc8dp"; + sha256 = "13dyn9pgq0jns6915diizviqyn64yfysb08k77xsmxrr4bhm1156"; }; propagatedBuildInputs = with pythonPackages; [ From 155053bcd96e4d5e6c5eaf96a95dca10ef4023f6 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 10:49:00 +0200 Subject: [PATCH 251/323] diod: Update from 1.0.22 to 1.0.23 --- pkgs/servers/diod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 4f0597ab3c39..dcda4e8c0bb4 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "diod-${version}"; - version = "1.0.22"; + version = "1.0.23"; src = fetchurl { url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; - sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27"; + sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3"; }; buildInputs = [ munge lua libcap perl ncurses ]; From f463f3813d072d42364f5e3e66a64433f7ca568f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 10:49:21 +0200 Subject: [PATCH 252/323] wal-e: Update from 0.6.9 to 0.6.10 --- pkgs/tools/backup/wal-e/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index c272f0e83785..025a998aed4e 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "wal-e-${version}"; - version = "0.6.9"; + version = "0.6.10"; namePrefix = ""; src = fetchurl { url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz"; - sha256 = "1yzz9hic8amq7mp0kh04hsmwisk5r374ddja5g8345bl8y3bzbgk"; + sha256 = "1hms24xz7wx3b91vv56fhcc3j0cszwqwnmwhka4yl90202hvdir2"; }; # needs tox From 8dd1abe3facfcf7b82967aa10053e9ed6c2a1a37 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 10:49:42 +0200 Subject: [PATCH 253/323] chrony: Update from 1.30 to 1.31 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 1e2b39869c54..e11fb377c210 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "1.30"; + version = "1.31"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "1pa6629nigcv95x2q9dnmzlrwhicxizq9z7ggy2c9cmyl1bakb23"; + sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3"; }; buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; From 66bbbc205daec5d751b4414da8f3b27f95caab6f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 10:51:05 +0200 Subject: [PATCH 254/323] nixos/nfs: Fix configuration merge --- nixos/modules/tasks/filesystems/nfs.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index c902b9e07905..16752ce7e1b5 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -54,12 +54,16 @@ in ###### implementation - config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) ({ + config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) { services.rpcbind.enable = true; system.fsPackages = [ pkgs.nfsUtils ]; + boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) '' + options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} + ''; + boot.kernelModules = [ "sunrpc" ]; boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; @@ -117,9 +121,5 @@ in serviceConfig.Restart = "always"; }; - } // mkIf (cfg.lockdPort != null) { - boot.extraModprobeConfig = '' - options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} - ''; - }); + }; } From 1dab09643204aefa8a0b912ecaf3355b35812109 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 16 Sep 2014 13:52:34 +0200 Subject: [PATCH 255/323] lirc: Update from 0.9.1 to 0.9.1a --- pkgs/development/libraries/lirc/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 88565d5d51b5..278eb8e9e523 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,13 +1,20 @@ { stdenv, fetchurl, alsaLib, bash, help2man }: stdenv.mkDerivation rec { - name = "lirc-0.9.1"; + name = "lirc-0.9.1a"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "0vakq9x10hyj9k7iv35sm5f4dhxvk0miwxvv6kn0bhwkr2mnapj6"; + sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r"; }; + patches = [ + (fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc"; + sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh"; + }) + ]; + preBuild = "patchShebangs ."; buildInputs = [ alsaLib help2man ]; From cf3d5494020f24095fa9f84934024d8b5d6cb7e8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 16 Sep 2014 14:37:14 +0200 Subject: [PATCH 256/323] bashmount: use fetchFromGitHub instead of fetchurl --- pkgs/tools/filesystems/bashmount/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 0c8119edff18..57bacfe6e887 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { name = "bashmount-${version}"; version = "3.2.0"; - src = fetchurl { - url = "https://github.com/jamielinux/bashmount/archive/${version}.tar.gz"; - sha256 = "08ncksz8xl0qg5y5qf64b9adfnsg6769wf5bw8lv8q0zjbhjiwrj"; + src = fetchFromGitHub { + owner = "jamielinux"; + repo = "bashmount"; + rev = version; + sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644"; }; installPhase = '' From a84c2d43570aa21488c1cb7826ea8650fd1766f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 16 Sep 2014 15:31:29 +0200 Subject: [PATCH 257/323] Re-add rubyLibs.jekyll closes #4096 --- .../interpreters/ruby/generated.nix | 313 +++++++++++++++++- 1 file changed, 311 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index ea54cad2d953..e778c796bb33 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -18,13 +18,19 @@ g: # Get dependencies from patched gems aws_sdk_v1 = g.aws_sdk_v1_1_53_0; backports = g.backports_3_6_0; bitbucket_backup = g.bitbucket_backup_0_3_1; + blankslate = g.blankslate_2_1_2_4; builder = g.builder_3_2_2; buildr = g.buildr_1_4_20; bundler = g.bundler_1_7_3; + celluloid = g.celluloid_0_16_0; childprocess = g.childprocess_0_5_3; chronic = g.chronic_0_10_2; chunky_png = g.chunky_png_1_3_1; + classifier_reborn = g.classifier_reborn_2_0_1; coderay = g.coderay_1_1_0; + coffee_script = g.coffee_script_2_3_0; + coffee_script_source = g.coffee_script_source_1_8_0; + colorator = g.colorator_0_1; compass = g.compass_1_0_1; compass_core = g.compass_core_1_0_1; compass_import_once = g.compass_import_once_1_0_5; @@ -44,6 +50,7 @@ g: # Get dependencies from patched gems fakes3 = g.fakes3_0_1_5_2; faraday = g.faraday_0_9_0; faraday_middleware = g.faraday_middleware_0_9_1; + fast_stemmer = g.fast_stemmer_1_0_2; ffi = g.ffi_1_9_3; file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_75_0; @@ -52,19 +59,30 @@ g: # Get dependencies from patched gems gherkin = g.gherkin_2_12_2; highline = g.highline_1_6_21; hike = g.hike_1_2_3; + hitimes = g.hitimes_1_2_2; hoe = g.hoe_3_7_1; http_cookie = g.http_cookie_1_0_2; i18n = g.i18n_0_6_11; iconv = g.iconv_1_0_4; + jekyll = g.jekyll_2_4_0; + jekyll_coffeescript = g.jekyll_coffeescript_1_0_1; + jekyll_gist = g.jekyll_gist_1_1_0; + jekyll_paginate = g.jekyll_paginate_1_0_0; + jekyll_sass_converter = g.jekyll_sass_converter_1_2_1; + jekyll_watch = g.jekyll_watch_1_1_1; jsduck = g.jsduck_5_3_4; json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; + kramdown = g.kramdown_1_4_2; launchy = g.launchy_2_4_2; + liquid = g.liquid_2_6_1; + listen = g.listen_2_7_9; locale = g.locale_2_1_0; lockfile = g.lockfile_2_1_3; macaddr = g.macaddr_1_7_1; mail = g.mail_2_6_1; mechanize = g.mechanize_2_7_3; + mercenary = g.mercenary_0_3_4; method_source = g.method_source_0_8_2; mime_types = g.mime_types_2_3; mini_portile = g.mini_portile_0_6_0; @@ -85,8 +103,11 @@ g: # Get dependencies from patched gems papertrail = g.papertrail_0_9_10; papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_7_1; + parslet = g.parslet_1_5_0; + posix_spawn = g.posix_spawn_0_3_9; pry = g.pry_0_9_12_6; pusher_client = g.pusher_client_0_6_0; + pygments_rb = g.pygments_rb_0_6_0; rack = g.rack_1_5_2; rack_protection = g.rack_protection_1_5_3; rack_test = g.rack_test_0_6_2; @@ -97,6 +118,7 @@ g: # Get dependencies from patched gems rb_inotify = g.rb_inotify_0_9_5; rdiscount = g.rdiscount_2_1_7_1; rdoc = g.rdoc_4_1_2; + redcarpet = g.redcarpet_3_1_2; remote_syslog = g.remote_syslog_1_6_14; riemann_dash = g.riemann_dash_0_2_9; right_aws = g.right_aws_3_1_0; @@ -109,6 +131,7 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_14_5; rspec_mocks = g.rspec_mocks_2_14_6; rubyzip = g.rubyzip_1_1_6; + safe_yaml = g.safe_yaml_1_0_3; sass = g.sass_3_4_4; selenium_webdriver = g.selenium_webdriver_2_43_0; servolux = g.servolux_0_10_0; @@ -126,7 +149,9 @@ g: # Get dependencies from patched gems thor = g.thor_0_19_1; thread_safe = g.thread_safe_0_3_4; tilt = g.tilt_1_4_1; + timers = g.timers_4_0_1; tins = g.tins_1_3_2; + toml = g.toml_0_1_1; travis = g.travis_1_7_1; trollop = g.trollop_2_0; typhoeus = g.typhoeus_0_6_9; @@ -143,7 +168,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_2; yajl_ruby = g.yajl_ruby_1_2_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; gems = { ZenTest_4_10_1 = { basename = ''ZenTest''; @@ -356,6 +381,16 @@ application.''; requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ]; sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj''; }; + blankslate_2_1_2_4 = { + basename = ''blankslate''; + meta = { + description = ''BlankSlate extracted from Builder.''; + homepage = ''http://github.com/masover/blankslate''; + }; + name = ''blankslate-2.1.2.4''; + requiredGems = [ ]; + sha256 = ''0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx''; + }; builder_3_2_2 = { basename = ''builder''; meta = { @@ -370,7 +405,7 @@ simple to do. Currently the following builder objects are supported: }; name = ''builder-3.2.2''; requiredGems = [ ]; - sha256 = ''no hash''; + sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; }; buildr_1_4_20 = { basename = ''buildr''; @@ -399,6 +434,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''00r3b4bchiqbd12y896hmrp5sa6n4391fygg1jmvljx1635x5kyj''; }; + celluloid_0_16_0 = { + basename = ''celluloid''; + meta = { + description = ''Actor-based concurrent object framework for Ruby''; + homepage = ''https://github.com/celluloid/celluloid''; + longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects''; + }; + name = ''celluloid-0.16.0''; + requiredGems = [ g.timers_4_0_1 ]; + sha256 = ''044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3''; + }; childprocess_0_5_3 = { basename = ''childprocess''; meta = { @@ -448,6 +494,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1kpcv2wrx3zyfi5jbsnd9da1wmkjwidnmpshq6vhzz0r8hp7ai8a''; }; + classifier_reborn_2_0_1 = { + basename = ''classifier_reborn''; + meta = { + description = ''A general classifier module to allow Bayesian and other types of classifications.''; + homepage = ''https://github.com/jekyll/classifier-reborn''; + }; + name = ''classifier-reborn-2.0.1''; + requiredGems = [ g.fast_stemmer_1_0_2 ]; + sha256 = ''1p90lwn6x2akg882h597vb6fdbw6zmiw7pqlpqsc1dj243zf0pks''; + }; coderay_1_1_0 = { basename = ''coderay''; meta = { @@ -459,6 +515,45 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s''; }; + coffee_script_2_3_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.3.0''; + requiredGems = [ g.coffee_script_source_1_8_0 g.execjs_2_2_1 ]; + sha256 = ''0i0p52f2s7hk8sq3q9342and3whjnhjhc7ldg8zmnjjcm44asm3d''; + }; + coffee_script_source_1_8_0 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.8.0''; + requiredGems = [ ]; + sha256 = ''04998xd43z9kqs6kmzvng90s2xn3ybp8918rq7xz6ljhv8yjqm88''; + }; + colorator_0_1 = { + basename = ''colorator''; + meta = { + description = ''String core extensions for terminal coloring.''; + homepage = ''https://github.com/octopress/colorator''; + longDescription = ''Colorize your text in the terminal.''; + }; + name = ''colorator-0.1''; + requiredGems = [ ]; + sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs''; + }; compass_1_0_1 = { basename = ''compass''; meta = { @@ -722,6 +817,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.faraday_0_9_0 ]; sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q''; }; + fast_stemmer_1_0_2 = { + basename = ''fast_stemmer''; + meta = { + description = ''Fast Porter stemmer based on a C version of algorithm''; + homepage = ''http://github.com/romanbsd/fast-stemmer''; + longDescription = ''Fast Porter stemmer based on a C version of algorithm''; + }; + name = ''fast-stemmer-1.0.2''; + requiredGems = [ ]; + sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh''; + }; ffi_1_9_3 = { basename = ''ffi''; meta = { @@ -817,6 +923,17 @@ minutes of work. requiredGems = [ ]; sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm''; }; + hitimes_1_2_2 = { + basename = ''hitimes''; + meta = { + description = ''Hitimes is a fast, high resolution timer library for recording performance metrics. It uses the appropriate low method calls for each system to get the highest granularity time increments possible.''; + homepage = ''http://github.com/copiousfreetime/hitimes''; + longDescription = ''Hitimes is a fast, high resolution timer library for recording performance metrics. It uses the appropriate low method calls for each system to get the highest granularity time increments possible. It currently supports any of the following systems: * any system with the POSIX call `clock_gettime()` * Mac OS X * Windows * JRuby Using Hitimes can be faster than using a series of `Time.new` calls, and it will have a much higher granularity. It is definitely faster than using `Process.times`.''; + }; + name = ''hitimes-1.2.2''; + requiredGems = [ ]; + sha256 = ''17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4''; + }; hoe_3_7_1 = { basename = ''hoe''; meta = { @@ -870,6 +987,67 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v''; }; + jekyll_2_4_0 = { + basename = ''jekyll''; + meta = { + description = ''A simple, blog aware, static site generator.''; + homepage = ''https://github.com/jekyll/jekyll''; + longDescription = ''Jekyll is a simple, blog aware, static site generator.''; + }; + name = ''jekyll-2.4.0''; + requiredGems = [ g.liquid_2_6_1 g.kramdown_1_4_2 g.mercenary_0_3_4 g.safe_yaml_1_0_3 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_1_2 g.toml_0_1_1 g.jekyll_paginate_1_0_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_1 g.classifier_reborn_2_0_1 ]; + sha256 = ''1n8m0cw91yayvcspqi3x9y9y0nahagg0sy8r6pn0zplqg1vh7y1l''; + }; + jekyll_coffeescript_1_0_1 = { + basename = ''jekyll_coffeescript''; + meta = { + description = ''A CoffeeScript converter for Jekyll.''; + homepage = ''https://github.com/jekyll/jekyll-coffeescript''; + }; + name = ''jekyll-coffeescript-1.0.1''; + requiredGems = [ g.coffee_script_2_3_0 ]; + sha256 = ''19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg''; + }; + jekyll_gist_1_1_0 = { + basename = ''jekyll_gist''; + meta = { + description = ''Liquid tag for displaying GitHub Gists in Jekyll sites.''; + homepage = ''https://github.com/jekyll/jekyll-gist''; + }; + name = ''jekyll-gist-1.1.0''; + requiredGems = [ ]; + sha256 = ''06d4jwf64fl7x3dqfimnfqzr4d3wbsdz2l4fif35j91mmh37nmq9''; + }; + jekyll_paginate_1_0_0 = { + basename = ''jekyll_paginate''; + meta = { + description = ''Built-in Pagination Generator for Jekyll''; + homepage = ''https://github.com/jekyll/jekyll-paginate''; + }; + name = ''jekyll-paginate-1.0.0''; + requiredGems = [ ]; + sha256 = ''1p01c3mncqrzyiskggdxd4cka1fl4ydlphhzbcfx9pylhrishkjk''; + }; + jekyll_sass_converter_1_2_1 = { + basename = ''jekyll_sass_converter''; + meta = { + description = ''A basic Sass converter for Jekyll.''; + homepage = ''https://github.com/jekyll/jekyll-sass-converter''; + }; + name = ''jekyll-sass-converter-1.2.1''; + requiredGems = [ g.sass_3_4_4 ]; + sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1''; + }; + jekyll_watch_1_1_1 = { + basename = ''jekyll_watch''; + meta = { + description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.''; + homepage = ''https://github.com/jekyll/jekyll-watch''; + }; + name = ''jekyll-watch-1.1.1''; + requiredGems = [ g.listen_2_7_9 ]; + sha256 = ''0q0skw4fjfrjaskfdvkknfy81a1pbr0mlhc2lrbpb533l5xm3gwz''; + }; jsduck_5_3_4 = { basename = ''jsduck''; meta = { @@ -903,6 +1081,19 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; + kramdown_1_4_2 = { + basename = ''kramdown''; + meta = { + description = ''kramdown is a fast, pure-Ruby Markdown-superset converter.''; + homepage = ''http://kramdown.gettalong.org''; + longDescription = ''kramdown is yet-another-markdown-parser but fast, pure Ruby, +using a strict syntax definition and supporting several common extensions. +''; + }; + name = ''kramdown-1.4.2''; + requiredGems = [ ]; + sha256 = ''1a1y2a7aysx45qhc6dpbfnlcs1syp04ix12q62f6z84zqrb996xf''; + }; launchy_2_4_2 = { basename = ''launchy''; meta = { @@ -914,6 +1105,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.addressable_2_3_6 ]; sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv''; }; + liquid_2_6_1 = { + basename = ''liquid''; + meta = { + description = ''A secure, non-evaling end user template engine with aesthetic markup.''; + homepage = ''http://www.liquidmarkup.org''; + }; + name = ''liquid-2.6.1''; + requiredGems = [ ]; + sha256 = ''0fc67cx36x05hsw0cc56la4qr3939g34cdgqmqgdi8yzs72cbv7x''; + }; + listen_2_7_9 = { + basename = ''listen''; + meta = { + description = ''Listen to file modifications''; + homepage = ''https://github.com/guard/listen''; + longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; + }; + name = ''listen-2.7.9''; + requiredGems = [ g.celluloid_0_16_0 g.rb_fsevent_0_9_4 g.rb_inotify_0_9_5 ]; + sha256 = ''1i9m8fc1w8khwpjxfv9430bqbl4df128i4r8gskgvi3pd4678llf''; + }; locale_2_1_0 = { basename = ''locale''; meta = { @@ -974,6 +1186,17 @@ a history.''; requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_21 ]; sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx''; }; + mercenary_0_3_4 = { + basename = ''mercenary''; + meta = { + description = ''Lightweight and flexible library for writing command-line apps in Ruby.''; + homepage = ''https://github.com/jekyll/mercenary''; + longDescription = ''Lightweight and flexible library for writing command-line apps in Ruby.''; + }; + name = ''mercenary-0.3.4''; + requiredGems = [ ]; + sha256 = ''0fg8pbixs68aqx6slp7cpbl0cwa8c4x8rf1s66f7icqa6i9ifcfn''; + }; method_source_0_8_2 = { basename = ''method_source''; meta = { @@ -1317,6 +1540,27 @@ enough of it.''; requiredGems = [ ]; sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq''; }; + parslet_1_5_0 = { + basename = ''parslet''; + meta = { + description = ''Parser construction library with great error reporting in Ruby.''; + homepage = ''http://kschiess.github.com/parslet''; + }; + name = ''parslet-1.5.0''; + requiredGems = [ g.blankslate_2_1_2_4 ]; + sha256 = ''0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3''; + }; + posix_spawn_0_3_9 = { + basename = ''posix_spawn''; + meta = { + description = ''posix_spawnp(2) for ruby''; + homepage = ''http://github.com/rtomayko/posix-spawn''; + longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning''; + }; + name = ''posix-spawn-0.3.9''; + requiredGems = [ ]; + sha256 = ''042i1afggy1sv2jmdjjjhyffas28xp2r1ylj5xfv3hchy3b4civ3''; + }; pry_0_9_12_6 = { basename = ''pry''; meta = { @@ -1339,6 +1583,17 @@ enough of it.''; requiredGems = [ g.websocket_1_2_1 g.json_1_8_1 ]; sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy''; }; + pygments_rb_0_6_0 = { + basename = ''pygments_rb''; + meta = { + description = ''pygments wrapper for ruby''; + homepage = ''https://github.com/tmm1/pygments.rb''; + longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby''; + }; + name = ''pygments.rb-0.6.0''; + requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_9 ]; + sha256 = ''0jszj99cirbkxaqllbgnp9718v32xhvg08rfldvr10gy8i7bhy2s''; + }; rack_1_5_2 = { basename = ''rack''; meta = { @@ -1492,6 +1747,17 @@ from the command-line.''; requiredGems = [ g.json_1_8_1 ]; sha256 = ''0cqhjidw657d8irkypxsrv6dr4y9r8csg9inaq40c3iz110cc8w6''; }; + redcarpet_3_1_2 = { + basename = ''redcarpet''; + meta = { + description = ''Markdown that smells nice''; + homepage = ''http://github.com/vmg/redcarpet''; + longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser''; + }; + name = ''redcarpet-3.1.2''; + requiredGems = [ ]; + sha256 = ''076p52lkns90hqs27rs4kns2bg7maz8qxr87bl34yd6in319flzz''; + }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { @@ -1713,6 +1979,17 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; requiredGems = [ ]; sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; + safe_yaml_1_0_3 = { + basename = ''safe_yaml''; + meta = { + description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.''; + homepage = ''https://github.com/dtao/safe_yaml''; + longDescription = ''Parse YAML safely''; + }; + name = ''safe_yaml-1.0.3''; + requiredGems = [ ]; + sha256 = ''063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl''; + }; sass_3_4_4 = { basename = ''sass''; meta = { @@ -1925,6 +2202,17 @@ management. requiredGems = [ ]; sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; + timers_4_0_1 = { + basename = ''timers''; + meta = { + description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout''; + homepage = ''https://github.com/celluloid/timers''; + longDescription = ''Pure Ruby one-shot and periodic timers''; + }; + name = ''timers-4.0.1''; + requiredGems = [ g.hitimes_1_2_2 ]; + sha256 = ''03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l''; + }; tins_0_13_2 = { basename = ''tins''; meta = { @@ -1947,6 +2235,17 @@ management. requiredGems = [ ]; sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly''; }; + toml_0_1_1 = { + basename = ''toml''; + meta = { + description = ''Parse your TOML.''; + homepage = ''http://github.com/jm/toml''; + longDescription = ''Parse your TOML, seriously.''; + }; + name = ''toml-0.1.1''; + requiredGems = [ g.parslet_1_5_0 ]; + sha256 = ''1m5dv66qnbbg0r2zpp45hzq2nkmc4qaq0xmqw8j1kwkrpiwihwp8''; + }; travis_1_7_1 = { basename = ''travis''; meta = { @@ -2106,6 +2405,16 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb''; }; + yajl_ruby_1_1_0 = { + basename = ''yajl_ruby''; + meta = { + description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.''; + homepage = ''http://github.com/brianmario/yajl-ruby''; + }; + name = ''yajl-ruby-1.1.0''; + requiredGems = [ ]; + sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m''; + }; yajl_ruby_1_2_1 = { basename = ''yajl_ruby''; meta = { From 6110679beeb0a88da65d517d2d79277151dd7798 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 16 Sep 2014 16:55:56 +0200 Subject: [PATCH 258/323] Update hol_light to r198. Add myself as a maintainer --- .../science/logic/hol_light/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 3e6440ea9773..a3c49ab294e9 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -7,14 +7,15 @@ let exec ${ocaml}/bin/ocaml -I \`${camlp5}/bin/camlp5 -where\` -init make.ml ''; in + stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "189"; + version = "198"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "1v10l64rs7da2kag3wlb651i09pn83icy9n5z84j8h1iwlxzajdh"; + sha256 = "1y7vivj5l84fb7wqn38qbykpgs8ql2gmqxxch1yn5mg1cf9iiqsx"; }; buildInputs = [ ocaml findlib camlp5 ]; @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/hol_light" ''; - meta = { + meta = with stdenv.lib; { description = "Interactive theorem prover based on Higher-Order Logic"; homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice z77z ]; }; } From e2331b52cde23a3754067636a76ebeb7bdccec6f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 16 Sep 2014 11:53:20 -0400 Subject: [PATCH 259/323] util-linux: bump --- pkgs/os-specific/linux/util-linux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 1dd7c0c089fa..123f8e4354bf 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.24.2"; + name = "util-linux-2.25.1"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz"; - sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj"; + url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz"; + sha256 = "4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8"; }; crossAttrs = { From 2bbd01485a73b0b23da77efa46212d1f833b5efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 16 Sep 2014 18:03:46 +0200 Subject: [PATCH 260/323] init list helper --- lib/lists.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/lists.nix b/lib/lists.nix index 4b5f04a67585..af70faacbcd7 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -209,6 +209,10 @@ in rec { assert list != []; elemAt list (dec (length list)); + # Return all elements but the last + init = list: assert list != []; take (length list - 1) list; + + # Zip two lists together. zipTwoLists = xs: ys: let From d8f80630f7f674c345df50ae5090fb21066afe12 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 16 Sep 2014 14:10:37 -0400 Subject: [PATCH 261/323] Add strongswan IPsec manager --- pkgs/tools/networking/strongswan/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/strongswan/default.nix diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix new file mode 100644 index 000000000000..01b96e2ab4a0 --- /dev/null +++ b/pkgs/tools/networking/strongswan/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "strongswan-5.2.0"; + + src = fetchurl { + url = "http://download.strongswan.org/${name}.tar.bz2"; + sha256 = "1ki6v9c54ykppqnj3prgh62na97yajnvnm2zr1gjxzv05syk035h"; + }; + + buildInputs = [ gmp ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.shlevy ]; + description = "OpenSource IPsec-based VPN Solution"; + homepage = https://www.strongswan.org; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c71b61a288..a7db78b04e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2242,6 +2242,8 @@ let stunnel = callPackage ../tools/networking/stunnel { }; + strongswan = callPackage ../tools/networking/strongswan { }; + su = shadow.su; surfraw = callPackage ../tools/networking/surfraw { }; From 5247c11b4a64e8a64a038464034f237fcef0d341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 16 Sep 2014 20:40:31 +0200 Subject: [PATCH 262/323] manual: mention go2nix --- doc/language-support.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 117e1d93c152..e7ffa8af1183 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -233,7 +233,7 @@ twisted = buildPythonPackage { -
Ruby +
Ruby For example, to package yajl-ruby package, use gem-nix: @@ -244,6 +244,11 @@ twisted = buildPythonPackage {
+
Go + To extract dependency information from a Go package in automated way use go2nix. +
+ +
Java Ant-based Java packages are typically built from source as follows: From ec9c4143a7142e28851b9b158a32274675114f2b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 16 Sep 2014 01:15:10 -0700 Subject: [PATCH 263/323] nixos/firewall: Cleanup in case reload fails --- .../modules/services/networking/firewall.nix | 359 ++++++++++-------- 1 file changed, 192 insertions(+), 167 deletions(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index eaf48b9c6e5b..68aac3d30de1 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -37,6 +37,180 @@ let } ''; + writeShScript = name: text: let dir = pkgs.writeScriptBin name '' + #! ${pkgs.stdenv.shell} -e + ${text} + ''; in "${dir}/bin/${name}"; + + startScript = writeShScript "firewall-start" '' + ${helpers} + + # Flush the old firewall rules. !!! Ideally, updating the + # firewall would be atomic. Apparently that's possible + # with iptables-restore. + ip46tables -D INPUT -j nixos-fw 2> /dev/null || true + for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do + ip46tables -F "$chain" 2> /dev/null || true + ip46tables -X "$chain" 2> /dev/null || true + done + + + # The "nixos-fw-accept" chain just accepts packets. + ip46tables -N nixos-fw-accept + ip46tables -A nixos-fw-accept -j ACCEPT + + + # The "nixos-fw-refuse" chain rejects or drops packets. + ip46tables -N nixos-fw-refuse + + ${if cfg.rejectPackets then '' + # Send a reset for existing TCP connections that we've + # somehow forgotten about. Send ICMP "port unreachable" + # for everything else. + ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset + ip46tables -A nixos-fw-refuse -j REJECT + '' else '' + ip46tables -A nixos-fw-refuse -j DROP + ''} + + + # The "nixos-fw-log-refuse" chain performs logging, then + # jumps to the "nixos-fw-refuse" chain. + ip46tables -N nixos-fw-log-refuse + + ${optionalString cfg.logRefusedConnections '' + ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: " + ''} + ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' + ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ + -j LOG --log-level info --log-prefix "rejected broadcast: " + ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ + -j LOG --log-level info --log-prefix "rejected multicast: " + ''} + ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse + ${optionalString cfg.logRefusedPackets '' + ip46tables -A nixos-fw-log-refuse \ + -j LOG --log-level info --log-prefix "rejected packet: " + ''} + ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse + + + # The "nixos-fw" chain does the actual work. + ip46tables -N nixos-fw + + # Perform a reverse-path test to refuse spoofers + # For now, we just drop, as the raw table doesn't have a log-refuse yet + ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' + if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then + echo "<2>failed to initialise rpfilter support" >&2 + fi + ''} + + # Accept all traffic on the trusted interfaces. + ${flip concatMapStrings cfg.trustedInterfaces (iface: '' + ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept + '')} + + # Accept packets from established or related connections. + ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept + + # Accept connections to the allowed TCP ports. + ${concatMapStrings (port: + '' + ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept + '' + ) cfg.allowedTCPPorts + } + + # Accept connections to the allowed TCP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedTCPPortRanges + } + + # Accept packets on the allowed UDP ports. + ${concatMapStrings (port: + '' + ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept + '' + ) cfg.allowedUDPPorts + } + + # Accept packets on the allowed UDP port ranges. + ${concatMapStrings (rangeAttr: + let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in + '' + ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept + '' + ) cfg.allowedUDPPortRanges + } + + # Accept IPv4 multicast. Not a big security risk since + # probably nobody is listening anyway. + #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept + + # Optionally respond to ICMPv4 pings. + ${optionalString cfg.allowPing '' + iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) + "-m limit ${cfg.pingLimit} " + }-j nixos-fw-accept + ''} + + # Accept all ICMPv6 messages except redirects and node + # information queries (type 139). See RFC 4890, section + # 4.4. + ${optionalString config.networking.enableIPv6 '' + ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP + ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP + ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept + ''} + + ${cfg.extraCommands} + + # Reject/drop everything else. + ip46tables -A nixos-fw -j nixos-fw-log-refuse + + + # Enable the firewall. + ip46tables -A INPUT -j nixos-fw + ''; + + stopScript = writeShScript "firewall-stop" '' + ${helpers} + + # Clean up in case reload fails + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + + # Clean up after added ruleset + ip46tables -D INPUT -j nixos-fw 2>/dev/null || true + + ${cfg.extraStopCommands} + ''; + + reloadScript = writeShScript "firewall-reload" '' + ${helpers} + + # Create a unique drop rule + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + ip46tables -F nixos-drop 2>/dev/null || true + ip46tables -X nixos-drop 2>/dev/null || true + ip46tables -N nixos-drop + ip46tables -A nixos-drop -j DROP + + # Don't allow traffic to leak out until the script has completed + ip46tables -A INPUT -j nixos-drop + if ${startScript}; then + ip46tables -D INPUT -j nixos-drop 2>/dev/null || true + else + echo "Failed to reload firewall... Stopping" + ${stopScript} + exit 1 + fi + ''; + kernelPackages = config.boot.kernelPackages; kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false; @@ -248,7 +422,7 @@ in '' Additional shell commands executed as part of the firewall shutdown script. These are executed just after the removal - of the nixos input rule. + of the nixos input rule, or if the service enters a failed state. ''; }; @@ -276,177 +450,28 @@ in message = "This kernel does not support disabling conntrack helpers"; } ]; - systemd.services.firewall = rec - { description = "Firewall"; + systemd.services.firewall = { + description = "Firewall"; + wantedBy = [ "network.target" ]; + after = [ "network-interfaces.target" "systemd-modules-load.service" ]; - wantedBy = [ "network.target" ]; - after = [ "network-interfaces.target" "systemd-modules-load.service" ]; + path = [ pkgs.iptables ]; - path = [ pkgs.iptables ]; + # FIXME: this module may also try to load kernel modules, but + # containers don't have CAP_SYS_MODULE. So the host system had + # better have all necessary modules already loaded. + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - # FIXME: this module may also try to load kernel modules, but - # containers don't have CAP_SYS_MODULE. So the host system had - # better have all necessary modules already loaded. - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + reloadIfChanged = true; - reloadIfChanged = true; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - - script = - '' - ${helpers} - - # Flush the old firewall rules. !!! Ideally, updating the - # firewall would be atomic. Apparently that's possible - # with iptables-restore. - ip46tables -D INPUT -j nixos-fw 2> /dev/null || true - for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do - ip46tables -F "$chain" 2> /dev/null || true - ip46tables -X "$chain" 2> /dev/null || true - done - - - # The "nixos-fw-accept" chain just accepts packets. - ip46tables -N nixos-fw-accept - ip46tables -A nixos-fw-accept -j ACCEPT - - - # The "nixos-fw-refuse" chain rejects or drops packets. - ip46tables -N nixos-fw-refuse - - ${if cfg.rejectPackets then '' - # Send a reset for existing TCP connections that we've - # somehow forgotten about. Send ICMP "port unreachable" - # for everything else. - ip46tables -A nixos-fw-refuse -p tcp ! --syn -j REJECT --reject-with tcp-reset - ip46tables -A nixos-fw-refuse -j REJECT - '' else '' - ip46tables -A nixos-fw-refuse -j DROP - ''} - - - # The "nixos-fw-log-refuse" chain performs logging, then - # jumps to the "nixos-fw-refuse" chain. - ip46tables -N nixos-fw-log-refuse - - ${optionalString cfg.logRefusedConnections '' - ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: " - ''} - ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' - ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ - -j LOG --log-level info --log-prefix "rejected broadcast: " - ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ - -j LOG --log-level info --log-prefix "rejected multicast: " - ''} - ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse - ${optionalString cfg.logRefusedPackets '' - ip46tables -A nixos-fw-log-refuse \ - -j LOG --log-level info --log-prefix "rejected packet: " - ''} - ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse - - - # The "nixos-fw" chain does the actual work. - ip46tables -N nixos-fw - - # Perform a reverse-path test to refuse spoofers - # For now, we just drop, as the raw table doesn't have a log-refuse yet - ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' - if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then - echo "<2>failed to initialise rpfilter support" >&2 - fi - ''} - - # Accept all traffic on the trusted interfaces. - ${flip concatMapStrings cfg.trustedInterfaces (iface: '' - ip46tables -A nixos-fw -i ${iface} -j nixos-fw-accept - '')} - - # Accept packets from established or related connections. - ip46tables -A nixos-fw -m conntrack --ctstate ESTABLISHED,RELATED -j nixos-fw-accept - - # Accept connections to the allowed TCP ports. - ${concatMapStrings (port: - '' - ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept - '' - ) cfg.allowedTCPPorts - } - - # Accept connections to the allowed TCP port ranges. - ${concatMapStrings (rangeAttr: - let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in - '' - ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept - '' - ) cfg.allowedTCPPortRanges - } - - # Accept packets on the allowed UDP ports. - ${concatMapStrings (port: - '' - ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept - '' - ) cfg.allowedUDPPorts - } - - # Accept packets on the allowed UDP port ranges. - ${concatMapStrings (rangeAttr: - let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in - '' - ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept - '' - ) cfg.allowedUDPPortRanges - } - - # Accept IPv4 multicast. Not a big security risk since - # probably nobody is listening anyway. - #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept - - # Optionally respond to ICMPv4 pings. - ${optionalString cfg.allowPing '' - iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) - "-m limit ${cfg.pingLimit} " - }-j nixos-fw-accept - ''} - - # Accept all ICMPv6 messages except redirects and node - # information queries (type 139). See RFC 4890, section - # 4.4. - ${optionalString config.networking.enableIPv6 '' - ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP - ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP - ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept - ''} - - ${cfg.extraCommands} - - # Reject/drop everything else. - ip46tables -A nixos-fw -j nixos-fw-log-refuse - - - # Enable the firewall. - ip46tables -A INPUT -j nixos-fw - ''; - - reload = '' - ${helpers} - ip46tables -A INPUT -j DROP - ${script} - ip46tables -D INPUT -j DROP || true # extraCommands might delete the above rule and cause this to fail - ''; - - postStop = - '' - ${helpers} - ip46tables -D INPUT -j nixos-fw || true - ${cfg.extraStopCommands} - ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "@${startScript} firewall-start"; + ExecReload = "@${reloadScript} firewall-reload"; + ExecStop = "@${stopScript} firewall-stop"; }; + }; }; From 44ca1a7f573b06a6089c0882120f7f1e6eae19e3 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Mon, 15 Sep 2014 22:25:14 -0400 Subject: [PATCH 264/323] Add coreutils dependency to ant launcher script Closes #4106. --- pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 751b40e714e8..476d2cb8ac52 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper }: +{ fetchurl, stdenv, coreutils, makeWrapper }: let version = "1.9.4"; in @@ -43,7 +43,7 @@ stdenv.mkDerivation { if [ -z "\$JAVA_HOME" ]; then for i in javac java gij; do if p="\$(type -p \$i)"; then - export JAVA_HOME="\$(dirname \$(dirname \$(readlink -f \$p)))" + export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" break fi done From d78973078a46570346f9d8eda2cf244d8d1feebc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Sep 2014 11:27:13 +0400 Subject: [PATCH 265/323] Adding AdvanceCOMP deflate compression optimizer --- .../tools/compression/advancecomp/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/compression/advancecomp/default.nix diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix new file mode 100644 index 000000000000..5737f1eca15f --- /dev/null +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, zlib}: +let + s = # Generated upstream information + rec { + baseName="advancecomp"; + version="1.19"; + name="${baseName}-${version}"; + url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download"; + sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m"; + }; + buildInputs = [ + zlib + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A set of tools to optimize deflate-compressed files''; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + updateWalker = true; + homepage = "http://advancemame.sourceforge.net/comp-readme.html"; + downloadPage = "http://advancemame.sourceforge.net/comp-download.html"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7db78b04e13..db1008dbbba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -440,6 +440,8 @@ let adom = callPackage ../games/adom { }; + advancecomp = callPackage ../tools/compression/advancecomp {}; + aefs = callPackage ../tools/filesystems/aefs { }; aegisub = callPackage ../applications/video/aegisub { From cef02482c646edf726fc38fd901ec366f3b52ae9 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Wed, 17 Sep 2014 12:02:47 +0300 Subject: [PATCH 266/323] haskellPackages: introduced ShellCheck. --- .../libraries/haskell/ShellCheck/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ShellCheck/default.nix diff --git a/pkgs/development/libraries/haskell/ShellCheck/default.nix b/pkgs/development/libraries/haskell/ShellCheck/default.nix new file mode 100644 index 000000000000..7f15fa6b30c4 --- /dev/null +++ b/pkgs/development/libraries/haskell/ShellCheck/default.nix @@ -0,0 +1,18 @@ +{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: + +cabal.mkDerivation (self: { + pname = "ShellCheck"; + version = "0.3.4"; + sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; + isLibrary = true; + isExecutable = true; + buildDepends = [ json mtl parsec QuickCheck regexCompat ]; + testDepends = [ json mtl parsec QuickCheck regexCompat ]; + meta = { + homepage = "http://www.shellcheck.net/"; + description = "Shell script analysis tool"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 02b38c5f86fc..b1c78ba59937 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2207,6 +2207,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shellCheck = callPackage ../development/libraries/haskell/ShellCheck {}; shellish = callPackage ../development/libraries/haskell/shellish {}; From 771e2d8d0918142c265b3055f34c57c3a89fa668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 17 Sep 2014 13:35:52 +0200 Subject: [PATCH 267/323] add xvidcap to the channel for linux --- pkgs/applications/video/xvidcap/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 83b5c778f866..ade840dc0218 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk -, scrollkeeper, libglade, libXmu, libX11, libXext, gettext, lame, libXfixes, libXdamage}: +, scrollkeeper, libglade, libXmu, libX11, libXext, gettext +, lame, libXfixes, libXdamage }: stdenv.mkDerivation { name = "xvidcap-1.1.7"; @@ -10,14 +11,18 @@ stdenv.mkDerivation { }; patches = [ ./xlib.patch ]; - buildInputs = [perl perlXMLParser pkgconfig gtk scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11]; + buildInputs = [ + perl perlXMLParser pkgconfig gtk scrollkeeper + libglade libXmu gettext lame libXdamage libXfixes libXext libX11 + ]; # !!! don't know why this is necessary NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; - meta = { + meta = with stdenv.lib; { description = "screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; }; } From a2865eb8e023d81c71e6bb5b07a97bcf48280db3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 17 Sep 2014 16:48:37 +0200 Subject: [PATCH 268/323] nodejs: Bump to version 0.10.32 --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 1b3d4950e377..deb5188750ae 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.30"; + version = "0.10.32"; # !!! Should we also do shared libuv? deps = { @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1li5hs8dada2lj9j82xas39kr1fs0wql9qbly5p2cpszgwqbvz1x"; + sha256 = "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); From c396ee991247dcd66917c0f6b501040fe06df504 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 13 Sep 2014 02:03:15 +0200 Subject: [PATCH 269/323] nixos: add collectd module --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + .../modules/services/monitoring/collectd.nix | 104 ++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 nixos/modules/services/monitoring/collectd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 37531ad1cdfd..cdce7d1a893e 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -151,6 +151,7 @@ dnsmasq = 141; uhub = 142; yandexdisk=143; + collectd=144; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 236534000fea..25827656608d 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -179,6 +179,7 @@ ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix + ./services/monitoring/collectd.nix ./services/monitoring/dd-agent.nix ./services/monitoring/graphite.nix ./services/monitoring/monit.nix diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix new file mode 100644 index 000000000000..6da92db7e5f5 --- /dev/null +++ b/nixos/modules/services/monitoring/collectd.nix @@ -0,0 +1,104 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.collectd; + + conf = pkgs.writeText "collectd.conf" '' + BaseDir "${cfg.dataDir}" + PIDFile "${cfg.dataDir}/collectd.pid" + AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"} + Hostname ${config.networking.hostName} + + LoadPlugin syslog + + LogLevel "info" + NotifyLevel "OKAY" + + + ${concatMapStrings (f: '' + Include "${f}" + '') cfg.include} + + ${cfg.extraConfig} + ''; + +in { + options.services.collectd = with types; { + enable = mkOption { + default = false; + description = '' + Whether to enable collectd agent. + ''; + type = bool; + }; + + user = mkOption { + default = "collectd"; + description = '' + User under which to run collectd. + ''; + type = nullOr str; + }; + + dataDir = mkOption { + default = "/var/lib/collectd"; + description = '' + Data directory for collectd agent. + ''; + type = path; + }; + + autoLoadPlugin = mkOption { + default = false; + description = '' + Enable plugin autoloading. + ''; + type = bool; + }; + + include = mkOption { + default = []; + description = '' + Additional paths to load config from. + ''; + type = listOf str; + }; + + extraConfig = mkOption { + default = ""; + description = '' + Extra configuration for collectd. + ''; + type = lines; + }; + + }; + + config = mkIf cfg.enable { + systemd.services.collectd = { + description = "Collectd Monitoring Agent"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.dataDir}/collectd.pid"; + Type = "forking"; + PIDFile = "${cfg.dataDir}/collectd.pid"; + User = optional (cfg.user!="root") cfg.user; + PermissionsStartOnly = true; + }; + + preStart = '' + mkdir -m 0700 -p ${cfg.dataDir} + if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user} ${cfg.dataDir}; fi + ''; + }; + + users.extraUsers = optional (cfg.user == "collectd") { + name = "collectd"; + uid = config.ids.uids.collectd; + }; + }; +} From 75aaeca9d2341c5f4dd4545535d3d8a4d3b0a1ee Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 17 Sep 2014 18:31:02 +0200 Subject: [PATCH 270/323] nixos/graphite: add seyren service, graphite alerting dashboard --- .../modules/services/monitoring/graphite.nix | 84 ++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index ff5951afb4c4..472c71845bcb 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -18,6 +18,12 @@ let ${cfg.api.extraConfig} ''; + seyrenConfig = { + SEYREN_URL = cfg.seyren.seyrenUrl; + MONGO_URL = cfg.seyren.mongoUrl; + GRAPHITE_URL = cfg.seyren.graphiteUrl; + } // cfg.seyren.extraConfig; + configDir = pkgs.buildEnv { name = "graphite-config"; paths = lists.filter (el: el != null) [ @@ -242,11 +248,65 @@ in { ''; }; }; + + seyren = { + enable = mkOption { + description = "Whether to enable seyren service."; + default = false; + type = types.uniq types.bool; + }; + + port = mkOption { + description = "Seyren listening port."; + default = 8081; + type = types.int; + }; + + seyrenUrl = mkOption { + default = "http://localhost:${toString cfg.seyren.port}/"; + description = "Host where seyren is accessible."; + type = types.str; + }; + + graphiteUrl = mkOption { + default = "http://${cfg.web.host}:${toString cfg.web.port}"; + description = "Host where graphite service runs."; + type = types.str; + }; + + mongoUrl = mkOption { + default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren"; + description = "Mongodb connection string."; + type = types.str; + }; + + extraConfig = mkOption { + default = {}; + description = '' + Extra seyren configuration. See + + ''; + type = types.attrsOf types.str; + example = literalExample '' + { + GRAPHITE_USERNAME = "user"; + GRAPHITE_PASSWORD = "pass"; + } + ''; + }; + }; }; ###### implementation - config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable) { + config = mkIf ( + cfg.carbon.enableAggregator || + cfg.carbon.enableCache || + cfg.carbon.enableRelay || + cfg.web.enable || + cfg.api.enable || + cfg.seyren.enable + ) { systemd.services.carbonCache = { enable = cfg.carbon.enableCache; description = "Graphite Data Storage Backend"; @@ -365,6 +425,28 @@ in { ''; }; + systemd.services.seyren = { + enable = cfg.seyren.enable; + description = "Graphite Alerting Dashboard"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" "mongodb.service" ]; + environment = seyrenConfig; + serviceConfig = { + ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; + WorkingDirectory = dataDir; + User = "graphite"; + Group = "graphite"; + }; + preStart = '' + if ! test -e ${dataDir}/db-created; then + mkdir -p ${dataDir} + chown -R graphite:graphite ${dataDir} + fi + ''; + }; + + services.mongodb.enable = mkDefault cfg.seyren.enable; + environment.systemPackages = [ pkgs.pythonPackages.carbon pkgs.python27Packages.graphite_web From 4d261e64f66e3a517b38817ff5f72647dd7b3fb4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 17 Sep 2014 18:32:09 +0200 Subject: [PATCH 271/323] pythonPackages.graphite_api: fix testing, make more nix-shell friendly --- pkgs/top-level/python-packages.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f8952b6713a..eb6280aa39d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10336,8 +10336,7 @@ let sha256 = "41b90d5f35e99a020a6b1b77938690652521d1841b3165574fcfcee807ce4e6a"; }; - # ImportError: No module named tests - doCheck = false; + checkPhase = "nosetests"; propagatedBuildInputs = [ flask @@ -10352,8 +10351,15 @@ let tzlocal ]; + buildInputs = [ + nose + mock + ]; + + LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API."; + description = "Graphite-web, without the interface. Just the rendering HTTP API."; homepage = https://github.com/brutasse/graphite-api; license = licenses.asl20; }; From 1cdb6cfb0095972f9149f8afaef38b6aa2790910 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 17 Sep 2014 18:32:51 +0200 Subject: [PATCH 272/323] nixos/graphite: add package option to graphiteApi --- nixos/modules/services/monitoring/graphite.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 472c71845bcb..3d97c31b7a17 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -116,6 +116,12 @@ in { type = types.int; }; + package = mkOption { + description = "Package to use for graphite api."; + default = pkgs.python27Packages.graphite_api; + type = types.package; + }; + extraConfig = mkOption { description = "Extra configuration for graphite api."; default = '' @@ -398,7 +404,7 @@ in { after = [ "network-interfaces.target" ]; environment = { PYTHONPATH = - "${pkgs.python27Packages.graphite_api}/lib/python2.7/site-packages:" + + "${cfg.api.package}/lib/python2.7/site-packages:" + concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; GRAPHITE_API_CONFIG = graphiteApiConfig; LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; From f8284a083f01be9fa88cd60d1e543f37f9e0254e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 17 Sep 2014 18:33:26 +0200 Subject: [PATCH 273/323] seyren: udpate to 1.1.0 --- pkgs/servers/monitoring/seyren/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index e6e151295687..e428067ab62b 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "seyren-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar"; - sha256 = "14p97yzfyacvavfms8qs3q5515vpfkjlfvislbwrf7qa89xzz8x0"; + sha256 = "10m64zdci4swlvivii1jnmrwfi461af3xvn0xvwvy7i8kyb56vrr"; }; phases = ["installPhase"]; From e6b9656e24f9e38654e20681fbef9bac86edc1bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Sep 2014 19:12:41 +0200 Subject: [PATCH 274/323] Quick hack to reduce Hydra memory consumption --- nixos/release.nix | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index d8cc1c8291bd..0207742e946c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -11,7 +11,9 @@ let forAllSystems = pkgs.lib.genAttrs supportedSystems; - callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args)); + scrubDrv = drv: let res = { inherit (drv) drvPath outPath type name; outputName = "out"; out = res; }; in res; + + callTest = fn: args: forAllSystems (system: scrubDrv (import fn ({ inherit system; } // args))); pkgs = import nixpkgs { system = "x86_64-linux"; }; @@ -40,7 +42,7 @@ let in # Declare the ISO as a build product so that it shows up in Hydra. - runCommand "nixos-iso-${config.system.nixosVersion}" + scrubDrv (runCommand "nixos-iso-${config.system.nixosVersion}" { meta = { description = "NixOS installation CD (${description}) - ISO image for ${system}"; maintainers = map (x: lib.getAttr x lib.maintainers) maintainers; @@ -51,7 +53,7 @@ let '' mkdir -p $out/nix-support echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products - ''; # */ + ''); # */ makeSystemTarball = @@ -78,7 +80,7 @@ let }; - makeClosure = module: forAllSystems (system: (import ./lib/eval-config.nix { + makeClosure = module: forAllSystems (system: scrubDrv (import ./lib/eval-config.nix { inherit system; modules = [ module ] ++ lib.singleton ({ config, lib, ... }: @@ -171,7 +173,7 @@ in rec { in # Declare the OVA as a build product so that it shows up in Hydra. - runCommand "nixos-ova-${config.system.nixosVersion}-${system}" + scrubDrv (runCommand "nixos-ova-${config.system.nixosVersion}-${system}" { meta = { description = "NixOS VirtualBox appliance (${system})"; maintainers = lib.maintainers.eelco; @@ -182,7 +184,7 @@ in rec { mkdir -p $out/nix-support fn=$(echo $ova/*.ova) echo "file ova $fn" >> $out/nix-support/hydra-build-products - '' # */ + '') # */ ); @@ -222,17 +224,17 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test); - tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test); - tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test); - tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); - tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); - tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); - tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test); - tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test); - tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test); - tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); - tests.installer.btrfsSubvolDefault = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); + tests.installer.efi = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).efi.test); + 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); + tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test); + tests.installer.separateBoot = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).separateBoot.test); + tests.installer.simple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simple.test); + tests.installer.simpleLabels = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleLabels.test); + tests.installer.simpleProvided = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.btrfsSimple = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSimple.test); + tests.installer.btrfsSubvols = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvols.test); + tests.installer.btrfsSubvolDefault = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; From 9c3c7a75d3a5969bd89922a67f28c3d760f4b796 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 17 Sep 2014 19:20:12 +0200 Subject: [PATCH 275/323] collectd: add pidFile option, change default pid to /var/run/collectd.pid --- .../modules/services/monitoring/collectd.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 6da92db7e5f5..717c2c481683 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -7,7 +7,7 @@ let conf = pkgs.writeText "collectd.conf" '' BaseDir "${cfg.dataDir}" - PIDFile "${cfg.dataDir}/collectd.pid" + PIDFile "${cfg.pidFile}" AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"} Hostname ${config.networking.hostName} @@ -50,6 +50,14 @@ in { type = path; }; + pidFile = mkOption { + default = "/var/run/collectd.pid"; + description = '' + Location of collectd pid file. + ''; + type = path; + }; + autoLoadPlugin = mkOption { default = false; description = '' @@ -83,16 +91,20 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.dataDir}/collectd.pid"; + ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.pidFile}"; Type = "forking"; - PIDFile = "${cfg.dataDir}/collectd.pid"; + PIDFile = cfg.pidFile; User = optional (cfg.user!="root") cfg.user; PermissionsStartOnly = true; }; preStart = '' mkdir -m 0700 -p ${cfg.dataDir} - if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user} ${cfg.dataDir}; fi + install -D /dev/null ${cfg.pidFile} + if [ "$(id -u)" = 0 ]; then + chown -R ${cfg.user} ${cfg.dataDir}; + chown ${cfg.user} ${cfg.pidFile} + fi ''; }; From 8fc777ffd6bb9abebb4bf0d48f6e39e397668626 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 8 Sep 2014 22:17:56 +0200 Subject: [PATCH 276/323] syslog-ng module: Add package option --- nixos/modules/services/logging/syslog-ng.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 0b3f0cabb007..4a16b19134a0 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -18,7 +18,7 @@ let syslogngOptions = [ "--foreground" - "--module-path=${concatStringsSep ":" (["${pkgs.syslogng}/lib/syslog-ng"] ++ cfg.extraModulePaths)}" + "--module-path=${concatStringsSep ":" (["${cfg.package}/lib/syslog-ng"] ++ cfg.extraModulePaths)}" "--cfgfile=${syslogngConfig}" "--control=${ctrlSocket}" "--persist-file=${persistFile}" @@ -37,6 +37,13 @@ in { Whether to enable the syslog-ng daemon. ''; }; + package = mkOption { + type = types.package; + default = pkgs.syslogng; + description = '' + The package providing syslog-ng binaries. + ''; + }; serviceName = mkOption { type = types.str; default = "syslog-ng"; @@ -77,7 +84,7 @@ in { Sockets = "syslog.socket"; StandardOutput = "null"; Restart = "on-failure"; - ExecStart = "${pkgs.syslogng}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; + ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; }; }; }; From 719b910eb3789055bbda8b8d7a9202990a943cd4 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 17 Sep 2014 19:55:45 +0200 Subject: [PATCH 277/323] Added httptunnel package. --- pkgs/tools/networking/httptunnel/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/httptunnel/default.nix diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix new file mode 100644 index 000000000000..c47dd03cb9d0 --- /dev/null +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.3"; + name = "httptunnel-${version}"; + + src = fetchurl { + url = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz"; + sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; + }; + + meta = with stdenv.lib; { + description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; + homepage = http://www.nocrew.org/software/httptunnel; + license = licenses.gpl2; + maintainers = with maintainers; [ koral ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4258a96503f5..428a3fc0effb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1349,6 +1349,8 @@ let httpfs2 = callPackage ../tools/filesystems/httpfs { }; + httptunnel = callPackage ../tools/networking/httptunnel { }; + # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl', # which no longer exists. # From d7124e8c3455210ebb645e2883775166745ba26a Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 17 Sep 2014 20:28:14 +0200 Subject: [PATCH 278/323] wicd: add urwid and curses to PYTHONPATH of wicd-curses --- pkgs/tools/networking/wicd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index e0537c8e1fa7..a32654696be7 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; From 17d7f653c34e41e03b0550d7c4123cf1d6e4d249 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Wed, 17 Sep 2014 20:58:09 +0200 Subject: [PATCH 279/323] Make emulator script run without tools in path --- pkgs/development/mobile/androidenv/emulate-app.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 278c073dc586..cad77ec7d62c 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { # Create a virtual android device for testing if it does not exists - if [ "$(android list avd | grep 'Name: device')" = "" ] + if [ "$(${androidsdkComposition}/libexec/android-sdk-*/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS @@ -106,7 +106,7 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - if [ -z "${package}" ] || [ "$(adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] + if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then From 31fa7222185fdcc64db1ffaa00cd8b1b8ac86f02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Sep 2014 20:53:30 +0200 Subject: [PATCH 280/323] Re-generate Haskell packages with cabal2nix. --- pkgs/development/libraries/haskell/ShellCheck/default.nix | 3 ++- .../libraries/haskell/pdf-toolbox-content/default.nix | 2 ++ .../development/libraries/haskell/pdf-toolbox-core/default.nix | 2 ++ .../libraries/haskell/pdf-toolbox-document/default.nix | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/ShellCheck/default.nix b/pkgs/development/libraries/haskell/ShellCheck/default.nix index 7f15fa6b30c4..8beca12325b8 100644 --- a/pkgs/development/libraries/haskell/ShellCheck/default.nix +++ b/pkgs/development/libraries/haskell/ShellCheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, json, mtl, parsec, QuickCheck, regexCompat }: cabal.mkDerivation (self: { @@ -15,4 +17,3 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; }; }) - diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix index fd43a0452db8..f9f631827d89 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base16Bytestring, ioStreams, pdfToolboxCore , text }: diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix index be55101fc2cb..bfccb645fbb2 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, errors, ioStreams, transformers, zlibBindings }: diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix index dc1e96823b35..b62d3e92e5ef 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cipherRc4, cryptohash, ioStreams, pdfToolboxContent , pdfToolboxCore, text, transformers }: From 89438059ab3e11691cbe8f24ab9e5612dcfbb5f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Sep 2014 20:54:05 +0200 Subject: [PATCH 281/323] haskell-git-annex: update to version 5.20140915 --- .../git-and-tools/git-annex/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 601e065bfff0..bf5b8d51c374 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -7,18 +7,18 @@ , hamlet, hinotify, hS3, hslogger, httpClient, httpConduit , httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl , network, networkInfo, networkMulticast, networkProtocolXmpp -, openssh, optparseApplicative, pathPieces, perl, QuickCheck -, random, regexTdfa, rsync, SafeSemaphore, securemem, SHA -, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun -, text, time, transformers, unixCompat, utf8String, uuid, wai -, waiExtra, warp, warpTls, which, xmlTypes, yesod, yesodCore -, yesodDefault, yesodForm, yesodStatic +, networkUri, openssh, optparseApplicative, pathPieces, perl +, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem +, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck +, tastyRerun, text, time, transformers, unixCompat, utf8String +, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod +, yesodCore, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140831"; - sha256 = "0s2pc8bm3c79dsbafwp2pc5yghzh6vdzs9sj0mfq6rxiv27wrrwq"; + version = "5.20140915"; + sha256 = "0csd16vqmr4s6x627ikkl8dz6hvr2grqkzjxh0hbkqrirfsxj0kk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -27,11 +27,11 @@ cabal.mkDerivation (self: { dlist dns editDistance exceptions fdoNotify feed filepath gnutls hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes IfElse json MissingH monadControl mtl network networkInfo - networkMulticast networkProtocolXmpp optparseApplicative pathPieces - QuickCheck random regexTdfa SafeSemaphore securemem SHA shakespeare - stm tasty tastyHunit tastyQuickcheck tastyRerun text time - transformers unixCompat utf8String uuid wai waiExtra warp warpTls - xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic + networkMulticast networkProtocolXmpp networkUri optparseApplicative + pathPieces QuickCheck random regexTdfa SafeSemaphore securemem SHA + shakespeare stm tasty tastyHunit tastyQuickcheck tastyRerun text + time transformers unixCompat utf8String uuid wai waiExtra warp + warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fAssistant -fProduction"; @@ -48,6 +48,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; - broken = true; }; }) From a4e643a5fe85d778e0030115915a71aa56f57b91 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 17 Sep 2014 21:10:51 +0200 Subject: [PATCH 282/323] opencv: update 2.4.7 -> 2.4.9 --- pkgs/development/libraries/opencv/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 7dafcfce9481..45ac75340b12 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg -, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages +, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip , enableBloat ? false }: -let v = "2.4.7"; in +let v = "2.4.9"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz"; - sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4"; + url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip"; + sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40"; }; buildInputs = - [ libjpeg libpng libtiff ] + [ unzip libjpeg libpng libtiff ] ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; nativeBuildInputs = [ cmake pkgconfig ]; From 784ceea75de38ece4a17844f9086cf70ae8b30a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 17 Sep 2014 21:36:30 +0200 Subject: [PATCH 283/323] python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix --- pkgs/top-level/python-packages-generated.nix | 2 +- pkgs/top-level/python-packages.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 247d18680d96..bb6be68fa9a5 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -3670,7 +3670,7 @@ in md5 = "d5d886088e78b1bdbfd66d328fc2d0bc"; }; doCheck = false; - buildInputs = [ ]; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index 74e092d309a9..7ef83ef9072a 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -89,6 +89,10 @@ "Products.DCWorkflow": { "propagatedBuildInputs": [ "eggtestinfo" ] }, + "lxml": { + "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], + "doCheck": false + }, "Products.CMFDefault": { "propagatedBuildInputs": [ "eggtestinfo" ] }, From 4671e59576baaebcba0ad95920b57f5a4a8af6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 17 Sep 2014 21:40:18 +0200 Subject: [PATCH 284/323] python34Packages.sympy: disable due to test failures --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb6280aa39d1..96dfd267db34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7839,6 +7839,7 @@ let sympy = buildPythonPackage rec { name = "sympy-0.7.4"; + disabled = isPy34; # some tests fail src = fetchurl { url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz"; From 55909ad36bf9a1d92a0031f3b0faf1bfcc15327e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Mon, 8 Sep 2014 03:29:56 +0200 Subject: [PATCH 285/323] dvdisaster: new package dvdisaster: new package --- pkgs/tools/cd-dvd/dvdisaster/default.nix | 29 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/cd-dvd/dvdisaster/default.nix diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix new file mode 100644 index 000000000000..b54f342b3454 --- /dev/null +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, which, gettext, intltool +, glib, gtk2 +}: + +stdenv.mkDerivation rec { + name = "dvdisaster-0.72.6"; + + src = fetchurl { + url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; + sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b"; + }; + + postPatch = '' + patchShebangs ./ + ''; + + buildInputs = [ + pkgconfig which gettext intltool + glib gtk2 + ]; + + meta = { + homepage = http://dvdisaster.net/; + description = + "Stores data on CD/DVD/BD in a way that it is fully recoverable even " + + "after some read errors have developed"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4258a96503f5..027f53edae56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -968,6 +968,8 @@ let duply = callPackage ../tools/backup/duply { }; + dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { }; + dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { }; dvgrab = callPackage ../tools/video/dvgrab { }; From 6fc7efa7b3529f6358ea7083f6d1782f20a5ad98 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 17 Sep 2014 23:25:10 +0200 Subject: [PATCH 286/323] add mathematica 10 (slightly borked but runs) --- .../science/math/mathematica/9.nix | 124 ++++++++++++++++++ .../science/math/mathematica/default.nix | 28 ++-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/science/math/mathematica/9.nix diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix new file mode 100644 index 000000000000..d4d352c95bbb --- /dev/null +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -0,0 +1,124 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, alsaLib +, fontconfig +, freetype +, gcc +, glib +, libpng +, ncurses +, opencv +, openssl +, unixODBC +, xlibs +, zlib +}: + +let + platform = + if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then + "Linux" + else + throw "Mathematica requires i686-linux or x86_64 linux"; +in +stdenv.mkDerivation rec { + + name = "mathematica-9.0.0"; + + src = requireFile rec { + name = "Mathematica_9.0.0_LINUX.sh"; + message = '' + This nix expression requires that Mathematica_9.0.0_LINUX.sh is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q"; + }; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + fontconfig + freetype + gcc.gcc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + ] ++ (with xlibs; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ldpath}" \ + "$f" + patchelf --shrink-rpath "$f" + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = "http://www.wolfram.com/mathematica/"; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d4d352c95bbb..2f11144bad40 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -14,6 +14,8 @@ , unixODBC , xlibs , zlib +, libxml2 +, libuuid }: let @@ -24,17 +26,18 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { + version = "10.0.1"; - name = "mathematica-9.0.0"; + name = "mathematica-${version}"; src = requireFile rec { - name = "Mathematica_9.0.0_LINUX.sh"; + name = "Mathematica_${version}_LINUX.sh"; message = '' - This nix expression requires that Mathematica_9.0.0_LINUX.sh is + This nix expression requires that ${name} is already part of the store. Find the file on your Mathematica CD and add it to the nix store with nix-store --add-fixed sha256 . ''; - sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q"; + sha256 = "1514qy5kbyislv8j7ryw8021k26y0z6dndliwy8hfi7w7kgb3ynq"; }; buildInputs = [ @@ -51,6 +54,8 @@ stdenv.mkDerivation rec { opencv openssl unixODBC + libxml2 + libuuid ] ++ (with xlibs; [ libX11 libXext @@ -59,6 +64,11 @@ stdenv.mkDerivation rec { libXmu libXrender libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM ]); ldpath = stdenv.lib.makeLibraryPath buildInputs @@ -92,11 +102,13 @@ stdenv.mkDerivation rec { : elif [ "$type" == "EXEC" ]; then echo "patching $f executable <<" - patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "${ldpath}" \ - "$f" patchelf --shrink-rpath "$f" + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 elif [ "$type" == "DYN" ]; then echo "patching $f library <<" patchelf \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 027f53edae56..751af7da5eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11204,6 +11204,7 @@ let openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { }; mathematica = callPackage ../applications/science/math/mathematica { }; + mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; sage = callPackage ../applications/science/math/sage { }; From a70ecf479798b07ebfc120edc83392a9e93d4de5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 17 Sep 2014 22:07:58 -0400 Subject: [PATCH 287/323] strongswan: build with clang Fixes https://lists.strongswan.org/pipermail/users/2014-September/006597.html --- pkgs/tools/networking/strongswan/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 01b96e2ab4a0..0187f2ba5167 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "OpenSource IPsec-based VPN Solution"; homepage = https://www.strongswan.org; license = stdenv.lib.licenses.gpl2Plus; + inherit (stdenv.gcc.clang.meta) platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a8c95b376f1..c2fb333898ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2246,7 +2246,7 @@ let stunnel = callPackage ../tools/networking/stunnel { }; - strongswan = callPackage ../tools/networking/strongswan { }; + strongswan = callPackage ../tools/networking/strongswan { stdenv = clangStdenv; }; su = shadow.su; From 960fdf0f2eda40d137375f6680a5f106123512fa Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Thu, 18 Sep 2014 08:06:12 +0200 Subject: [PATCH 288/323] clamav: add myself to lib.maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1cbef21daeff..881a22e92df4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -103,6 +103,7 @@ relrod = "Ricky Elrod "; rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; + robberer = "Longrin Wischnewski " roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; From 14b2b311138efb9854cdf0e65b9cf9480ee6b0a4 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Thu, 18 Sep 2014 08:08:48 +0200 Subject: [PATCH 289/323] clamav: add myself as a maintainer --- pkgs/tools/security/clamav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index f5c4a4e9b4e6..7dc13b3d11b2 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.robberer ]; platforms = platforms.linux; }; } From 23db66e792787eaf0ef525a8b977c57186ee1fde Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Thu, 18 Sep 2014 08:24:55 +0200 Subject: [PATCH 290/323] keepnote: add myself as a maintainer --- pkgs/applications/office/keepnote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 409da36b2640..8c3cabef9549 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -18,5 +18,6 @@ buildPythonPackage { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ maintainers.robberer ]; }; } From e0479f3489ebd7e428fbb45c84191c17afc7eeb8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Sep 2014 00:48:31 -0700 Subject: [PATCH 291/323] gtest: Update meta --- pkgs/development/libraries/gtest/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index a59e3d07cb44..787cd4066c0a 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -24,11 +24,12 @@ stdenv.mkDerivation rec { cp -v -r ../src $out ''; - meta = { + meta = with stdenv.lib; { description = "Google test: Google's framework for writing C++ tests."; homepage = https://code.google.com/p/googletest/; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.zoomulator ]; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ zoomulator ]; }; } From 5dff5ede0a4cd2aa74934588ac06c56e78a9acfb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Sep 2014 00:48:53 -0700 Subject: [PATCH 292/323] protobuf: 2.5.0 -> 2.6.0 --- .../libraries/protobuf/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index bba8481780a5..874c58c6bf6c 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,28 +1,28 @@ -{ fetchurl, stdenv, zlib }: +{ stdenv, fetchFromGitHub, autoreconfHook, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.5.0"; + name = "protobuf-${version}"; + version = "2.6.0"; - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + sha256 = "020a59x9kbrbhh207j62gw55pj7p5rvz01i6ml6xhpcghp7l50b4"; }; - buildInputs = [ zlib ]; + buildInputs = [ autoreconfHook zlib ]; - doCheck = true; - - meta = { + meta = with stdenv.lib; { + homepage = http://code.google.com/p/protobuf/; description = "Protocol Buffers - Google's data interchange format"; - longDescription = '' Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; - - license = "mBSD"; - - homepage = http://code.google.com/p/protobuf/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From b2600df4a86e561aa8e66475299e5aad399f3f3b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Sep 2014 00:49:08 -0700 Subject: [PATCH 293/323] protobuf-c: 0.15 -> 1.0.2 --- .../libraries/protobufc/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index 58c639ee604c..4d2c1d4349fc 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,22 +1,23 @@ -{ fetchurl, stdenv, zlib, protobuf }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, protobuf, zlib }: stdenv.mkDerivation rec { - name = "protobuf-c-0.15"; + name = "protobuf-c-${version}"; + version = "1.0.2"; - src = fetchurl { - url = "http://protobuf-c.googlecode.com/files/${name}.tar.gz"; - sha256 = "0dh0180lzqk6n1r0qk38kgdy4x15mpkg5j4g2r31qhx52f757jwg"; + src = fetchFromGitHub { + owner = "protobuf-c"; + repo = "protobuf-c"; + rev = "v${version}"; + sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz"; }; - buildInputs = [ protobuf ]; + buildInputs = [ autoreconfHook pkgconfig protobuf zlib ]; - doCheck = true; - - meta = { + meta = with stdenv.lib; { + homepage = http://github.com/protobuf-c/protobuf-c/; description = "C bindings for Google's Protocol Buffers"; - - license = "BSD"; - - homepage = http://code.google.com/p/protobuf-c/; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From 8f8f99bcc8966c4faf45ff1a77c756cdf136fb98 Mon Sep 17 00:00:00 2001 From: lethalman Date: Thu, 18 Sep 2014 10:44:01 +0200 Subject: [PATCH 294/323] Revert "keepnote: add myself as a maintainer" --- pkgs/applications/office/keepnote/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 8c3cabef9549..409da36b2640 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -18,6 +18,5 @@ buildPythonPackage { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ maintainers.robberer ]; }; } From fc265a85aab1ecc0c64255335274a255d04c685d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 10:47:01 +0200 Subject: [PATCH 295/323] Fix evaluation --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 881a22e92df4..d5e6a52c7674 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -103,7 +103,7 @@ relrod = "Ricky Elrod "; rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; - robberer = "Longrin Wischnewski " + robberer = "Longrin Wischnewski "; roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; From 6e6dc04a6b420568ed799420f481cf23615d2ccc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 11:00:26 +0200 Subject: [PATCH 296/323] awesome 3.4: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac7d68b2f53..7d531687c05b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8453,6 +8453,7 @@ let awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { cairo = cairo.override { xcbSupport = true; }; + lua = lua5_1; }; awesome-3-5 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; From 05e2859ab60dfd604a1ad26d92c5cb4e3de0191a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 18 Sep 2014 11:18:25 +0200 Subject: [PATCH 297/323] gem-nix: change platforms to unix, tested on OS X --- pkgs/tools/package-management/gem-nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/gem-nix/default.nix b/pkgs/tools/package-management/gem-nix/default.nix index de5f3a9e0444..e048122b287f 100644 --- a/pkgs/tools/package-management/gem-nix/default.nix +++ b/pkgs/tools/package-management/gem-nix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "gem nix command in a nice wrapper"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.iElectric ]; }; } From bca4fa5fc0a3a4316dff71f3f8747d8a813e29b4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 11:09:09 +0200 Subject: [PATCH 298/323] asc: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d531687c05b..6291c59cc104 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10530,7 +10530,7 @@ let anki = callPackage ../games/anki { }; asc = callPackage ../games/asc { - lua = lua5; + lua = lua5_1; libsigcxx = libsigcxx12; }; From 0ce741f571ba212f21194295472f70e46cebb043 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 11:09:23 +0200 Subject: [PATCH 299/323] eiskaltdcpp: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6291c59cc104..93337fa68427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9814,7 +9814,7 @@ let qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { }; + eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; qemu = callPackage ../applications/virtualization/qemu { }; From 8e2e4216ba09cc0412c9f3d1a1b8076e77827be8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 12:16:12 +0200 Subject: [PATCH 300/323] boehm-gc: Support --enable-large-config --- pkgs/development/libraries/boehm-gc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index cc047da2758c..68b1fb1c9ba4 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl, enableLargeConfig ? false }: stdenv.mkDerivation rec { name = "boehm-gc-7.2f"; @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; - configureFlags = "--enable-cplusplus"; + configureFlags = + [ "--enable-cplusplus" ] + ++ lib.optional enableLargeConfig "--enable-large-config"; doCheck = true; From 97a8e959b4962571b2bdc15f7351ea035406f99c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 12:16:47 +0200 Subject: [PATCH 301/323] Remove some ISOs --- nixos/release.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 0207742e946c..243e2b849356 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -149,12 +149,6 @@ in rec { inherit system; }); - iso_graphical_new_kernel = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix; - type = "graphical-new-kernel"; - inherit system; - }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forAllSystems (system: From 634e9ab4f8e700d12bd65e86ec7f0cb7315d61ba Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 12:00:18 +0200 Subject: [PATCH 302/323] love: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93337fa68427..a929ee02b4b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3668,7 +3668,7 @@ let kona = callPackage ../development/interpreters/kona {}; - love = callPackage ../development/interpreters/love {lua=lua5;}; + love = callPackage ../development/interpreters/love {lua=lua5_1;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; From 979206c0b195bc9fb98cdc76f5947795bcc378db Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 12:00:29 +0200 Subject: [PATCH 303/323] mysqlWorkbench: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a929ee02b4b9..82f951284173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11596,7 +11596,7 @@ let lkproof = callPackage ../tools/typesetting/tex/lkproof { }; mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { - lua = lua5; + lua = lua5_1; inherit (pythonPackages) pexpect paramiko; }; From a87e5507c084364f6f974bf8ada9d720d485a358 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Sep 2014 14:37:49 +0400 Subject: [PATCH 304/323] More specific Ocsigen license checked by FlorentBecker --- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 6f68958aeab1..e33d40373796 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; - license = "LGPL"; # <- todo: check + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; From b851e970daee1cd4a6b6977c9f67ed16cefc1229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 18 Sep 2014 13:12:01 +0200 Subject: [PATCH 305/323] Revert "protobuf: 2.5.0 -> 2.6.0" This reverts commit 5dff5ede0a4cd2aa74934588ac06c56e78a9acfb. --- .../libraries/protobuf/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 874c58c6bf6c..bba8481780a5 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib }: +{ fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; - version = "2.6.0"; + name = "protobuf-2.5.0"; - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "020a59x9kbrbhh207j62gw55pj7p5rvz01i6ml6xhpcghp7l50b4"; + src = fetchurl { + url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; - buildInputs = [ autoreconfHook zlib ]; + buildInputs = [ zlib ]; - meta = with stdenv.lib; { - homepage = http://code.google.com/p/protobuf/; + doCheck = true; + + meta = { description = "Protocol Buffers - Google's data interchange format"; + longDescription = '' Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + + license = "mBSD"; + + homepage = http://code.google.com/p/protobuf/; }; } From 4742c886dd7b03763f90e12d80f3b16eedd96b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 18 Sep 2014 13:53:40 +0200 Subject: [PATCH 306/323] libtoxcore: disable tests for now --- pkgs/development/libraries/libtoxcore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index b5665fe402e7..c562467802f1 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libvpx check libconfig pkgconfig ]; - doCheck = true; + doCheck = false; # certian tests fail, upstream advice is to wait meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; From cee221bc8480fdf56f8dbef085d0fad9b4f93868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 18 Sep 2014 14:03:16 +0200 Subject: [PATCH 307/323] setuptools: 2.1 -> 5.8 --- pkgs/development/python-modules/setuptools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index e33c815d23bc..4649bc5a2a7a 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "2.1"; + version = "5.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "1m8qjvj5bfbphdags5s6pgmvk3xnw509lgdlq9whkq5a9mgxf8m7"; + sha256 = "15h643gf821b72d0s59cjj60c6dm5l57rggv5za9d05mccp3psff"; }; buildInputs = [ python wrapPython distutils-cfg ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - doCheck = stdenv.system != "x86_64-darwin"; + doCheck = false; # requires pytest checkPhase = '' ${python}/bin/${python.executable} setup.py test From 47761617d08390a6dd8e63d8e8d212fd094b8efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 18 Sep 2014 14:21:55 +0200 Subject: [PATCH 308/323] python33Packages.sqlalchemy_imageattach: disable --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96dfd267db34..9582bea65301 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8251,12 +8251,13 @@ let sqlalchemy_imageattach = buildPythonPackage rec { name = "SQLAlchemy-ImageAttach-${version}"; - version = "0.8.1"; + version = "0.8.2"; + disabled = isPy33; src = fetchgit { url = https://github.com/crosspop/sqlalchemy-imageattach.git; rev = "refs/tags/${version}"; - md5 = "051dd9de0757714d33c3ecd5ab37b97d"; + md5 = "cffdcde30952176e35fccf385f579dda"; }; buildInputs = [ pytest webob pkgs.imagemagick nose ]; From e8c2159809428a5f4d6abcfe153cd82d6bda5d78 Mon Sep 17 00:00:00 2001 From: wyvie Date: Thu, 18 Sep 2014 17:17:06 +0400 Subject: [PATCH 309/323] Added lua-filesystem module built with lua-5.1 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f951284173..47657c5864c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3687,6 +3687,7 @@ let }; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {}; + lua51_filesystem = lua5_filesystem.override { lua5=lua5_1; }; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; luarocks = callPackage ../development/tools/misc/luarocks { From ec4f38c56f0a7dfc9b2f9db111250f925e009c7d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 16:12:36 +0200 Subject: [PATCH 310/323] Manual: Remove some option defaults that refer to store paths Option defaults should not refer to store paths, because they cause the manual to be rebuilt gratuitously. It's especially bad to refer to a highly variable path like a computed configuration file. --- nixos/modules/config/pulseaudio.nix | 5 ++- nixos/modules/services/hardware/pommed.nix | 38 ++++++++++--------- .../services/x11/display-managers/default.nix | 7 +++- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index fb5715022b78..297b3a82d6c1 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -71,8 +71,7 @@ in { }; configFile = mkOption { - type = types.uniq types.path; - default = "${cfg.package}/etc/pulse/default.pa"; + type = types.path; description = '' The path to the configuration the PulseAudio server should use. By default, the "default.pa" configuration @@ -112,6 +111,8 @@ in { target = "pulse/client.conf"; source = clientConf; }; + + hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa"; } (mkIf cfg.enable { diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix index 04db46999b0a..a24557b40ba1 100644 --- a/nixos/modules/services/hardware/pommed.nix +++ b/nixos/modules/services/hardware/pommed.nix @@ -4,30 +4,34 @@ with lib; { - options.services.hardware.pommed = { - enable = mkOption { - default = false; - description = '' - Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. - ''; + options = { + + services.hardware.pommed = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. + ''; + }; + + configFile = mkOption { + type = types.path; + description = '' + The path to the pommed.conf file. + ''; + }; }; - configFile = mkOption { - default = "${pkgs.pommed}/etc/pommed.conf"; - description = '' - The contents of the pommed.conf file. - ''; - }; }; config = mkIf config.services.hardware.pommed.enable { environment.systemPackages = [ pkgs.polkit ]; - environment.etc = [ - { source = config.services.hardware.pommed.configFile; - target = "pommed.conf"; - } - ]; + environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile; + + services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf"; services.dbus.packages = [ pkgs.pommed ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 6e61576f501f..004ea6ef49ac 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -169,7 +169,6 @@ in xserverBin = mkOption { type = types.path; - default = "${xorg.xorgserver}/bin/X"; description = "Path to the X server used by display managers."; }; @@ -280,4 +279,10 @@ in }; + config = { + + services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X"; + + }; + } From 9b66e1f7b1450adefbe60b7a4bdd7795caae277a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 16:21:00 +0200 Subject: [PATCH 311/323] Fix the manual jobs --- nixos/release.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 243e2b849356..b3039afb18c1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -80,14 +80,17 @@ let }; - makeClosure = module: forAllSystems (system: scrubDrv (import ./lib/eval-config.nix { + makeClosure = module: buildFromConfig module (config: config.system.build.toplevel); + + + buildFromConfig = module: sel: forAllSystems (system: scrubDrv (sel (import ./lib/eval-config.nix { inherit system; - modules = [ module ] ++ lib.singleton + modules = [ module versionModule ] ++ lib.singleton ({ config, lib, ... }: { fileSystems."/".device = lib.mkDefault "/dev/sda1"; boot.loader.grub.device = lib.mkDefault "/dev/sda"; }); - }).config.system.build.toplevel); + }).config)); in rec { @@ -124,9 +127,9 @@ in rec { }; - manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual); - manualPDF = iso_minimal.x86_64-linux.config.system.build.manual.manualPDF; - manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages); + manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); + manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux; + manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); iso_minimal = forAllSystems (system: makeIso { From eca58fd02f7648fe19fd737f7ce543967b8e8ebf Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 16:22:25 +0200 Subject: [PATCH 312/323] vimNox: fix after lua upgrade for ZHF --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47657c5864c8..95305f7b71a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10203,7 +10203,7 @@ let libICE; features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; + lua = pkgs.lua5_1; gui = config.vim.gui or "auto"; # optional features by flags From d9bd04b90c7424e2dc0c95e3bbdbf7d72ce059d1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 18 Sep 2014 17:06:58 +0200 Subject: [PATCH 313/323] Revert "spiped: 1.3.1 -> 1.4.0" This reverts commit 792afca11318aaac0715f343d7454ea4933a932a. Version 1.4.0 failed to build. --- pkgs/tools/networking/spiped/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index f854b92b87e5..ac2736ffb19e 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spiped-${version}"; - version = "1.4.0"; + version = "1.3.1"; src = fetchurl { url = "http://www.tarsnap.com/spiped/${name}.tgz"; - sha256 = "0pyg1llnqgfx7n7mi3dq4ra9xg3vkxlf01z5jzn7ncq5d6ii7ynq"; + sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a"; }; buildInputs = [ openssl ]; From c60bd6e435adeb623e88fb644b5b038ece8e3936 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 18 Sep 2014 17:41:36 +0200 Subject: [PATCH 314/323] dog-1.7: added potential cat replacement --- pkgs/tools/system/dog/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/system/dog/default.nix diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix new file mode 100644 index 000000000000..9c98da6ac85b --- /dev/null +++ b/pkgs/tools/system/dog/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "dog-1.7"; + + src = fetchurl { + url = "http://archive.debian.org/debian/pool/main/d/dog/dog_1.7.orig.tar.gz"; + sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + cp dog.1 $out/man/man1 + cp dog $out/bin + ''; + + meta = { + homepage = "http://lwn.net/Articles/421072/"; + description = "a cat replacement"; + license="GPLv2+"; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 200881c916a6..4653d1f6cb94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,6 +915,8 @@ let inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; }; + dog = callPackage ../tools/system/dog { }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; From 092235bde6529b961ff01c01ae76aa78669a4bca Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 18 Sep 2014 17:42:04 +0200 Subject: [PATCH 315/323] Add screenkey to screencast your keys --- pkgs/top-level/python-packages.nix | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57032cf2ec4d..03e4e7d37da2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9777,6 +9777,37 @@ rec { }; }; + screenkey = buildPythonPackage rec { + version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6"; + name = "screenkey-${version}"; + + propagatedBuildInputs = [ pygtk distutils_extra xlib pkgs.xorg.xmodmap ]; + + preConfigure = '' + substituteInPlace setup.py --replace "/usr/share" "./share" + + # disable the feature that binds a shortcut to turning on/off + # screenkey. This is because keybinder is not packages in Nix as + # of today. + substituteInPlace Screenkey/screenkey.py \ + --replace "import keybinder" "" \ + --replace " keybinder.bind(self.options['hotkey'], self.hotkey_cb, show_item)" "" + ''; + + src = fetchgit { + url = https://github.com/scs3jb/screenkey.git; + rev = "b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6"; + sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/scs3jb/screenkey; + description = "A screencast tool to show your keys"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ maintainers.DamienCassou ]; + platforms = platforms.linux; + }; + }; tarman = buildPythonPackage rec { version = "0.1.3"; From e38d7cbfb264ee42f31b3a0bd7171a38e10a7091 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 18 Sep 2014 11:43:16 -0400 Subject: [PATCH 316/323] Fix the new Ruby interpreters (fixes #3509). Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present. This provides both files in a pure manner, and also deletes the download script to prevent any future confusion. --- pkgs/development/interpreters/ruby/config.nix | 6 ++++++ pkgs/development/interpreters/ruby/ruby-2.1.0.nix | 10 +++++++++- pkgs/development/interpreters/ruby/ruby-2.1.1.nix | 10 +++++++++- pkgs/development/interpreters/ruby/ruby-2.1.2.nix | 10 +++++++++- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/interpreters/ruby/config.nix diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix new file mode 100644 index 000000000000..c03c0520d7ae --- /dev/null +++ b/pkgs/development/interpreters/ruby/config.nix @@ -0,0 +1,6 @@ +# Ruby >= 2.1.0 tries to download config.{guess,sub} +fetchgit: fetchgit { + url = "git://git.sv.gnu.org/config.git"; + rev = "576c839acca0e082e536fd27568b90a446ce5b96"; + sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0"; +} diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index e0a9531d225d..fd0c278133bc 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchgit, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -12,6 +12,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; + config = import ./config.nix fetchgit; baseruby = ruby_2_1_0.override { useRailsExpress = false; }; in @@ -63,6 +64,13 @@ stdenv.mkDerivation rec { "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch" ]; + # Ruby >= 2.1.0 tries to download config.{guess,sub} + postPatch = '' + rm tool/config_files.rb + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + ''; + configureFlags = ["--enable-shared" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" # on darwin, we have /usr/include/tk.h -- so the configure script detects diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index 1a7a507f49c3..c60a6cb313d4 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchgit, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -12,6 +12,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; + config = import ./config.nix fetchgit; baseruby = ruby_2_1_1.override { useRailsExpress = false; }; in @@ -62,6 +63,13 @@ stdenv.mkDerivation rec { "${patchSet}/patches/ruby/2.1.0/railsexpress/11-backport-r44370.patch" ]; + # Ruby >= 2.1.0 tries to download config.{guess,sub} + postPatch = '' + rm tool/config_files.rb + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + ''; + configureFlags = ["--enable-shared" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" # on darwin, we have /usr/include/tk.h -- so the configure script detects diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index 62159cb97860..1738606bf140 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, fetchurl, fetchgit, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -12,6 +12,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; + config = import ./config.nix fetchgit; baseruby = ruby_2_1_2.override { useRailsExpress = false; }; in @@ -61,6 +62,13 @@ stdenv.mkDerivation rec { "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch" ]; + # Ruby >= 2.1.0 tries to download config.{guess,sub} + postPatch = '' + rm tool/config_files.rb + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + ''; + configureFlags = ["--enable-shared" ] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" # on darwin, we have /usr/include/tk.h -- so the configure script detects From dc86f52740690888d87f5fa65ae566b6e0746bbf Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 18 Sep 2014 18:06:49 +0200 Subject: [PATCH 317/323] dfc-3.0.4: a colored df -h replacement --- pkgs/tools/system/dfc/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/system/dfc/default.nix diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix new file mode 100644 index 000000000000..84150b468378 --- /dev/null +++ b/pkgs/tools/system/dfc/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, cmake, gettext}: + +stdenv.mkDerivation rec { + name = "dfc-3.0.4"; + + src = fetchurl { + url = "http://projects.gw-computing.net/attachments/download/79/dfc-3.0.4.tar.gz"; + sha256 = "0bdc2edb92c7f740a0b7d3fa75eb134adf197ba711bfa589ab51c691fabd617e"; + }; + + buildInputs = [ cmake gettext ]; + + meta = { + homepage = "http://projects.gw-computing.net/projects/dfc"; + description = "displays file system space usage using graphs and colors"; + license="free"; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 200881c916a6..5eb3e4f42d90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -883,6 +883,8 @@ let despotify = callPackage ../development/libraries/despotify { }; + dfc = callPackage ../tools/system/dfc { }; + dev86 = callPackage ../development/compilers/dev86 { }; dnsmasq = callPackage ../tools/networking/dnsmasq { }; From 4dce30e51040b18792ac32726a9d2696017e08f0 Mon Sep 17 00:00:00 2001 From: lostdj Date: Thu, 18 Sep 2014 20:21:26 +0400 Subject: [PATCH 318/323] tzdata: bump to 2014g. --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 90111cb52e19..6a4427bea404 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014e"; in +let version = "2014g"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1ic63ykplnrvh9704j6l089rais0nxw1lcf1dbc3iy2ij2kl7qh8"; + sha256 = "0w52hafnf82vy678rm8p39ckymcj6shv5376zwzzbxw2m6vxaism"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "074c98vmdgysgkksaqwkn1gbrlnzk8l28zs8lhif44a9mckc9ss3"; + sha256 = "0ymg0cscpbfj9jpnx4g9apmfrixq6z8dch99h6a77k2pmnj5ymfz"; }) ]; From 837a0c05e5c9c5ae3a4bc29fb1cbc4b26bceb077 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 18:48:28 +0200 Subject: [PATCH 319/323] httpd: Don't emit robots.txt if there are no robots entries --- .../web-servers/apache-httpd/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 9ac28373dacb..c452cd126ffb 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -208,16 +208,11 @@ let ''; - robotsTxt = pkgs.writeText "robots.txt" '' - ${# If this is a vhost, the include the entries for the main server as well. - if isMainServer then "" - else concatMapStrings (svc: svc.robotsEntries) mainSubservices} - ${concatMapStrings (svc: svc.robotsEntries) subservices} - ''; - - robotsConf = '' - Alias /robots.txt ${robotsTxt} - ''; + robotsTxt = + concatStringsSep "\n" ( + # If this is a vhost, the include the entries for the main server as well. + (if isMainServer then [] else map (svc: svc.robotsEntries) mainSubservices) + ++ (map (svc: svc.robotsEntries) subservices)); in '' ServerName ${serverInfo.canonicalName} @@ -245,7 +240,9 @@ let CustomLog ${mainCfg.logDir}/access_log-${cfg.hostName} ${cfg.logFormat} '' else ""} - ${robotsConf} + ${optionalString (robotsTxt != "") '' + Alias /robots.txt ${pkgs.writeText "robots.txt" robotsTxt} + ''} ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""} From 0de982d75bc0edddbd1dd61467eb6445eb561109 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 19:04:59 +0200 Subject: [PATCH 320/323] httpd: Add option for specifying robots.txt --- .../services/web-servers/apache-httpd/default.nix | 7 ++++--- .../apache-httpd/per-server-options.nix | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index c452cd126ffb..85458a2ab565 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -209,10 +209,11 @@ let ''; robotsTxt = - concatStringsSep "\n" ( + concatStringsSep "\n" (filter (x: x != "") ( # If this is a vhost, the include the entries for the main server as well. - (if isMainServer then [] else map (svc: svc.robotsEntries) mainSubservices) - ++ (map (svc: svc.robotsEntries) subservices)); + (if isMainServer then [] else [mainCfg.robotsEntries] ++ map (svc: svc.robotsEntries) mainSubservices) + ++ [cfg.robotsEntries] + ++ (map (svc: svc.robotsEntries) subservices))); in '' ServerName ${serverInfo.canonicalName} diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index b8e863345398..76f55a63e326 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -142,9 +142,19 @@ with lib; type = types.str; default = "common"; example = "combined"; - description = " + description = '' Log format for Apache's log files. Possible values are: combined, common, referer, agent. - "; + ''; + }; + + robotsEntries = mkOption { + type = types.lines; + default = ""; + example = "Disallow: /foo/"; + description = '' + Specification of pages to be ignored by web crawlers. See for details. + ''; }; } From 194419244d762ea2438ade730f2801652ea6b1c7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 18 Sep 2014 11:26:01 -0700 Subject: [PATCH 321/323] radvd: 2.6 -> 2.7 --- pkgs/tools/networking/radvd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index fa0a87099ae3..b1c116266f2f 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.6"; + name = "radvd-2.7"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1vp86a2jcrrbyc62rglby3nx11i8rz5bsxbh6bp6049a0s9m4k4r"; + sha256 = "09rzw96cjkzywadxmhbhaw52ahawzjp3pv7pblcsnb0mrwaawny0"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; From 7f7505c620ba89217cf81fe9d8c9a6f8594811bb Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 18 Sep 2014 20:41:54 +0200 Subject: [PATCH 322/323] dwarf-fortress: Bump to 0.40.13. --- pkgs/games/dwarf-fortress/df2014.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix index 300d7557e02b..64a3e5bc9755 100644 --- a/pkgs/games/dwarf-fortress/df2014.nix +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -8,13 +8,13 @@ let srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "4681508dd799aaf20b47c2ac0e9da18fa4876993"; - sha256 = "16495214a19742cb97351109b124ad9d691ee52bbb1b86c9c1907978734b5ca0"; + rev = "044b266ce3e03b54a4228d51d6b75d70963debc9"; + sha256 = "0xc839zmg1bqyrdirhy2ixm8i58q7nwhyi86h60qmrfdg3bsnnpr"; }; df = fetchurl { - url = "http://www.bay12games.com/dwarves/df_40_10_linux.tar.bz2"; - sha256 = "0hfm4395y0lacgsl7wqr6vwcw42pqm03xp7giqfk3mfsn32wqnm7"; + url = "http://www.bay12games.com/dwarves/df_40_13_linux.tar.bz2"; + sha256 = "1azsxgjc1fh8i041p6i7dmvdk0v3xpmhg44lmimlrs78a08h4z61"; }; }; @@ -23,7 +23,7 @@ in assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.40.10"; + name = "dwarf-fortress-0.40.13"; buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; From aa67e95bb5845323ed1b4b9c516b6efb762fc243 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Sep 2014 21:16:44 +0200 Subject: [PATCH 323/323] haskell-here: revert "new expression" This reverts commit 3e5bcdc327eb0347e15ffe2072b2b61f80218d32. The package doesn't compile. --- .../libraries/haskell/here/default.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/here/default.nix diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix deleted file mode 100644 index 5bb96384c882..000000000000 --- a/pkgs/development/libraries/haskell/here/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, haskellSrcMeta, mtl, parsec }: - -cabal.mkDerivation (self: { - pname = "here"; - version = "1.2.5"; - sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb"; - buildDepends = [ haskellSrcMeta mtl parsec ]; - meta = { - homepage = "https://github.com/tmhedberg/here"; - description = "Here docs & interpolated strings via quasiquotation"; - 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 b1c78ba59937..083d40384b6c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1105,8 +1105,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hedis = callPackage ../development/libraries/haskell/hedis {}; - here = callPackage ../development/libraries/haskell/here {}; - heredoc = callPackage ../development/libraries/haskell/heredoc {}; hexpat = callPackage ../development/libraries/haskell/hexpat {};