From 943fd93c14d4f54fd38ea95c53a5bd2108c57f67 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 7 Apr 2015 00:38:20 -0400 Subject: [PATCH 01/86] git-imerge: new package --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-imerge/default.nix | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-imerge/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b206fc671b5a..f492ae61d0ca 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -102,4 +102,6 @@ rec { git-extras = callPackage ./git-extras { }; git-cola = callPackage ./git-cola { }; + + git-imerge = callPackage ./git-imerge { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix new file mode 100644 index 000000000000..91180b33cde9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + name = "git-imerge-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; + sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; + }; + + buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + + installPhase = '' + mkdir -p $out/bin + make install PREFIX=$out + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mhagger/git-imerge; + description = "Perform a merge between two branches incrementally"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.spwhitt ]; + }; +} From 7532c5379d02fb012fa42190424a46bdb033efcc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 19 Apr 2015 12:09:32 +0300 Subject: [PATCH 02/86] ddclient: Force line buffering on stdout Status messages of ddclient go to stdout, which is block buffered by default, so most of its output won't appear in the journal until it is exiting: -- Reboot -- Apr 19 11:31:04 xen systemd[1]: Starting Dynamic DNS Client... Apr 19 11:31:04 xen systemd[1]: Started Dynamic DNS Client. Apr 19 11:31:53 xen systemd[1]: Stopping Dynamic DNS Client... Apr 19 11:31:53 xen ddclient[530]: === opt ==== Apr 19 11:31:53 xen ddclient[530]: opt{cache} : Apr 19 11:31:53 xen ddclient[530]: opt{cmd} : ... Fix this by adding a patch to set line buffering on stdout. --- .../ddclient-line-buffer-stdout.patch | 20 +++++++++++++++++++ pkgs/tools/networking/ddclient/default.nix | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch diff --git a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch new file mode 100644 index 000000000000..d1ef9e024d2a --- /dev/null +++ b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch @@ -0,0 +1,20 @@ +diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient +--- ddclient-3.8.1/ddclient 2011-07-11 23:04:21.000000000 +0200 ++++ ddclient-3.8.1.patched/ddclient 2012-11-08 11:52:31.930647236 +0100 +@@ -19,6 +19,7 @@ use strict; + use Getopt::Long; + use Sys::Hostname; + use IO::Socket; ++use IO::Handle qw( ); + + my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/; + +@@ -675,7 +676,7 @@ $SIG{'TERM'} = sub { $caught_term = 1; }; + $SIG{'KILL'} = sub { $caught_kill = 1; }; + # don't fork() if foreground or force is on + if (opt('foreground') || opt('force')) { +- ; ++ STDOUT->autoflush(1); + } elsif (opt('daemon')) { + $SIG{'CHLD'} = 'IGNORE'; + my $pid = fork; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index fdc5e145c4db..41688d843513 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -10,7 +10,7 @@ buildPerlPackage { buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; - patches = [ ./ddclient-foreground.patch ]; + patches = [ ./ddclient-foreground.patch ./ddclient-line-buffer-stdout.patch ]; # Use iproute2 instead of ifconfig preConfigure = '' From cdc7c6b916d5b1cbc0f507d416f7b825402cbd77 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 20 Apr 2015 03:32:12 -0300 Subject: [PATCH 03/86] ComicNeue: 1.1 -> 2.2 --- pkgs/data/fonts/comic-neue/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 91608d17db44..5d3da910e0b2 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl +, unzip }: stdenv.mkDerivation rec { - name = "comic-neue-1.1"; + name = "comic-neue-${version}"; + version = "2.2"; src = fetchurl { - url = "http://comicneue.com/comic-neue-1.1.zip"; - sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923"; + url = "http://comicneue.com/${name}.zip"; + sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" ]; sourceRoot = name; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name} + cp -v OTF/*.otf $out/share/fonts/opentype + cp -v Web/*.ttf $out/share/fonts/truetype + cp -v Web/*.eot $out/share/fonts/EOT + cp -v Web/*.woff $out/share/fonts/WOFF + cp -v Web/*.woff2 $out/share/fonts/WOFF2 + cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name} ''; meta = with stdenv.lib; { @@ -27,7 +34,8 @@ stdenv.mkDerivation rec { the latter angular terminals. Both variants come in Light, Regular, and Bold weights with Oblique variants. ''; - license = licenses.cc0; + license = licenses.ofl; platforms = platforms.all; + maintainers = [ maintainers.AndersonTorres ]; }; } From bba9d17e943540413fe4d1b47ede03ac7f74da04 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 15 Apr 2015 17:46:51 +0000 Subject: [PATCH 04/86] actkbd: add version 0.2.8 --- pkgs/tools/system/actkbd/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/system/actkbd/default.nix diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix new file mode 100644 index 000000000000..706b3700a415 --- /dev/null +++ b/pkgs/tools/system/actkbd/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "actkbd-0.2.8"; + + src = fetchurl { + url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2"; + sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm"; + }; + + preConfigure = '' + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace /etc $out/etc + ''; + + postInstall = '' + mkdir -p $out/share/doc/actkbd + cp -r README samples $out/share/doc/actkbd + ''; + + meta = with stdenv.lib; { + description = "A keyboard shortcut daemon"; + longDescription = '' + actkbd is a simple daemon that binds actions to keyboard events + directly on evdev interface (that is, no X11 required). It + recognises key combinations and can handle press, repeat and + release events. + ''; + license = licenses.gpl2; + homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ee71adff23e..fc06961bd8d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -475,6 +475,8 @@ let actdiag = pythonPackages.actdiag; + actkbd = callPackage ../tools/system/actkbd { }; + adom = callPackage ../games/adom { }; advancecomp = callPackage ../tools/compression/advancecomp {}; From 57ab189e7807ade1432a5c02599ed11a7ee9cc37 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 15 Apr 2015 17:48:38 +0000 Subject: [PATCH 05/86] nixos: add actkbd module and sound.enableMediaKeys option --- nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/alsa.nix | 27 +++++ nixos/modules/services/hardware/actkbd.nix | 130 +++++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 nixos/modules/services/hardware/actkbd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a9cce76ee91..e5da4fb2fb42 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -149,6 +149,7 @@ ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/hardware/acpid.nix + ./services/hardware/actkbd.nix ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix ./services/hardware/freefall.nix diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 653c0ed5d70b..c63f4dc8d7f1 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -33,6 +33,16 @@ in ''; }; + enableMediaKeys = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable volume and capture control with keyboard media keys. + + Enabling this will turn on . + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -80,6 +90,23 @@ in }; }; + services.actkbd = mkIf config.sound.enableMediaKeys { + enable = true; + bindings = [ + # "Mute" media key + { keys = [ 113 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Master toggle"; } + + # "Lower Volume" media key + { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; } + + # "Raise Volume" media key + { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; } + + # "Mic Mute" media key + { keys = [ 190 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Capture toggle"; } + ]; + }; + }; } diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix new file mode 100644 index 000000000000..82de362c371b --- /dev/null +++ b/nixos/modules/services/hardware/actkbd.nix @@ -0,0 +1,130 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.actkbd; + + configFile = pkgs.writeText "actkbd.conf" '' + ${concatMapStringsSep "\n" + ({ keys, events, attributes, command, ... }: + ''${concatMapStringsSep "+" toString keys}:${concatStringsSep "," events}:${concatStringsSep "," attributes}:${command}'' + ) + cfg.bindings} + ${cfg.extraConfig} + ''; + + bindingCfg = { config, ... }: { + options = { + + keys = mkOption { + type = types.listOf types.int; + description = "List of keycodes to match."; + }; + + events = mkOption { + type = types.listOf (types.enum ["key" "rep" "rel"]); + default = [ "key" ]; + description = "List of events to match."; + }; + + attributes = mkOption { + type = types.listOf types.str; + default = [ "exec" ]; + description = "List of attributes."; + }; + + command = mkOption { + type = types.str; + default = ""; + description = "What to run."; + }; + + }; + }; + +in + +{ + + ###### interface + + options = { + + services.actkbd = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the actkbd key mapping daemon. + + Turning this on will start an actkbd + instance for every evdev input that has at least one key + (which is okay even for systems with tiny memory footprint, + since actkbd normally uses <100 bytes of memory per + instance). + + This allows binding keys globally without the need for e.g. + X11. + ''; + }; + + bindings = mkOption { + type = types.listOf (types.submodule bindingCfg); + default = []; + example = lib.literalExample '' + [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; } + ] + ''; + description = '' + Key bindings for actkbd. + + See actkbd README for documentation. + + The example shows a piece of what does when enabled. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Literal contents to append to the end of actkbd configuration file. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "actkbd-udev-rules"; + destination = "/etc/udev/rules.d/61-actkbd.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="actkbd@$env{DEVNAME}.service" + ''; + }); + + systemd.services."actkbd@" = { + enable = true; + restartIfChanged = true; + unitConfig = { + Description = "actkbd on %I"; + ConditionPathExists = "%I"; + }; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.actkbd}/bin/actkbd -D -c ${configFile} -d %I"; + }; + }; + + }; + +} From 7c5dbbe23a422ece4a21a661aa86a256ca443c9c Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Fri, 24 Apr 2015 10:44:33 +0100 Subject: [PATCH 06/86] Add jython --- .../interpreters/jython/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/interpreters/jython/default.nix diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix new file mode 100644 index 000000000000..f9d6271e5d86 --- /dev/null +++ b/pkgs/development/interpreters/jython/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "jython-${version}"; + + version = "2.7-rc3"; + + src = fetchurl { + url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; + sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78"; + }; + + buildInputs = [ makeWrapper ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -pv $out/bin + cp $src $out/jython.jar + makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar" + ''; + + meta = { + description = "Python interpreter written in Java"; + homepage = http://jython.org/; + license = stdenv.lib.licenses.psfl; + platforms = jre.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69d9c417b19..bb5a68ec5acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4793,6 +4793,8 @@ let jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; jruby165 = callPackage ../development/interpreters/jruby { }; + + jython = callPackage ../development/interpreters/jython {}; guileCairo = callPackage ../development/guile-modules/guile-cairo { }; From cbf1c3ca22cd719c4462d138297edfdc168fbad4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:18:05 +0200 Subject: [PATCH 07/86] kubernetes: update to 0.15 --- .../networking/cluster/kubernetes/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c89ad0a51685..4eb4d8cc1ea9 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,25 +2,27 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; + sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; }; buildInputs = [ makeWrapper which go iptables rsync ]; - preBuild = "patchShebangs ./hack"; - - postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + buildPhase = '' + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + GOPATH=$(pwd) + patchShebangs ./hack + hack/build-go.sh --use_go_build + ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" - cp pause $out/bin/kube-pause ''; preFixup = '' From 6cb195a83d43531c465b6678ca6bd94ef205fea3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:18:25 +0200 Subject: [PATCH 08/86] nixos/kubernetes: fix module --- nixos/modules/services/cluster/kubernetes.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index d9ae0454ba5e..6a775bb159fc 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -224,7 +224,7 @@ in { machines = mkOption { description = "Kubernetes controller list of machines to schedule to schedule onto"; - default = []; + default = [config.networking.hostName]; type = types.listOf types.str; }; @@ -310,6 +310,12 @@ in { type = types.str; }; + master = mkOption { + description = "Kubernetes apiserver address"; + default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes proxy extra command line options."; default = ""; @@ -355,6 +361,7 @@ in { --secure_port=${toString cfg.apiserver.securePort} \ --portal_net=${cfg.apiserver.portalNet} \ --logtostderr=true \ + --runtime_config=api/v1beta3 \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; @@ -416,7 +423,6 @@ in { script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" exec ${cfg.package}/bin/kubelet \ - --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ @@ -443,7 +449,7 @@ in { after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ + --master=${cfg.proxy.master} \ --bind_address=${cfg.proxy.address} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ From 5984c04f1fbb07692ae3981b3a12ab32297df2e9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:38:05 +0200 Subject: [PATCH 09/86] nixos/ripple-data-api: add import mode option --- .../modules/services/misc/ripple-data-api.nix | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index 6e5ac7ab00bd..3b281449a256 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -43,6 +43,24 @@ in { type = types.int; }; + importMode = mkOption { + description = "Ripple data api import mode."; + default = "liveOnly"; + type = types.enum ["live" "liveOnly"]; + }; + + minLedger = mkOption { + description = "Ripple data api minimal ledger to fetch."; + default = null; + type = types.nullOr types.int; + }; + + maxLedger = mkOption { + description = "Ripple data api maximal ledger to fetch."; + default = null; + type = types.nullOr types.int; + }; + redis = { enable = mkOption { description = "Whether to enable caching of ripple data to redis."; @@ -129,6 +147,7 @@ in { serviceConfig = { ExecStart = "${pkgs.ripple-data-api}/bin/api"; + Restart = "always"; User = "ripple-data-api"; }; }; @@ -145,8 +164,15 @@ in { LOG_FILE = "/dev/null"; }; - serviceConfig = { - ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2"; + serviceConfig = let + importMode = + if cfg.minLedger != null && cfg.maxLedger != null then + "${toString cfg.minLedger} ${toString cfg.maxLedger}" + else + cfg.importMode; + in { + ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug"; + Restart = "always"; User = "ripple-data-api"; }; From 494d1820e3613f55c4f36304b9f2bf54975959ca Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 15:17:06 +0200 Subject: [PATCH 10/86] nixos/nginx: enable service/config reload --- nixos/modules/services/web-servers/nginx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0f21ef012639..fe50c182bfe5 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,7 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; RestartSec = "10s"; StartLimitInterval = "1min"; From 374000befd016165e181174f8e27f73dcda961ff Mon Sep 17 00:00:00 2001 From: Michael Alyn Miller Date: Sat, 25 Apr 2015 10:48:49 -0700 Subject: [PATCH 11/86] Add enableAdobeFlashDRM option to firefoxWrapper --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e406e5ff419..9ff6c33aa0f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12413,7 +12413,8 @@ let ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); + (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; From 60aa7bec6426be7ead41352a5d2c3d260937baaf Mon Sep 17 00:00:00 2001 From: Hendrik Bunke Date: Thu, 23 Apr 2015 12:41:05 +0200 Subject: [PATCH 12/86] python-packages: added geeknote and dependencies packages: geeknote, thrift, markdown2, evernote --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 91 ++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 547d458d1f68..d812338ca6b1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -90,6 +90,7 @@ goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + hbunke = "Hendrik Bunke "; henrytill = "Henry Till "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea0035b47922..71f9998ba141 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14994,4 +14994,95 @@ let }; }; + + markdown2 = buildPythonPackage rec { + name = "markdown2-${version}"; + version = "2.3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/markdown2/${name}.zip"; + sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8"; + }; + propagatedBuildInputs = with self; []; + meta = with stdenv.lib; { + description = "A fast and complete Python implementation of Markdown"; + homepage = https://github.com/trentm/python-markdown2; + license = licenses.mit; + maintainers = with maintainers; [ hbunke ]; + }; + }; + + + evernote = buildPythonPackage rec { + name = "evernote-${version}"; + version = "1.25.0"; + disabled = ! isPy27; #some dependencies do not work with py3 + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/evernote/${name}.tar.gz"; + sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d"; + }; + + propagatedBuildInputs = with self; [ oauth2 ]; + + meta = with stdenv.lib; { + description = "Evernote SDK for Python"; + homepage = http://dev.evernote.com; + license = licenses.asl20; + maintainers = with maintainers; [ hbunke ]; + }; + }; + + thrift = buildPythonPackage rec { + name = "thrift-${version}"; + version = "0.9.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/thrift/${name}.tar.gz"; + sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8"; + }; + + meta = with stdenv.lib; { + description = "Python bindings for the Apache Thrift RPC system"; + homepage = http://thrift.apache.org/; + license = licenses.asl20; + maintainers = with maintainers; [ hbunke ]; + + }; + }; + + geeknote = buildPythonPackage rec { + version = "2015-03-02"; + name = "geeknote-${version}"; + disabled = ! isPy27; + + src = pkgs.fetchFromGitHub { + owner = "VitaliyRodnenko"; + repo = "geeknote"; + rev = "7ea2255bb6"; + sha256 = "0lw3m8g7r8r7dxhqih08x0i6agd201q2ig35a59rd4vygr3xqw2j"; + }; + + /* build with tests fails with "Can not create application dirictory : + /homeless-shelter/.geeknotebuilder". */ + doCheck = false; + + propagatedBuildInputs = with self; [ + thrift + beautifulsoup4 + markdown2 + sqlalchemy + html2text + evernote + ]; + + meta = with stdenv.lib; { + description = "Work with Evernote from command line"; + homepage = http://www.geeknote.me; + license = licenses.gpl1; + maintainers = with maintainers; [ hbunke ]; + + }; + }; + }; in pythonPackages From 8b7a05cba615748379a81db3c3e82e7e419565ff Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 26 Apr 2015 14:51:50 -0400 Subject: [PATCH 13/86] firestr: initial package at 0.8 http://firestr.com/ --- .../networking/p2p/firestr/default.nix | 35 +++++++++++++++++++ .../networking/p2p/firestr/return.patch | 13 +++++++ pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/p2p/firestr/default.nix create mode 100644 pkgs/applications/networking/p2p/firestr/return.patch diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix new file mode 100644 index 000000000000..49d15f59c7fa --- /dev/null +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid, qt5 +, libXScrnSaver, openssl }: + +stdenv.mkDerivation { + name = "firestr-0.8"; + + buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ]; + + src = fetchFromGitHub { + owner = "mempko"; + repo = "firestr"; + rev = "f888890f71d49953d05bccdd27a1c4f6690e165c"; + sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb"; + }; + + patches = ./return.patch; + + postPatch = + '' + substituteInPlace CMakeLists.txt \ + --replace "set(Boost_USE_STATIC_LIBS on)" "" \ + --replace "/usr/include/botan" "${botan}/include/botan" \ + --replace "libopus.a" "libopus.so" \ + --replace "libsnappy.a" "libsnappy.so" \ + --replace "libbotan-1.10.a" "libbotan-1.10.so.0" + ''; + + meta = with stdenv.lib; + { description = "Grass computing platform"; + homepage = http://firestr.com/; + license = licenses.gpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/firestr/return.patch b/pkgs/applications/networking/p2p/firestr/return.patch new file mode 100644 index 000000000000..c3e469ae92b0 --- /dev/null +++ b/pkgs/applications/networking/p2p/firestr/return.patch @@ -0,0 +1,13 @@ +diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp +index c3a5ea9..7c821b9 100644 +--- a/src/message/master_post.cpp ++++ b/src/message/master_post.cpp +@@ -56,7 +56,7 @@ namespace fire + + metadata::encryption_type to_message_encryption_type(sc::encryption_type s) + { +- metadata::encryption_type r; ++ metadata::encryption_type r = metadata::encryption_type::asymmetric; + switch(s) + { + case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 247e5db85469..682b99cdf430 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10775,6 +10775,11 @@ let libXfixes libXinerama libXrender libXt; }; + firestr = callPackage ../applications/networking/p2p/firestr + { boost = boost155; + inherit (xlibs) libXScrnSaver; + }; + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { From 00c3434a7ee66390ac5a193264ead622985a8c9c Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 22 Apr 2015 18:15:31 +0000 Subject: [PATCH 14/86] Added mwlib --- pkgs/top-level/python-packages.nix | 227 +++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7cdb87eda31..11a565ec280f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -458,6 +458,23 @@ let }; }; + apipkg = buildPythonPackage rec { + name = "apipkg-1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/apipkg/${name}.tar.gz"; + md5 = "17e5668601a2322aff41548cb957e7c8"; + }; + + buildInputs = with self; [ ]; + + meta = { + description = "namespace control and lazy-import mechanism"; + homepage = "http://bitbucket.org/hpk42/apipkg"; + license = stdenv.lib.licenses.mit; + }; + }; + appdirs = buildPythonPackage rec { name = "appdirs-1.4.0"; @@ -3388,6 +3405,92 @@ let }; }; + mwlib = buildPythonPackage rec { + version = "0.15.15"; + name = "mwlib-${version}"; + + src = pkgs.fetchurl { + url = "http://pypi.pediapress.com/packages/mirror/${name}.tar.gz"; + sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7"; + }; + + commonDeps = with self; + [ + apipkg + bottle + gevent + lxml + odfpy + pillow + py + pyPdf + pyparsing1 + qserve + roman + simplejson + sqlite3dbm + timelib + ]; + + pythonPath = commonDeps ++ + [ + modules.sqlite3 + ]; + + propagatedBuildInputs = commonDeps; + + buildInputs = with self; + [ + pil + ] ++ propagatedBuildInputs; + + meta = { + description = "Library for parsing MediaWiki articles and converting them to different output formats"; + homepage = "http://pediapress.com/code/"; + license = stdenv.lib.licenses.bsd3; + }; + }; + + mwlib-ext = buildPythonPackage rec { + version = "0.13.2"; + name = "mwlib.ext-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.pediapress.com/packages/mirror/${name}.zip"; + md5 = "36193837359204d3337b297ba0f20bc8"; + }; + + meta = { + description = "dependencies for mwlib markup"; + homepage = "http://pediapress.com/code/"; + license = stdenv.lib.licenses.bsd3; + }; + }; + + mwlib-rl = buildPythonPackage rec { + version = "0.14.6"; + name = "mwlib.rl-${version}"; + + src = pkgs.fetchurl { + url = "http://pypi.pediapress.com/packages/mirror/${name}.zip"; + md5 = "49d72b0172f69cbe039f62dd4efb65ea"; + }; + + buildInputs = with self; + [ + mwlib + mwlib-ext + pygments + ]; + + meta = { + description = "generate pdfs from mediawiki markup"; + homepage = "http://pediapress.com/code/"; + license = stdenv.lib.licenses.bsd3; + }; + }; + logster = buildPythonPackage { name = "logster-7475c53822"; src = pkgs.fetchgit { @@ -3397,6 +3500,26 @@ let }; }; + odfpy = buildPythonPackage rec { + version = "0.9.6"; + name = "odfpy-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/odfpy/${name}.tar.gz"; + md5 = "3f570ead2b5f5eb6eab97eecce22d491"; + }; + + buildInputs = with self; with pkgs; [ ]; + + propagatedBuildInputs = with self; [ ]; + + meta = { + description = "Python API and tools to manipulate OpenDocument files"; + homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; + license = stdenv.lib.licenses.asl20; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; @@ -3786,6 +3909,26 @@ let }; }; + roman = buildPythonPackage rec { + version = "2.0.0"; + name = "roman-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/roman/${name}.zip"; + md5 = "aa71d131eec16d45c030fd06a27c9d17"; + }; + + buildInputs = with self; with pkgs; [ ]; + + propagatedBuildInputs = with self; [ ]; + + meta = { + description = "Integer to Roman numerals converter"; + homepage = "https://pypi.python.org/pypi/roman"; + license = stdenv.lib.licenses.psfl; + }; + }; + hypatia = buildPythonPackage rec { name = "hypatia-0.3"; @@ -9351,6 +9494,21 @@ let }; }; + pyparsing1 = buildPythonPackage rec { + name = "pyparsing-1.5.7"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz"; + md5 = "9be0fcdcc595199c646ab317c1d9a709"; + }; + + meta = { + homepage = http://pyparsing.wikispaces.com/; + description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + }; + }; + pyparted = buildPythonPackage rec { name = "pyparted-${version}"; @@ -9702,6 +9860,22 @@ let }; }; + pyPdf = buildPythonPackage rec { + name = "pyPdf-1.13"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyPdf/${name}.tar.gz"; + md5 = "7a75ef56f227b78ae62d6e38d4b6b1da"; + }; + + buildInputs = with self; [ ]; + + meta = { + description = "Pure-Python PDF toolkit"; + homepage = "http://pybrary.net/pyPdf/"; + license = stdenv.lib.licenses.bsd3; + }; + }; pyopengl = buildPythonPackage rec { name = "pyopengl-${version}"; @@ -10211,6 +10385,24 @@ let }; }; + qserve = buildPythonPackage rec { + name = "qserve-0.2.8"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/qserve/${name}.zip"; + md5 = "d481f0dad66a93d0479022fe0487e8ee"; + }; + + buildInputs = with self; [ ]; + + meta = { + description = "job queue server"; + homepage = "https://github.com/pediapress/qserve"; + license = stdenv.lib.licenses.bsd3; + }; + }; + quantities = buildPythonPackage rec { name = "quantities-0.10.1"; @@ -10958,6 +11150,24 @@ let }; }; + sqlite3dbm = buildPythonPackage rec { + name = "sqlite3dbm-0.1.4"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/s/sqlite3dbm/${name}.tar.gz"; + md5 = "fc2f8fb09a4bbc0260b97e835b369184"; + }; + + buildInputs = with self; [ modules.sqlite3 ]; + + meta = with stdenv.lib; { + description = "sqlite-backed dictionary"; + homepage = "http://github.com/Yelp/sqlite3dbm"; + license = stdenv.lib.licenses.asl20; + }; + }; + pgpdump = self.buildPythonPackage rec { name = "pgpdump-1.5"; @@ -11034,6 +11244,23 @@ let }; }; + timelib = buildPythonPackage rec { + name = "timelib-0.2.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/timelib/${name}.zip"; + md5 = "400e316f81001ec0842fa9b2cef5ade9"; + }; + + buildInputs = with self; [ ]; + + meta = { + description = "parse english textual date descriptions"; + homepage = "https://github.com/pediapress/timelib/"; + license = stdenv.lib.licenses.zlib; + }; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; disabled = isPy3k; From e216a63c7d732035a4127b7ed8061318ff9fb1df Mon Sep 17 00:00:00 2001 From: Linus Arver Date: Sat, 25 Apr 2015 16:17:40 -0700 Subject: [PATCH 15/86] Add package: pcg-c Also, add myself as maintainer. --- lib/maintainers.nix | 1 + pkgs/development/libraries/pcg-c/default.nix | 38 +++++++++++++++++++ .../libraries/pcg-c/prefix-variable.patch | 15 ++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/pcg-c/default.nix create mode 100644 pkgs/development/libraries/pcg-c/prefix-variable.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c944414ce6c2..f0e87507ceb6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -118,6 +118,7 @@ lethalman = "Luca Bruno "; lhvwb = "Nathaniel Baxter "; linquize = "Linquize "; + linus = "Linus Arver "; lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix new file mode 100644 index 000000000000..4b8cedd90c73 --- /dev/null +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchzip }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "0.94"; + name = "pcg-c-${version}"; + + src = fetchzip { + url = "http://www.pcg-random.org/downloads/${name}.zip"; + sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv"; + }; + + enableParallelBuilding = true; + + patches = [ + ./prefix-variable.patch + ]; + + preInstall = '' + sed -i s,/usr/local,$out, Makefile + mkdir -p $out/lib $out/include + ''; + + meta = { + description = "A family of better random number generators"; + homepage = "http://www.pcg-random.org/"; + license = stdenv.lib.licenses.asl20; + longDescription = '' + PCG is a family of simple fast space-efficient statistically good + algorithms for random number generation. Unlike many general-purpose RNGs, + they are also hard to predict. + ''; + platforms = platforms.unix; + maintainers = [ maintainers.linus ]; + repositories.git = git://github.com/imneme/pcg-c.git; + }; +} diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/development/libraries/pcg-c/prefix-variable.patch new file mode 100644 index 000000000000..bfdcdfa7b17e --- /dev/null +++ b/pkgs/development/libraries/pcg-c/prefix-variable.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index dddea44..fdb9401 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,8 +30,8 @@ all: + PREFIX = /usr/local + + install: all +- install src/libpcg_random.a $PREFIX/lib +- install -m 0644 include/pcg_variants.h $PREFIX/include ++ install src/libpcg_random.a ${PREFIX}/lib ++ install -m 0644 include/pcg_variants.h ${PREFIX}/include + + test: all + cd test-low; $(MAKE) test diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3731cd40d598..ddb2349bdfb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7259,6 +7259,8 @@ let pangoxsl = callPackage ../development/libraries/pangoxsl { }; + pcg_c = callPackage ../development/libraries/pcg-c { }; + pcl = callPackage ../development/libraries/pcl { vtk = vtkWithQt4; }; From c9e337196a03ea7147e09907f1187410e14bddd3 Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Sun, 26 Apr 2015 19:58:12 -0700 Subject: [PATCH 16/86] Issue #7584 Kafka Log Directory Not Writeable Fix quotes in substitution so LOG_DIR is set to a writeable location --- pkgs/servers/apache-kafka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index f3d0a43c4cff..06f8c5130633 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # allow us the specify logging directory using env substituteInPlace $out/bin/kafka-run-class.sh \ - --replace 'LOG_DIR=$base_dir/logs' 'LOG_DIR=$KAFKA_LOG_DIR' + --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"' for p in $out/bin\/*.sh; do wrapProgram $p \ From 9402a566206f855234f3bdd90983974ea96f6e07 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 24 Apr 2015 11:51:05 -0500 Subject: [PATCH 17/86] coq_8_5: New expression --- pkgs/applications/science/logic/coq/8.5.nix | 68 +++++++++++++++++++ pkgs/development/coq-modules/mathcomp/1.5.nix | 26 +++++++ .../development/coq-modules/ssreflect/1.5.nix | 42 ++++++++++++ .../coq-modules/ssreflect/threads.patch | 16 +++++ pkgs/top-level/all-packages.nix | 19 ++++++ 5 files changed, 171 insertions(+) create mode 100644 pkgs/applications/science/logic/coq/8.5.nix create mode 100644 pkgs/development/coq-modules/mathcomp/1.5.nix create mode 100644 pkgs/development/coq-modules/ssreflect/1.5.nix create mode 100644 pkgs/development/coq-modules/ssreflect/threads.patch diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix new file mode 100644 index 000000000000..87b476249f44 --- /dev/null +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -0,0 +1,68 @@ +# - coqide compilation can be disabled by setting lablgtk to null; + +{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: + +let + version = "8.5b2"; + coq-version = "8.5"; + buildIde = lablgtk != null; + ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; +in + +stdenv.mkDerivation { + name = "coq-${version}"; + + inherit coq-version; + inherit ocaml camlp5; + + src = fetchurl { + url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz; + sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v"; + }; + + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + + postPatch = '' + UNAME=$(type -tp uname) + RM=$(type -tp rm) + substituteInPlace configure --replace "/bin/uname" "$UNAME" + substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)" + ''; + + setupHook = writeText "setupHook.sh" '' + addCoqPath () { + if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then + export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" + fi + } + + envHooks=(''${envHooks[@]} addCoqPath) + ''; + + preConfigure = '' + configureFlagsArray=( + -opt + ${ideFlags} + ) + ''; + + prefixKey = "-prefix "; + + buildFlags = "revision coq coqide"; + + meta = with stdenv.lib; { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = licenses.lgpl21; + branch = coq-version; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp/1.5.nix b/pkgs/development/coq-modules/mathcomp/1.5.nix new file mode 100644 index 000000000000..c984bab49171 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp/1.5.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, coq, ssreflect}: + +stdenv.mkDerivation { + + name = "coq-mathcomp-1.5-8.5b2"; + + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz; + sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy"; + }; + + propagatedBuildInputs = [ coq ssreflect ]; + + enableParallelBuilding = true; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = http://ssr.msr-inria.inria.fr/; + license = licenses.cecill-b; + maintainers = [ maintainers.vbgl maintainers.jwiegley ]; + platforms = coq.meta.platforms; + hydraPlatforms = []; + }; + +} diff --git a/pkgs/development/coq-modules/ssreflect/1.5.nix b/pkgs/development/coq-modules/ssreflect/1.5.nix new file mode 100644 index 000000000000..7c16b43ba8cb --- /dev/null +++ b/pkgs/development/coq-modules/ssreflect/1.5.nix @@ -0,0 +1,42 @@ +{stdenv, fetchurl, coq}: + +assert coq.coq-version == "8.5"; + +stdenv.mkDerivation { + + name = "coq-ssreflect-1.5-8.5b2"; + + src = fetchurl { + url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz; + sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + patches = [ ./threads.patch ]; + + postPatch = '' + # Permit building of the ssrcoq statically-bound executable + sed -i 's/^#-custom/-custom/' Make + sed -i 's/^#SSRCOQ/SSRCOQ/' Make + ''; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + postInstall = '' + mkdir -p $out/bin + cp -p bin/ssrcoq $out/bin + cp -p bin/ssrcoq.byte $out/bin + ''; + + meta = with stdenv.lib; { + homepage = http://ssr.msr-inria.inria.fr/; + license = licenses.cecill-b; + maintainers = with maintainers; [ vbgl jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ssreflect/threads.patch b/pkgs/development/coq-modules/ssreflect/threads.patch new file mode 100644 index 000000000000..d60a645f6ee8 --- /dev/null +++ b/pkgs/development/coq-modules/ssreflect/threads.patch @@ -0,0 +1,16 @@ +--- a/Make 2015-04-20 13:37:06.000000000 +0200 ++++ b/Make 2015-04-25 11:32:53.885194600 +0200 +@@ -1,9 +1,9 @@ + ### Uncomment for static linking + ## +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte +-#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" +-#SSRCOQ = bin/ssrcoq ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq -I +threads src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte ++-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" ++SSRCOQ = bin/ssrcoq + ## + + ## What follows should be left untouched by the final user of ssreflect diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf86837e35b..75c7dc9789c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13523,6 +13523,11 @@ let camlp5 = ocamlPackages.camlp5_transitional; }; + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { inherit (ocamlPackages_3_12_1) ocaml findlib; camlp5 = ocamlPackages_3_12_1.camlp5_transitional; @@ -13569,7 +13574,21 @@ let }; + mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec { + + mathcomp = callPackage ../development/coq-modules/mathcomp/1.5.nix { + coq = coq_8_5; + ssreflect = ssreflect; + }; + + ssreflect = callPackage ../development/coq-modules/ssreflect/1.5.nix { + coq = coq_8_5; + }; + + }; + coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages); + coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages); cvc3 = callPackage ../applications/science/logic/cvc3 {}; cvc4 = callPackage ../applications/science/logic/cvc4 {}; From fce71133457f470bae620dc96d267e6204b51d44 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 Apr 2015 06:58:58 +0200 Subject: [PATCH 18/86] chromium: Add missing dependency on libcap. After the pulseaudio refactor in NixOS/nixpkgs@a2a3508, libcap is no longer propagated to chromium anymore. And we need to have libcap for the renderer sandbox. Build log: https://hydra.nixos.org/build/21689759/nixlog/1/raw What makes me wonder is that given that this was propagated by pulseaudio noone either seemed to have disabled pulseaudio support for Chromium or just didn't report the build failure. Half-assed testing done against all channels, because it builds the sandbox and we can't break an already broken build twice (or maybe we can, who knows...). Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 14d53357b895..247a27ca37be 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -3,7 +3,7 @@ # default dependencies , bzip2, flac, speex, icu, libopus , libevent, expat, libjpeg, snappy -, libpng, libxml2, libxslt +, libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp , libusb1, libexif, pciutils @@ -86,7 +86,7 @@ let defaultDependencies = [ bzip2 flac speex icu opusWithCustomModes libevent expat libjpeg snappy - libpng libxml2 libxslt + libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp libusb1 libexif ]; From 0241c1f25cf603fe1a2da2d1d7e645e5d3ba9e33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 26 Apr 2015 17:38:17 +0200 Subject: [PATCH 19/86] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/30bfb9f702b39c828659ab8470ab3f38bcf683da with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd --- .../haskell-modules/hackage-packages.nix | 350 +++++++++++++----- 1 file changed, 252 insertions(+), 98 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4bd22feda5c3..1f64e841fa6a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1619,6 +1619,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "BufferedSocket" = callPackage + ({ mkDerivation, base, bytestring, network, text }: + mkDerivation { + pname = "BufferedSocket"; + version = "0.1.1.0"; + sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg"; + buildDepends = [ base bytestring network text ]; + jailbreak = true; + description = "A socker wrapper that makes the IO of sockets much cleaner"; + license = stdenv.lib.licenses.mit; + }) {}; + "Buster" = callPackage ({ mkDerivation, base, bytestring, conduit, data-default, errors , hinotify, hslogger, hspec, hspec-expectations, http-conduit @@ -6639,12 +6651,15 @@ self: { mkDerivation { pname = "HList"; version = "0.3.4.1"; + revision = "1"; sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2"; + editedCabalFile = "b3eec9db43bda99e47b409bc7f188e89899f0e13854de02674be6d0d24eef4f6"; buildDepends = [ base ghc-prim mtl tagged template-haskell ]; testDepends = [ base cmdargs directory doctest filepath hspec lens mtl process syb ]; buildTools = [ diffutils ]; + jailbreak = true; description = "Heterogeneous lists"; license = stdenv.lib.licenses.mit; }) { inherit (pkgs) diffutils;}; @@ -10629,15 +10644,14 @@ self: { }: mkDerivation { pname = "Network-NineP"; - version = "0.2.0"; - sha256 = "0pa0j9ljq32dikffwi3n1cifilb2586z3q004rqa0sq82zyah949"; + version = "0.3.0"; + sha256 = "02igsbmhkpkaxdpdhkl6vb7kzryhg7p5bb59irykz0dkg095wr89"; isLibrary = true; isExecutable = true; buildDepends = [ base binary bytestring containers convertible monad-loops mstate mtl network NineP regex-posix stateref transformers ]; - jailbreak = true; description = "High-level abstraction over 9P protocol"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -22932,8 +22946,8 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }: mkDerivation { pname = "base58string"; - version = "0.9.0"; - sha256 = "09mkc4fqm897b9msczqpdfipj9kr98pkmq4gbsynksrapiamrgg3"; + version = "0.9.1"; + sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd"; buildDepends = [ aeson base binary bytestring text ]; testDepends = [ base binary bytestring hspec text ]; homepage = "http://www.leonmergen.com/opensource.html"; @@ -24347,6 +24361,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { fann = null;}; + "bindings-fluidsynth" = callPackage + ({ mkDerivation, base, bindings-DSL, fluidsynth }: + mkDerivation { + pname = "bindings-fluidsynth"; + version = "0.1.1"; + sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5"; + buildDepends = [ base bindings-DSL ]; + pkgconfigDepends = [ fluidsynth ]; + homepage = "http://github.com/bgamari/bindings-fluidsynth"; + description = "Haskell FFI bindings for fluidsynth software synthesizer"; + license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs) fluidsynth;}; + "bindings-friso" = callPackage ({ mkDerivation, base, bindings-DSL, friso }: mkDerivation { @@ -28193,20 +28220,21 @@ self: { ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit , conduit, conduit-extra, containers, directory, filepath , http-client, http-client-tls, http-conduit, http-types, network - , process, resourcet, shelly, system-fileio, system-filepath, tar - , temporary, text, transformers + , process, resourcet, shelly, streaming-commons, system-fileio + , system-filepath, tar, temporary, text, transformers }: mkDerivation { pname = "cabal-src"; - version = "0.2.5"; - sha256 = "07nxnr011i50lpmahvj6q113zd6jmmxv83y4rby2rjnimjvgj3z7"; + version = "0.2.5.1"; + sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring Cabal classy-prelude-conduit conduit conduit-extra containers directory filepath http-client http-client-tls http-conduit http-types network process resourcet shelly - system-fileio system-filepath tar temporary text transformers + streaming-commons system-fileio system-filepath tar temporary text + transformers ]; homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; @@ -29403,8 +29431,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.4.0.0"; - sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7"; + version = "0.4.0.1"; + sha256 = "05mpw0dgn5f9gwnk7jkkm5k6fsfhi70i3fr96b6jca7w1b151hn9"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; @@ -30622,8 +30650,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { pname = "cipher-aes128"; - version = "0.7"; - sha256 = "105400panhmmykbdvfajb4kff4qj24zq2n65qwy2nh8py722nbw0"; + version = "0.7.0.1"; + sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cereal crypto-api tagged ]; @@ -34565,8 +34593,8 @@ self: { }: mkDerivation { pname = "conversion-text"; - version = "1.0.0.1"; - sha256 = "0v2vpma9sf0n2fd635zagnfzv1bizys6yf592c2mm7yxanlhj6rp"; + version = "1.0.0.2"; + sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby"; buildDepends = [ base-prelude bytestring conversion conversion-bytestring text ]; @@ -35922,8 +35950,8 @@ self: { }: mkDerivation { pname = "crypto-classical"; - version = "0.0.3"; - sha256 = "1k158w6dvnfcfan167lvk2g852fgn0aqsfc7qagxihkbi4l0nrls"; + version = "0.1.0"; + sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg"; buildDepends = [ base bytestring containers crypto-numbers crypto-random lens modular-arithmetic QuickCheck random random-shuffle text @@ -36704,17 +36732,15 @@ self: { ({ mkDerivation, base, bytestring, hspec, rtld, time }: mkDerivation { pname = "curlhs"; - version = "0.1.4"; + version = "0.1.5"; revision = "1"; - sha256 = "09zsrz2n4rhyscjdykz17dprbapjhgj4nkbpjvj0if7crr4dy5xr"; - editedCabalFile = "0d7a7a08c0da6d5ee17977e7f821a12bf138019418b559c1295041c6d16b5e46"; + sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky"; + editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd"; buildDepends = [ base bytestring rtld time ]; testDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/kkardzis/curlhs"; description = "bindings to libcurl, the multiprotocol file transfer library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "currency" = callPackage @@ -44879,8 +44905,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "enummapset"; - version = "0.5.2.0"; - sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js"; + version = "0.5.2.1"; + sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg"; buildDepends = [ base containers deepseq ]; homepage = "https://github.com/michalt/enummapset"; description = "IntMap and IntSet with Enum keys/elements"; @@ -45758,6 +45784,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventloop" = callPackage + ({ mkDerivation, aeson, base, bytestring, network, suspend, text + , timers, websockets + }: + mkDerivation { + pname = "eventloop"; + version = "0.2.1.2"; + sha256 = "0lir7xynmq2awgjd163ma16fvpq58dwfkkdjbi4vmcacgyxwxmw9"; + buildDepends = [ + aeson base bytestring network suspend text timers websockets + ]; + jailbreak = true; + homepage = "-"; + description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "eventstore" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , network, protobuf, random, sodium, text, time, uuid @@ -47821,24 +47864,28 @@ self: { "find-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators - , directory, doctest, either, exceptions, filepath, hspec, mmorph - , monad-control, mtl, regex-posix, semigroups, system-filepath - , text, time, transformers, transformers-base, unix + , conduit-extra, directory, doctest, either, exceptions, filepath + , hspec, mmorph, monad-control, mtl, regex-posix, semigroups + , streaming-commons, system-filepath, text, time, transformers + , transformers-base, unix, unix-compat }: mkDerivation { pname = "find-conduit"; - version = "0.4.1"; - sha256 = "171y1bb3r6af41i2xsip2r4xm7grbzpvlwczrvaj8hzyknr3y7dx"; + version = "0.4.3"; + sha256 = "05s1whyqmv1nxcbrrfhfn8lcqb2cwyz1wa2im8b976i14qgw65lm"; + isLibrary = true; + isExecutable = true; buildDepends = [ - attoparsec base conduit conduit-combinators either exceptions - mmorph monad-control mtl regex-posix semigroups system-filepath - text time transformers transformers-base unix + attoparsec base conduit conduit-combinators conduit-extra either + exceptions filepath mmorph monad-control mtl regex-posix semigroups + streaming-commons system-filepath text time transformers + transformers-base unix unix-compat ]; testDepends = [ attoparsec base conduit conduit-combinators directory doctest either exceptions filepath hspec mmorph monad-control mtl - regex-posix semigroups system-filepath text time transformers - transformers-base unix + regex-posix semigroups streaming-commons system-filepath text time + transformers transformers-base unix-compat ]; description = "A file-finding conduit that allows user control over traversals"; license = stdenv.lib.licenses.mit; @@ -47962,10 +48009,8 @@ self: { }: mkDerivation { pname = "fit"; - version = "0.5"; - revision = "1"; - sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl"; - editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f"; + version = "0.5.1"; + sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db"; buildDepends = [ attoparsec base bytestring containers contravariant mtl text ]; @@ -47973,7 +48018,6 @@ self: { attoparsec base bytestring containers hspec hspec-attoparsec mtl QuickCheck text ]; - jailbreak = true; description = "FIT file decoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -52353,8 +52397,8 @@ self: { }: mkDerivation { pname = "git-monitor"; - version = "3.1.1.3"; - sha256 = "0xcb7i5hvx7967wqsyawxz8fk052ylrb90y3b2spw9pxhqry3j4s"; + version = "3.1.1.4"; + sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -52502,21 +52546,27 @@ self: { "github" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , byteable, bytestring, case-insensitive, conduit, containers - , cryptohash, data-default, failure, hashable, HTTP, http-conduit - , http-types, network, old-locale, text, time, unordered-containers - , vector + , cryptohash, data-default, failure, hashable, hspec, HTTP + , http-conduit, http-types, network, old-locale, text, time + , unordered-containers, vector }: mkDerivation { pname = "github"; - version = "0.13.1"; - sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l"; + version = "0.13.2"; + sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z"; buildDepends = [ aeson attoparsec base base16-bytestring byteable bytestring case-insensitive conduit containers cryptohash data-default failure hashable HTTP http-conduit http-types network old-locale text time unordered-containers vector ]; - homepage = "https://github.com/fpco/github"; + testDepends = [ + aeson attoparsec base base16-bytestring byteable bytestring + case-insensitive conduit containers cryptohash data-default failure + hashable hspec HTTP http-conduit http-types network old-locale text + time unordered-containers vector + ]; + homepage = "https://github.com/jwiegley/github"; description = "Access to the Github API, v3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -52709,21 +52759,21 @@ self: { ({ mkDerivation, base, bytestring, conduit, conduit-combinators , containers, directory, exceptions, fast-logger, filepath, gitlib , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit - , lifted-async, lifted-base, missing-foreign, mmorph, monad-control - , monad-logger, monad-loops, mtl, resourcet, stm, stm-conduit - , tagged, template-haskell, text, text-icu, time, transformers + , lifted-async, lifted-base, mmorph, monad-control, monad-logger + , monad-loops, mtl, resourcet, stm, stm-conduit, tagged + , template-haskell, text, text-icu, time, transformers , transformers-base }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.0.3"; - sha256 = "19lly5nrxa05gj6mv887d419mm65ha40rggv2a8y1jd6s7z6drfi"; + version = "3.1.0.4"; + sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7"; buildDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 lifted-async - lifted-base missing-foreign mmorph monad-control monad-logger - monad-loops mtl resourcet stm stm-conduit tagged template-haskell - text text-icu time transformers transformers-base + lifted-base mmorph monad-control monad-logger monad-loops mtl + resourcet stm stm-conduit tagged template-haskell text text-icu + time transformers transformers-base ]; testDepends = [ base exceptions gitlib gitlib-test hspec hspec-expectations HUnit @@ -55100,21 +55150,21 @@ self: { }) { gtk3 = null;}; "gtk3-mac-integration" = callPackage - ({ mkDerivation, array, base, containers, glib, gtk-mac-integration - , gtk2hs-buildtools, gtk3, mtl + ({ mkDerivation, array, base, containers, glib + , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.0.2"; - sha256 = "0fsgcy5vwdcy7mf57w6axqa7804w0729mbzb7gvf4wh25k2i2xhp"; + version = "0.3.0.3"; + sha256 = "1jzkx10mmmxxv1ys9ywr2sfpy0pxvy8276pbkh0xnypxsyd2sfdn"; buildDepends = [ array base containers glib gtk3 mtl ]; buildTools = [ gtk2hs-buildtools ]; - pkgconfigDepends = [ gtk-mac-integration ]; + pkgconfigDepends = [ gtk-mac-integration-gtk3 ]; homepage = "http://www.haskell.org/gtk2hs/"; description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { gtk-mac-integration = null;}; + }) { gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext @@ -66103,6 +66153,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpack" = callPackage + ({ mkDerivation, aeson, base, base-compat, deepseq, directory + , filepath, hspec, interpolate, mockery, unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.1.1"; + sha256 = "10a0rgz9ng84m30x2x9swpdr41yk6wkvhk9vlplbq254rfsg865b"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base base-compat deepseq directory filepath + unordered-containers yaml + ]; + testDepends = [ + aeson base base-compat deepseq directory filepath hspec interpolate + mockery unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "hpaco" = callPackage ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict , utf8-string, yaml @@ -68878,8 +68951,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.5"; - sha256 = "1973b4rp11lqck4233ha88z867sfz0rzpp3v3irkrjhvzmdhh6lx"; + version = "0.3.2.6"; + sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -69745,8 +69818,8 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.0.0.2"; - sha256 = "09djrc8ws8ijig8syanjj29b4fdgrf6cp7py3vx2x1gap4jg5zya"; + version = "1.0.0.3"; + sha256 = "15m48aniszfkbkd6h2ql3r88ldj6f3ph3dyv97nmi8xk1kliipn1"; buildDepends = [ attoparsec base-prelude text unordered-containers ]; @@ -75763,18 +75836,21 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, base, hslogger, lens, template-haskell, text - , transformers + ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell + , text, transformers, webkitgtk3, webkitgtk3-javascriptcore }: mkDerivation { pname = "jsaddle"; - version = "0.2.0.3"; - sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x"; - buildDepends = [ base lens template-haskell text transformers ]; - testDepends = [ - base hslogger lens template-haskell text transformers + version = "0.2.0.4"; + sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8"; + buildDepends = [ + base lens template-haskell text transformers webkitgtk3 + webkitgtk3-javascriptcore + ]; + testDepends = [ + base glib gtk3 hslogger lens template-haskell text transformers + webkitgtk3 webkitgtk3-javascriptcore ]; - jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; }) {}; @@ -84687,27 +84763,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memcache-conduit" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , conduit, conduit-extra, containers, hashtables, memcache-haskell + , monad-control, mtl, network, resourcet, split, stm, transformers + }: + mkDerivation { + pname = "memcache-conduit"; + version = "0.0.3"; + sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec attoparsec-binary base bytestring conduit conduit-extra + containers hashtables memcache-haskell monad-control mtl network + resourcet split stm transformers + ]; + description = "Conduit library for memcache procotol"; + license = stdenv.lib.licenses.mit; + }) {}; + "memcache-haskell" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, hashable - , hashtables, HUnit, mtl, network, network-conduit, QuickCheck + ({ mkDerivation, attoparsec, base, bytestring, conduit-extra + , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck , resourcet, split, stm, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers }: mkDerivation { pname = "memcache-haskell"; - version = "0.0.10"; - sha256 = "1k853wc1rqwq4wrsk72qs4gravd7scdgi4cvsjzjg8w0vn0scqm2"; + version = "0.0.10.1"; + sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec base bytestring containers hashable hashtables mtl - network network-conduit resourcet split stm transformers + attoparsec base bytestring conduit-extra containers hashable + hashtables mtl network resourcet split stm transformers ]; testDepends = [ base bytestring HUnit network QuickCheck split test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; + description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -89773,7 +89869,9 @@ self: { mkDerivation { pname = "netrc"; version = "0.2.0.0"; + revision = "1"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; + editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd"; buildDepends = [ base bytestring deepseq parsec ]; testDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -98261,8 +98359,8 @@ self: { }: mkDerivation { pname = "pred-trie"; - version = "0.0.10.2"; - sha256 = "1wh53dswpn4prkbkn87aqv6vbbf651dwy1avqx261jg3w4hg8i96"; + version = "0.0.12"; + sha256 = "0hyghjp1zcprgzq2szkpfpkihr1hhgf70901wm5hfgs6bfvgw2sb"; buildDepends = [ base semigroups ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Predicative tries"; @@ -98287,8 +98385,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.34.0.0"; - sha256 = "09qbzr1rb2nbhwa8mmynv4lskz4l9339sprjy03v2ar06vz8f37k"; + version = "0.36.0.0"; + sha256 = "0kh7mf6g7qc2gp4xpvnnq3053i3wxabwiq827l14k8wv43bjsalj"; buildDepends = [ base bytestring containers contravariant rainbow split text transformers @@ -101167,8 +101265,8 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.24.0.0"; - sha256 = "1ksgnxh8j6rrcpkkzwh4qj1p9npanb75xz9wacjxhd91y26zfzdd"; + version = "0.26.0.0"; + sha256 = "1criyy8iw1har4nd6rm32gwcrqq4f421935dnbyq4iwkd9xf9mqs"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; @@ -101198,8 +101296,8 @@ self: { }: mkDerivation { pname = "rainbox"; - version = "0.14.0.0"; - sha256 = "0fdqw0d1n2br8gm0rdmnmzkn6dwmljkcgz0w1y6wy62cijwqzz52"; + version = "0.16.0.0"; + sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2"; buildDepends = [ base bytestring containers rainbow text ]; testDepends = [ base bytestring containers QuickCheck rainbow tasty @@ -106632,8 +106730,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.1.3.1"; - sha256 = "0vh48fbfa4drp6wvhnj7yswgd09dabq61b7gpar0l0fviz98y8id"; + version = "0.2.0"; + sha256 = "0bqnjnyjvhhj2lh8jr6cris5l4crwyql95rfzrvc95wvkb75jwzv"; buildDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -112603,6 +112701,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sorting" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "sorting"; + version = "1.0.0.1"; + sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n"; + buildDepends = [ base ]; + homepage = "https://github.com/joneshf/sorting"; + description = "Utils for sorting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sorty" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -114563,6 +114673,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "step-function" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }: + mkDerivation { + pname = "step-function"; + version = "0.1.0.0"; + sha256 = "0v7mpi680zl5ihzrdda7di790br5jm563kf0r46z40b63lbzzv01"; + buildDepends = [ base ]; + testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ]; + homepage = "https://github.com/jonpetterbergman/step-function"; + description = "Step functions, staircase functions or piecewise constant functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stepwise" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -118912,8 +119035,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.3"; - sha256 = "0hkpz3l5b1vpnpgagl150g5rdawwf9mwgb7ai0xilj4d7i55gdwl"; + version = "0.1.4"; + sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj"; buildDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -122564,6 +122687,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "twentefp-eventloop-trees" = callPackage + ({ mkDerivation, base, eventloop }: + mkDerivation { + pname = "twentefp-eventloop-trees"; + version = "0.0.0.1"; + sha256 = "1zp381z9anqajcwpx6b3yq496a5c44xy98g9qqzq6v79qbhr6rbc"; + buildDepends = [ base eventloop ]; + description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "twentefp-graphs" = callPackage ({ mkDerivation, base, twentefp-eventloop-graphics }: mkDerivation { @@ -126012,15 +126146,14 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.3"; - sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f"; + version = "0.0.4"; + sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base directory filepath process text ]; testDepends = [ attoparsec base directory filepath process QuickCheck text ]; - jailbreak = true; homepage = "https://github.com/hamishmack/vado"; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; @@ -132472,8 +132605,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.4"; - sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08"; + version = "1.4.5"; + sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -133650,6 +133783,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-transloadit" = callPackage + ({ mkDerivation, aeson, base, byteable, bytestring, cryptohash + , hspec, lens, lens-aeson, old-locale, shakespeare, text, time + , transformers, yesod, yesod-core, yesod-form, yesod-test + }: + mkDerivation { + pname = "yesod-transloadit"; + version = "0.1.0.0"; + sha256 = "15c6z262fcbradphrv82fz5pc2il27vqnmkym1b61wvpsydy2681"; + buildDepends = [ + aeson base byteable bytestring cryptohash lens lens-aeson + old-locale shakespeare text time transformers yesod yesod-core + yesod-form + ]; + testDepends = [ + base hspec old-locale text time yesod yesod-form yesod-test + ]; + description = "Transloadit support for Yesod"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-vend" = callPackage ({ mkDerivation, base, blaze-html, hamlet, monad-logger, persistent , persistent-sqlite, resourcet, text, yesod, yesod-form From 2028ece4a8c551050b6a2c92da4bfbf631022654 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 13:38:35 +0200 Subject: [PATCH 20/86] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/0342de381c9f9c25900e9aab5a452b484524c96f with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd --- .../haskell-modules/hackage-packages.nix | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f64e841fa6a..0148ca906647 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45790,8 +45790,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.2.1.2"; - sha256 = "0lir7xynmq2awgjd163ma16fvpq58dwfkkdjbi4vmcacgyxwxmw9"; + version = "0.3.0.0"; + sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3"; buildDepends = [ aeson base bytestring network suspend text timers websockets ]; @@ -66662,20 +66662,21 @@ self: { "hruby" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck - , scientific, stm, text, unordered-containers, vector + , ruby, scientific, stm, text, unordered-containers, vector }: mkDerivation { pname = "hruby"; - version = "0.3.1.1"; - sha256 = "137vvqmyq81aqjpag6rl980l2amf0in1rx6im4pp0gzwl48vzsyj"; + version = "0.3.1.2"; + sha256 = "1w57k3c4y08mk0887knar33yg36hpk2z31lqwz4aiq3dnidvjmdz"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; + extraLibraries = [ ruby ]; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) { inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: @@ -114169,6 +114170,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-upload" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , http-client, http-client-tls, http-types, optparse-applicative + , stackage-cli, text + }: + mkDerivation { + pname = "stackage-upload"; + version = "0.1.0.1"; + sha256 = "1m2dhj2gsg3f1ykrabgvf61vmlv6dhc013nii4ymn6smacqzihhv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring directory filepath http-client + http-client-tls http-types optparse-applicative stackage-cli text + ]; + homepage = "https://github.com/fpco/stackage-upload"; + description = "A more secure version of cabal upload which uses HTTPS"; + license = stdenv.lib.licenses.mit; + }) {}; + "standalone-haddock" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , optparse-applicative @@ -122691,10 +122712,10 @@ self: { ({ mkDerivation, base, eventloop }: mkDerivation { pname = "twentefp-eventloop-trees"; - version = "0.0.0.1"; - sha256 = "1zp381z9anqajcwpx6b3yq496a5c44xy98g9qqzq6v79qbhr6rbc"; + version = "0.1.0.0"; + sha256 = "18cifjf8avblgf0v1nskxdfx08ph92d16n8c50l9ln99aj9pw724"; buildDepends = [ base eventloop ]; - description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; + description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; }) {}; From 6db9c9a2bbb80bd6c3bd0f5b79d987c39c1e5aa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 15:25:54 +0200 Subject: [PATCH 21/86] haskell-configuration-common: build hruby with ruby 2.1 Our default version, 1.9, is not supported. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e2a5ba6a1cc..173ca92dd3e6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,8 +22,8 @@ self: super: { statistics = dontCheck super.statistics; text = dontCheck super.text; - # https://github.com/bartavelle/hruby/issues/10 - hruby = addExtraLibrary super.hruby pkgs.ruby_2_1; + # The package doesn't compile with ruby 1.9, which is our default at the moment. + hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; From 534b84a9ac125e960660cb05c4f75a5d6f666c5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Apr 2015 18:23:55 +0200 Subject: [PATCH 22/86] Don't require sslServerChain to be set --- .../services/web-servers/apache-httpd/per-server-options.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9fb25c37f5b1..0db27b0bcbe6 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 @@ -57,7 +57,8 @@ with lib; }; sslServerChain = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = "/var/ca.pem"; description = "Path to server SSL chain file."; }; From d3a328bf8244fdab1e9b5835accfae8f9b61f7ea Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Mon, 27 Apr 2015 18:33:34 +0200 Subject: [PATCH 23/86] Update syncthing to v0.11.1 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 430ab70caa14..84d0d4ba2391 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.30"; + version = "0.11.1"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a"; + sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4"; }; subPackages = [ "cmd/syncthing" ]; From 19366a10fcfa33acc1d150e6815cc49bd1a59988 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Apr 2015 19:19:48 +0200 Subject: [PATCH 24/86] Remove redundant i18n.supportedLocales setting This is already set in profiles/minimal.nix. Probably fixes #7589. --- nixos/modules/profiles/installation-device.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index f1e733080573..a41d17e51821 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -26,10 +26,6 @@ with lib; # Disable some other stuff we don't need. security.sudo.enable = false; - # Include only the en_US locale. This saves 75 MiB or so compared to - # the full glibcLocales package. - i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"]; - # Automatically log in at the virtual consoles. services.mingetty.autologinUser = "root"; From 69c0eff66128826decce9e8d7f1aca2ed1426aba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Apr 2015 19:28:53 +0200 Subject: [PATCH 25/86] Add squeak 4.10.2.2614: a Smalltalk environment --- pkgs/development/compilers/squeak/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/compilers/squeak/default.nix diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix new file mode 100644 index 000000000000..e222d54dbcb8 --- /dev/null +++ b/pkgs/development/compilers/squeak/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, cmake, coreutils, freetype, gnused, pkgconfig, which }: + +let version = "4.10.2.2614"; in +stdenv.mkDerivation rec { + name = "squeak-${version}"; + + src = fetchurl { + sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix"; + url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Smalltalk programming language and environment"; + longDescription = '' + Squeak is a full-featured implementation of the Smalltalk programming + language and environment based on (and largely compatible with) the + original Smalltalk-80 system. Squeak has very powerful 2- and 3-D + graphics, sound, video, MIDI, animation and other multimedia + capabilities. It also includes a customisable framework for creating + dynamic HTTP servers and interactively extensible Web sites. + ''; + homepage = http://squeakvm.org/; + downloadPage = http://squeakvm.org/unix/index.html; + license = with licenses; [ asl20 mit ]; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cmake coreutils freetype gnused pkgconfig which ]; + + postPatch = '' + for i in squeak.in squeak.sh.in; do + substituteInPlace unix/cmake/$i --replace "PATH=" \ + "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #" + done + ''; + + configurePhase = '' + unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads} + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cba94349dfe8..291570894440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4385,6 +4385,8 @@ let sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + squeak = callPackage ../development/compilers/squeak { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; From 85840be86eb10092d5ea335762acd31f44eb1a5e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 12:52:17 -0700 Subject: [PATCH 26/86] quassel: 0.11.0 -> 0.12.2 --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 343e53bc947b..b5bf86690edc 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -19,12 +19,12 @@ let in with stdenv; mkDerivation rec { - version = "0.11.0"; + version = "0.12.2"; name = "quassel${tag}-${version}"; src = fetchurl { url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; - sha256 = "01251y5i1fvm6s2g9acxaczk2jdyw1byr45q41q0yh9apjw938cr"; + sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb"; }; enableParallelBuilding = true; From fc15ee2b4b78879b6959da2045f64ff47e95a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 27 Apr 2015 21:51:21 +0200 Subject: [PATCH 27/86] MuseScore: 1.3 -> 2.0.0 --- pkgs/applications/audio/musescore/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index a0bb87896582..7d4768d23324 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,33 +1,31 @@ -{ stdenv, fetchurl, makeWrapper, cmake, qt4, pkgconfig, alsaLib, portaudio, jack2, libsndfile}: +{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2 +, lame, libsndfile, libvorbis }: stdenv.mkDerivation rec { - name = "musescore-1.3"; + name = "musescore-${version}"; + version = "2.0.0"; src = fetchurl { - url = "http://ftp.osuosl.org/pub/musescore/releases/MuseScore-1.3/mscore-1.3.tar.bz2"; - sha256 = "a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683"; + url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; + sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w"; }; - buildInputs = [ makeWrapper cmake qt4 pkgconfig alsaLib portaudio jack2 libsndfile ]; + buildInputs = [ + makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis + ]; - configurePhase = '' - cd mscore; - mkdir build; - cd build; - cmake -DCMAKE_INSTALL_PREFIX=$out -DQT_PLUGINS_DIR=$out/lib/qt4/plugins -DCMAKE_BUILD_TYPE=Release ..''; - - preBuild = ''make lrelease;''; - - postInstall = '' - wrapProgram $out/bin/mscore --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + patchPhase = '' + sed s,"/usr/local",$out, -i Makefile ''; + preBuild = "make lrelease"; + meta = with stdenv.lib; { description = "Qt-based score editor"; homepage = http://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.vandenoever ]; + maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; }; } From 239a129b5a7d9236312f0def940264412c81a633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Apr 2015 21:11:42 +0200 Subject: [PATCH 28/86] squeak: build commonly required plugins Squeak without X11 or audio support is not very useful. Include the required dependencies. --- pkgs/development/compilers/squeak/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index e222d54dbcb8..4a6408d66d11 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, coreutils, freetype, gnused, pkgconfig, which }: +{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused +, libpthreadstubs, pango, pkgconfig, pulseaudio, which }: let version = "4.10.2.2614"; in stdenv.mkDerivation rec { @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ cmake coreutils freetype gnused pkgconfig which ]; + buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs + pango pkgconfig pulseaudio which ]; postPatch = '' for i in squeak.in squeak.sh.in; do From 7e3b44b20541a06a8bbb3ca076f386e886b1313a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Apr 2015 23:01:20 +0200 Subject: [PATCH 29/86] stress-ng 0.03.22 -> 0.04.00 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a65213839c8c..f67921c6b712 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.03.22"; in +let version = "0.04.00"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "0byhaqw332894vg4rkc8mwxyzh6ggx4l7qnzzk1m3b2j52m908mn"; + sha256 = "1rivmqa3qy9saxcz7mg211imcfyfwdhyhl2z6k1zc55vhnjdwhih"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 4f0b6fa3ba09f7228184853df3e9a48ca1e4b44b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Apr 2015 23:10:25 +0200 Subject: [PATCH 30/86] vnstat 1.13 -> 1.14 26-Apr-2015 - Fix: JSON output syntax during first day of newly created databases (pull request by Stefan Merettig) - Fix: field padding when using UTF-8 locale - Add optional mode parameter to --json and --xml for limiting the output to only selected information --- pkgs/applications/networking/vnstat/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index d3ee682329d0..3d0f408659fb 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, ncurses}: +let version = "1.14"; in stdenv.mkDerivation rec { - name = "vnstat-1.13"; + name = "vnstat-${version}"; src = fetchurl { + sha256 = "11l39qqv5pgli9zzn0xilld67bi5qzxymsn97m4r022xv13jlipq"; url = "http://humdi.net/vnstat/${name}.tar.gz"; - sha256 = "1kcrxpvp3al1j6kh7k69vwva6kd1ba32wglx95gv55dixfcjakkg"; }; installPhase = '' @@ -18,10 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ncurses]; - meta = { + meta = with stdenv.lib; { + inherit version; homepage = http://humdi.net/vnstat/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; - maintainers = with stdenv.lib.maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx ]; }; } From 999241a90721817bb3dd9c6e464974d201638be9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 00:10:14 +0200 Subject: [PATCH 31/86] Add aha 0.4.8: quick & dirty ANSI-to-HTML converter --- pkgs/tools/text/aha/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/aha/default.nix diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix new file mode 100644 index 000000000000..a0be19607ea5 --- /dev/null +++ b/pkgs/tools/text/aha/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +let version = "0.4.8"; in +stdenv.mkDerivation rec { + name = "aha-${version}"; + + src = fetchFromGitHub { + sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj"; + rev = version; + repo = "aha"; + owner = "theZiz"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "ANSI HTML Adapter"; + longDescription = '' + aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. + ''; + homepage = https://github.com/theZiz/aha; + downloadPage = https://github.com/theZiz/aha/releases; + license = with licenses; [ lgpl2Plus mpl11 ]; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + makeFlags = "PREFIX=$(out)"; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 291570894440..c63e02cef0db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -499,6 +499,8 @@ let afl = callPackage ../tools/security/afl { }; + aha = callPackage ../tools/text/aha { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; aiccu = callPackage ../tools/networking/aiccu { }; From e64cd5feecd4f7bbfb895dfafb6496d506334f36 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Apr 2015 00:57:12 +0200 Subject: [PATCH 32/86] Adds ocaml-magic-mime This OCaml library contains a database of MIME types that maps filename extensions into MIME types suitable for use in many Internet protocols such as HTTP or e-mail. Homepage: https://github.com/mirage/ocaml-magic-mime --- .../ocaml-modules/magic-mime/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/magic-mime/default.nix diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix new file mode 100644 index 000000000000..d77c3f681158 --- /dev/null +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "1.0.0"; in + +stdenv.mkDerivation { + name = "ocaml-magic-mime-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; + sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-magic-mime; + description = "Convert file extensions to MIME types"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c63e02cef0db..64739664f40f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4163,6 +4163,8 @@ let macaque = callPackage ../development/ocaml-modules/macaque { }; + magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; + magick = callPackage ../development/ocaml-modules/magick { }; menhir = callPackage ../development/ocaml-modules/menhir { }; From 47e67a80b9cb04507e5f8bc65efb3797c24aae04 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 15:58:34 -0700 Subject: [PATCH 33/86] fusionio: Add iomemory-vsl driver --- .../linux/fusionio/vsl-fix-file-inode.patch | 13 +++++++ pkgs/os-specific/linux/fusionio/vsl.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch create mode 100644 pkgs/os-specific/linux/fusionio/vsl.nix diff --git a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch new file mode 100644 index 000000000000..25887ceee0f6 --- /dev/null +++ b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch @@ -0,0 +1,13 @@ +diff --git a/kfile.c b/kfile.c +index 5014e77..a65d921 100644 +--- a/kfile.c ++++ b/kfile.c +@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp) + #if KFIOC_STRUCT_FILE_HAS_PATH + return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode; + #else +- return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode; ++ return (fusion_inode *) file_inode((struct file *)fp); + #endif + } + diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix new file mode 100644 index 000000000000..7947446c1f2b --- /dev/null +++ b/pkgs/os-specific/linux/fusionio/vsl.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, kernel }: + +stdenv.mkDerivation rec { + name = "fusionio-iomemory-vsl-3.2.10"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM"; + sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc"; + }; + + prePatch = '' + cd root/usr/src/iomemory-vsl-* + ''; + + patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch; + + preBuild = '' + sed -i Makefile kfio_config.sh \ + -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g" + export DKMS_KERNEL_VERSION=${kernel.modDirVersion} + export TARGET="x86_64_cc48" + ''; + + installPhase = '' + export INSTALL_ROOT=$out + make modules_install + ''; + + meta = with stdenv.lib; { + homepage = http://fusionio.com; + description = "kernel driver for accessing fusion-io cards"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + broken = stdenv.system != "x86_64-linux"; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64739664f40f..9239fd1074af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9278,6 +9278,8 @@ let frandom = callPackage ../os-specific/linux/frandom { }; + fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { }; + ktap = callPackage ../os-specific/linux/ktap { }; lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; From 16bb38655d067517749ce21e4954d086a93bf359 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 02:02:55 +0200 Subject: [PATCH 34/86] Add rsstail 1.9: tail for RSS feeds --- .../feedreaders/rsstail/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/feedreaders/rsstail/default.nix diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix new file mode 100644 index 000000000000..df5f79541822 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cppcheck, libmrss }: + +let version = "1.9"; in +stdenv.mkDerivation rec { + name = "rsstail-${version}"; + + src = fetchFromGitHub { + sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf"; + rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef"; + repo = "rsstail"; + owner = "flok99"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Monitor RSS feeds for new entries"; + longDescription = '' + RSSTail is more or less an RSS reader: it monitors an RSS feed and if it + detects a new entry it'll emit only that new entry. + ''; + homepage = http://www.vanheusden.com/rsstail/; + license = with licenses; gpl2Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ libmrss ] + ++ stdenv.lib.optional doCheck cppcheck; + + postPatch = '' + substituteInPlace Makefile --replace /usr $out + ''; + + enableParallelBuilding = true; + + doCheck = true; + + preInstall = '' + mkdir -p $out/{bin,share/man/man1} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9239fd1074af..f3e32256a156 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,8 @@ let rrdtool = callPackage ../tools/misc/rrdtool { }; + rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; + rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; From f401b3cf0bad8ceba7fe13cc9a3f03ad9c4b6846 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 02:09:12 +0200 Subject: [PATCH 35/86] httping 2.3.4 -> 2.4 Also add support for the fancy ncurses interface. --- pkgs/tools/networking/httping/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 7e9906e7971a..9243550a1b1b 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,26 +1,27 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, ncurses }: stdenv.mkDerivation rec { name = "httping-${version}"; - version = "2.3.4"; + version = "2.4"; src = fetchurl { - url = "http://www.vanheusden.com/httping/httping-2.3.4.tgz"; - sha256 = "1hkbhdxb0phrvrddx9kcfpqlzm41xv9jvy82nfkqa7bb0v5p2qd7"; + url = "http://www.vanheusden.com/httping/${name}.tgz"; + sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"; }; - buildInputs = [ gettext ]; + buildInputs = [ gettext ncurses ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { - homepage = "http://www.vanheusden.com/httping"; - description = "ping for HTTP requests"; - maintainers = with stdenv.lib.maintainers; [ rickynils ]; - platforms = with stdenv.lib.platforms; linux; + meta = with stdenv.lib; { + inherit version; + homepage = http://www.vanheusden.com/httping; + description = "ping with HTTP requests"; + maintainers = with maintainers; [ nckx rickynils ]; + platforms = with platforms; linux; }; } From 9258e8a4bfd180289363d9533e56395115488f03 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 17:24:33 -0700 Subject: [PATCH 36/86] fusionio: Refactor and add utils --- pkgs/os-specific/linux/fusionio/srcs.nix | 22 +++++++++++++++ pkgs/os-specific/linux/fusionio/util.nix | 36 ++++++++++++++++++++++++ pkgs/os-specific/linux/fusionio/vsl.nix | 11 ++++---- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/fusionio/srcs.nix create mode 100644 pkgs/os-specific/linux/fusionio/util.nix diff --git a/pkgs/os-specific/linux/fusionio/srcs.nix b/pkgs/os-specific/linux/fusionio/srcs.nix new file mode 100644 index 000000000000..fb632a6e9fba --- /dev/null +++ b/pkgs/os-specific/linux/fusionio/srcs.nix @@ -0,0 +1,22 @@ +{ fetchurl }: +rec { + version = "3.2.10"; + + libvsl = fetchurl { + name = "fusionio-libvsl-${version}.deb"; + url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk"; + sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk"; + }; + + util = fetchurl { + name = "fusionio-util-${version}.deb"; + url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs"; + sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq"; + }; + + vsl = fetchurl { + name = "fusionio-iomemory-vsl-${version}.tar.gz"; + url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM"; + sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc"; + }; +} diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix new file mode 100644 index 000000000000..4605731fbbef --- /dev/null +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }: + +let + srcs = import ./srcs.nix { inherit fetchurl; }; +in +stdenv.mkDerivation { + name = "fusionio-util-${srcs.version}"; + + nativeBuildInputs = [ dpkg ]; + + buildCommand = '' + dpkg-deb -R ${srcs.libvsl} $TMPDIR + dpkg-deb -R ${srcs.util} $TMPDIR + + rm $TMPDIR/usr/bin/fio-{bugreport,sanitize} + + mkdir -p $out + cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out + for BIN in $(find $out/bin -type f); do + echo Patching $BIN + patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN + $BIN --help >/dev/null 2>&1 || [ "$?" -lt "128" ] || { echo "Failed testing $BIN"; exit 1; } + done + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + homepage = http://fusionio.com; + description = "Fusionio command line utilities."; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + broken = stdenv.system != "x86_64-linux"; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix index 7947446c1f2b..f3909950cb91 100644 --- a/pkgs/os-specific/linux/fusionio/vsl.nix +++ b/pkgs/os-specific/linux/fusionio/vsl.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, kernel }: +let + srcs = import ./srcs.nix { inherit fetchurl; }; +in stdenv.mkDerivation rec { - name = "fusionio-iomemory-vsl-3.2.10"; + name = "fusionio-iomemory-vsl-${srcs.version}"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM"; - sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc"; - }; + src = srcs.vsl; prePatch = '' cd root/usr/src/iomemory-vsl-* diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e32256a156..95bd693a9f8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9025,6 +9025,8 @@ let fuse = callPackage ../os-specific/linux/fuse { }; + fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { }; + fxload = callPackage ../os-specific/linux/fxload { }; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; From 00230c92402bb3d94eae0db63cd6d2ba237b541f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 17:38:08 -0700 Subject: [PATCH 37/86] fusionio: Correct binary testing code --- pkgs/os-specific/linux/fusionio/util.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix index 4605731fbbef..16f1ef73dba5 100644 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -19,7 +19,16 @@ stdenv.mkDerivation { for BIN in $(find $out/bin -type f); do echo Patching $BIN patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN - $BIN --help >/dev/null 2>&1 || [ "$?" -lt "128" ] || { echo "Failed testing $BIN"; exit 1; } + + # Test our binary to see if it was correctly patched + set +e + $BIN --help >/dev/null 2>&1 + ST="$?" + set -e + if [ "$ST" -ge "10" ]; then + echo "Failed testing $BIN" + exit 1; + fi done ''; From 4463bad2dd5d5175c2c80f2050f2622372724be1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 18:23:46 -0700 Subject: [PATCH 38/86] grub: Update from 2015-2-21 -> 2015-04-24 --- pkgs/tools/misc/grub/2.0x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3e1fa21fd562..47eb90eb11e1 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.02-git-2ae9457"; + version = "2.02-git-2015-04-24"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = "2ae9457e6eb4c352051fb32bc6fc931a22528ab2"; - sha256 = "1ik60qgkymg0xdns5az1hbxasspah2vzxg334rpbk2yy3h3nx5ln"; + rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de"; + sha256 = "1170413b4d9kwqwgi1dcsnbwn8mb3snbid858wyfv84910kbrs2d"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; From 09602f7f39cddab281189e0d9e947797aceb2513 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 27 Apr 2015 21:59:51 -0400 Subject: [PATCH 39/86] ruby: fix gems that use mysql --- .../interpreters/ruby/bundler-env/default-gem-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index b7ddfdea80b3..38b7ce530ae4 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,7 +25,6 @@ let v8 = v8_3_16_14; - mysql = assert false; (import {}).mysql; in From c45bc8c2b4045be504a30cefd005ff638a360614 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Mon, 27 Apr 2015 22:38:24 -0400 Subject: [PATCH 40/86] Added innoextract package. Allows to extract inno installer packages. --- pkgs/tools/archivers/innoextract/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/tools/archivers/innoextract/default.nix diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix new file mode 100644 index 000000000000..d8c88b6ee657 --- /dev/null +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: +stdenv.mkDerivation rec { + name = "innoextract-1.4"; + src = fetchurl { + url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; + sha256 = "1j8wj0ijdnfh0r9qjr7ykp9v3n2yd4qisxln81bl6474w5d4njas"; + }; + buildInputs = [ python doxygen lzma boost ]; + nativeBuildInputs = [ cmake ]; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95bd693a9f8f..6d16c81e9802 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1722,6 +1722,8 @@ let inetutils = callPackage ../tools/networking/inetutils { }; + innoextract = callPackage ../tools/archivers/innoextract {}; + ioping = callPackage ../tools/system/ioping {}; iodine = callPackage ../tools/networking/iodine { }; From e1c65ddfe11c8070dda00a66f2b4ae45bbddb0bc Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 09:48:52 +0200 Subject: [PATCH 41/86] pycairo: set user-agent to fix download of patches --- pkgs/development/python-modules/pycairo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 0589bec36b95..50e1435f3f4b 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -15,11 +15,13 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} patches = [(fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; + curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; })]; patch_waf = fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; + curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; From 06e2fdc62e7639a5dccb8ee3260d3ba76d048c7e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 09:57:10 +0200 Subject: [PATCH 42/86] spin: update from 6.4.1 to 6.4.3 --- pkgs/development/tools/analysis/spin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index e21ae8e92738..f1295060d3c4 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.1"; + version = "6.4.3"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz"; curlOpts = "--user-agent 'Mozilla/5.0'"; - sha256 = "02r2jazb2hnhcqcjnmlj6sjd9dvyfalgi99bzncwfadixf3hmpvn"; + sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1"; }; buildInputs = [ yacc ]; From 8388bd3280104c17e27693b75038e11f55941e85 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 07:38:16 +0000 Subject: [PATCH 43/86] wiki: do not rewrite served files --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index c0ed20416397..310083e7610d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -142,6 +142,7 @@ in RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs} + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedFiles} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" From bca76e46f0c4cc3907ee010589439f2edb3402d9 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 07:39:35 +0000 Subject: [PATCH 44/86] Apache servedFiles: fixed a typo in example --- .../services/web-servers/apache-httpd/per-server-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0db27b0bcbe6..5abcc5e74900 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 @@ -97,7 +97,7 @@ with lib; default = []; example = [ { urlPath = "/foo/bar.png"; - dir = "/home/eelco/some-file.png"; + files = "/home/eelco/some-file.png"; } ]; description = '' From 4855b0b3fb38d2f617cc50563ff23fac27e6f851 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 08:04:10 +0000 Subject: [PATCH 45/86] Mediawiki 1.23.9 --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 310083e7610d..52d8c89baff2 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.3"; + name= "mediawiki-1.23.9"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf"; + sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql"; }; skins = config.skins; From c323c87565fdf4b256a802c18fd59acec4d5ca29 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 28 Apr 2015 11:09:50 +0300 Subject: [PATCH 46/86] kmod-blacklist-ubuntu: Fix source package URL returning 404 The original URL http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-3ubuntu1.debian.tar.gz is dead. --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 686f63720fc1..c750006fcd21 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-${version}.debian.tar.gz"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; }; From f99d5cf2fc9c97df6853eab6187c79c299fb897f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 10:54:58 +0200 Subject: [PATCH 47/86] Fixed some descriptions --- pkgs/applications/altcoins/primecoin.nix | 2 +- .../audio/mopidy-mopify/default.nix | 2 +- .../editors/emacs-modes/icicles/default.nix | 2 +- pkgs/applications/editors/idea/default.nix | 2 +- pkgs/applications/editors/yi/wrapper.nix | 2 +- pkgs/applications/editors/yi/yi.nix | 2 +- pkgs/applications/misc/ctodo/default.nix | 2 +- .../networking/cluster/kubernetes/default.nix | 2 +- .../networking/cluster/marathon/default.nix | 2 +- .../networking/feedreaders/rawdog/default.nix | 2 +- .../programming/kframework/default.nix | 2 +- pkgs/data/fonts/dina/default.nix | 2 +- .../coq-modules/unimath/default.nix | 2 +- pkgs/development/libraries/geis/default.nix | 4 +-- .../libraries/libcouchbase/default.nix | 4 +-- .../libnetfilter_cthelper/default.nix | 2 +- .../libnetfilter_cttimeout/default.nix | 2 +- .../libraries/libosmpbf/default.nix | 2 +- .../development/libraries/luabind/default.nix | 2 +- .../libraries/science/math/arpack/default.nix | 2 +- pkgs/development/libraries/stxxl/default.nix | 2 +- pkgs/development/libraries/tevent/default.nix | 2 +- .../lisp-modules/lisp-packages.nix | 16 +++++----- pkgs/development/tools/chefdk/default.nix | 2 +- .../tools/database/sqldeveloper/default.nix | 2 +- .../tools/misc/autoconf-archive/default.nix | 2 +- .../tools/misc/checkbashisms/default.nix | 2 +- .../tools/parsing/jshon/default.nix | 2 +- pkgs/development/tools/rust/racer/default.nix | 2 +- .../tools/selenium/selendroid/default.nix | 2 +- pkgs/games/gnubg/default.nix | 2 +- pkgs/games/scrolls/default.nix | 2 +- pkgs/misc/emulators/cdemu/base.nix | 2 +- pkgs/servers/mail/exim/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/sensu/default.nix | 3 +- pkgs/servers/osrm-backend/default.nix | 2 +- pkgs/servers/sql/pgpool/default.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/misc/fluentd/default.nix | 2 +- pkgs/tools/misc/moreutils/default.nix | 2 +- pkgs/tools/misc/rmlint/default.nix | 2 +- pkgs/tools/misc/t/default.nix | 2 +- pkgs/tools/networking/wrk/default.nix | 2 +- pkgs/tools/system/augeas/default.nix | 2 +- pkgs/tools/system/honcho/default.nix | 2 +- pkgs/tools/text/grin/default.nix | 2 +- pkgs/tools/text/html2text/default.nix | 2 +- pkgs/top-level/go-packages.nix | 2 +- pkgs/top-level/lua-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 30 +++++++++---------- 54 files changed, 77 insertions(+), 78 deletions(-) diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 11ec35a71bda..61bba04cb6ae 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec{ else "install -D bitcoind $out/bin/primecoind"; meta = { - description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers."; + description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; longDescription= '' Primecoin is an innovative cryptocurrency, a form of digital currency secured by cryptography and issued through a diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 2dd4c19f0e01..4616d3f7c64c 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://github.com/dirkgroenen/mopidy-mopify; - description = "A mopidy webclient based on the Spotify webbased interface."; + description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; maintainers = [ maintainers.Gonzih ]; }; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 820e959a3574..1a145e1b6486 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.emacswiki.org/emacs/Icicles"; - description = "Enhance Emacs minibuffer input with cycling and powerful completion."; + description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ simons ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 0f9df276569f..b99265cf0dd9 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -227,7 +227,7 @@ in name = "clion-${version}"; version = "1.0"; build = "141.353"; - description = "C/C++ IDE. New. Intelligent. Cross-platform."; + description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 4887662bce54..a4dc3fe367ad 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { env = yiEnv; meta = with stdenv.lib; { - description = "Allows Yi to find libraries and the compiler easily."; + description = "Allows Yi to find libraries and the compiler easily"; # This wrapper and wrapper only is under PD license = licenses.publicDomain; maintainers = with maintainers; [ fuuzetsu ]; diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index a63375adfd14..f9ef27d999de 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -30,7 +30,7 @@ cabal.mkDerivation (self: { configureFlags = "-fpango -fvty"; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8"; meta = { - homepage = "http://haskell.org/haskellwiki/Yi"; + homepage = http://haskell.org/haskellwiki/Yi; description = "The Haskell-Scriptable Editor"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 3978a369d06f..7301ea704e85 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ctodo.apakoh.dk/"; - description = "A simple ncurses-based task list manager."; + description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c89ad0a51685..23ec975078b8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Open source implementation of container cluster management."; + description = "Open source implementation of container cluster management"; license = licenses.asl20; homepage = https://github.com/GoogleCloudPlatform; maintainers = with maintainers; [offline]; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 36ce79aaf341..1714aa274f0e 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://mesosphere.github.io/marathon; - description = "Cluster-wide init and control system for services in cgroups or Docker containers."; + description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index fc494c6aebc0..231b3195b5f0 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = "http://offog.org/code/rawdog/"; - description = "an RSS Aggregator Without Delusions Of Grandeur."; + description = "An RSS Aggregator Without Delusions Of Grandeur"; license = stdenv.lib.licenses.gpl2; platform = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix index 090dc5ac756a..e8a4f2b31564 100644 --- a/pkgs/applications/science/programming/kframework/default.nix +++ b/pkgs/applications/science/programming/kframework/default.nix @@ -90,7 +90,7 @@ releaseTools.mvnBuild rec { ''; meta = { - description = "The K Framework is a rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined."; + description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined"; homepage = http://www.kframework.org; license = stdenv.lib.licenses.bsd3; # technically it is the UIUC/NCSA license # but LLVM uses that license as well and diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index da7a1bc5fb9e..e79dcd014d3b 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A monospace bitmap font aimed at programmers."; + description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is relatively compact to allow a lot of code on screen, while (hopefully) diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix index e16156dec530..e6f32d60c4f8 100644 --- a/pkgs/development/coq-modules/unimath/default.nix +++ b/pkgs/development/coq-modules/unimath/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/UniMath/UniMath; - description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view."; + description = "A formalization of a substantial body of mathematics using the univalent point of view"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 15f42afd9a8e..24c24fe5f123 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://launchpad.net/geis"; - description = "GEIS is a library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism."; + description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 841edd3dff61..bcc9e9f673f1 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; meta = { - description = "C client library for Couchbase."; + description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 197892897f32..973198409758 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; meta = { - description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure."; + description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure"; longDescription = '' libnetfilter_cthelper is the userspace library that provides the programming interface to the user-space helper infrastructure available since Linux kernel 3.6. With this diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 0626e91b8ba2..2920cbd97858 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; meta = { - description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure."; + description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure"; longDescription = '' libnetfilter_cttimeout is the userspace library that provides the programming interface to the fine-grain connection tracking timeout infrastructure. diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 6ff5d8167760..334748d668c4 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/scrosby/OSM-binary; - description = "C library to read and write OpenStreetMap PBF files."; + description = "C library to read and write OpenStreetMap PBF files"; license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index edb914123e17..e03535ba979e 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/luabind/luabind; - description = "Luabind is a library that helps you create bindings between C++ and Lua."; + description = "A library that helps you create bindings between C++ and Lua"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 296c5f6b9202..01bb3371f5e2 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue - problems. + problems ''; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index b387c59efa13..23590f17ca88 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/stxxl/stxxl; - description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations."; + description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index db863d951a69..baa7e288178c 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "an event system based on the talloc memory management library."; + description = "An event system based on the talloc memory management library"; homepage = http://tevent.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index ff95bb4a000e..d7bd2348244e 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -20,7 +20,7 @@ let lispPackages = rec { clx = buildLispPackage rec { baseName = "clx"; version = "git-20150117"; - description = "An implementation of the X Window System protocol in Lisp."; + description = "An implementation of the X Window System protocol in Lisp"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -98,7 +98,7 @@ let lispPackages = rec { clx-truetype = buildLispPackage rec { baseName = "clx-truetype"; version = "git-20141112"; - description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension"; deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; # Source type: git src = pkgs.fetchgit { @@ -178,7 +178,7 @@ let lispPackages = rec { trivial-features = buildLispPackage rec { baseName = "trivial-features"; version = "git-20141112"; - description = "Ensures consistent *FEATURES* across multiple CLs."; + description = "Ensures consistent *FEATURES* across multiple CLs"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -280,7 +280,7 @@ let lispPackages = rec { babel = buildLispPackage rec { baseName = "babel"; version = "git-20141113"; - description = "Babel, a charset conversion library."; + description = "A charset conversion library"; deps = [alexandria trivial-features]; # Source type: git src = pkgs.fetchgit { @@ -408,7 +408,7 @@ let lispPackages = rec { trivial-gray-streams = buildLispPackage rec { baseName = "trivial-gray-streams"; version = "git-20141113"; - description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -421,7 +421,7 @@ let lispPackages = rec { cl-ssl = buildLispPackage rec { baseName = "cl+ssl"; version = "git-20141113"; - description = "Common Lisp interface to OpenSSL."; + description = "Common Lisp interface to OpenSSL"; deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; # Source type: git src = pkgs.fetchgit { @@ -448,7 +448,7 @@ let lispPackages = rec { trivial-garbage = buildLispPackage rec { baseName = "trivial-garbage"; version = "git-20141113"; - description = "Portable finalizers, weak hash-tables and weak pointers."; + description = "Portable finalizers, weak hash-tables and weak pointers"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -461,7 +461,7 @@ let lispPackages = rec { cl-base64 = buildLispPackage rec { baseName = "cl-base64"; version = "git-20141113"; - description = "Base64 encoding and decoding with URI support."; + description = "Base64 encoding and decoding with URI support"; deps = []; # Source type: git src = pkgs.fetchgit { diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 8352c71a6864..f8e759b83ee5 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -11,7 +11,7 @@ bundlerEnv { buildInputs = [ perl ]; meta = with lib; { - description = "A streamlined development and deployment workflow for Chef platform."; + description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9a0afdc8e1d1..7c4aefee639b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Oracle's Oracle DB GUI client."; + description = "Oracle's Oracle DB GUI client"; longDescription = '' Oracle SQL Developer is a free integrated development environment that simplifies the development and management of Oracle Database in both diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 0e6ca01c625e..c5c965ac58e5 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; meta = with stdenv.lib; { - description = "Archive of autoconf m4 macros."; + description = "Archive of autoconf m4 macros"; homepage = http://www.gnu.org/software/autoconf-archive/; license = licenses.gpl3; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 259224aac5da..9c48227c9a83 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/checkbaskisms/; - description = "Performs basic checks on shell scripts for the presence of non portable syntax."; + description = "Performs basic checks on shell scripts for the presence of non portable syntax"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index fa11671db0bd..4b35ba0cce29 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://kmkeen.com/jshon; - description = "JSON parser designed for maximum convenience within the shell."; + description = "JSON parser designed for maximum convenience within the shell"; license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ rushmorem ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 341088dc0f2d..4ef9cc6d285f 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A utility intended to provide Rust code completion for editors and IDEs."; + description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/phildawes/racer; license = stdenv.lib.licenses.mit; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index e34e479e938a..6604bc5648d8 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/selenium; - description = "Test automation for native or hybrid Android apps and the mobile web."; + description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 00ae4e28860a..83560c21f5df 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gtk" "--with--board3d" ]; meta = with stdenv.lib; - { description = "World class backgammon application."; + { description = "World class backgammon application"; homepage = http://www.gnubg.org/; license = licenses.gpl3; maintainers = [ maintainers.emery ]; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 171a6d6fe838..376d1e334734 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "scrolls-2014-03-08"; meta = { - description = "Scrolls is a strategy collectible card game."; + description = "A strategy collectible card game"; homepage = "https://scrolls.com/"; # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index b2b641e3f7a6..58727f10ef19 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation ({ cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON ''; meta = { - description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system."; + description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system"; longDescription = '' CDEmu consists of: diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index ae4e1d6f2452..3dd0463b604f 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://exim.org/"; - description = "Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems."; + description = "A mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 1e818a508d90..c0126fda5723 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Analyzes resource usage and performance characteristics of running docker containers."; + description = "Analyzes resource usage and performance characteristics of running docker containers"; homepage = https://github.com/google/cadvisor; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 2785898bed56..38e59a39f381 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -9,8 +9,7 @@ gemset = ./gemset.nix; meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, -and scalable."; + description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; license = with licenses; mit; maintainers = with maintainers; [ theuni ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 37d3650f6833..3e9e2158524c 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/Project-OSRM/osrm-backend/wiki; - description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project."; + description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 137e536e5d84..775621e64b44 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://pgpool.net/mediawiki/index.php; - description = "a middleware that works between postgresql servers and postgresql clients."; + description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 57ca79a00a22..016e3c5d51e8 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bareos.org/; - description = "a fork of the bacula project."; + description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 0d7a0e14e7de..343709dd9571 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { }; meta = with stdenv.lib; { - description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives."; + description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "http://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 0f9bff82967b..409e7a8c36ff 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Quickly find duplicate files."; + description = "Quickly find duplicate files"; homepage = http://duff.dreda.org/; license = with licenses; zlib; longDescription = '' diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index b659dafddeb8..cfc1e9ab5647 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -11,7 +11,7 @@ bundlerEnv { buildInputs = [ curl ]; meta = with lib; { - description = "Fluentd data collector."; + description = "A data collector"; homepage = http://www.fluentd.org/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 5a42a5d85154..843672fa26cf 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; meta = { - description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young."; + description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 21643a9d11aa..aed93775ce98 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = "scons --prefix=$out install"; meta = { - description = "Extremely fast tool to remove duplicates and other lint from your filesystem."; + description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; homepage = http://rmlint.readthedocs.org; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index 10db8764f89d..fd64f6694ee5 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -9,7 +9,7 @@ bundlerEnv { gemset = ./gemset.nix; meta = with lib; { - description = "A command-line power tool for Twitter."; + description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 9af28dbebd6a..f4cdb7eaddb3 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "HTTP benchmarking tool."; + description = "HTTP benchmarking tool"; homepage = http://github.com/wg/wrk; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index e6b09932f867..263690728d22 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig readline libxml2 ]; meta = with stdenv.lib; { - description = "Configuration editing tool."; + description = "Configuration editing tool"; license = licenses.lgpl2; homepage = http://augeas.net/; maintainers = with maintainers; [offline]; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 6bf2a995a24c..b52c1c0f636d 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -20,7 +20,7 @@ let honcho = buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "A Python clone of Foreman, a tool for managing Procfile-based applications."; + description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; homepage = https://github.com/nickstenning/honcho; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index da7799900a35..2ea4a9501452 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = https://pypi.python.org/pypi/grin; - description = "A grep program configured the way I like it."; + description = "A grep program configured the way I like it"; platform = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sjagoe ]; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 27de591d8896..8fd0bea2254c 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text."; + description = "A command line utility, written in C++, that converts HTML documents into plain text"; homepage = http://www.mbayer.de/html2text/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 42b73fe612d6..8c2f090e0c10 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -448,7 +448,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.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."; + 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/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 766ff90d5b7b..773ddd295215 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -74,7 +74,7 @@ let meta = with stdenv.lib; { homepage = http://luaforge.net/projects/luaevent/; - description = "Binding of libevent to Lua."; + description = "Binding of libevent to Lua"; license = licenses.mit; maintainers = [ maintainers.koral ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c86204cfd23..56bffa0bc51b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6727,7 +6727,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x"; }; meta = { - description = "Mozilla's ldap client library."; + description = "Mozilla's ldap client library"; license = "unknown"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0734c0d0727b..0f224aae2f30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -435,7 +435,7 @@ let meta = { homepage = http://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project."; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; }; @@ -668,7 +668,7 @@ let }; meta = { - description = "Utilities and Python modules for handling audio."; + description = "Utilities and Python modules for handling audio"; homepage = "http://audiotools.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; }; @@ -794,7 +794,7 @@ let meta = { homepage = http://pypi.python.org/pypi/babelfish; - description = "A module to work with countries and languages."; + description = "A module to work with countries and languages"; license = stdenv.lib.licenses.bsd3; }; }; @@ -1172,7 +1172,7 @@ let propagatedBuildInputs = with self; [ six html5lib ]; meta = with stdenv.lib; { - description = "An easy, HTML5, whitelisting HTML sanitizer."; + description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' Bleach is an HTML sanitizing library that escapes or strips markup and attributes based on a white list. Bleach can also linkify text safely, @@ -5784,7 +5784,7 @@ let meta = { homepage = http://pypi.python.org/pypi/guessit; license = stdenv.lib.licenses.lgpl3; - description = "A library for guessing information from video files."; + description = "A library for guessing information from video files"; }; }; @@ -6227,7 +6227,7 @@ let meta = with stdenv.lib; { homepage = http://maebert.github.io/jrnl/; - description = "A simple command line journal application that stores your journal in a plain text file."; + description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; }; }; @@ -6775,7 +6775,7 @@ let meta = with stdenv.lib; { description = '' - A content management platform built using the Django framework. + A content management platform built using the Django framework ''; longDescription = '' Mezzanine is a powerful, consistent, and flexible content management @@ -7713,8 +7713,8 @@ let }; meta = { - homepage = "http://code.google.com/p/oauth"; - description = "Library for OAuth version 1.0a."; + homepage = http://code.google.com/p/oauth; + description = "Library for OAuth version 1.0a"; license = licenses.mit; platforms = stdenv.lib.platforms.all; }; @@ -9490,7 +9490,7 @@ let meta = { homepage = http://pyparsing.wikispaces.com/; - description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; }; }; @@ -11636,7 +11636,7 @@ let propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer six ]; meta = with stdenv.lib; { - description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects."; + description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; license = licenses.bsd3; platforms = platforms.unix; @@ -13004,7 +13004,7 @@ let propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; meta = with stdenv.lib; { - description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python."; + description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; homepage = http://willie.dftba.net/; license = licenses.efl20; }; @@ -14796,8 +14796,8 @@ let propagatedBuildInputs = with self; [ nose ]; meta = { - homepage = "https://more-itertools.readthedocs.org"; - description = "Expansion of the itertools module."; + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; license = licenses.mit; }; }; @@ -14830,7 +14830,7 @@ let }; meta = with stdenv.lib; { - description = "Collection of fancy functional tools focused on practicality."; + description = "Collection of fancy functional tools focused on practicality"; homepage = "http://funcy.readthedocs.org/"; license = stdenv.lib.licenses.bsd3; From 69116f8fc93edf64c641c4f6dd74d65c86b9bd11 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 11:09:20 +0200 Subject: [PATCH 48/86] Fix evaluation after refactoring (a2a35082ccd64b4d00d88778d9633fe18c0bb215) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95bd693a9f8f..b2ada831e476 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1995,7 +1995,6 @@ let minecraft = callPackage ../games/minecraft { pulseaudioSupport = config.pulseaudio or true; - pulseaudio = pulseaudio.override { ossWrapper = true; }; }; minecraft-server = callPackage ../games/minecraft-server { }; From ed46b22db0fbc2d51512f91f018711ed05ed7143 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 03:28:23 +0200 Subject: [PATCH 49/86] librep: git -> 0.92.5 This is the latest release and is more recent than the GIT revision pointed to previously. I have also taken the liberty of removing some irrelevant information from the package description. --- pkgs/development/libraries/librep/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 2abe01decb77..314508cc5c20 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,18 +1,17 @@ - - { stdenv, fetchgit +{ stdenv, fetchurl , pkgconfig, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: with stdenv.lib; + stdenv.mkDerivation rec { + name = "librep-${version}"; + version = "0.92.5"; - name = "librep-git-2015-02-15"; - - src = fetchgit { - url = "https://github.com/SawfishWM/librep.git"; - rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf"; - sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6"; + src = fetchurl { + url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz"; + sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76"; }; buildInputs = [ pkgconfig autoreconfHook readline texinfo ]; @@ -25,15 +24,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - description = "Lisp system for Sawfish"; + description = "Fast, lightweight, and versatile Lisp environment"; longDescription = '' - This is librep, a Lisp system for UNIX, needed by Sawfish window manager. - It contains a Lisp interpreter, byte-code compiler and virtual machine. - Applications may use the Lisp interpreter as an extension language, - or it may be used for stand-alone scripts. - - The Lisp dialect was originally inspired by Emacs Lisp, but with the worst - features removed. It also borrows many ideas from Scheme. + librep is a Lisp system for UNIX, comprising an + interpreter, a byte-code compiler, and a virtual + machine. It can serve as an application extension language + but is also suitable for standalone scripts. ''; homepage = http://sawfish.wikia.com; license = licenses.gpl2; From 0e7e91030f2833471d6ab50a5827c0c4b9600daa Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 11:05:58 +0200 Subject: [PATCH 50/86] rep-gtk: git -> 0.90.8.2 This is the most recent release which has a tarball. It is strictly older than the GIT revision previously pointed to, but the delta is insignificant (fixes to debian helper scripts, updating NEWS & fixing a typo in the changelog) --- pkgs/development/libraries/rep-gtk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 070baf7ae794..888a81a390ed 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }: with stdenv.lib; stdenv.mkDerivation rec { - name = "rep-gtk-git-2015-02-15"; + name = "rep-gtk-${version}"; + version = "0.90.8.2"; - src = fetchgit { - url = "https://github.com/SawfishWM/rep-gtk.git"; - rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d"; - sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031"; + src = fetchurl { + url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz"; + sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r"; }; buildInputs = [ pkgconfig autoreconfHook ]; From db5623fd3edfa2ea3af0c534429b2d187e00d77b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 11:06:56 +0200 Subject: [PATCH 51/86] sawfish: git -> 1.11.90 This is the latest release (more recent than the GIT revision previously pointed to). There is no release tarball, however. --- .../window-managers/sawfish/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 4281eb99dd03..f3b19e846101 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango +, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo +, makeWrapper +}: with stdenv.lib; + stdenv.mkDerivation rec { - name = "sawfish-git-2015-02-15"; + name = "sawfish-${version}"; + version = "1.11.90"; src = fetchgit { url = "https://github.com/SawfishWM/sawfish.git"; - rev = "44729f44017e6779b4b66a7ecdbd63a98731f668"; - sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73"; + rev = "b121f832571c9aebd228691c32604146e49f5e55"; + sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc"; }; - buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ]; + buildInputs = + [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama + libXrandr libXtst imlib gettext texinfo makeWrapper + ]; patchPhase = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in @@ -25,7 +33,7 @@ stdenv.mkDerivation rec { --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; - + meta = { description = "An extensible, Lisp-based window manager"; longDescription = '' From 27ea35b4819cbcdfc9365f18504c5d1650b51f3a Mon Sep 17 00:00:00 2001 From: Hendrik Bunke Date: Tue, 28 Apr 2015 12:24:28 +0200 Subject: [PATCH 52/86] pythonPackages: fixed and updated goobook goobook didn't work because dependency package 'six' has been in buildInputs but should be in propagatedBuildInputs. Also: updated goobook to 1.6 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f224aae2f30..03e120dbea12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5638,7 +5638,7 @@ let }; goobook = buildPythonPackage rec { - name = "goobook-1.5"; + name = "goobook-1.6"; disabled = isPy3k; src = pkgs.fetchurl { @@ -5646,7 +5646,7 @@ let sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z"; }; - buildInputs = with self; [ six ]; + buildInputs = with self; [ ]; preConfigure = '' sed -i '/distribute/d' setup.py @@ -5656,11 +5656,11 @@ let description = "Search your google contacts from the command-line or mutt"; homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 hbunke ]; platforms = platforms.unix; }; - propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson ]; + propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson six]; }; google_api_python_client = buildPythonPackage rec { From 7b37a5f168706db5efa33599354f5c1967ac4c51 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Tue, 28 Apr 2015 12:16:37 +1000 Subject: [PATCH 53/86] nixos-install: Fix password prompt failing outside NixOS. When bootstrapping from other distributions, nixos-install is unable to find various tools in the chroot since their paths aren't aware of NixOS conventions. This makes a small change to existing code by specifying nixpkgs/nixos instead of just nixos when running nix-instantiate in the chroot. I haven't tested this outside of bootstrapping, but the same specification is used elsewhere in the code so I don't see why it wouldn't work. --- nixos/modules/installer/tools/nixos-install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 14ae3daace0b..86e57f704c1b 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -254,8 +254,14 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ chroot $mountPoint /nix/var/nix/profiles/system/activate +# Some systems may not be prepared to use NixOS' paths. +export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH +export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs +export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels + + # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi From 71910be9ea225895e36f60ed23a1bdce402b3088 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Tue, 28 Apr 2015 12:16:38 +1000 Subject: [PATCH 54/86] nixos-install: Fix chroot flag not defaulting to Bash outside NixOS. Passing the chroot flag to nixos-install without arguments should now give you a Bash shell as intended rather than try an empty path. This was masked by the user's shell (usually /bin/bash) being defaulted to by chroot, and being found since their paths used NixOS conventions. --- nixos/modules/installer/tools/nixos-install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 86e57f704c1b..097631eda9c9 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -45,7 +45,9 @@ while [ "$#" -gt 0 ]; do ;; --chroot) runChroot=1 - chrootCommand=("$@") + if [[ "$@" != "" ]]; then + chrootCommand=("$@") + fi break ;; --help) From c449a930aaf849416b39062d80b6e9eff24a9add Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Apr 2015 13:14:05 +0200 Subject: [PATCH 55/86] ghcWithPackages: add postBuild hook so that users can mess with the generated environment postBuild can be used to execute user-specific commands on the generated $out environment before finalizing the build. For example, this hook can be used to generate appropriate 'makeWrapper' script for binaries contained in the environment. --- .../haskell-modules/with-packages-wrapper.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 30035671a327..136566f65f0b 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, ghc, llvmPackages, packages, buildEnv -, makeWrapper -, ignoreCollisions ? false, withLLVM ? false }: +{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper +, ignoreCollisions ? false, withLLVM ? false +, postBuild ? "" +}: # This wrapper works only with GHC 6.12 or later. assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; @@ -89,7 +90,7 @@ buildEnv { ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} $out/bin/${ghcCommand}-pkg check - ''; + '' + postBuild; } // { preferLocalBuild = true; inherit (ghc) version meta; From 8233fd5c6a3690acaa2117c060544d63a3e58b32 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 20:49:19 +0200 Subject: [PATCH 56/86] i2p: add service to module-list --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 023d67a01424..61cc551f4358 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -272,6 +272,7 @@ ./services/networking/haproxy.nix ./services/networking/hostapd.nix ./services/networking/i2pd.nix + ./services/networking/i2p.nix ./services/networking/ifplugd.nix ./services/networking/iodined.nix ./services/networking/ircd-hybrid/default.nix From c6562348b830c6cf8695c39f0eea33ecc2fd5381 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 21:13:44 +0200 Subject: [PATCH 57/86] i2p: update 0.9.18 -> 0.9.19 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 9a20e009e58a..60dfd0067766 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }: stdenv.mkDerivation rec { - name = "i2p-0.9.18"; + name = "i2p-0.9.19"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl"; + sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936"; }; buildInputs = [ openjdk8 ant gettext ]; buildPhase = '' From 9754783b06597fc133b955ab3c360660aa9fd4dc Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 21:14:02 +0200 Subject: [PATCH 58/86] i2p: fix compilation - use system jdk instead of hardcoded openjdk - remove backgrounding of service launcher --- pkgs/tools/networking/i2p/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 60dfd0067766..b5ef06c34eaa 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }: +{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { name = "i2p-0.9.19"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936"; }; - buildInputs = [ openjdk8 ant gettext ]; + buildInputs = [ jdk ant gettext which ]; buildPhase = '' export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" ant preppkg-linux-only @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e 's#%USER_HOME#$HOME#' \ -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \ - -e 's#JAVA=java#JAVA=${openjre}/bin/java#' + -e 's#JAVA=java#JAVA=${jre}/bin/java#' + sed -i $out/runplain.sh \ + -e "s#nohup \(.*Launch\) .*#\1#" \ + -e "s#echo \$\! .*##" mv $out/runplain.sh $out/bin/i2prouter-plain mv $out/man $out/share/ chmod +x $out/bin/* $out/i2psvc From f5e7190572dcc3f0f62918f1676439706623fe93 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Apr 2015 17:15:02 +0200 Subject: [PATCH 59/86] nixos.system_tarball_pc: Fix evaluation It was broken due to 57b05765c968c1ad5245c59513d11d679ed7130d. ZFS requires `networking.hostId` to be set. --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- nixos/modules/profiles/base.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index fde9989e1f97..446d79ce2200 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -45,9 +45,6 @@ with lib; # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; - # Configure host id for ZFS to work - networking.hostId = "8425e349"; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 0d40b7112df7..6c8e99943797 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -54,4 +54,6 @@ # Include support for various filesystems. boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ]; + # Configure host id for ZFS to work + networking.hostId = "8425e349"; } From f426922f4a7a32980a4dc9ab30189609bebaa55e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 17:40:03 +0200 Subject: [PATCH 60/86] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/44775051f9c0c34f42413a2af5d8c5ed4146cecf with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b --- .../haskell-modules/hackage-packages.nix | 325 ++++++++++-------- 1 file changed, 188 insertions(+), 137 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0148ca906647..8628d5a16982 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2886,19 +2886,20 @@ self: { "CouchDB" = callPackage ({ mkDerivation, base, bytestring, containers, HTTP, HUnit, json - , mtl, network, utf8-string + , mtl, network, network-uri, utf8-string }: mkDerivation { pname = "CouchDB"; - version = "1.2"; - sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; + version = "1.2.1"; + sha256 = "0hj1rml9pf9knwm3grwrkizjricc7bchsi6m7dgjlfh81q247jp4"; buildDepends = [ - base bytestring containers HTTP json mtl network utf8-string + base bytestring containers HTTP json mtl network network-uri + utf8-string ]; testDepends = [ - base bytestring containers HTTP HUnit json mtl network utf8-string + base bytestring containers HTTP HUnit json mtl network network-uri + utf8-string ]; - jailbreak = true; homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; license = stdenv.lib.licenses.bsd3; @@ -17526,8 +17527,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "agum"; - version = "2.5"; - sha256 = "0acirnqsm7mrz6pgy9nabn23bmljdcz08b3ahak4ma5lcm5bql9q"; + version = "2.6"; + sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -18033,8 +18034,8 @@ self: { }: mkDerivation { pname = "alms"; - version = "0.6.5"; - sha256 = "12hnhz1lz9wb4s95b9via1nkfgmgmr7p1wc9k4bcvsm778j920s8"; + version = "0.6.7"; + sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -18042,7 +18043,7 @@ self: { incremental-sat-solver mtl network parsec pretty QuickCheck random stm syb template-haskell transformers tuple ]; - homepage = "http://www.ccs.neu.edu/~tov/pubs/alms"; + homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/"; description = "a practical affine language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23041,8 +23042,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.3.12"; - sha256 = "1qmwxd8wfszawhfncqhcnbc2h1a47jcqa4zj4pfwybhy3xnn0yns"; + version = "0.3.13"; + sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l"; buildDepends = [ base bytestring containers hashable lifted-base ReadArgs safe system-filepath text transformers unordered-containers vector @@ -27876,8 +27877,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.2.0"; - sha256 = "06igjmr0n8418wid1pr74cgvlsmwni7ar72g9bddivlbxax1pfli"; + version = "0.3.2.1"; + sha256 = "0rhabhbcxl3gsq4wdkxd4mswrb8rqfmq6crcc70hm75fjxfmr3sz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28294,7 +28295,6 @@ self: { homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -30132,17 +30132,12 @@ self: { }) {}; "chart-histogram" = callPackage - ({ mkDerivation, base, Chart, colour, data-default-class, lens - , vector - }: + ({ mkDerivation, base, Chart }: mkDerivation { pname = "chart-histogram"; - version = "0.4.5"; - sha256 = "0c1y4jaslzxlcmqhj5bgdcx76jw49asmnfgdvfkprf2siq154zba"; - buildDepends = [ - base Chart colour data-default-class lens vector - ]; - jailbreak = true; + version = "1.0.0"; + sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5"; + buildDepends = [ base Chart ]; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32104,8 +32099,8 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "cmu"; - version = "1.9"; - sha256 = "1mn6l17x7zwhc8wlbfqiaxjsvmwh6j0sr4x3gss1z32n5g03syd0"; + version = "1.10"; + sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers ]; @@ -33506,8 +33501,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.4"; - sha256 = "1vqajj5mwnknqcjc5pj883jz4iwjj6is4jr701bzr0n6ngvn7qvh"; + version = "1.2.4.1"; + sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6"; buildDepends = [ base exceptions lifted-base mmorph mtl resourcet transformers transformers-base void @@ -33647,8 +33642,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.2"; - sha256 = "0nb7sd8a5lbl9frypz9clr808ircln356244nzm7kl5qd53752iw"; + version = "1.1.7.3"; + sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34673,17 +34668,17 @@ self: { }) {}; "cookie" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, data-default - , deepseq, HUnit, old-locale, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, time + ({ mkDerivation, base, blaze-builder, bytestring + , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, time }: mkDerivation { pname = "cookie"; - version = "0.4.1.4"; - sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d"; + version = "0.4.1.5"; + sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn"; buildDepends = [ - base blaze-builder bytestring data-default deepseq old-locale text - time + base blaze-builder bytestring data-default-class deepseq old-locale + text time ]; testDepends = [ base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit @@ -53032,10 +53027,9 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "gll"; - version = "0.1.0.0"; - sha256 = "0z3v0bg8r1gmca5bgkrbc44j9ggxkrzlk6r1mqmpycjgv5zryw05"; + version = "0.1.0.1"; + sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv"; buildDepends = [ array base containers ]; - jailbreak = true; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66159,8 +66153,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.1.1"; - sha256 = "10a0rgz9ng84m30x2x9swpdr41yk6wkvhk9vlplbq254rfsg865b"; + version = "0.1.2"; + sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -68681,8 +68675,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.6"; - sha256 = "0ych09pli7v3mhfmvr6c0milvcmxf8bk1jf528z9r9halgjg18vh"; + version = "2.1.7"; + sha256 = "096rfq7ss5hvy1wcc9fdb4svnfiy96p79xh7vj3h7radh2wggfwv"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -68752,8 +68746,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.6"; - sha256 = "0ymgsvl9bq96b7ln4x3yqj5pkla7683xpgg1mp0z9nc70kdzq1w5"; + version = "2.1.7"; + sha256 = "1ifwsqa8ay8f8l96k37rawxjya0qs72bcifxfr5hlz3gagg4a02b"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -68772,8 +68766,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.6"; - sha256 = "0vjgnh4g4sg73n4rfgrlqn0xw2mhkpwrwkkccpwik5jfyks7l1jq"; + version = "2.1.7"; + sha256 = "0gh9kn9ds50xl0zin5vbablf4dpfiabi96sz2a4xsxlskfjflhl0"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -69819,14 +69813,14 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.0.0.3"; - sha256 = "15m48aniszfkbkd6h2ql3r88ldj6f3ph3dyv97nmi8xk1kliipn1"; + version = "1.0.1.0"; + sha256 = "0s44w6nhp6xlibh1740paa21rbjvbnkhjdf35d9yw5hycjwyjwqc"; buildDepends = [ attoparsec base-prelude text unordered-containers ]; testDepends = [ base base-prelude directory doctest filepath ]; homepage = "https://github.com/nikita-volkov/html-entities"; - description = "An \"attoparsec\" parser and a decoder of HTML entities"; + description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; }) {}; @@ -70249,8 +70243,8 @@ self: { }: mkDerivation { pname = "http-common"; - version = "0.7.2.0"; - sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960"; + version = "0.8.2.0"; + sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"; buildDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive directory mtl network text transformers unordered-containers @@ -70575,8 +70569,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.7.2.6"; - sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7"; + version = "0.8.3.1"; + sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -70591,6 +70585,7 @@ self: { snap-core snap-server system-fileio system-filepath text transformers unordered-containers ]; + jailbreak = true; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; @@ -78580,8 +78575,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.1.1"; - sha256 = "14bfzzf4lspkb1haf0bdq75zii50hzwzcl4q5rxysmxfhvmgldh4"; + version = "1.1.1.2"; + sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78594,7 +78589,7 @@ self: { time transformers unix unordered-containers vector yaml ]; testDepends = [ - ansi-wl-pprint base Glob hspec HUnit lens parsec parsers + ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; homepage = "http://lpuppet.banquise.net/"; @@ -89698,17 +89693,18 @@ self: { "nested-routes" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , containers, hspec, http-types, lucid, mtl, pred-trie, QuickCheck - , quickcheck-instances, semigroups, text, transformers, wai - , wai-extra + , constraints, containers, hspec, http-types, lucid, mtl + , poly-arity, pred-trie, QuickCheck, quickcheck-instances + , semigroups, text, transformers, wai, wai-extra }: mkDerivation { pname = "nested-routes"; - version = "0.2.2.2"; - sha256 = "0cnm6clz7y8kpnsi65i15a0vgv7i2q3150igvvmrs1jz15cxzi8z"; + version = "0.3"; + sha256 = "04cgy9hvriq4r8imi23s5lpvbvvdg8a3a51ypmwwgk6vss84jz1l"; buildDepends = [ - aeson attoparsec base blaze-html bytestring containers http-types - lucid mtl pred-trie semigroups text transformers wai wai-extra + aeson attoparsec base blaze-html bytestring constraints containers + http-types lucid mtl poly-arity pred-trie semigroups text + transformers wai wai-extra ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Declarative, compositional Wai responses"; @@ -92259,6 +92255,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "one-time-password" = callPackage + ({ mkDerivation, base, byteable, bytestring, cereal, cryptohash + , tasty, tasty-hunit, time + }: + mkDerivation { + pname = "one-time-password"; + version = "1.0.0.1"; + sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0"; + buildDepends = [ base byteable bytestring cereal cryptohash time ]; + testDepends = [ + base bytestring cryptohash tasty tasty-hunit time + ]; + homepage = "https://github.com/s9gf4ult/one-time-password"; + description = "HMAC-Based and Time-Based One-Time Passwords"; + license = stdenv.lib.licenses.mit; + }) {}; + "oneOfN" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96059,8 +96072,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.2.1"; - sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci"; + version = "0.1.2.2"; + sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -98012,8 +98025,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "1.1.0"; - sha256 = "116w1lac70fpqrcnx7xbr25jfl3nsqw1v35famnfxgf6mjirsbqg"; + version = "1.1.1"; + sha256 = "0c6ns1zwqanqxd45zly2ms6zg3wx0lzr690pvq1prmf676vw2fj1"; buildDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta @@ -98386,8 +98399,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.36.0.0"; - sha256 = "0kh7mf6g7qc2gp4xpvnnq3053i3wxabwiq827l14k8wv43bjsalj"; + version = "0.36.0.2"; + sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb"; buildDepends = [ base bytestring containers contravariant rainbow split text transformers @@ -99821,12 +99834,12 @@ self: { }) {}; "pseudomacros" = callPackage - ({ mkDerivation, base, old-locale, template-haskell, time }: + ({ mkDerivation, base, template-haskell, time }: mkDerivation { pname = "pseudomacros"; - version = "0.0.1"; - sha256 = "168vqim5m72yl51w6pi9vxzp324i1gnawrl2zlsayw81s7lf1jp4"; - buildDepends = [ base old-locale template-haskell time ]; + version = "0.0.2"; + sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9"; + buildDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101266,8 +101279,8 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.0"; - sha256 = "1criyy8iw1har4nd6rm32gwcrqq4f421935dnbyq4iwkd9xf9mqs"; + version = "0.26.0.2"; + sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; @@ -102663,6 +102676,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "refined" = callPackage + ({ mkDerivation, base, base-prelude, template-haskell }: + mkDerivation { + pname = "refined"; + version = "0.1.0.0"; + sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n"; + buildDepends = [ base base-prelude template-haskell ]; + homepage = "https://github.com/nikita-volkov/refined"; + description = "Refinement types with static and runtime checking"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -108208,8 +108233,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.3.2"; - sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5"; + version = "0.3.3"; + sha256 = "0jddjsvkc2fdnz9yny44ikrqwwx500rd0cgh8fz1894c6p6qfgkm"; buildDepends = [ base io-streams seqid ]; jailbreak = true; description = "Sequence ID IO-Streams"; @@ -109606,8 +109631,8 @@ self: { }: mkDerivation { pname = "shuffle"; - version = "0.1.3.1"; - sha256 = "120rc9gzdhad4nqich1mwixzax9bhsm3vv87qkvyarcz0qf80qcx"; + version = "0.1.3.2"; + sha256 = "07amjk5l9apxs90klq3ii8gxmywnxqhx4fk2yapmm8l75l8b6kfg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109617,7 +109642,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/shuffle"; description = "Shuffle tool for UHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -110935,6 +110959,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-series" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text + }: + mkDerivation { + pname = "smallcheck-series"; + version = "0.2"; + sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v"; + buildDepends = [ base bytestring smallcheck text ]; + testDepends = [ base doctest Glob ]; + homepage = "https://github.com/jdnavarro/smallcheck-series"; + description = "Extra SmallCheck series"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallpt-hs" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -111325,13 +111363,12 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.7"; - sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc"; + version = "1.2.8"; + sha256 = "1ycqfx4qv00cxjrddch1wxadrffq55zbv6bhcahan93wq3a5lb7w"; buildDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -113869,23 +113906,23 @@ self: { }) {}; "ssh" = callPackage - ({ mkDerivation, asn1-data, base, base64-string, binary, bytestring - , cereal, containers, crypto-api, crypto-pubkey-types - , cryptohash-cryptoapi, directory, filepath, HsOpenSSL, HUnit - , integer-gmp, libssh2, network, process, pseudomacros, QuickCheck - , random, RSA, SHA, SimpleAES, split, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, th-lift-instances - , transformers + ({ mkDerivation, asn1-encoding, asn1-types, base, base64-string + , binary, bytestring, cereal, containers, crypto-api + , crypto-pubkey-types, cryptohash-cryptoapi, directory, filepath + , HsOpenSSL, HUnit, integer-gmp, libssh2, network, process + , pseudomacros, QuickCheck, random, RSA, SHA, SimpleAES, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-lift-instances, transformers }: mkDerivation { pname = "ssh"; - version = "0.3.0.1"; - sha256 = "1325af0ij2ys1waghk3f4mr5ndcqbb1k6pjf5m71fk324hb2s9cx"; + version = "0.3.1"; + sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj"; buildDepends = [ - asn1-data base base64-string binary bytestring cereal containers - crypto-api crypto-pubkey-types cryptohash-cryptoapi HsOpenSSL - integer-gmp network process random RSA SHA SimpleAES split - transformers + asn1-encoding asn1-types base base64-string binary bytestring + cereal containers crypto-api crypto-pubkey-types + cryptohash-cryptoapi HsOpenSSL integer-gmp network process random + RSA SHA SimpleAES split transformers ]; testDepends = [ base bytestring containers directory filepath HUnit libssh2 @@ -114106,28 +114143,28 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, Cabal , classy-prelude-conduit, conduit, conduit-extra, containers , data-default-class, directory, filepath, hspec, http-client - , http-client-tls, http-conduit, mono-traversable, mtl, old-locale - , optparse-applicative, process, QuickCheck, semigroups - , stackage-types, stm, streaming-commons, system-fileio + , http-client-tls, http-conduit, monad-unlift, mono-traversable + , mtl, old-locale, optparse-applicative, optparse-simple, process + , QuickCheck, semigroups, stackage-cli, stackage-types + , stackage-update, stm, streaming-commons, system-fileio , system-filepath, tar, temporary, text, time, transformers , unix-compat, utf8-string, xml-conduit, yaml, zlib }: mkDerivation { pname = "stackage-curator"; - version = "0.7.4"; - revision = "1"; - sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk"; - editedCabalFile = "4e0d029d79d0224ebe84bcf2891b5fd37cdc3178d4acae146d1ba2148bee86b1"; + version = "0.8.0"; + sha256 = "1nzbx22y90llcbfv37v119s7psp70rh7gyszar6zfg7wr4plcimb"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async base bytestring Cabal classy-prelude-conduit conduit conduit-extra containers data-default-class directory filepath - http-client http-client-tls http-conduit mono-traversable mtl - old-locale optparse-applicative process semigroups stackage-types - stm streaming-commons system-fileio system-filepath tar temporary - text time transformers unix-compat utf8-string xml-conduit yaml - zlib + http-client http-client-tls http-conduit monad-unlift + mono-traversable mtl old-locale optparse-applicative + optparse-simple process semigroups stackage-cli stackage-types + stackage-update stm streaming-commons system-fileio system-filepath + tar temporary text time transformers unix-compat utf8-string + xml-conduit yaml zlib ]; testDepends = [ base Cabal classy-prelude-conduit containers hspec http-client @@ -114173,17 +114210,18 @@ self: { "stackage-upload" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-client, http-client-tls, http-types, optparse-applicative - , stackage-cli, text + , process, stackage-cli, temporary, text }: mkDerivation { pname = "stackage-upload"; - version = "0.1.0.1"; - sha256 = "1m2dhj2gsg3f1ykrabgvf61vmlv6dhc013nii4ymn6smacqzihhv"; + version = "0.1.0.3"; + sha256 = "0bg08nmcm9jg4pamsm41y1vw2fy2dy9pxxs36nmbrkn1622x7dkc"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring directory filepath http-client - http-client-tls http-types optparse-applicative stackage-cli text + http-client-tls http-types optparse-applicative process + stackage-cli temporary text ]; homepage = "https://github.com/fpco/stackage-upload"; description = "A more secure version of cabal upload which uses HTTPS"; @@ -118865,8 +118903,8 @@ self: { }: mkDerivation { pname = "test-framework-golden"; - version = "1.1.3.1"; - sha256 = "1vmkc16z3gzbq9aibfk3wv7ms7sq7yivaamld63qrzlqaffz1xrw"; + version = "1.1.3.3"; + sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36"; buildDepends = [ base bytestring filepath mtl process temporary test-framework ]; @@ -122712,8 +122750,8 @@ self: { ({ mkDerivation, base, eventloop }: mkDerivation { pname = "twentefp-eventloop-trees"; - version = "0.1.0.0"; - sha256 = "18cifjf8avblgf0v1nskxdfx08ph92d16n8c50l9ln99aj9pw724"; + version = "0.1.0.1"; + sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m"; buildDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; @@ -123055,8 +123093,8 @@ self: { }: mkDerivation { pname = "twitter-feed"; - version = "0.1.1.3"; - sha256 = "1c50rirj3wymbh1850c7dm79jyglcn34116vljh5f54f8sv17y96"; + version = "0.1.1.4"; + sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir"; buildDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; @@ -125228,20 +125266,21 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens + , QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "uri-bytestring"; - version = "0.0.1"; - sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5"; + version = "0.1"; + sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1"; buildDepends = [ attoparsec base bytestring ]; testDepends = [ - attoparsec base bytestring derive HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck + attoparsec base bytestring derive HUnit lens QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck ]; jailbreak = true; - homepage = "https://travis-ci.org/Soostone/uri-bytestring"; + homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127024,18 +127063,18 @@ self: { ({ mkDerivation, base, bytestring, c2hs, containers, data-default , deepseq, directory, filepath, hspec, hspec-expectations, libmpd , mtl, ncurses, old-locale, process, QuickCheck, template-haskell - , time, transformers, utf8-string, wcwidth + , time, time-locale-compat, transformers, utf8-string, wcwidth }: mkDerivation { pname = "vimus"; - version = "0.2.0"; - sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h"; + version = "0.2.1"; + sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring containers data-default deepseq directory filepath - libmpd mtl old-locale process template-haskell time utf8-string - wcwidth + libmpd mtl old-locale process template-haskell time + time-locale-compat utf8-string wcwidth ]; testDepends = [ base data-default hspec hspec-expectations mtl QuickCheck @@ -128985,8 +129024,8 @@ self: { }: mkDerivation { pname = "webcrank"; - version = "0.2"; - sha256 = "0ws66z1qrlx91arpj3i9nz6lqbz1iwcpbzxdnqrwc1bml7zs2ipj"; + version = "0.2.0.1"; + sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -133208,6 +133247,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-gitrev" = callPackage + ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core + }: + mkDerivation { + pname = "yesod-gitrev"; + version = "0.1.0.0"; + sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih"; + buildDepends = [ aeson base gitrev template-haskell yesod-core ]; + description = "A subsite for displaying git information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-goodies" = callPackage ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form @@ -133811,8 +133862,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.1.0.0"; - sha256 = "15c6z262fcbradphrv82fz5pc2il27vqnmkym1b61wvpsydy2681"; + version = "0.1.1.0"; + sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f"; buildDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers yesod yesod-core From a3beaca54f248471ba966dd50ac483712f890ddd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 19:44:38 +0200 Subject: [PATCH 61/86] haskell-cabal-test-quickcheck: fix build by providing a recent-enough version of QuickCheck --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 173ca92dd3e6..fe74c9c5600e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -155,9 +155,8 @@ self: super: { patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal"; }); - # The test suite imposes too narrow restrictions on the version of - # Cabal that can be used to build this package. - cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck; + # Needs the latest version of QuickCheck to compile. + cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; From 6f7e793f0398466592de3133648e1055c44ebb59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 19:57:02 +0200 Subject: [PATCH 62/86] haskell-rainbox: the test suite does not compile --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fe74c9c5600e..f6819a100fef 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -158,6 +158,9 @@ self: super: { # Needs the latest version of QuickCheck to compile. cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; + # https://github.com/massysett/rainbox/issues/1 + rainbox = dontCheck super.rainbox; + # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; From 90b84a60a63705ed9a11bbc5a1169476dfdf222d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 20:02:52 +0200 Subject: [PATCH 63/86] haskell-wreq: the library is broken with GHC 7.10.1 --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 9a05a2511370..0e4fd3cc5d1f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -329,4 +329,9 @@ self: super: { seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0; vector_0_10_9_3 = markBroken super.vector_0_10_9_3; + # https://github.com/bos/wreq/issues/61 + wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq); + wreq-sb = dontDistribute (dontCheck super.wreq-sb); + hipbot = dontDistribute super.hipbot; + } From ecd30ec9ca4fcbdee11bc17f5d029ea4bafcc477 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 28 Apr 2015 19:15:57 +0200 Subject: [PATCH 64/86] gcc-arm-embedded: Update to latest version. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdf26fea90d..6035fef7edd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3707,9 +3707,9 @@ let sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; }; gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { - version = "4.9-2014q4-20141203"; - releaseType = "major"; - sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f"; + version = "4.9-2015q1-20150306"; + releaseType = "update"; + sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; }; gcc-arm-embedded = gcc-arm-embedded-4_9; From cdeb2e58860df70a50aaf73b61af2661c677e329 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 21:31:15 +0200 Subject: [PATCH 65/86] mcelog 115 -> 116 Added Knights Landing (Xeon Phi) support. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 55ab8eda9b56..342e29a6d2e0 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "115"; in +let version = "116"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "13m9y4xfd3klzj2xrwwwwg31pnjfwd0rbrr2845sf557iyqrshki"; + sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From cb8f111a72a54888dea24b6ccbdb5a657577983f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 22:21:57 +0200 Subject: [PATCH 66/86] Revert "pycairo: set user-agent to fix download of patches" This commit was should fix issue #7586, but it does not. This reverts commit e1c65ddfe11c8070dda00a66f2b4ae45bbddb0bc. --- pkgs/development/python-modules/pycairo/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 50e1435f3f4b..0589bec36b95 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -15,13 +15,11 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} patches = [(fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; - curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; })]; patch_waf = fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; - curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; From 4256ab778a0cc50c88cbd0366c2f126edb06fc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:35:39 +0200 Subject: [PATCH 67/86] fetchhg: pass proxyvars to hg --- pkgs/build-support/fetchhg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 4675cbe6ec80..26426ce7d83e 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -6,13 +6,17 @@ stdenv.mkDerivation { builder = ./builder.sh; buildInputs = [mercurial]; + impureEnvVars = [ + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; + # Nix <= 0.7 compatibility. id = md5; outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive"; outputHash = if md5 != null then md5 else sha256; - + inherit url rev; preferLocalBuild = true; } From 63c00f27460ab465443c2a9d041b31ae0c03ba3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:36:56 +0200 Subject: [PATCH 68/86] fetchFrom{Savannah,RepoOrCz,GitLab}: added fetchgit migration helpers --- pkgs/top-level/all-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdf26fea90d..cbf5a7aa4ab2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -375,12 +375,31 @@ let inherit sha256; }; + # gitorious example fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name; url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; }; + # cgit example, snapshot support is optional in cgit + fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; + }; + + # gitlab example + fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; + }; + + # gitweb example, snapshot support is optional in gitweb + fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; From b9b8e3acbae451f6a4d95b2faf2ddfd588f224b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:41:40 +0200 Subject: [PATCH 69/86] {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src: use mirrors, https and fetchFromSavannah to enable better availability for proxied users --- pkgs/development/libraries/libs3/default.nix | 9 +++++---- pkgs/development/libraries/nss_wrapper/default.nix | 9 ++++----- pkgs/development/libraries/socket_wrapper/default.nix | 9 ++++----- pkgs/tools/filesystems/ceph/0.94.nix | 2 +- pkgs/tools/misc/grub/2.0x.nix | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 551f65c2971c..3d8699918e16 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, curl, libxml2 }: +{ stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { name = "libs3-2015-01-09"; - src = fetchgit { - url = "git://github.com/bji/libs3.git"; + src = fetchFromGitHub { + owner = "bji"; + repo = "libs3"; rev = "4d21fdc0857b88c964649b321057d7105d1e4da3"; - sha256 = "058sixppk078mdn9ii3swg87nbpgl86llz9mdhj5km5m53a7dnjw"; + sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3"; }; buildInputs = [ curl libxml2 ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index b0595e61e65d..278834190bbf 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "nss_wrapper-1.0.3"; - src = fetchgit { - url = "git://git.samba.org/nss_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; }; buildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 1344ad18d09f..d682b10141ec 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "socket_wrapper-1.1.3"; - src = fetchgit { - url = "git://git.samba.org/socket_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3"; }; buildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 0fc2b60748ab..a14259184a57 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec { version = "0.94.1"; src = fetchgit { - url = "git://github.com/ceph/ceph.git"; + url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx"; }; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 47eb90eb11e1..501c6820df23 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , zfs ? null , efiSupport ? false @@ -41,10 +41,10 @@ assert zfsSupport -> zfs != null; stdenv.mkDerivation rec { name = "grub-${version}"; - src = fetchgit { - url = "git://git.savannah.gnu.org/grub.git"; + src = fetchFromSavannah { + repo = "grub"; rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de"; - sha256 = "1170413b4d9kwqwgi1dcsnbwn8mb3snbid858wyfv84910kbrs2d"; + sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; From d941d4c26e8efb8f20207b97d33f707b694cfe5b Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 29 Apr 2015 11:58:52 +1200 Subject: [PATCH 70/86] Update tor-browser to 4.5 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index b605f3eb3308..67d8b1105681 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.8"; + version = "4.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "d8e1ff1865542eb358834bd6f095a2bfa2a991a30ca5188a5752883636a31a36" else - "152186ff31425660675c082af1759ef6cc65f618b6e49e25385c7ccacfe70061"; + "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else + "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49"; }; patchPhase = '' From afa51d31f5af60af61ec109f97be295b8828df39 Mon Sep 17 00:00:00 2001 From: dnhgff Date: Tue, 28 Apr 2015 17:37:27 -0700 Subject: [PATCH 71/86] ghcjs: bump ghcjs-boot commit see https://github.com/ghcjs/ghcjs-boot/pull/17 for justification (ghcjs-boot won't build anymore on the previous commit :() --- pkgs/development/compilers/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 4c75861cbec2..8206bb19e4fa 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -45,8 +45,8 @@ let libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8bf1a2c665d42a66354f17220c7dfb1c8b44c0ea"; # 7.10 branch - sha256 = "18bm6sfa9c9kwsmv3lz6j27ng6jl0ck3ifgqbwwa8myfy7fw4il7"; + rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch + sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343"; fetchSubmodules = true; }; shims = fetchgit { From 5f149c80f25d733bcefbabc85c1163a3492596c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 28 Apr 2015 21:18:06 -0700 Subject: [PATCH 72/86] gpgme: 1.5.3 -> 1.5.4 --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2e51f70e91d2..d4913ef21f6e 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.3"; + name = "gpgme-1.5.4"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d"; + sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; From 4d60f8f1bd196ed4aca83bdcec830d9bf004f6b0 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Tue, 28 Apr 2015 22:07:09 -0700 Subject: [PATCH 73/86] package Dirt Dirt is used with the Tidal audio programming library (already packaged). I tested by building and running locally. --- pkgs/applications/audio/dirt/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/dirt/default.nix diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix new file mode 100644 index 000000000000..b5436fde7e9f --- /dev/null +++ b/pkgs/applications/audio/dirt/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }: + +stdenv.mkDerivation rec { + name = "dirt-git"; + src = fetchFromGitHub { + repo = "Dirt"; + owner = "tidalcycles"; + rev = "cfc5e85318defda7462192b5159103c823ce61f7"; + sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; + }; + buildInputs = [ libsndfile libsamplerate liblo jack2 ]; + configurePhase = '' + export DESTDIR=$out + ''; + + meta = { + description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; + homepage = "https://github.com/tidalcycles/Dirt"; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c108c8915e7..76c39a11261f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10392,6 +10392,8 @@ let distrho = callPackage ../applications/audio/distrho {}; + dirt = callPackage ../applications/audio/dirt {}; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; From f64d767130152c7bc8136efcc589d7fc28a6d9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 29 Apr 2015 14:20:50 +0800 Subject: [PATCH 74/86] libxmp: Update to 4.3.8 --- pkgs/development/libraries/libxmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 7b4d3d6287aa..4bc9e8ed1c4a 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.2.7"; + name = "libxmp-4.3.8"; meta = with stdenv.lib; { description = "Extended module player library"; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; - sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536"; + sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny"; }; } From a5f2cbff0a161482830842a393c142ff7d24e8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 29 Apr 2015 14:22:28 +0800 Subject: [PATCH 75/86] xmp: Update to 4.0.10 --- pkgs/applications/audio/xmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 7f21d389cf5f..6bec03bd71b0 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.0.7"; + name = "xmp-4.0.10"; meta = with stdenv.lib; { description = "Extended module player"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; - sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw"; + sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; }; buildInputs = [ pkgconfig alsaLib libxmp ]; From 310da1b4dad2b9d4ae0b4411194dd1ce7c0a22df Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 29 Apr 2015 08:19:47 +0200 Subject: [PATCH 76/86] chromium/update: Remove reference to . We shouldn't make assumptions on what is set by NIX_PATH in order to make it easier to rename that Nix path reference. Signed-off-by: aszlig --- .../applications/networking/browsers/chromium/source/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index cfa5f1e009b8..27af85de5465 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -1,7 +1,7 @@ { system ? builtins.currentSystem }: let - inherit (import { + inherit (import ../../../../../../. { inherit system; }) lib writeText stdenv; From 543ec3cf469df5d551eb93e3cc0306581c580401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Wed, 29 Apr 2015 08:50:48 +0100 Subject: [PATCH 77/86] boot: bump from rc8 to rc14 --- pkgs/development/tools/build-managers/boot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index ccc7e326fd77..6ae4da408c0e 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - version = "2.0.0-rc8"; + version = "2.0.0-rc14"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh"; - sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j"; + sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0"; }; inherit jdk; From 2f2c50d9f4e11e99fca5b5300b68035fa7556345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 29 Apr 2015 10:10:28 +0200 Subject: [PATCH 78/86] uid_wrapper.src: use mirrors to enable better availability for proxied users --- pkgs/development/libraries/uid_wrapper/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index b19d404bee2f..07fffeff20d6 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "uid_wrapper-1.1.0"; - src = fetchgit { - url = "git://git.samba.org/uid_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn"; }; buildInputs = [ cmake pkgconfig ]; From eadb3a51ff475d741465921aca2ef5c2dbad604a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 29 Apr 2015 11:23:40 +0200 Subject: [PATCH 79/86] Fix sorting: dirt comes before distrho --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c39a11261f..07a230a5fee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10390,10 +10390,10 @@ let diffuse = callPackage ../applications/version-management/diffuse { }; - distrho = callPackage ../applications/audio/distrho {}; - dirt = callPackage ../applications/audio/dirt {}; + distrho = callPackage ../applications/audio/distrho {}; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; From a38672dea22d424105a0e21ae4b71e051f657c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2015 11:27:30 +0200 Subject: [PATCH 80/86] release: fix eval by lib.tests -> lib-tests See discussion on commit https://github.com/NixOS/nixpkgs/commit/de0f122b016c88#commitcomment-10937080 --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cb469e613056..e156f336ffa2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -23,7 +23,7 @@ let { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; }; manual = import ../../doc; - lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -31,7 +31,7 @@ let constituents = [ jobs.tarball jobs.manual - jobs.lib.tests + jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin From 8978ff3840e8ceb52441ea50cb068adf8b6f63fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2015 11:47:18 +0200 Subject: [PATCH 81/86] unstable job: glib-tested seems ready (succeeding often) This reverts commit a35d4a9d4e2d4435e53fdfd1698f2118828c773f. --- pkgs/top-level/release.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e156f336ffa2..361b9ab6cc32 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -40,10 +40,8 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux - /* not ready yet jobs.glib-tested.x86_64-linux # standard glib doesn't do checks jobs.glib-tested.i686-linux - */ ]; }; From ad0bd73775954d4ecc7f83874ac813eff6d83866 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 29 Apr 2015 09:55:20 +0000 Subject: [PATCH 82/86] Work around infinite recursion issue in nixops. --- nixos/modules/virtualisation/google-compute-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 9e6be93b6d98..f6bca1aa8579 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -1,5 +1,5 @@ -{ config, pkgs, modulesPath, ... }: +{ config, pkgs, ... }: { - imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ]; + imports = [ ]; } From 9b27a88b66d318035943dbd70082ab4bd43412f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Apr 2015 18:38:18 +0200 Subject: [PATCH 83/86] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/5f6d964cbaae84478f73a185e89cafc169362cfd with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b --- .../haskell-modules/hackage-packages.nix | 289 ++++++++++++------ 1 file changed, 200 insertions(+), 89 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8628d5a16982..04293b81fe70 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1007,6 +1007,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "BCMtools" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-lexing + , colour, conduit, conduit-extra, data-binary-ieee754 + , data-default-class, matrices, optparse-applicative, resourcet + , split, transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "BCMtools"; + version = "0.1.0"; + sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring bytestring-lexing colour conduit + conduit-extra data-binary-ieee754 data-default-class matrices + optparse-applicative resourcet split transformers + unordered-containers vector zlib + ]; + description = "Big Contact Map Tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "BNFC" = callPackage ({ mkDerivation, alex, array, base, containers, deepseq, directory , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process @@ -3910,12 +3932,12 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, containers, kan-extensions, ListLike }: + ({ mkDerivation, base, containers, ListLike }: mkDerivation { pname = "Earley"; - version = "0.6.0"; - sha256 = "0fqiiqrmrnb7zmk61bjnc98y30jvrd0yqflsk8mcnkfahbhhsc5w"; - buildDepends = [ base containers kan-extensions ListLike ]; + version = "0.7.0"; + sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72"; + buildDepends = [ base containers ListLike ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14679,8 +14701,8 @@ self: { }: mkDerivation { pname = "UISF"; - version = "0.3.0.1"; - sha256 = "0qfhcc0ii7nncfsyxvafwbrx8j6jjdc0jrj56g8jm8vmzsa082kp"; + version = "0.3.0.2"; + sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46"; buildDepends = [ arrows base containers deepseq GLFW OpenGL stm transformers ]; @@ -17376,21 +17398,20 @@ self: { }) {}; "aeson-t" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec2, text + ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec, text , unordered-containers, vector }: mkDerivation { pname = "aeson-t"; - version = "0.0.4"; - sha256 = "0y4mbn1xb288amgy8j6p5x9ih873qwiwrialfchc8ryg0n8syp8r"; + version = "0.0.5"; + sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd"; buildDepends = [ aeson base bytestring text unordered-containers vector ]; testDepends = [ - aeson aeson-qq base bytestring hspec2 text unordered-containers + aeson aeson-qq base bytestring hspec text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/begriffs/aeson-t"; description = "Transform JSON"; license = stdenv.lib.licenses.mit; @@ -21094,8 +21115,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.0.1"; - sha256 = "0x5q3aqsqi10plrwdpcprpvc9fd6vq0ar4f4am5kv5zs1h0yjvfd"; + version = "0.4.0.2"; + sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp"; buildDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -21778,8 +21799,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.4"; - sha256 = "0bd424ls3kfqx2y7fzcmhssss3r3bhra8bzmllx1slb1x04apgn6"; + version = "0.0.5"; + sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring containers cryptohash inflections influxdb MonadRandom mtl network @@ -22052,8 +22073,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.4.0.0"; - sha256 = "1jmm83pciv4mfknwj9z57kbq4siikfad21xhysnhwrpm2maqswa4"; + version = "0.4.0.1"; + sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22064,7 +22085,6 @@ self: { resourcet stm stm-chans stm-queue-extras text transformers unordered-containers ]; - jailbreak = true; description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; }) {}; @@ -22146,8 +22166,8 @@ self: { }: mkDerivation { pname = "aws-route53"; - version = "0.1.1"; - sha256 = "1nzxs6ff0nh6ncswfnx2gxxmx2by0xxzfpmlkk1cnd9xkz7c8n0k"; + version = "0.1.2"; + sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18"; buildDepends = [ aws base bytestring containers http-conduit http-types old-locale resourcet text time xml-conduit xml-hamlet @@ -25151,6 +25171,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitcoin-types" = callPackage + ({ mkDerivation, base, base58string, binary, bytestring, hexstring + , hspec, text + }: + mkDerivation { + pname = "bitcoin-types"; + version = "0.9.0"; + sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5"; + buildDepends = [ + base base58string binary bytestring hexstring text + ]; + testDepends = [ base base58string bytestring hexstring hspec ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Provides consistent low-level types used commonly among Bitcoin implementations"; + license = stdenv.lib.licenses.mit; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -27877,8 +27914,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.2.1"; - sha256 = "0rhabhbcxl3gsq4wdkxd4mswrb8rqfmq6crcc70hm75fjxfmr3sz"; + version = "0.3.3.0"; + sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -31949,12 +31986,12 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, HUnit, text }: + ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.1"; - sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb"; - buildDepends = [ base text ]; + version = "0.3.2"; + sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk"; + buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; @@ -32137,8 +32174,8 @@ self: { }: mkDerivation { pname = "cndict"; - version = "0.5.4"; - sha256 = "1jza2s9qmmzg4qgq8wpslj71ybbs3b8lk81jfqp70j3dq1zvzhba"; + version = "0.5.5"; + sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z"; buildDepends = [ base binary bytestring cassava containers file-embed text vector ]; @@ -41822,8 +41859,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.6.0.0"; - sha256 = "17dbhnwdn89wqm0s8j9zfydi7g6x1wlf1bnjv39qrp7qyr8mm2k5"; + version = "0.6.0.1"; + sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42379,6 +42416,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dove" = callPackage + ({ mkDerivation, acl2, base }: + mkDerivation { + pname = "dove"; + version = "0.0.0"; + sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd"; + buildDepends = [ acl2 base ]; + description = "The Dove verification language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dow" = callPackage ({ mkDerivation, array, base, directory, elerea, GLFW , mersenne-random, OpenGL @@ -43151,8 +43199,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.7"; - sha256 = "1jpl8prd18ka8ypkf2ni8i6arfmv9x3d75r7327aalayj3vzap3d"; + version = "0.1.0.8"; + sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k"; buildDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers @@ -46742,12 +46790,12 @@ self: { }) {}; "fasta" = callPackage - ({ mkDerivation, base, containers, parsec, split, text }: + ({ mkDerivation, base, containers, parsec, pipes, split, text }: mkDerivation { pname = "fasta"; - version = "0.5.3.0"; - sha256 = "060y8sqbklf7wr8kl2c935cxakykj705f1bbn72c4zcwfdrf5jz4"; - buildDepends = [ base containers parsec split text ]; + version = "0.5.4.0"; + sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg"; + buildDepends = [ base containers parsec pipes split text ]; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -47666,17 +47714,17 @@ self: { }) {}; "filediff" = callPackage - ({ mkDerivation, base, data-default, data-memocombinators - , directory, either, mtl, tasty, tasty-hunit, text, time - , transformers, Zora + ({ mkDerivation, base, bytestring, data-default + , data-memocombinators, directory, either, mtl, rainbow, tasty + , tasty-hunit, text, time, transformers, Zora }: mkDerivation { pname = "filediff"; - version = "0.1.0.7"; - sha256 = "1anjfh549ah2m8k5ibdgc578pi5phyycxj1avky38w499dadgwfi"; + version = "0.1.0.8"; + sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3"; buildDepends = [ - base data-default data-memocombinators directory either mtl tasty - tasty-hunit text time transformers Zora + base bytestring data-default data-memocombinators directory either + mtl rainbow tasty tasty-hunit text time transformers Zora ]; testDepends = [ base directory either mtl tasty tasty-hunit text time transformers @@ -70081,22 +70129,21 @@ self: { "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, clock, containers - , cookie, data-default-class, deepseq, directory, exceptions - , filepath, ghc-prim, hspec, http-types, mime-types, monad-control - , network, network-uri, publicsuffixlist, random, streaming-commons - , text, time, transformers, zlib + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib }: mkDerivation { pname = "http-client"; - version = "0.4.11.1"; - sha256 = "122h9g6nk17nwxrwqwni75gfbc221s1jvjjlmq6sh9ksgsyh09b4"; + version = "0.4.11.2"; + sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2"; buildDepends = [ array base base64-bytestring blaze-builder bytestring - case-insensitive clock containers cookie data-default-class deepseq + case-insensitive containers cookie data-default-class deepseq exceptions filepath ghc-prim http-types mime-types network - network-uri publicsuffixlist random streaming-commons text time - transformers + network-uri random streaming-commons text time transformers ]; testDepends = [ async base base64-bytestring blaze-builder bytestring @@ -79864,19 +79911,20 @@ self: { "libconfig" = callPackage ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text - , text-binary, transformers + , text-binary, transformers, transformers-compat }: mkDerivation { pname = "libconfig"; - version = "0.2.0.0"; - sha256 = "1z03vnqhm6iiz964rmhvzm15hdx7mmck06yawf0sy4h5ljwrq94a"; + version = "0.3.0.0"; + sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12"; buildDepends = [ base binary cereal cereal-text deepseq hashable profunctors text - text-binary transformers + text-binary transformers transformers-compat ]; testDepends = [ base doctest doctest-prop lens ]; buildTools = [ c2hs ]; extraLibraries = [ config ]; + homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; }) { config = null;}; @@ -81281,15 +81329,21 @@ self: { }) {}; "list-t-html-parser" = callPackage - ({ mkDerivation, base-prelude, either, html-tokenizer, list-t - , mtl-prelude, text + ({ mkDerivation, base-prelude, case-insensitive, conversion + , conversion-text, either, hspec, html-entities, html-tokenizer + , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text }: mkDerivation { pname = "list-t-html-parser"; - version = "0.2.1.0"; - sha256 = "0vf58ji73vc8hgbq2bd7p2ls7syk33qy5pp92kx5byr5j38zzar3"; + version = "0.2.2.0"; + sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0"; buildDepends = [ - base-prelude either html-tokenizer list-t mtl-prelude text + base-prelude case-insensitive either html-entities html-tokenizer + list-t mtl-prelude text + ]; + testDepends = [ + base-prelude conversion conversion-text hspec html-tokenizer + list-t-attoparsec list-t-text text ]; homepage = "https://github.com/nikita-volkov/list-t-html-parser"; description = "Streaming HTML parser"; @@ -81335,8 +81389,8 @@ self: { }: mkDerivation { pname = "list-t-text"; - version = "0.1.0.2"; - sha256 = "05vz6r9r5903wm9spmy6zsql8jzzqj1dv94yfnfhiwkkmgjsvv5z"; + version = "0.2.0.1"; + sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng"; buildDepends = [ base-prelude bytestring list-t mtl-prelude text ]; testDepends = [ base base-prelude bytestring hspec list-t QuickCheck @@ -84322,12 +84376,15 @@ self: { }) { eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, binary, primitive, vector }: + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , tasty-quickcheck, vector + }: mkDerivation { pname = "matrices"; - version = "0.4.0"; - sha256 = "1whajm8cqr724dz6aqnjbki77c40xr1sy16pks15rq56j7f2av2v"; - buildDepends = [ base binary primitive vector ]; + version = "0.4.1"; + sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z"; + buildDepends = [ base primitive vector ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -91943,20 +92000,20 @@ self: { , base64-bytestring, bytestring, containers, cryptohash, dotenv , either, errors, ghc-prim, hspec, hspec-expectations, http-client , http-types, lens, mtl, optparse-applicative, text, time - , transformers, unordered-containers, utf8-string, wreq, xmlhtml + , transformers, unordered-containers, utf8-string, wreq-sb, xmlhtml , yaml }: mkDerivation { pname = "octohat"; - version = "0.1.4.1"; - sha256 = "1cc7np4kb03160fbn2bwkbl0xgcnizcgr3yvq8pp47p31k965x54"; + version = "0.1.4.2"; + sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base base-compat base16-bytestring base64-bytestring bytestring containers cryptohash dotenv either errors ghc-prim http-client http-types lens mtl optparse-applicative text time - transformers unordered-containers utf8-string wreq xmlhtml yaml + transformers unordered-containers utf8-string wreq-sb xmlhtml yaml ]; testDepends = [ base base-compat dotenv hspec hspec-expectations text transformers @@ -102413,15 +102470,15 @@ self: { "redis" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers - , MonadCatchIO-mtl, mtl, network, old-time, utf8-string + , exceptions, mtl, network, old-time, utf8-string }: mkDerivation { pname = "redis"; - version = "0.13.0.1"; - sha256 = "0djwih122pp7y0c1lx7ab7n80ra1488hrwgf0iq20gywk8an9wfq"; + version = "0.14"; + sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094"; buildDepends = [ - base bytestring concurrent-extra containers MonadCatchIO-mtl mtl - network old-time utf8-string + base bytestring concurrent-extra containers exceptions mtl network + old-time utf8-string ]; homepage = "http://hub.darcs.net/ganesh/redis"; description = "A driver for Redis key-value database"; @@ -104611,8 +104668,8 @@ self: { }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.16"; - sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1"; + version = "0.0.17"; + sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz"; buildDepends = [ aeson base binary bytestring hashable mtl network old-locale scientific template-haskell text time unordered-containers vector @@ -110508,8 +110565,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.1.0.0"; - sha256 = "183kqvkp0s55bqm5gr7kiq9lk9qpm3ijwnansl6lpdxclcg9gm8y"; + version = "0.1.1.0"; + sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s"; buildDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -113056,8 +113113,8 @@ self: { ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.2.0"; - sha256 = "1a3dmmq1dcz5sanj0cisddk313f89sil89xxbk2l9sjprc1fwrv7"; + version = "0.2.3.0"; + sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4"; buildDepends = [ base binary cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; @@ -114103,12 +114160,16 @@ self: { }) {}; "stackage" = callPackage - ({ mkDerivation, base, stackage-cli, stackage-update }: + ({ mkDerivation, base, stackage-cli, stackage-install + , stackage-update, stackage-upload + }: mkDerivation { pname = "stackage"; - version = "0.7.0.0"; - sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj"; - buildDepends = [ base stackage-cli stackage-update ]; + version = "0.7.1.0"; + sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7"; + buildDepends = [ + base stackage-cli stackage-install stackage-update stackage-upload + ]; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; @@ -114176,6 +114237,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-install" = callPackage + ({ mkDerivation, async, base, bytestring, directory, filepath + , http-client, http-client-tls, process, stm + }: + mkDerivation { + pname = "stackage-install"; + version = "0.1.0.1"; + sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring directory filepath http-client + http-client-tls process stm + ]; + homepage = "https://github.com/fpco/stackage-install"; + description = "Secure download of packages for cabal-install"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions , hashable, semigroups, text, unordered-containers, vector @@ -118562,6 +118642,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "templater" = callPackage + ({ mkDerivation, attoparsec, base, hspec, hspec-attoparsec, HUnit + , QuickCheck, text + }: + mkDerivation { + pname = "templater"; + version = "0.0.2.0"; + sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb"; + buildDepends = [ attoparsec base text ]; + testDepends = [ + base hspec hspec-attoparsec HUnit QuickCheck text + ]; + homepage = "https://github.com/geraud/templater"; + description = "Simple string templater"; + license = stdenv.lib.licenses.mit; + }) {}; + "tempodb" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , HsOpenSSL, HTTP, http-streams, io-streams, mtl, old-locale, text @@ -119574,6 +119671,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-position" = callPackage + ({ mkDerivation, base, QuickCheck, regex-applicative }: + mkDerivation { + pname = "text-position"; + version = "0.1.0.0"; + sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8"; + buildDepends = [ base regex-applicative ]; + testDepends = [ base QuickCheck regex-applicative ]; + jailbreak = true; + homepage = "http://rel4tion.org/projects/text-position/"; + description = "Handling positions in text and position-tagging it"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -129675,8 +129786,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.2"; - sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; + version = "0.1.2.3"; + sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; From b88fc6c90e7f8d32fa24d8e51d099c16c36d59d7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 29 Apr 2015 13:15:17 +0200 Subject: [PATCH 84/86] update vagrant to 1.7.2 --- pkgs/development/tools/vagrant/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 44cb5fef90e4..84bfcce541ac 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.6.5"; + version = "1.7.2"; rake = buildRubyGem { inherit ruby; name = "rake-10.3.2"; @@ -19,19 +19,19 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb"; - sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2"; + sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx"; } else fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb"; - sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq"; + sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz"; }; meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 globin ]; platforms = platforms.linux; }; @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { preFixup = '' # 'hide' the template file from shebang-patching - chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable - chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh + chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; postFixup = '' - chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable - chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh + chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; } From 552ea209d0862e4fd5e28573cfa0e1512f78d747 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2015 16:07:36 +0200 Subject: [PATCH 85/86] php: Update to 5.4.40 --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 02137e5823ef..c94199b7ab13 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./makePhpDerivation.nix { - phpVersion = "5.4.39"; - sha = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw"; + phpVersion = "5.4.40"; + sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; apacheHttpd = apacheHttpd; } From 182acabbae644182ee6dafc9779e63abd7991f8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2015 16:09:30 +0200 Subject: [PATCH 86/86] Don't use camelCase in file names --- pkgs/development/interpreters/php/5.4.nix | 2 +- pkgs/development/interpreters/php/5.5.nix | 2 +- pkgs/development/interpreters/php/5.6.nix | 2 +- .../interpreters/php/{makePhpDerivation.nix => generic.nix} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/php/{makePhpDerivation.nix => generic.nix} (100%) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c94199b7ab13..7133b1e0824f 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.4.40"; sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 842f12a89105..fdc1ab79c769 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.5.21"; sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 2f4a3165f437..5f69e46189fa 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.6.6"; sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/makePhpDerivation.nix b/pkgs/development/interpreters/php/generic.nix similarity index 100% rename from pkgs/development/interpreters/php/makePhpDerivation.nix rename to pkgs/development/interpreters/php/generic.nix