From b1b9efdbe1eadd771e08aa0b4aa05e679115db3c Mon Sep 17 00:00:00 2001 From: Andrey Arapov Date: Mon, 19 Jan 2015 10:46:45 +0100 Subject: [PATCH 001/223] nginx service improvements Adding Restart, RestartSec, StartLimitInterval to ensure that the service is started in case if it can't assign (bind) the address as often it takes longer for the network (e.g. dhcpcd) to get the IP assigned. --- nixos/modules/services/web-servers/nginx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0af1b58b7ca..0f21ef01263 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,9 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; }; }; From 0d91df8129a608c89171033913b693e62a465752 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 24 Jan 2015 23:13:19 +0100 Subject: [PATCH 002/223] phpPackages: add redis and composer --- pkgs/top-level/php-packages.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 600768536ca..6f99cd76cfa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -95,4 +95,36 @@ let self = with self; { buildInputs = [ pkgs.geoip ]; }; + redis = buildPecl { + name = "redis-2.2.5"; + + sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + }; + + composer = pkgs.stdenv.mkDerivation rec { + name = "composer-${version}"; + version = "1.0.0-alpha9"; + + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar"; + sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${php}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" + ''; + + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = https://getcomposer.org/; + maintainers = with maintainers; [offline]; + }; + }; }; in self From 28a9ed618fd0ec26ca1425892498ae8f77a4b480 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sat, 14 Feb 2015 14:56:08 -0700 Subject: [PATCH 003/223] Add more options to multitouch (mtrack) module --- .../services/x11/hardware/multitouch.nix | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix index 6e6e88e6721..f8386b5e333 100644 --- a/nixos/modules/services/x11/hardware/multitouch.nix +++ b/nixos/modules/services/x11/hardware/multitouch.nix @@ -2,9 +2,15 @@ with lib; -let cfg = config.services.xserver.multitouch; in - -{ +let cfg = config.services.xserver.multitouch; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -30,6 +36,33 @@ let cfg = config.services.xserver.multitouch; in description = "Whether to ignore touches detected as being the palm (i.e when typing)"; }; + tapButtons = mkOption { + type = types.bool; + default = true; + example = false; + description = "Whether to enable tap buttons."; + }; + + buttonsMap = mkOption { + type = types.listOf types.int; + default = [3 2 0]; + example = [1 3 2]; + description = "Remap touchpad buttons."; + apply = map toString; + }; + + additionalOptions = mkOption { + type = types.str; + default = ""; + example = '' + Option "ScaleDistance" "50" + Option "RotateDistance" "60" + ''; + description = '' + Additional options for mtrack touchpad driver. + ''; + }; + }; }; @@ -46,12 +79,17 @@ let cfg = config.services.xserver.multitouch; in Identifier "Touchpads" Driver "mtrack" Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}" + Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString (!cfg.tapButtons) disabledTapConfig} ${optionalString cfg.invertScroll '' Option "ScrollUpButton" "5" Option "ScrollDownButton" "4" Option "ScrollLeftButton" "7" Option "ScrollRightButton" "6" ''} + ${cfg.additionalOptions} EndSection ''; From d9078d03a30dd332542f662734d67898421c3bf6 Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 6 Feb 2015 00:50:11 +0100 Subject: [PATCH 004/223] Updated fcgiwrap's systemd unit to match upstream version. --- .../modules/services/web-servers/fcgiwrap.nix | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 7e91e7b60ee..2c5e433003c 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.fcgiwrap; - in { options = { @@ -21,29 +20,53 @@ in { description = "Number of processes to prefork."; }; - bindSocket = mkOption { - type = types.string; - default = "unix:/run/fcgiwrap.sock"; - description = '' - Socket to bind to. Valid socket URLs are: - unix:/path/to/socket for Unix sockets - tcp:dot.ted.qu.ad:port for IPv4 sockets - tcp6:[ipv6_addr]:port for IPv6 sockets - ''; + socketType = mkOption { + type = types.addCheck types.str (t: t == "unix" || t == "tcp" || t == "tcp6"); + default = "unix"; + description = "Socket type: 'unix', 'tcp' or 'tcp6'."; + }; + + socketAddress = mkOption { + type = types.str; + default = "/run/fcgiwrap.sock"; + example = "1.2.3.4:5678"; + description = "Socket address. In case of a UNIX socket, this should be its filesystem path."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = "User permissions for the socket."; + }; + + group = mkOption { + type = types.nullOr types.str; + default = null; + description = "Group permissions for the socket."; }; }; }; config = mkIf cfg.enable { - systemd.services.fcgiwrap = { after = [ "nss-user-lookup.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional (cfg.socketType != "unix") "multi-user.target"; serviceConfig = { - ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}"; - }; + ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${ + if (cfg.socketType != "unix") then "-s ${cfg.socketType}:${cfg.socketAddress}" else "" + }"; + } // (if cfg.user != null && cfg.group != null then { + User = cfg.user; + Group = cfg.group; + } else { } ); }; + systemd.sockets = if (cfg.socketType == "unix") then { + fcgiwrap = { + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = cfg.socketAddress; + }; + } else { }; }; } From 0738edc1fd8c0ed48ca67c5a69f545b5570d1206 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 00:49:31 +0300 Subject: [PATCH 005/223] added ddccontrol package --- .../tools/misc/automake/automake-1.10.x.nix | 46 +++++++++++++++++++ pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 17 +++++++ pkgs/tools/misc/ddccontrol/default.nix | 31 +++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 4 files changed, 100 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix create mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix create mode 100644 pkgs/tools/misc/ddccontrol/default.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 00000000000..a06426e9cf4 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: + +stdenv.mkDerivation rec { + name = "automake-1.10.3"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.gz"; + sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + # Run the test suite in parallel. + enableParallelBuilding = true; + + meta = { + branch = "1.10"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix new file mode 100644 index 00000000000..0835e97c5a7 --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ]; + meta= with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix new file mode 100644 index 00000000000..417a118a47a --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +let version = "0.4.2"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + + prePatch = '' + npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + mv configure.ac configure.ac.old + opath="\$" + opath+="{datadir}\/ddccontrol-db" + sed "s/$opath/$npath/" configure.ac + rm configure.ac.old + ''; + preConfigure = '' + autoreconf --install + ''; + + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} + \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a6ba9e5f8..ba83f98ca0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1007,6 +1007,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -4528,6 +4532,8 @@ let automake = automake112x; + automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; + automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; From 4e926e50da81c990ef4635b6ef5ee9b0ba5df88c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:26:29 +0300 Subject: [PATCH 006/223] Stylistical changes for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 44 +++++++++---- pkgs/tools/misc/ddccontrol/default.nix | 68 ++++++++++++++------ 2 files changed, 78 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 0835e97c5a7..66a9a5024c0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + let version = "20061014"; in let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; - }; - buildInputs = - [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ]; - meta= with stdenv.lib; { - description = "Monitor database for DDCcontrol"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + stdenv + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 417a118a47a..80d925cf0f9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,31 +1,57 @@ -{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +{ stdenv +, fetchurl +, intltool +, libtool +, autoconf +, automake110x +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +, ddccontrol-db +}: + let version = "0.4.2"; in let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; - }; - buildInputs = - [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv + intltool + libtool + autoconf + automake110x + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ddccontrol-db + ]; - prePatch = '' - npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + prePatch = '' + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") mv configure.ac configure.ac.old - opath="\$" - opath+="{datadir}\/ddccontrol-db" - sed "s/$opath/$npath/" configure.ac + oldPath="\$" + oldPath+="{datadir}\/ddccontrol-db" + sed "s/$oldPath/$newPath/" configure.ac rm configure.ac.old - ''; - preConfigure = '' + ''; + preConfigure = '' autoreconf --install - ''; + ''; - meta = with stdenv.lib; { - description = "A program used to control monitor parameters by software"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file From 0baa4eba330a12172eab602d3d20c2ffc367d693 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:53:16 +0300 Subject: [PATCH 007/223] Changes in meta for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 2 ++ pkgs/tools/misc/ddccontrol/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 66a9a5024c0..199ed5b7eb0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; + homepage = "http://http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 80d925cf0f9..3da2a14f4c7 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; + homepage = "http://http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } \ No newline at end of file From b85beb6984618c6c04099cc0fe32a4196422645c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:57:10 +0300 Subject: [PATCH 008/223] Added a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4621e719cfd..591349a6118 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -130,6 +130,7 @@ orbitz = "Malcolm Matalka "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; + pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; From ffb4797dd303589d48bae466ec4b735438f2244e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Feb 2015 12:30:14 +0100 Subject: [PATCH 009/223] nixos/haproxy: remove broken default 'config' HAProxy fails to start with the default 'config'. Better disable it and assert that the user provides a suitable 'config'. (AFAICS, there cannot really be a default config file for HAProxy.) --- nixos/modules/services/networking/haproxy.nix | 43 +++---------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 887ea79c34b..09e48ec4bff 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -18,42 +18,8 @@ with lib; }; config = mkOption { - type = types.lines; - default = - '' - global - log 127.0.0.1 local6 - maxconn 24000 - daemon - nbproc 1 - - defaults - mode http - option httpclose - - # Remove requests from the queue if people press stop button - option abortonclose - - # Try to connect this many times on failure - retries 3 - - # If a client is bound to a particular backend but it goes down, - # send them to a different one - option redispatch - - monitor-uri /haproxy-ping - - timeout connect 7s - timeout queue 300s - timeout client 300s - timeout server 300s - - # Enable status page at this URL, on the port HAProxy is bound to - stats enable - stats uri /haproxy-status - stats refresh 5s - stats realm Haproxy statistics - ''; + type = types.nullOr types.lines; + default = null; description = '' Contents of the HAProxy configuration file, haproxy.conf. @@ -66,6 +32,11 @@ with lib; config = mkIf cfg.enable { + assertions = [{ + assertion = cfg.config != null; + message = "You must provide services.haproxy.config."; + }]; + systemd.services.haproxy = { description = "HAProxy"; after = [ "network.target" ]; From c1cefa1a58e371dc49a6fc4ddb17fc89ec767dd4 Mon Sep 17 00:00:00 2001 From: koral Date: Mon, 23 Feb 2015 17:43:10 +0000 Subject: [PATCH 010/223] Simplify (and fix) settings for transmission module. --- .../modules/services/torrent/transmission.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1b38ea3b679..135113b3ceb 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -9,28 +9,16 @@ let homeDir = "/var/lib/transmission"; downloadDir = "${homeDir}/Downloads"; incompleteDir = "${homeDir}/.incomplete"; + settingsDir = "${homeDir}/.config/transmission-daemon"; - settingsFile = "${settingsDir}/settings.json"; + settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); # Strings must be quoted, ints and bools must not (for settings.json). toOption = x: if x == true then "true" else if x == false then "false" else if isInt x then toString x - else toString ''\"${x}\"''; - - # All lines in settings.json end with a ',' (comma), except for the last - # line. This is standard JSON. But a comma can also appear *inside* some - # fields, notably the "rpc-whitelist" field. This is difficult to handle in - # sed so we simply ignore it and say that if you want to change the option at - # the last line of settings.json, you have to do it manually. At this time of - # writing, the last option is "utp-enable":true. - attrsToSedArgs = as: - concatStrings (concatLists (mapAttrsToList (name: value: - #map (x: '' -e 's=\(\"${name}\":\)[^,]*\(.*\)=\1 ${toOption x}\2=' '') # breaks if comma inside value field - map (x: '' -e 's=\(\"${name}\":\).*=\1 ${toOption x},=' '') # always append ',' (breaks last line in settings.json) - (if isList value then value else [value])) - as)); + else toString ''"${x}"''; # for users in group "transmission" to have access to torrents fullSettings = cfg.settings // { umask = 2; }; @@ -73,7 +61,7 @@ in boolean values must not. See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation and/or look at ${settingsFile}. + documentation. ''; }; @@ -95,7 +83,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. serviceConfig.ExecStartPre = '' - ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs fullSettings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}" + ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" ''; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; From eb935ffb733bd8acf53a897f43a03e5330ba9625 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Tue, 3 Mar 2015 18:53:47 +0100 Subject: [PATCH 011/223] eclipse: update to 4.4.2 --- pkgs/applications/editors/eclipse/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e04e438b8ba..3ddffbb8738 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -271,4 +271,19 @@ in { }; }; + eclipse_sdk_442 = buildEclipse { + name = "eclipse-sdk-4.4.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; + + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; + sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d"; + }; + }; + }; } From 2b0a3cd085cc6495e51f8be95d4d63bb0208ec08 Mon Sep 17 00:00:00 2001 From: Jeff Simpson Date: Thu, 5 Mar 2015 07:11:57 -0700 Subject: [PATCH 012/223] Added choqok build --- .../instant-messengers/choqok/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/choqok/default.nix diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix new file mode 100644 index 00000000000..9b16404b620 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver +, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }: + +let + pn = "choqok"; + v = "1.5"; +in + +stdenv.mkDerivation rec { + name = "${pn}-${v}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz"; + sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; + }; + + buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs + automoc4 pkgconfig phonon qca2 qjson qoauth ]; + + meta = with stdenv.lib; { + description = "A KDE microblogging client"; + repositories.git = git://anongit.kde.org/choqok; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa0b0d32fb8..c0710dfaed2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12647,6 +12647,8 @@ let calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + choqok = callPackage ../applications/networking/instant-messengers/choqok { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; digikam = if builtins.compareVersions "4.9" kde4.release == 1 then From ff42e0ae7f2c30c6afbcbf3d85888f95d9456636 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 5 Mar 2015 13:23:02 -0700 Subject: [PATCH 013/223] 2.0.0-rc2 -> 2.0.0, add CardDAV support --- pkgs/tools/networking/asynk/default.nix | 20 +++++++++---- pkgs/top-level/python-packages.nix | 37 +++++++++++++++++++++---- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index cb3e1445aa3..38514a5604b 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -1,28 +1,38 @@ { stdenv, fetchurl, python2, python2Packages, makeWrapper }: stdenv.mkDerivation rec { - version = "2.0.0-rc2"; + version = "2.0.0"; name = "ASynK-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz"; - sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b"; + sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1"; }; - propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ]; + propagatedBuildInputs = with python2Packages; + [ python2 makeWrapper tornado requests dateutil + vobject gdata caldavclientlibrary-asynk ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib cp asynk.py $out/bin/ cp state.init.json $out/ cp -R config $out/ - cp -R lib $out/ + cp lib/*.py $out/lib # */ + cp -R lib/s $out/lib/ cp -R asynk $out/ substituteInPlace $out/bin/asynk.py \ --replace "ASYNK_BASE_DIR = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR = \"$out\"" + for file in `find $out/asynk -type f`; do + # Oh yeah, tab characters! + substituteInPlace $file \ + --replace 'from vobject import vobject' 'from vobject import *' \ + --replace 'from vobject import vobject' 'from vobject import *' + done + wrapProgram "$out/bin/asynk.py" \ --prefix PYTHONPATH : "$PYTHONPATH" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f2d646c217..15817b4b270 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -809,6 +809,31 @@ let }; }; + caldavclientlibrary-asynk = buildPythonPackage rec { + version = "asynkdev"; + name = "caldavclientlibrary-asynk-${version}"; + + src = pkgs.fetchgit { + url = "https://github.com/skarra/CalDAVClientLibrary.git"; + rev = "06699b08190d50cc2636b921a654d67db0a967d1"; + sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940"; + }; + + meta = { + description = "CalDAVCLientLibrary is a Python library and tool for CalDAV"; + + longDescription = '' + CalDAVCLientLibrary is a Python library and tool for CalDAV. + + This package is the unofficial CalDAVCLientLibrary Python + library maintained by the author of Asynk and is needed for + that package. + ''; + + homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; + maintainers = with maintainers; [ pjones ]; + }; + }; bedup = buildPythonPackage rec { name = "bedup-20140413"; @@ -3057,15 +3082,15 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/mailchimp/mailchimp-${version}.tar.gz"; sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; - }; - + }; + # Test fails because specific version of docopt is searched # (Possible fix: Needs upstream patching in the library) doCheck = false; buildInputs = with self; [ docopt ]; - propagatedBuildInputs = with self; [ requests ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "A CLI client and Python API library for the MailChimp email platform"; @@ -13483,7 +13508,7 @@ let url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; }; - + propagatedBuildInputs = with self; [ nose ]; meta = { @@ -13502,7 +13527,7 @@ let }; buildInputs = with self; [ nose numpy ]; - + meta = { homepage = "http://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; @@ -13765,7 +13790,7 @@ let license = licenses.mit; }; }; - + html2text = buildPythonPackage rec { name = "html2text-2014.12.29"; From eb8105ad019670be5ae05f3872d3ce1bbdf9c722 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Sat, 7 Mar 2015 01:10:46 +0300 Subject: [PATCH 014/223] Separated DDCcontrol-DB declaration from DDCcontrol declaration --- pkgs/data/misc/ddccontrol-db/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/misc/ddccontrol-db/default.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix new file mode 100644 index 00000000000..199ed5b7eb0 --- /dev/null +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + stdenv + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + homepage = "http://http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba83f98ca0b..cfbef1ac006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1009,7 +1009,7 @@ let ddccontrol = callPackage ../tools/misc/ddccontrol { }; - ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; ddclient = callPackage ../tools/networking/ddclient { }; From 5113a065d7340f8c2650566bf1400e1863c539e2 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 20:45:02 -0800 Subject: [PATCH 015/223] boto: Apply patch needed to fix docker-registry This makes docker-registry work when backed by S3. It's the same patch applied in the docker upstream container image. Backported from boto/boto#2932 --- .../python-modules/boto/content-length-str.patch | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/boto/content-length-str.patch diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch new file mode 100644 index 00000000000..7895e223c6b --- /dev/null +++ b/pkgs/development/python-modules/boto/content-length-str.patch @@ -0,0 +1,16 @@ +Cherry-picked from https://github.com/boto/boto/pull/2932 + +This fix is required for things like docker-registry to interact with S3. Will +be obsolete after the next boto release (> 2.36.0) + +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -381,7 +381,7 @@ class HTTPRequest(object): + if 'Content-Length' not in self.headers: + if 'Transfer-Encoding' not in self.headers or \ + self.headers['Transfer-Encoding'] != 'chunked': +- self.headers['Content-Length'] = len(self.body) ++ self.headers['Content-Length'] = str(len(self.body)) + + + class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b41732005bf..200c086ed80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1110,6 +1110,8 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; + patches = [ ../development/python-modules/boto/content-length-str.patch ]; + meta = { homepage = https://github.com/boto/boto; From 02712cc3f1443e0b1d6ff6a9d18daab59f98b005 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 20:48:25 -0800 Subject: [PATCH 016/223] Drop obsolete boto-1.9 patch This has been unreferenced since commit d52d71a04bd99794401178acaf164fec94b8e387 from August 2014. --- .../python-modules/boto-1.9-python-2.7.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 pkgs/development/python-modules/boto-1.9-python-2.7.patch diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch deleted file mode 100644 index 79ff9a7e4af..00000000000 --- a/pkgs/development/python-modules/boto-1.9-python-2.7.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix Boto 1.9 on Python 2.7. - -https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 - -diff --git a/boto/connection.py b/boto/connection.py -index c5779e2..71942f1 100644 ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -252,8 +252,9 @@ class AWSAuthConnection(object): - # versions, it would append ":443" to the hostname sent - # in the Host header and so we needed to make sure we - # did the same when calculating the V2 signature. In 2.6 -+ # (and higher!) - # it no longer does that. Hence, this kludge. -- if sys.version[:3] == "2.6" and port == 443: -+ if sys.version[:3] in ('2.6', '2.7') and port == 443: - signature_host = self.host - else: - signature_host = '%s:%d' % (self.host, port) From 65d6eb0f20584e9e0654860ee304907744897188 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 6 Mar 2015 23:20:18 -0800 Subject: [PATCH 017/223] docker-registry: update to 0.9.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 200c086ed80..f3272fa5700 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2407,12 +2407,12 @@ let }; docker_registry = buildPythonPackage rec { - name = "docker-registry-0.9.0"; + name = "docker-registry-0.9.1"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; - md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + sha256 = "1svm1h59sg4bwj5cy10m016gj0xpiin15nrz5z66h47sbkndvlw3"; }; DEPS = "loose"; @@ -2420,7 +2420,7 @@ let doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + requests2 rsa sqlalchemy9 setuptools backports_lzma pyasn1 m2crypto ]; patchPhase = "> requirements/main.txt"; From ed6ce446d03ce89cffe533aaec02b0325f091d44 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 7 Mar 2015 00:58:23 -0800 Subject: [PATCH 018/223] euca2ools: bump to 2.1.4, use python27 Change-Id: I8be644bcf2892e1146c3b3eedea36c5f5e749c16 --- pkgs/tools/virtualization/euca2ools/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 84dc7c3c071..a87dd568322 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.1.3"; + name = "euca2ools-2.1.4"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "8ae2ecc"; - sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; + rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; + sha256 = "0f52jqw3s79w391lbzlh83lp55j73clvwmn2np4fy6kxc4j49da1"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; - doCheck = false; - meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90b5cbbbf7..30bc8f664f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1187,7 +1187,7 @@ let ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + euca2ools = callPackage ../tools/virtualization/euca2ools { }; evtest = callPackage ../applications/misc/evtest { }; From 08ea20df654de16c7e5cb7e51fe3cfb921da97f6 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 8 Mar 2015 01:39:29 +0100 Subject: [PATCH 019/223] git-cola: add package --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-cola/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-cola/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 a313a566c4e..b206fc671b5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,4 +100,6 @@ rec { gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; git-extras = callPackage ./git-extras { }; + + git-cola = callPackage ./git-cola { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix new file mode 100644 index 00000000000..eee17911cea --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: + +pythonPackages.buildPythonPackage rec { + name = "git-cola-${version}"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; + sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1"; + }; + + buildInputs = [ makeWrapper gettext ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ]; + + # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but + # "import __future__" must be placed above that. This removes the argv[0] line. + postFixup = '' + wrapPythonPrograms + + sed -i "$out/bin/.git-dag-wrapped" -e '{ + /import sys; sys.argv/d + }' + + sed -i "$out/bin/.git-cola-wrapped" -e '{ + /import sys; sys.argv/d + }' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/git-cola/git-cola; + description = "A sleek and powerful Git GUI"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bobvanderlinden ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f00392005f..ac9dc4fb7ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10376,6 +10376,7 @@ let pythonSupport = false; }; gitSVN = gitAndTools.gitSVN; + git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; From 0d1c39443b616408886cd8e9597d498c35d17e66 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 16 Feb 2015 19:42:10 +0100 Subject: [PATCH 020/223] Change kernel config: improve squashfs support of kernel --- pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3e92e9c3fa6..7889e9c3cab 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -189,6 +189,12 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.14") '' CEPH_FS_POSIX_ACL y ''} + SQUASHFS_FILE_DIRECT y + SQUASHFS_DECOMP_MULTI_PERCPU y + SQUASHFS_XATTR y + SQUASHFS_ZLIB y + SQUASHFS_LZO y + SQUASHFS_XZ y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem From 887a547ac903e3f628fb3984aef9c3354afbeba8 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sun, 8 Mar 2015 20:04:33 -0700 Subject: [PATCH 021/223] Add x11 service for unclutter modeled after the redshift service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/x11/unclutter.nix | 33 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 nixos/modules/services/x11/unclutter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c41ae69c1ac..9335b6d24f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -352,6 +352,7 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix + ./services/x11/unclutter.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix new file mode 100644 index 00000000000..556d9e187fd --- /dev/null +++ b/nixos/modules/services/x11/unclutter.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: +with lib; +let cfg = config.services.unclutter; +in { + options = { + services.unclutter.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable unclutter to hide your mouse cursor when inactive"; + }; + + services.unclutter.arguments = mkOption { + description = "Arguments to pass to unclutter command"; + default = "-idle 1"; + type = types.uniq types.string; + }; + }; + + config = mkIf cfg.enable { + systemd.services.unclutter = { + description = "unclutter"; + requires = [ "display-manager.service" ]; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = '' + ${pkgs.unclutter}/bin/unclutter ${cfg.arguments} + ''; + environment = { DISPLAY = ":0"; }; + serviceConfig.Restart = "always"; + }; + }; +} From 7b67e3fe35410e3768aa52ed764af3ed40b59625 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 8 Mar 2015 23:58:48 -0700 Subject: [PATCH 022/223] Enable aalib support in mplayer. --- pkgs/applications/video/mplayer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index dec3a5fc28d..86e5d9cb9eb 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, freetype, yasm +, aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig freetype ] + ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext mesa ] From 0b1489df4eed0177eb0b07cfca87ba61af18a85c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 16:54:27 -0700 Subject: [PATCH 023/223] eglibc: Remove as it is now defunct --- pkgs/development/libraries/eglibc/builder.sh | 63 ------------------- pkgs/development/libraries/eglibc/default.nix | 32 ---------- pkgs/top-level/all-packages.nix | 5 -- 3 files changed, 100 deletions(-) delete mode 100644 pkgs/development/libraries/eglibc/builder.sh delete mode 100644 pkgs/development/libraries/eglibc/default.nix diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh deleted file mode 100644 index 6ac1d223b47..00000000000 --- a/pkgs/development/libraries/eglibc/builder.sh +++ /dev/null @@ -1,63 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - -preConfigure() { - - for i in libc/configure libc/io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # Include source for debugging - mkdir -p $out/src - cp -R libc ports $out/src - ln -s $out/src/ports $out/src/libc/ports - # glibc wants -O2 minimum - export CFLAGS="-pipe -g -O2" - - mkdir $NIX_BUILD_TOP/build - cd $NIX_BUILD_TOP/build - - configureScript=$out/src/libc/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/eglibc/default.nix b/pkgs/development/libraries/eglibc/default.nix deleted file mode 100644 index a27d0f53fbf..00000000000 --- a/pkgs/development/libraries/eglibc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchsvn, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation rec { - name = "eglibc-2.10"; - - src = fetchsvn { - url = svn://svn.eglibc.org/branches/eglibc-2_10; - rev = 8690; - sha256 = "029hklrx2rlhsb5r2csd0gapjm0rbr8n28ib6jnnhms12x302viq"; - }; - - inherit kernelHeaders installLocales; - - configureFlags = [ - "--with-headers=${kernelHeaders}/include" - "--without-fp" - "--enable-add-ons=libidn,ports,nptl" - "--disable-profile" - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - ]; - - builder = ./builder.sh; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3f3fb9a8c..e8f636af1a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5667,11 +5667,6 @@ let libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; - eglibc = callPackage ../development/libraries/eglibc { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - }; - # Only supported on Linux glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; From 4bcc817521ede20d76dde97de096f9a5ce5c78f7 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Mon, 9 Mar 2015 23:26:08 -0700 Subject: [PATCH 024/223] build-fhs-userenv passes through command line args The motivation for this change is to allow things like the following derivation, which wraps the debian-packaged hello binary. let nixpkgs = import {}; stdenv = nixpkgs.stdenv; in rec { dumb-hello = stdenv.mkDerivation { name = "dumb-hello"; builder = ./builder.sh; dpkg = nixpkgs.dpkg; src = nixpkgs.fetchurl { url = "http://ftp.us.debian.org/debian/pool/main/h/hello-traditional/hello-traditional_2.9-2_amd64.deb"; md5 = "f5f3c28b65221dae44dda6f242c23316"; }; }; full-hello = nixpkgs.buildFHSUserEnv { name = "full-hello"; targetPkgs = pkgs: [ dumb-hello ]; multiPkgs = pkgs: [ pkgs.dpkg ]; runScript = "hello"; }; } --- pkgs/build-support/build-fhs-userenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 57864b4934b..67484857ee1 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/${name} < $out/libexec/run < Date: Tue, 10 Mar 2015 08:40:08 +0100 Subject: [PATCH 025/223] nixos: refactor tarsnap backup service module Major changes - Port to systemd timers: for each archive configuration is created a tarsnap@archive-name.timer which triggers the instanced service unit - Rename the `config` option to `archives` Minor/superficial improvements - Restrict tarsnap service capabilities - Use dirOf builtin - Set executable bit for owner of tarsnap cache directory - Set IOSchedulingClass to idle - Humanize numbers when printing stats - Rewrite most option descriptions - Simplify assertion --- nixos/modules/rename.nix | 3 + nixos/modules/services/backup/tarsnap.nix | 174 +++++++++++----------- 2 files changed, 88 insertions(+), 89 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1efc278aeb2..e820b2cb9ce 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -112,6 +112,9 @@ in zipModules ([] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] +# Tarsnap +++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ] + # proxy ++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ] diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 1b0bcadca15..155161945cd 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -12,6 +12,7 @@ let keyfile ${config.services.tarsnap.keyfile} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} + ${optionalString cfg.printStats "humanize-numbers"} ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes} ${optionalString cfg.aggressiveNetworking "aggressive-networking"} ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} @@ -27,46 +28,39 @@ in type = types.bool; default = false; description = '' - If enabled, NixOS will periodically create backups of the - specified directories using the tarsnap - backup service. This installs a systemd - service called tarsnap-backup which is - periodically run by cron, or you may run it on-demand. - - See the Tarsnap Getting - Started page. + Enable periodic tarsnap backups. ''; }; keyfile = mkOption { - type = types.path; + type = types.str; default = "/root/tarsnap.key"; description = '' - Path to the keyfile which identifies the machine - associated with your Tarsnap account. This file can - be created using the - tarsnap-keygen utility, and - providing your Tarsnap login credentials. + The keyfile which associates this machine with your tarsnap + account. + Create the keyfile with tarsnap-keygen. + + The keyfile name should be given as a string and not a path, to + avoid the key being copied into the Nix store. ''; }; cachedir = mkOption { - type = types.path; + type = types.nullOr types.path; default = "/var/cache/tarsnap"; description = '' - Tarsnap operations use a "cache directory" which - allows Tarsnap to identify which blocks of data have - been previously stored; this directory is specified - via the cachedir option. If the - cache directory is lost or out of date, tarsnap - creation/deletion operations will exit with an error - message instructing you to run tarsnap - --fsck to regenerate the cache directory. + The cache allows tarsnap to identify previously stored data + blocks, reducing archival time and bandwidth usage. + + Should the cache become desynchronized or corrupted, tarsnap + will refuse to run until you manually rebuild the cache with + tarsnap --fsck. + + Set to null to disable caching. ''; }; - config = mkOption { + archives = mkOption { type = types.attrsOf (types.submodule ( { options = { @@ -74,41 +68,44 @@ in type = types.bool; default = true; description = '' - If set to true, then don't - archive files which have the - nodump flag set. + Exclude files with the nodump flag. ''; }; printStats = mkOption { type = types.bool; default = true; - description = "Print statistics when creating archives."; + description = '' + Print global archive statistics upon completion. + The output is available via + systemctl status tarsnap@archive-name. + ''; }; checkpointBytes = mkOption { type = types.nullOr types.str; - default = "1G"; + default = "1GB"; description = '' - Create a checkpoint per a particular amount of - uploaded data. By default, Tarsnap will create - checkpoints once per GB of data uploaded. At - minimum, checkpointBytes must be - 1GB. + Create a checkpoint every checkpointBytes + of uploaded data (optionally specified using an SI prefix). - Can also be set to null to - disable checkpointing. + 1GB is the minimum value. A higher value is recommended, + as checkpointing is expensive. + + Set to null to disable checkpointing. ''; }; period = mkOption { type = types.str; - default = "15 01 * * *"; + default = "01:15"; + example = "hourly"; description = '' - This option defines (in the format used by cron) - when tarsnap is run for backups. The default is to - backup the specified paths at 01:15 at night every - day. + Create archive at this interval. + + The format is described in + systemd.time + 7. ''; }; @@ -116,11 +113,11 @@ in type = types.bool; default = false; description = '' - Aggressive network behaviour: Use multiple TCP - connections when writing archives. Use of this - option is recommended only in cases where TCP - congestion control is known to be the limiting - factor in upload performance. + Upload data over multiple TCP connections, potentially + increasing tarsnap's bandwidth utilisation at the cost + of slowing down all other network traffic. Not + recommended unless TCP congestion is the dominant + limiting factor. ''; }; @@ -134,8 +131,7 @@ in type = types.listOf types.str; default = []; description = '' - Exclude files and directories matching the specified - patterns. + Exclude files and directories matching these patterns. ''; }; @@ -143,12 +139,10 @@ in type = types.listOf types.str; default = []; description = '' - Include only files and directories matching the - specified patterns. + Include only files and directories matching these + patterns (the empty list includes everything). - Note that exclusions specified via - excludes take precedence over - inclusions. + Exclusions have precedence over inclusions. ''; }; @@ -156,10 +150,10 @@ in type = types.bool; default = false; description = '' - Attempt to reduce tarsnap memory consumption. This - option will slow down the process of creating - archives, but may help on systems where the average - size of files being backed up is less than 1 MB. + Reduce memory consumption by not caching small files. + Possibly beneficial if the average file size is smaller + than 1 MB and the number of files is lower than the + total amount of RAM in KB. ''; }; @@ -167,11 +161,9 @@ in type = types.bool; default = false; description = '' - Try even harder to reduce tarsnap memory - consumption. This can significantly slow down - tarsnap, but reduces its memory usage by an - additional factor of 2 beyond what the - lowmem option does. + Reduce memory consumption by a factor of 2 beyond what + lowmem does, at the cost of significantly + slowing down the archiving process. ''; }; }; @@ -188,25 +180,22 @@ in gamedata = { directories = [ "/var/lib/minecraft "]; - period = "*/30 * * * *"; + period = "*:30"; }; } ''; description = '' - Configuration of a Tarsnap archive. In the example, your - machine will have two tarsnap archives: - gamedata (backed up every 30 minutes) and - nixos (backed up at 1:15 AM every night by - default). You can control individual archive backups using - systemctl, using the - tarsnap@nixos or - tarsnap@gamedata units. For example, - systemctl start tarsnap@nixos will - immediately create a new NixOS archive. By default, archives - are suffixed with the timestamp of when they were started, - down to second resolution. This means you can use GNU - sort to sort output easily. + Tarsnap archive configurations. Each attribute names an archive + to be created at a given time interval, according to the options + associated with it. When uploading to the tarsnap server, + archive names are suffixed by a 1 second resolution timestamp. + + For each member of the set is created a timer which triggers the + instanced tarsnap@ service unit. You may use + systemctl start tarsnap@archive-name to + manually trigger creation of archive-name at + any time. ''; }; }; @@ -216,38 +205,45 @@ in assertions = (mapAttrsToList (name: cfg: { assertion = cfg.directories != []; - message = "Must specify directories for Tarsnap to back up"; - }) cfg.config) ++ + message = "Must specify paths for tarsnap to back up"; + }) cfg.archives) ++ (mapAttrsToList (name: cfg: - { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem); + { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; - }) cfg.config); + }) cfg.archives); systemd.services."tarsnap@" = { - description = "Tarsnap Backup of '%i'"; + description = "Tarsnap archive '%i'"; requires = [ "network.target" ]; path = [ pkgs.tarsnap pkgs.coreutils ]; scriptArgs = "%i"; script = '' - mkdir -p -m 0755 $(dirname ${cfg.cachedir}) - mkdir -p -m 0600 ${cfg.cachedir} + mkdir -p -m 0755 ${dirOf cfg.cachedir} + mkdir -p -m 0700 ${cfg.cachedir} DIRS=`cat /etc/tarsnap/$1.dirs` exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS ''; + + serviceConfig = { + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH"; + }; }; - services.cron.systemCronJobs = mapAttrsToList (name: cfg: - "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap@${name}" - ) cfg.config; + systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}" + { timerConfig.OnCalendar = cfg.period; + wantedBy = [ "timers.target" ]; + }) cfg.archives; environment.etc = (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" { text = configFile cfg; - }) cfg.config) // + }) cfg.archives) // (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" { text = concatStringsSep " " cfg.directories; - }) cfg.config); + }) cfg.archives); environment.systemPackages = [ pkgs.tarsnap ]; }; From 5d02f0e854a82a664ea798261d1dd069fec0801e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 12:40:19 +0100 Subject: [PATCH 026/223] fetchgit: add 'deepClone' argument to disable shallow fetching This patch resolves https://github.com/NixOS/nixpkgs/issues/6395. Deep cloning is useful in combination with 'leaveDotGit' for builds that want to run "git describe" to obtain a proper version string, etc., like the 'haskellngPackages.cabal2nix' package does. --- pkgs/build-support/fetchgit/builder.sh | 1 + pkgs/build-support/fetchgit/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 9050cce6ee8..71374d1f238 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -8,6 +8,7 @@ header "exporting $url (rev $rev) into $out" $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ + ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} stopNest diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7dd179f4c8b..bb89a8f5532 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -11,8 +11,8 @@ else ""; in "${if matched == null then base else builtins.head matched}${appendShort}"; in -{ url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false -, fetchSubmodules ? true +{ url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? deepClone +, fetchSubmodules ? true, deepClone ? false , name ? urlToName url rev }: @@ -39,6 +39,7 @@ in */ assert md5 != "" || sha256 != ""; +assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; @@ -50,7 +51,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit fetchSubmodules; + inherit url rev leaveDotGit fetchSubmodules deepClone; GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; @@ -64,4 +65,3 @@ stdenv.mkDerivation { preferLocalBuild = true; } - From f5b2b73dee10253dc471a5e6e6f33bd08d656f45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 13:14:54 +0100 Subject: [PATCH 027/223] cabal2nix: update git snapshot to latest version --- .../haskell-modules/configuration-common.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c09cf799a16..cd77d8ef2df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -634,26 +634,28 @@ self: super: { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "2.0"; + version = "20150310"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - sha256 = "5cc98f530303a82885e2f23d2c83f67f1a3767bfdd5ed3340e45858f1a0f04e1"; - rev = "6a445468030b064e4f71b43c269ba506e7e2f779"; + rev = "267d0495209822ad819b58cb472a0da54f5a0b72"; + sha256 = "1sdsjwf1cda4bpriiv1vfx0pa26087hzw7vviacvgbmn0xh6wm8g"; + deepClone = true; }; isLibrary = false; isExecutable = true; buildDepends = with self; [ - aeson base bytestring Cabal containers deepseq deepseq-generics - directory filepath hackage-db monad-par monad-par-extras mtl pretty - prettyclass process QuickCheck regex-posix SHA split transformers - utf8-string + aeson base bytestring Cabal containers deepseq-generics directory + filepath hackage-db lens monad-par monad-par-extras mtl pretty + prettyclass process regex-posix SHA split transformers utf8-string cartel ]; testDepends = with self; [ aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec monad-par + directory doctest filepath hackage-db hspec lens monad-par monad-par-extras mtl pretty prettyclass process QuickCheck regex-posix SHA split transformers utf8-string ]; + buildTools = [ pkgs.gitMinimal ]; + preConfigure = "runhaskell $setupCompileFlags generate-cabal-file >cabal2nix.cabal"; homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = pkgs.stdenv.lib.licenses.bsd3; From a0da8638d6c1ed35bd6588f2b09283e2682e9c17 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 5 Mar 2015 01:50:19 +0100 Subject: [PATCH 028/223] git: 2.3.0 -> 2.3.1 (cherry picked from commit 36c1a8a6c7b9fd137f4428dc802978cbc765bdd9) --- .../version-management/git-and-tools/git/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d31edb04bbe..310fcbc92e6 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,11 +9,8 @@ }: let - - version = "2.3.0"; - + version = "2.3.1"; svn = subversionClient.override { perlBindings = true; }; - in stdenv.mkDerivation { @@ -21,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1jhagfsmn9as6bss0c6zppw0iydcalgmadyywz7kdxbdsqa3mcll"; + sha256 = "1dwqqi3hynf4q8fnlkpvqp3qi5b2fra6gxc03ns3w53n2l2lpk0s"; }; patches = [ From 5d0cc81d083c38f94628f3f9297a6bafa9c9854b Mon Sep 17 00:00:00 2001 From: koral Date: Tue, 10 Mar 2015 10:32:56 +0000 Subject: [PATCH 029/223] git: 2.3.1 -> 2.3.2 (cherry picked from commit 50933385c53ae640bfe9188d4111a540feeb648f) --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 310fcbc92e6..1a0ea9e02da 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.3.1"; + version = "2.3.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1dwqqi3hynf4q8fnlkpvqp3qi5b2fra6gxc03ns3w53n2l2lpk0s"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; patches = [ From 44c32560173709800e1946bf6d56fc55f79f26c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 10 Mar 2015 14:35:12 +0100 Subject: [PATCH 030/223] Updating gobby and libinfinity. --- pkgs/applications/editors/gobby/default.nix | 4 ++-- pkgs/development/libraries/libinfinity/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 5ef19874531..c023da0bc95 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "gobby-0.4.94"; + name = "gobby-0.5.0"; src = fetchurl { url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00"; + sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 1a39e094153..ad0fa8589f3 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.5"; + name = "libinfinity-0.6.5"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7"; + sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] From 7e45327e9a0d3bddc5ee4ed989aed98a094e6dcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 15:38:59 +0100 Subject: [PATCH 031/223] mnemosyne: update to version 2.3.2 --- pkgs/games/mnemosyne/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4d4eb7659e1..e01999b2ecc 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -6,13 +6,13 @@ , cherrypy , sqlite3 }: -let - version = "2.2.1"; +let + version = "2.3.2"; in buildPythonPackage rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "7f5dd06a879b9ab059592355412182ee286e78e124aa25d588cacf9e4ab7c423"; + sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; }; pythonPath = [ pyqt4 @@ -51,7 +51,7 @@ in buildPythonPackage rec { uploaded to a central server for analysis. This data will be valuable to study the behaviour of our memory over a very long time period. The results will be used to improve the scheduling algorithms behind the - software even further. + software even further. ''; }; } From 581a4da7b50d0b8dfde112b5c615207dbc3e1dbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 15:42:10 +0100 Subject: [PATCH 032/223] frei0r: fix invalid download URL --- pkgs/development/libraries/frei0r/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2e3db4c2d73..ca2895f3c89 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4"; src = fetchurl { - url = "https://files.dyne.org/.xsend.php?file=frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/frei0r-plugins-1.4.tar.gz"; sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; }; From 54290aaa35a4ac6b6c2ab1240b1fbd0147d76968 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Tue, 10 Mar 2015 16:18:50 +0100 Subject: [PATCH 033/223] i3: 4.9 -> 4.9.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d7008d6a8ca..a8d2b42bb3b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.9"; + version = "4.9.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0n6hfma058iykfxnl1m23mkh8y5sx1x80s3fxfdngbd9wc41kqxy"; + sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; }; buildInputs = [ From 6fdd92742c0e9a3a48acea90414d782066bbd1b1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 10 Mar 2015 16:22:50 +0100 Subject: [PATCH 034/223] Document container@ systemd service --- nixos/doc/manual/administration/declarative-containers.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 177ebdd8db1..5e0bf9d4431 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -49,4 +49,8 @@ on container networking.) switch. Note that this will not delete the root directory of the container in /var/lib/containers. - \ No newline at end of file +Declarative containers can be started and stopped using the relative +systemd service. For example +systemctl start container@database. + + From fc15721871776672488c8b2e85424e4ddcf56cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Mar 2015 17:38:29 +0100 Subject: [PATCH 035/223] gettext: fix build on darwin Hash on Linuxes is unchanged. For details about the error see discussion at: https://github.com/NixOS/nixpkgs/commit/0ffb98828e87612 --- pkgs/development/libraries/gettext/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 81918b7c5e3..c35f8f3521e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, xz }: +{ stdenv, fetchurl, libiconv, libintlOrEmpty, xz }: stdenv.mkDerivation (rec { name = "gettext-0.18.2"; @@ -30,7 +30,8 @@ stdenv.mkDerivation (rec { fi ''; - buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz ] + ++ libintlOrEmpty ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; From 4b58636c0d798506342917591a6ba90eb080f1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Mar 2015 18:08:01 +0100 Subject: [PATCH 036/223] Revert "gettext: fix build on darwin" This reverts commit fc15721871776672488c8b2e85424e4ddcf56cd4. I trusted the referred comment (and maybe misunderstood it), but the commit wasn't a good idea at all. --- pkgs/development/libraries/gettext/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c35f8f3521e..81918b7c5e3 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, libintlOrEmpty, xz }: +{ stdenv, fetchurl, libiconv, xz }: stdenv.mkDerivation (rec { name = "gettext-0.18.2"; @@ -30,8 +30,7 @@ stdenv.mkDerivation (rec { fi ''; - buildInputs = [ xz ] - ++ libintlOrEmpty ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; From 7711446298a6024d05a876edac2f2ee435e24d12 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Tue, 10 Mar 2015 10:09:41 -0700 Subject: [PATCH 037/223] build LocaleGettext on darwin --- pkgs/top-level/perl-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b3afb09412..3538339fa29 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5104,6 +5104,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; + buildInputs = [ pkgs.gettext ]; + NIX_CFLAGS_LINK = "-lintl"; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; From b1adfeb23d956908a10b0e628790c8cc689defbb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 10 Mar 2015 18:11:25 +0100 Subject: [PATCH 038/223] fhs-userenv: Make it work on kernel < 3.19 cc @abbradar It may not be very secure, but I think it's better to make it work with older kernel since 3.19 is not the default on nixos. --- pkgs/build-support/build-fhs-userenv/chroot-user.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 35608bd3eb6..3e140fac97e 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -79,7 +79,11 @@ if $cpid == 0 $unshare.call CLONE_NEWNS | CLONE_NEWUSER # Map users and groups to the parent namespace - write_file '/proc/self/setgroups', 'deny' + begin + # setgroups is only available since Linux 3.19 + write_file '/proc/self/setgroups', 'deny' + rescue + end write_file '/proc/self/uid_map', "#{uid} #{uid} 1" write_file '/proc/self/gid_map', "#{gid} #{gid} 1" From c904f35728bfcb1322c862af99890793c25984f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Mar 2015 18:23:02 +0100 Subject: [PATCH 039/223] perlPackages.LocalGettext: fix on both Linux and Darwin --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3538339fa29..625aea9046e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5104,8 +5104,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; - buildInputs = [ pkgs.gettext ]; - NIX_CFLAGS_LINK = "-lintl"; + buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext; + NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; From 14d72a1c6597b9e5330c47de36f5342cc8a44207 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 11:17:25 -0700 Subject: [PATCH 040/223] talloc: 2.1.1 -> 2.1.2 --- pkgs/development/libraries/talloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8a523593c4b..9aad51f9fad 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.1"; + name = "talloc-2.1.2"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; + sha256 = "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393"; }; buildInputs = [ From aad4e6fb844d7b30a1aeaacef63592a6894376f8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 11:23:40 -0700 Subject: [PATCH 041/223] zfs: 2015-03-05 -> 2015-03-10 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 2007cd83518..1318722d395 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-05"; + version = "2015-03-10"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "417104bdd3c7ce07ec58674dd078f9891c3bc780"; - sha256 = "0w6cr6avi3raxdzqzljn840k1vcvakqrb88jifsqnd5asws5v8wm"; + rev = "7f3e4662832269b687ff20dafc6a33f8e1d28912"; + sha256 = "1z0aizn212m6vygp4iqd3dv2xpqb883bvz12sw6hg7w8isq83ila"; }; patches = [ From 2491e32cc577c6d42a65e8dd74e535510da278c8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 10 Mar 2015 19:30:05 +0100 Subject: [PATCH 042/223] Update 'fira' to version 4.002. --- pkgs/data/fonts/fira/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 56fa9f51a47..7696632ef92 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-3.111"; + name = "fira-4.002"; src = fetchurl { - url = "http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip"; - sha256 = "3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457"; + url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; + sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; }; buildInputs = [unzip]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.carrois.com/fira-3-1/; + homepage = http://www.carrois.com/fira-4-0/; description = "Sans-serif and monospace font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, From 0de5e56d877889a73b780d443a70c00040c7d29c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 11:44:59 -0700 Subject: [PATCH 043/223] msgpack: Update to 1.0.0 --- .../{CMakeLists.patch => 0.5-CMake.patch} | 0 pkgs/development/libraries/libmsgpack/0.5.nix | 14 ++++++++++ .../libraries/libmsgpack/default.nix | 28 ++++++------------- .../libraries/libmsgpack/generic.nix | 20 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 44 insertions(+), 19 deletions(-) rename pkgs/development/libraries/libmsgpack/{CMakeLists.patch => 0.5-CMake.patch} (100%) create mode 100644 pkgs/development/libraries/libmsgpack/0.5.nix create mode 100644 pkgs/development/libraries/libmsgpack/generic.nix diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch similarity index 100% rename from pkgs/development/libraries/libmsgpack/CMakeLists.patch rename to pkgs/development/libraries/libmsgpack/0.5-CMake.patch diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix new file mode 100644 index 00000000000..4f14dcd8b13 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/0.5.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "0.5.9"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs"; + }; + + patches = [ ./0.5-CMake.patch ]; +}) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index d9f4bfcc750..4bec67f8513 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,22 +1,12 @@ -{ stdenv, fetchurl, cmake}: +{ callPackage, fetchFromGitHub, ... } @ args: -stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; +callPackage ./generic.nix (args // rec { + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"; - sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq"; + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; }; - - buildInputs = [ cmake ]; - patches = [ ./CMakeLists.patch ]; - - meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.redbaron ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} +}) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix new file mode 100644 index 00000000000..72943c098ba --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -0,0 +1,20 @@ +{ stdenv, cmake +, version, src, patches ? [ ] +, ... +}: + +stdenv.mkDerivation rec { + name = "libmsgpack-${version}"; + + inherit src patches; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = with maintainers; [ redbaron wkennington ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c215cc507be..c701ecac74b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6331,6 +6331,7 @@ let libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libnatspec = callPackage ../development/libraries/libnatspec { }; From dfe87f3c283f4771ad328995bcb6282bba63c48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 10 Mar 2015 21:10:12 +0100 Subject: [PATCH 044/223] lmms: update from 1.1.2 to 1.1.3 --- pkgs/applications/audio/lmms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 663e1827b85..6d28c038f23 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz"; - sha256 = "0p0lfy3vmxjf9nwajzyhl2jscpmbi26qqqsy1hsa4ljc0plfz60p"; + sha256 = "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr"; }; buildInputs = [ From 59be6b06b4a9110aa16017b4ff404db8a5afee5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 10 Mar 2015 21:10:31 +0100 Subject: [PATCH 045/223] python33Packages.evdev: update from 0.4.6 to 0.4.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c959f74538f..f926fc877dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2615,13 +2615,13 @@ let evdev = buildPythonPackage rec { - version = "0.4.6"; + version = "0.4.7"; name = "evdev-${version}"; disabled = isPy34; # see http://bugs.python.org/issue21121 src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; - sha256 = "08bzyr3zc8ijnv25bysmmvzircblh42ja15f6ijdzmqqw8vfaij8"; + sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k"; }; buildInputs = with self; [ pkgs.linuxHeaders ]; From 7b6e2e1c689a40b9a077a819322d5b571ea76642 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 14:03:12 -0700 Subject: [PATCH 046/223] lightdm: Fix rendering --- .../services/x11/display-managers/lightdm.nix | 26 +++++++++++-------- .../lightdm-gtk-greeter/default.nix | 2 -- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 47d94dbe73b..d4cf88a7ffd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -26,19 +26,15 @@ let buildInputs = [ pkgs.makeWrapper ]; buildCommand = '' - mkdir -p $out/gtk-3.0/ - - # This wrapper ensures that we actually get ?? (fonts should be OK now) + # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ - --set XDG_CONFIG_HOME $out/ - - # We need this to ensure that it actually tries to find icons from gnome-icon-theme - cat - > $out/gtk-3.0/settings.ini << EOF - [Settings] - gtk-icon-theme-name=gnome - EOF + --prefix PATH : "${pkgs.glibc}/bin" \ + --set GTK_DATA_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \ + --set GTK_EXE_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \ + --set GTK_PATH "${pkgs.gnome3.gnome_themes_standard}" \ + --set XDG_DATA_DIRS "${pkgs.gnome3.gnome_themes_standard}/share:${pkgs.gnome3.gnome_icon_theme}/share" \ + --set XDG_CONFIG_HOME ${pkgs.gnome3.gnome_themes_standard}/share cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] @@ -73,6 +69,13 @@ let greeter-session = ${cfg.greeter.name} ''; + gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" + '' + [greeter] + theme-name = Adwaita + icon-theme-name = Adwaita + ''; + in { options = { @@ -112,6 +115,7 @@ in ''; }; + environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; environment.etc."lightdm/lightdm.conf".source = lightdmConf; environment.etc."lightdm/users.conf".source = usersConf; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 176888328a5..171fefc8a09 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -6,8 +6,6 @@ #ToDo: bad icons with gtk2; # avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from -#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory - let ver_branch = "2.0"; version = "2.0.0"; From 0a34c59c38207f0420f64e2870fd3978ecdb70d5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 10 Mar 2015 15:19:51 -0600 Subject: [PATCH 047/223] Add dependency for wicd-gtk to use the systray --- pkgs/tools/networking/wicd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d4463b42ec6..55a99dd2729 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ python pythonPackages.Babel pythonPackages.urwid ]; + buildInputs = [ + python pythonPackages.Babel + pythonPackages.urwid pythonPackages.notify + ]; patches = [ ./no-var-install.patch @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in From 5893d2ecd395596011adc9a116872324888e18c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 14:23:43 -0700 Subject: [PATCH 048/223] nixos/lightdm: More Cleanups --- .../services/x11/display-managers/lightdm.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index d4cf88a7ffd..e6851669723 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -18,6 +18,9 @@ let exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} ''; + theme = pkgs.gnome3.gnome_themes_standard; + icons = pkgs.gnome3.gnome_icon_theme; + # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. @@ -30,11 +33,12 @@ let makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ --prefix PATH : "${pkgs.glibc}/bin" \ - --set GTK_DATA_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \ - --set GTK_EXE_PREFIX "${pkgs.gnome3.gnome_themes_standard}" \ - --set GTK_PATH "${pkgs.gnome3.gnome_themes_standard}" \ - --set XDG_DATA_DIRS "${pkgs.gnome3.gnome_themes_standard}/share:${pkgs.gnome3.gnome_icon_theme}/share" \ - --set XDG_CONFIG_HOME ${pkgs.gnome3.gnome_themes_standard}/share + --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \ + --set GTK_PATH "${theme}:${pkgs.gtk3}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] From ffed8a85bcebff20ffd0de7d876a1bd0652fb431 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 14:32:53 -0700 Subject: [PATCH 049/223] nixos/sddm: Hide users which don't have login shells --- nixos/modules/services/x11/display-managers/sddm.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 020e8795045..c14c13b1cba 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -25,6 +25,8 @@ let [Users] MaximumUid=${toString config.ids.uids.nixbld} + HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} + HideShells=/run/current-system/sw/sbin/nologin [XDisplay] MinimumVT=${toString xcfg.tty} From 3a67a51689ea0ec366ac9f3741470fb239180587 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 14:35:49 -0700 Subject: [PATCH 050/223] nixos/lightdm: Small cleanup --- nixos/modules/services/x11/display-managers/lightdm.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index e6851669723..b2664b5a5a7 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -50,13 +50,11 @@ let ''; }; - hiddenUsers = config.services.xserver.displayManager.hiddenUsers; - usersConf = writeText "users.conf" '' [UserList] minimum-uid=500 - hidden-users=${concatStringsSep " " hiddenUsers} + hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/sbin/nologin ''; From e519414e1ff8ef9c86879a6c4e722e171918faa1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 14:55:54 -0700 Subject: [PATCH 051/223] nixos/lightdm: Fix data directory --- nixos/modules/services/x11/display-managers/lightdm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index b2664b5a5a7..e988302cc5f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -82,6 +82,7 @@ in { options = { services.xserver.displayManager.lightdm = { + enable = mkOption { default = false; description = '' @@ -129,7 +130,7 @@ in users.extraUsers.lightdm = { createHome = true; - home = "/var/lib/lightdm"; + home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; From 9da09f3fdf574c252ca8670c3f57b3f765f6b3a4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 15:57:17 -0700 Subject: [PATCH 052/223] nixpkgs: Add nixos-artwork --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c701ecac74b..c7ab7a6e7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13448,6 +13448,12 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; + nixos-artwork = fetchgit { + url = "git://github.com/NixOS/nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { From 26020cfe8a0122496a1a471ca2a190737d48752a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Mar 2015 15:57:46 -0700 Subject: [PATCH 053/223] nixos/lightdm: Add a background option --- nixos/modules/services/x11/display-managers/lightdm.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index e988302cc5f..e7ddb7ff254 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -76,6 +76,7 @@ let [greeter] theme-name = Adwaita icon-theme-name = Adwaita + background = ${cfg.background} ''; in @@ -101,6 +102,13 @@ in }; }; + background = mkOption { + default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + description = '' + The background image or color to use. + ''; + }; + }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7ab7a6e7c8..62f5db40fa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13448,6 +13448,7 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; + # Remember to check the default lightdm wallpaper nixos-artwork = fetchgit { url = "git://github.com/NixOS/nixos-artwork"; rev = "e71b6846023919136795ede22b16d73b2cf1693d"; From a25b2b7aa9e3e324ba9a113b7ed93a0f9db8ccb8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 10 Mar 2015 18:24:18 -0500 Subject: [PATCH 054/223] kdeApps_14_12: version bump to 14.12.3 --- pkgs/applications/kde-apps-14.12/manifest.nix | 1890 +++++++++++++++++ pkgs/applications/kde-apps-14.12/manifest.sh | 2 + 2 files changed, 1892 insertions(+) diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix index 8411690b1eb..88069b6702a 100644 --- a/pkgs/applications/kde-apps-14.12/manifest.nix +++ b/pkgs/applications/kde-apps-14.12/manifest.nix @@ -2080,6 +2080,15 @@ name = "kde-l10n-hu-14.12.2.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar"; + store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz"; + sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv"; + name = "kde-l10n-ca_valencia-14.12.2.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar"; store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz"; @@ -3772,4 +3781,1885 @@ name = "poxml-14.12.2.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz"; + sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl"; + name = "libkexiv2-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz"; + sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh"; + name = "kbruch-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar"; + store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz"; + sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96"; + name = "kde-dev-scripts-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar"; + store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz"; + sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh"; + name = "kdeartwork-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz"; + sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4"; + name = "libkipi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar"; + store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz"; + sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56"; + name = "okteta-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz"; + sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi"; + name = "analitza-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar"; + store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz"; + sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv"; + name = "kdepim-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz"; + sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d"; + name = "kteatime-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz"; + sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77"; + name = "pairs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz"; + sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj"; + name = "kreversi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz"; + sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m"; + name = "kcachegrind-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz"; + sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny"; + name = "kmouth-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz"; + sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a"; + name = "kcron-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz"; + sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l"; + name = "kde-l10n-sk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz"; + sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m"; + name = "kde-l10n-mr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar"; + store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz"; + sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg"; + name = "kde-l10n-et-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz"; + sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q"; + name = "kde-l10n-zh_TW-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz"; + sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf"; + name = "kde-l10n-ga-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz"; + sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p"; + name = "kde-l10n-hr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz"; + sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb"; + name = "kde-l10n-uk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz"; + sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79"; + name = "kde-l10n-fa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz"; + sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74"; + name = "kde-l10n-pt-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz"; + sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa"; + name = "kde-l10n-ar-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz"; + sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp"; + name = "kde-l10n-ca-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz"; + sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820"; + name = "kde-l10n-cs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar"; + store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz"; + sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4"; + name = "kde-l10n-is-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz"; + sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75"; + name = "kde-l10n-ia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz"; + sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9"; + name = "kde-l10n-wa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz"; + sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4"; + name = "kde-l10n-sv-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz"; + sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53"; + name = "kde-l10n-nn-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar"; + store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz"; + sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg"; + name = "kde-l10n-it-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar"; + store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz"; + sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1"; + name = "kde-l10n-pt_BR-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz"; + sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz"; + name = "kde-l10n-el-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz"; + sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc"; + name = "kde-l10n-ro-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz"; + sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893"; + name = "kde-l10n-fi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz"; + sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv"; + name = "kde-l10n-sr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz"; + sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa"; + name = "kde-l10n-da-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz"; + sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0"; + name = "kde-l10n-es-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz"; + sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p"; + name = "kde-l10n-he-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz"; + sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks"; + name = "kde-l10n-ja-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz"; + sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm"; + name = "kde-l10n-ug-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz"; + sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d"; + name = "kde-l10n-bs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz"; + sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg"; + name = "kde-l10n-bg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz"; + sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx"; + name = "kde-l10n-zh_CN-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz"; + sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh"; + name = "kde-l10n-fr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar"; + store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz"; + sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi"; + name = "kde-l10n-de-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz"; + sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib"; + name = "kde-l10n-kk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz"; + sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b"; + name = "kde-l10n-eu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar"; + store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz"; + sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri"; + name = "kde-l10n-lt-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar"; + store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz"; + sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk"; + name = "kde-l10n-pa-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz"; + sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb"; + name = "kde-l10n-tr-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz"; + sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw"; + name = "kde-l10n-nl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz"; + sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5"; + name = "kde-l10n-ca_valencia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar"; + store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz"; + sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww"; + name = "kde-l10n-id-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz"; + sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f"; + name = "kde-l10n-lv-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz"; + sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc"; + name = "kde-l10n-pl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz"; + sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1"; + name = "kde-l10n-nds-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz"; + sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr"; + name = "kde-l10n-km-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz"; + sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452"; + name = "kde-l10n-hu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar"; + store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz"; + sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v"; + name = "kde-l10n-ko-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz"; + sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz"; + name = "kde-l10n-hi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz"; + sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3"; + name = "kde-l10n-ru-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz"; + sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1"; + name = "kde-l10n-nb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz"; + sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h"; + name = "kde-l10n-en_GB-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz"; + sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla"; + name = "kde-l10n-gl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz"; + sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35"; + name = "kde-l10n-sl-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz"; + sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc"; + name = "kate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz"; + sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h"; + name = "kolourpaint-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz"; + sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj"; + name = "kruler-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar"; + store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz"; + sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib"; + name = "ktimer-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz"; + sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr"; + name = "ksquares-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz"; + sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy"; + name = "ksystemlog-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz"; + sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2"; + name = "kshisen-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar"; + store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz"; + sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm"; + name = "ksudoku-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz"; + sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx"; + name = "libkomparediff2-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar"; + store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz"; + sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8"; + name = "kamera-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar"; + store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz"; + sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j"; + name = "kscd-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz"; + sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721"; + name = "kdegraphics-mobipocket-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz"; + sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825"; + name = "ksnapshot-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar"; + store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz"; + sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz"; + name = "ksnakeduel-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz"; + sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8"; + name = "filelight-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz"; + sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l"; + name = "step-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar"; + store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz"; + sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl"; + name = "kompare-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar"; + store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz"; + sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv"; + name = "kblocks-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz"; + sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc"; + name = "knetwalk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar"; + store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz"; + sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19"; + name = "killbots-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz"; + sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f"; + name = "kde-wallpapers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar"; + store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz"; + sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc"; + name = "bomber-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz"; + sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w"; + name = "kjumpingcube-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz"; + sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk"; + name = "kfourinline-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar"; + store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz"; + sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig"; + name = "kwordquiz-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz"; + sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f"; + name = "palapeli-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz"; + sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz"; + name = "libkdcraw-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz"; + sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98"; + name = "sweeper-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz"; + sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp"; + name = "zeroconf-ioslave-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar"; + store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz"; + sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l"; + name = "kalgebra-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz"; + sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74"; + name = "kaccessible-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar"; + store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz"; + sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a"; + name = "kdepim-runtime-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz"; + sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8"; + name = "kmix-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz"; + sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl"; + name = "kbreakout-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz"; + sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy"; + name = "libkmahjongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz"; + sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb"; + name = "kmahjongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar"; + store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz"; + sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii"; + name = "libkdeedu-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz"; + sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z"; + name = "kstars-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz"; + sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg"; + name = "granatier-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz"; + sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy"; + name = "juk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar"; + store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz"; + sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh"; + name = "kdepimlibs-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz"; + sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27"; + name = "libkdegames-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar"; + store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz"; + sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm"; + name = "ktuberling-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz"; + sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd"; + name = "poxml-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar"; + store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz"; + sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9"; + name = "kmag-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz"; + sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai"; + name = "kde-runtime-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz"; + sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2"; + name = "lokalize-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz"; + sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp"; + name = "kopete-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar"; + store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz"; + sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v"; + name = "parley-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz"; + sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira"; + name = "svgpart-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh"; + name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz"; + sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji"; + name = "ffmpegthumbs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz"; + sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks"; + name = "kdesdk-kioslaves-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz"; + sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m"; + name = "kremotecontrol-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz"; + sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp"; + name = "kdenetwork-filesharing-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz"; + sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb"; + name = "audiocd-kio-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz"; + sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a"; + name = "konsole-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz"; + sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr"; + name = "mplayerthumbs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar"; + store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz"; + sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns"; + name = "kde-dev-utils-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz"; + sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy"; + name = "krdc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz"; + sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm"; + name = "klickety-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz"; + sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5"; + name = "kdiamond-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz"; + sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx"; + name = "ark-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz"; + sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6"; + name = "kfloppy-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar"; + store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz"; + sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im"; + name = "picmi-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz"; + sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh"; + name = "konquest-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar"; + store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz"; + sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24"; + name = "kalzium-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz"; + sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1"; + name = "kde-base-artwork-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz"; + sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb"; + name = "blinken-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz"; + sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v"; + name = "kcharselect-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz"; + sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy"; + name = "umbrello-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz"; + sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia"; + name = "kget-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar"; + store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz"; + sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim"; + name = "kuser-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar"; + store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz"; + sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31"; + name = "kigo-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar"; + store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz"; + sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj"; + name = "dolphin-plugins-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar"; + store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz"; + sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn"; + name = "katomic-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz"; + sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p"; + name = "rocs-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz"; + sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144"; + name = "libkcddb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz"; + sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz"; + name = "kdewebdev-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar"; + store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz"; + sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb"; + name = "krfb-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar"; + store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz"; + sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd"; + name = "kde-baseapps-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz"; + sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y"; + name = "cantor-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar"; + store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz"; + sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk"; + name = "kdelibs-4.14.6.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz"; + sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0"; + name = "kubrick-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz"; + sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r"; + name = "kpat-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar"; + store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz"; + sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4"; + name = "marble-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar"; + store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz"; + sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj"; + name = "kcolorchooser-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz"; + sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam"; + name = "libkface-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar"; + store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz"; + sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin"; + name = "kbounce-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki"; + name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz"; + sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5"; + name = "kcalc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar"; + store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz"; + sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k"; + name = "lskat-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar"; + store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz"; + sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c"; + name = "amor-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar"; + store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz"; + sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x"; + name = "klines-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz"; + sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0"; + name = "kiriki-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz"; + sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i"; + name = "kgpg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar"; + store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz"; + sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g"; + name = "kolf-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar"; + store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz"; + sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0"; + name = "superkaramba-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz"; + sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb"; + name = "kapman-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar"; + store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz"; + sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5"; + name = "khangman-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar"; + store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz"; + sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3"; + name = "libksane-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz"; + sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8"; + name = "kgoldrunner-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar"; + store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz"; + sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp"; + name = "bovo-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz"; + sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm"; + name = "kgamma-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz"; + sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj"; + name = "kajongg-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar"; + store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz"; + sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7"; + name = "kppp-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar"; + store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz"; + sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i"; + name = "kmplot-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar"; + store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz"; + sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp"; + name = "kdf-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar"; + store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz"; + sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki"; + name = "knavalbattle-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar"; + store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz"; + sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m"; + name = "ksirk-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar"; + store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz"; + sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5"; + name = "print-manager-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz"; + sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh"; + name = "artikulate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar"; + store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz"; + sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb"; + name = "kdeedu-data-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar"; + store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz"; + sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34"; + name = "kturtle-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar"; + store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz"; + sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c"; + name = "klettres-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar"; + store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz"; + sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk"; + name = "libkeduvocdocument-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz"; + sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7"; + name = "libkcompactdisc-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz"; + sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r"; + name = "kdesdk-strigi-analyzers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar"; + store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz"; + sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd"; + name = "kiten-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar"; + store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz"; + sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4"; + name = "kwalletmanager-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar"; + store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz"; + sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4"; + name = "kanagram-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar"; + store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz"; + sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb"; + name = "kspaceduel-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar"; + store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz"; + sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb"; + name = "kig-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar"; + store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz"; + sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz"; + name = "jovie-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar"; + store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz"; + sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax"; + name = "cervisia-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar"; + store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz"; + sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj"; + name = "dragon-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar"; + store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz"; + sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0"; + name = "kqtquickcharts-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar"; + store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz"; + sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6"; + name = "kblackbox-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar"; + store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz"; + sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy"; + name = "kapptemplate-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar"; + store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz"; + sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf"; + name = "kgeography-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar"; + store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz"; + sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah"; + name = "ksaneplugin-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar"; + store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz"; + sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7"; + name = "okular-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz"; + sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk"; + name = "kdesdk-thumbnailers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar"; + store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz"; + sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx"; + name = "kde-workspace-4.11.17.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar"; + store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz"; + sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p"; + name = "ktux-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar"; + store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz"; + sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08"; + name = "kmousetool-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar"; + store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz"; + sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6"; + name = "oxygen-icons-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar"; + store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz"; + sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h"; + name = "ktouch-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz"; + sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf"; + name = "kollision-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar"; + store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz"; + sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax"; + name = "kdegraphics-thumbnailers-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar"; + store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz"; + sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw"; + name = "gwenview-14.12.3.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar"; + store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz"; + sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f"; + name = "kmines-14.12.3.tar.xz"; + }; + } ] diff --git a/pkgs/applications/kde-apps-14.12/manifest.sh b/pkgs/applications/kde-apps-14.12/manifest.sh index 487e505ccd0..7e3038275b8 100755 --- a/pkgs/applications/kde-apps-14.12/manifest.sh +++ b/pkgs/applications/kde-apps-14.12/manifest.sh @@ -6,6 +6,8 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ http://download.kde.org/stable/applications/14.12.1/ \ + http://download.kde.org/stable/applications/14.12.2/ \ + http://download.kde.org/stable/applications/14.12.3/ \ -A '*.tar.xz' else From 2d00826ac958d211bd1011d5cb6d650e353b643c Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 11 Mar 2015 02:07:43 +0100 Subject: [PATCH 055/223] syslog-ng: Update from 3.6.1 to 3.6.2 --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cec906e1f43..4fcc0680ada 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; + sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; }; buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; From df9daf16aacf5e16f627743a71c2c3970ec7fbd5 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Tue, 10 Mar 2015 10:53:00 -0700 Subject: [PATCH 056/223] Package vmtouch --- lib/maintainers.nix | 1 + pkgs/tools/misc/vmtouch/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/vmtouch/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 956f7eb6492..a16f6ed9631 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -78,6 +78,7 @@ fuuzetsu = "Mateusz Kowalczyk "; gal_bolle = "Florent Becker "; garbas = "Rok Garbas "; + garrison = "Jim Garrison "; gavin = "Gavin Rogers "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix new file mode 100644 index 00000000000..767a61c2bb5 --- /dev/null +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, perl}: + +stdenv.mkDerivation rec { + pname = "vmtouch"; + version = "git-20150310"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "hoytech"; + repo = "vmtouch"; + rev = "4e1b106e59942678c1e6e490e2c7ca7df50eb7a3"; + sha256 = "1m37gvlypyfizd33mfyfha4hhwiyfzsj8gb2h5im6wzis4j15d0y"; + }; + + buildInputs = [perl]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + description = "Portable file system cache diagnostics and control"; + longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; + homepage = "http://hoytech.com/vmtouch/vmtouch.html"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c215cc507be..2db8ebd3df0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2986,6 +2986,8 @@ let vlan = callPackage ../tools/networking/vlan { }; + vmtouch = callPackage ../tools/misc/vmtouch { }; + volumeicon = callPackage ../tools/audio/volumeicon { }; wakelan = callPackage ../tools/networking/wakelan { }; From ff2a48b3efe07d22d4458771cae6c9b080d1e7b4 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Wed, 11 Mar 2015 06:06:12 +0100 Subject: [PATCH 057/223] Fix broken urls --- pkgs/applications/editors/eclipse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e04e438b8ba..0251eaa5315 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -246,11 +246,11 @@ in { description = "Eclipse Classic"; sources = { "x86_64-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd"; }; "i686-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg"; }; }; @@ -261,11 +261,11 @@ in { description = "Eclipse Classic"; sources = { "x86_64-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz; sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2"; }; "i686-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z"; }; }; From fff1cc805a4d65b331bd40cc2e06b86b4fe55b07 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:06:41 +0100 Subject: [PATCH 058/223] add calendar functions to PHP by default --- pkgs/development/interpreters/php/5.4.nix | 5 +++++ pkgs/development/interpreters/php/5.5.nix | 4 ++++ pkgs/development/interpreters/php/5.6.nix | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index dab983a1349..75e3b6b2be9 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -189,6 +189,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-maintainer-zts"]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -229,6 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); ztsSupport = config.php.zts or false; + calendarSupport = config.php.calendar or false; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 70380889bd3..27878925e88 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -193,6 +193,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; }; cfg = { @@ -227,6 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index bf0f2076c1c..aba94d63932 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -193,6 +193,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + + calendar = { + configureFlags = ["--enable-calendar"]; + }; + }; cfg = { @@ -227,6 +232,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' From 9d26ad274a8fbb476c286eda2ee3294064822533 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:24:43 +0100 Subject: [PATCH 059/223] rename weirdly called patch for php --- 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/{fix-5.4.patch => fix-paths.patch} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/php/{fix-5.4.patch => fix-paths.patch} (100%) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 75e3b6b2be9..598d4fa7d1d 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -267,6 +267,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 27878925e88..f4933ede9d3 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -264,6 +264,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index aba94d63932..a0131dcdac5 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -266,6 +266,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-paths.patch similarity index 100% rename from pkgs/development/interpreters/php/fix-5.4.patch rename to pkgs/development/interpreters/php/fix-paths.patch From 282530454a7d4388b462f277b0296f385ad52fb5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:24:55 +0100 Subject: [PATCH 060/223] add myself as php and rustc maintainer --- lib/maintainers.nix | 1 + pkgs/development/compilers/rustc/makeRustcDerivation.nix | 2 +- pkgs/development/interpreters/php/5.4.nix | 3 ++- pkgs/development/interpreters/php/5.5.nix | 3 ++- pkgs/development/interpreters/php/5.6.nix | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a16f6ed9631..a25b20667ca 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -80,6 +80,7 @@ garbas = "Rok Garbas "; garrison = "Jim Garrison "; gavin = "Gavin Rogers "; + globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 7be005fb763..0059fd82227 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -61,7 +61,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 598d4fa7d1d..49740fddb46 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -261,10 +261,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index f4933ede9d3..fac04654847 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -258,10 +258,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index a0131dcdac5..6559ecfa658 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -260,10 +260,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "0vfhvwn84lrz9psf10sjnwljbna1r7yqxq3lmsh5qajifl3lraxd"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ]; From ccef701daa49e8b7445876e54ef93c54c68621d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Mar 2015 09:34:40 -0500 Subject: [PATCH 061/223] kdeApps_14_12: set priorities to avoid collisions --- pkgs/applications/kde-apps-14.12/default.nix | 2 ++ pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 0a186567143..555d4d472bc 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -201,6 +201,7 @@ let NIX_CFLAGS_COMPILE = (super.kde-runtime.NIX_CFLAGS_COMPILE or "") + " -I${ilmbase}/include/OpenEXR"; + meta = { priority = 10; }; }; kde-workspace = with pkgs; super.kde-workspace // { @@ -214,6 +215,7 @@ let nativeBuildInputs = super.kde-workspace.nativeBuildInputs ++ [ pkgconfig ]; + meta = { priority = 10; }; }; kdelibs = with pkgs; super.kdelibs // { diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 6d96b1b5082..c53ae595e5e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -32,7 +32,7 @@ let ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = drv.meta or + meta = { license = with stdenv.lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -40,7 +40,7 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; - }; + } // (drv.meta or {}); }); renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; From 8a9e4271749f1bb1214c2e035effdff4a712dbd4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Mar 2015 15:29:55 +0100 Subject: [PATCH 062/223] Manual tweak --- nixos/doc/manual/administration/declarative-containers.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 5e0bf9d4431..228c45b0c1f 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -49,8 +49,8 @@ on container networking.) switch. Note that this will not delete the root directory of the container in /var/lib/containers. -Declarative containers can be started and stopped using the relative -systemd service. For example -systemctl start container@database. +Declarative containers can be started and stopped using the +corresponding systemd service, e.g. systemctl start +container@database. From 7b4d8d361d1dd77101d3c1272ee2dc9f17d03752 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 11 Mar 2015 14:45:53 +0000 Subject: [PATCH 063/223] mercurial: 3.2.4 -> 3.3.2 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c97e9c762a5..bd35ebb5266 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.2.4"; + version = "3.3.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1g7nfvapxj5k44dyp0p08v37s0zmrj2vl0rjgfd8297x0afidm08"; + sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; }; inherit python; # pass it so that the same version can be used in hg2git From 0ccf34039cf5d68dbc70d26addc3208464553500 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 11 Mar 2015 16:53:24 +0100 Subject: [PATCH 064/223] xorg.mxfontscale: Fix segfault with some fonts. The update to version 1.1.2 in 9c22c1b introduces a segfault when mkfontscale is processing fonts where the family name is missing. Applies a patch from Stefan Dirsch to be found at: https://bugs.freedesktop.org/show_bug.cgi?id=89409 Signed-off-by: aszlig --- pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb3be6e8b51..5a2fd0ba46e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -61,6 +61,15 @@ in preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; + mkfontscale = attrs: attrs // { + patches = lib.singleton (args.fetchpatch { + name = "mkfontscale-fix-sig11.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=113951"; + sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim"; + }); + patchFlags = [ "-p0" ]; + }; + libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb"; From 9d7f4843d8575329e8fcf34882f967e5bdf3e5c5 Mon Sep 17 00:00:00 2001 From: bstrik Date: Wed, 11 Mar 2015 17:10:31 +0100 Subject: [PATCH 065/223] 2 more windowmaker dockapps --- .../windowmaker/dockapps/alsamixer.app.nix | 26 +++++++++++++++++++ .../windowmaker/dockapps/wmsm.app.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix new file mode 100644 index 00000000000..11e5460fecb --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }: + +stdenv.mkDerivation { + name = "alsamixer.app-0.2.1"; + src = fetchgit { + url = git://repo.or.cz/dockapps.git; + rev = "38c74350b02f35824554ce0c4f0f251d71762040"; + sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ]; + + postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; + + installPhase = '' + mkdir -pv $out/bin; + cp AlsaMixer.app $out/bin/AlsaMixer; + ''; + + meta = { + description = "Alsa mixer application for Windowmaker"; + homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix new file mode 100644 index 00000000000..6fe49745fa7 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: + +stdenv.mkDerivation { + name = "wmsm.app-0.2.1"; + src = fetchurl { + url = http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2; + sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; + + installPhase = '' + substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" + mkdir -pv $out/bin; + make PREFIX=$out/bin install; + ''; + + meta = { + description = "System monitor for Windowmaker"; + homepage = "http://linux-bsd-unix.strefa.pl"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fce0f1b249..9ddcf7358d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11730,8 +11730,12 @@ let windowmaker = callPackage ../applications/window-managers/windowmaker { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; + wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; + wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; winswitch = callPackage ../tools/X11/winswitch { }; From dfc68092155626c465f26443bb249a78ac0b3c2b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Mar 2015 16:13:41 +0100 Subject: [PATCH 066/223] Add perf-tools --- pkgs/os-specific/linux/perf-tools/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/os-specific/linux/perf-tools/default.nix diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix new file mode 100644 index 00000000000..0273fed3ec4 --- /dev/null +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation { + name = "perf-tools-20150130"; + + src = fetchFromGitHub { + owner = "brendangregg"; + repo = "perf-tools"; + rev = "85414b01247666c9fefad25a1406c8078011c936"; + sha256 = "1g15nnndcmxd1k9radcvfpn223pp627vs9wh90yiy73v03g7b8cs"; + }; + + buildInputs = [ perl ]; + + patchPhase = + '' + for i in execsnoop iolatency iosnoop kernel/funcslower killsnoop opensnoop; do + substituteInPlace $i \ + --replace /usr/bin/gawk "$(type -p gawk)" \ + --replace /usr/bin/mawk /no-such-path \ + --replace /usr/bin/getconf "$(type -p getconf)" \ + --replace awk=awk "awk=$(type -p gawk)" + done + + rm -rf examples deprecated + ''; + + installPhase = + '' + d=$out/libexec/perf-tools + mkdir -p $d $out/share + cp -prvd . $d/ + ln -s $d/bin $out/bin + mv $d/man $out/share/ + ''; + + meta = { + platforms = lib.platforms.linux; + homepage = https://github.com/brendangregg/perf-tools; + description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01976f84cd..d100308f5d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9138,6 +9138,8 @@ let config = config.pcmciaUtils.config or null; }; + perf-tools = callPackage ../os-specific/linux/perf-tools { }; + plymouth = callPackage ../os-specific/linux/plymouth { automake = automake113x; }; From 798e613e16dd6274d301a50d6e9ee6917949050d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Mar 2015 17:11:41 +0100 Subject: [PATCH 067/223] kernel: Enable kprobes and other tracing features All of these should have minimal performance impact unless enabled at runtime. --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c802d3f266d..90f012f282d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -53,7 +53,6 @@ with stdenv.lib; NUMA? y # Disable some expensive (?) features. - KPROBES n PM_TRACE_RTC n # Enable various subsystems. @@ -300,9 +299,14 @@ with stdenv.lib; # Tracing. FTRACE y + KPROBES y FUNCTION_TRACER y FTRACE_SYSCALLS y SCHED_TRACER y + STACK_TRACER y + UPROBE_EVENT y + FUNCTION_PROFILER y + RING_BUFFER_BENCHMARK n # Devtmpfs support. DEVTMPFS y From ab1f4ac92e3a1b84bb47019ecc5839d45adbac3f Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 11 Mar 2015 16:43:52 +0000 Subject: [PATCH 068/223] mkvtoolnix: 7.6.0 -> 7.7.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 1fa77128c04..74d4196e47c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.6.0"; + version = "7.7.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "1n6waln6r9jx26al3k2nh6wi8p1q6lv2fs48nbc1lj9s2fc35pkl"; + sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; }; buildInputs = [ From 5b5b7aa951dd371cd8ee1a88997ede0c3c17cb10 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Mar 2015 09:34:56 -0500 Subject: [PATCH 069/223] kde5: add kde-workspace and kde-runtime to systemPackages --- nixos/modules/services/x11/desktop-managers/kde5.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9c3c65dcfaa..4cdc880d04c 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,7 +88,9 @@ in }; environment.systemPackages = - [ + filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) + ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kdeApps.kde-baseapps @@ -97,13 +99,12 @@ in kdeApps.konsole kdeApps.oxygen-icons + kdeApps.kde-runtime + pkgs.hicolor_icon_theme pkgs.orion # GTK theme, nearly identical to Breeze - ] - ++ filter isDerivation (builtins.attrValues plasma5) - ++ filter isDerivation (builtins.attrValues kf5) - ++ phononBackendPackages; + ] ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; From 4b109071524766c53910481cfb1894cbfcd366f4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Mar 2015 10:59:02 -0500 Subject: [PATCH 070/223] ssh: make askPassword an option By making askPassword an option, desktop environment modules can override the default x11_ssh_askpassword with their own equivalent for better integration. For example, KDE 5 uses plasma5.ksshaskpass instead. --- nixos/modules/programs/ssh.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index bd9b897158d..6ca73eea5f6 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -9,7 +9,7 @@ let cfg = config.programs.ssh; cfgd = config.services.openssh; - askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + askPassword = cfg.askPassword; askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" '' @@ -26,6 +26,12 @@ in programs.ssh = { + askPassword = mkOption { + type = types.string; + default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + description = ''Program used by SSH to ask for passwords.''; + }; + forwardX11 = mkOption { type = types.bool; default = false; From f370af91adde32dc6412976eb3aecbd9cbb284b6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 Mar 2015 11:00:22 -0500 Subject: [PATCH 071/223] kde5: use ksshaskpass for SSH_ASKPASS --- nixos/modules/services/x11/desktop-managers/kde5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4cdc880d04c..02e51577e3e 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -122,6 +122,8 @@ in fonts.fonts = [ plasma5.oxygen-fonts ]; + programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; + # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; From fa3bcc4f1c168d4d6248e214f8c9d996859df7a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Mar 2015 18:14:57 +0100 Subject: [PATCH 072/223] perf: Use libunwind and libbfd This gives better stack traces. --- pkgs/os-specific/linux/kernel/perf.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index be375ea310f..efd3515ff24 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , withGtk ? false, gtk ? null }: with lib; @@ -21,8 +21,9 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang + # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; - buildInputs = [ elfutils python perl newt slang pkgconfig] ++ + buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++ stdenv.lib.optional withGtk gtk; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 4a2986e6549c849cd059ff0734c167f50267b99e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 11 Mar 2015 18:34:26 +0100 Subject: [PATCH 073/223] tuxguitar: fix nixpkgs tarball job --- pkgs/applications/editors/music/tuxguitar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 09d30ad4e17..768842a3875 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }: -let metadata = if stdenv.system == "i686-linux" - then { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } - else if stdenv.system == "x86_64-linux" - then { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; } - else { }; +let metadata = assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + if stdenv.system == "i686-linux" then + { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } + else + { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; }; in stdenv.mkDerivation rec { version = "1.2"; name = "tuxguitar-${version}"; From bf3d901aad6c5d02766756d89cd3436d995486da Mon Sep 17 00:00:00 2001 From: Marcell Vazquez-Chanlatte Date: Mon, 16 Feb 2015 13:17:38 -0600 Subject: [PATCH 074/223] allow funcy package to be built under python3 and python2 --- pkgs/top-level/python-packages.nix | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9eb9078f62..9e633ed27f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13510,6 +13510,7 @@ let }; }; + moreItertools = buildPythonPackage rec { name = "more-itertools-2.2"; @@ -13529,6 +13530,7 @@ let }; }; + uncertainties = buildPythonPackage rec { name = "uncertainties-2.4.6.1"; @@ -13547,6 +13549,23 @@ let }; + funcy = buildPythonPackage rec { + name = "funcy-1.4"; + + src = pkgs.fetchurl { + url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; + sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; + }; + + meta = with stdenv.lib; { + description = "Collection of fancy functional tools focused on practicality."; + homepage = "http://funcy.readthedocs.org/"; + license = stdenv.lib.licenses.bsd3; + + }; + }; + + # python2.7 specific packages } // optionalAttrs isPy27 ( with self; @@ -13848,20 +13867,5 @@ let }; }; - funcy = buildPythonPackage rec { - name = "funcy-1.4"; - - src = pkgs.fetchurl { - url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; - sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; - }; - - meta = with stdenv.lib; { - description = "Collection of fancy functional tools focused on practicality."; - homepage = "http://funcy.readthedocs.org/"; - license = stdenv.lib.licenses.bsd3; - }; - }; - }); in pythonPackages From 6058403ca24d1856cb6114151a9538c0d16f4b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 11 Mar 2015 19:04:51 +0100 Subject: [PATCH 075/223] dogecoin: 1.8.1 -> 1.8.2 --- pkgs/applications/altcoins/dogecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 80137de33b3..cf2f25bfeee 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; - sha256 = "0h3jn400dj6qxl1gd4max7wl30cib2wczf9dd3qnbw42wngpdvx2"; + sha256 = "17jxsxsrsz3qy2hxdpw78vcbnnd0nq614iy42ypzhw4pdpz0s1l7"; }; buildInputs = [ autoreconfHook pkgconfig openssl From ec77aca09173422c40b289a69335b9ddcbc9488f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 11 Mar 2015 19:05:31 +0100 Subject: [PATCH 076/223] srm: 1.2.14 -> 1.2.15 --- pkgs/tools/security/srm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index db14a5b0e0c..a109e9ca6a6 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "srm-" + version; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/1.2.14/srm-1.2.14.tar.gz"; - sha256 = "1irwwpb7yhmii2v4vz1fjkmmhw7w7qd1ak9arn9zfg3mgcnwl32q"; + url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; meta = with stdenv.lib; { From 3d2604a8b61a2c242fb36362794ea729ed6b9e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 11 Mar 2015 19:06:13 +0100 Subject: [PATCH 077/223] libevhtp: added package --- .../libraries/libevhtp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libevhtp/default.nix diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix new file mode 100644 index 00000000000..f909d6d8ff2 --- /dev/null +++ b/pkgs/development/libraries/libevhtp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: + +stdenv.mkDerivation rec { + name = "libevhtp-${version}"; + version = "1.2.10"; + + src = fetchFromGitHub { + owner = "ellzey"; + repo = "libevhtp"; + rev = version; + sha256 = "0z5cxa65zp89vkaj286gp6fpmc5fylr8bmd17g3j1rgc42nysm6a"; + }; + + buildInputs = [ cmake openssl libevent ]; + + buildPhase = "cmake"; + + meta = with stdenv.lib; { + description = "A more flexible replacement for libevent's httpd API"; + homepage = "https://github.com/ellzey/libevhtp"; + license = licenses.bsd3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d100308f5d8..b19677de26a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1761,6 +1761,8 @@ let libevdev = callPackage ../development/libraries/libevdev { }; + libevhtp = callPackage ../development/libraries/libevhtp { }; + liboauth = callPackage ../development/libraries/liboauth { }; libtidy = callPackage ../development/libraries/libtidy { }; From e946ef111229c37188c23765071ce936c32c7c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 11 Mar 2015 19:10:07 +0100 Subject: [PATCH 078/223] ihaskell-with-packages: added config.ihaskell.packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19677de26a..c21b2689bec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1611,7 +1611,7 @@ let ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix { inherit (pythonPackages) ipython; inherit (haskellngPackages) ihaskell ghcWithPackages; - packages = self: []; + packages = self: config.ihaskell.packages or []; }; imapproxy = callPackage ../tools/networking/imapproxy { }; From afeed64bbe3861f8fc42c31b3f9e71acd83ba0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 11 Mar 2015 19:52:35 +0100 Subject: [PATCH 079/223] kodiPlugins.{genesis,svtplay}: version bumps --- pkgs/applications/video/kodi/plugins.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e38e00bc61f..f41d0e839ac 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -18,7 +18,7 @@ let mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d + cp -R "$sauce/"* $d ''; }; @@ -59,13 +59,13 @@ in plugin = "genesis"; namespace = "plugin.video.genesis"; - version = "2.4.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "lambda81"; repo = "lambda-addons"; - rev = "1eb1632063e18f3f30e9fdbed2a15cf1e9c05315"; - sha256 = "1gzx0jq4gyhkpdd21a70lhww9djr5dlgyl93b4l7dhgr3hnzxccl"; + rev = "34af083980598177684eeb6e1e73da336b84575a"; + sha256 = "1fh3j4ymkrx9flpvnlyjp1q4avfmjv5a6yfwl3cmqnslkkp6kn9n"; }; meta = with stdenv.lib; { @@ -81,17 +81,17 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.9"; + version = "4.0.14"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; + rev = "a6041aa6cf8f8461c0ebb093d901320822539094"; + sha256 = "1nxa2855i1if4vsflhb88i9s12flp2yzgan2wzdv2117cmll4pvd"; }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.org/showthread.php?tid=67110"; + homepage = "http://forum.kodi.tv/showthread.php?tid=67110"; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play From f222abea4465e9fe62c49214c4c238e0d66bca35 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Mar 2015 19:26:41 +0100 Subject: [PATCH 080/223] Add programs.ibus config option to enable ibus and plugins. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/ibus.nix | 51 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 nixos/modules/programs/ibus.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de86f11c6bb..23809796878 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./programs/dconf.nix ./programs/environment.nix ./programs/info.nix + ./programs/ibus.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix new file mode 100644 index 00000000000..c9447878993 --- /dev/null +++ b/nixos/modules/programs/ibus.nix @@ -0,0 +1,51 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.ibus; +in +{ + options = { + + programs.ibus = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable IBus input method"; + }; + plugins = mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + IBus plugin packages + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ibus ]; + + gtkPlugins = [ pkgs.ibus ]; + qtPlugins = [ pkgs.ibus ]; + + environment.variables = + let + env = pkgs.buildEnv { + name = "ibus-env"; + paths = [ pkgs.ibus ] ++ cfg.plugins; + }; + in { + GTK_IM_MODULE = "ibus"; + QT_IM_MODULE = "ibus"; + XMODIFIERS = "@im=ibus"; + + IBUS_COMPONENT_PATH = "${env}/share/ibus/component"; + }; + + services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon -d -t none"; + }; +} From fde4a0d442b6beb2f748328bc27e5a8dfd441881 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 10 Mar 2015 19:28:36 +0100 Subject: [PATCH 081/223] Add ibus-anthy. --- lib/maintainers.nix | 1 + .../tools/inputmethods/ibus-anthy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/tools/inputmethods/ibus-anthy/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a25b20667ca..cee9f0023e2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -80,6 +80,7 @@ garbas = "Rok Garbas "; garrison = "Jim Garrison "; gavin = "Gavin Rogers "; + gebner = "Gabriel Ebner "; globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix new file mode 100644 index 00000000000..df0790877ac --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }: + +let version = "1.5.4"; +in stdenv.mkDerivation { + name = "ibus-anthy-${version}"; + + meta = with stdenv.lib; { + description = "IBus interface to the anthy input method"; + homepace = https://code.google.com/p/ibus/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; + }; + + buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ]; + + postFixup = '' + for file in "$out"/libexec/*; do + wrapProgram "$file" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0 + done + ''; + + src = fetchurl { + url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz"; + sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c21b2689bec..c8375066920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -955,6 +955,8 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; clamav = callPackage ../tools/security/clamav { }; From 59da79c733f1b97ffc51f8863c96e9ef1c7751d0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 11 Mar 2015 19:29:08 +0100 Subject: [PATCH 082/223] ibus: Enable XIM support. This allows firefox to use ibus. --- nixos/modules/programs/ibus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix index c9447878993..ee3a734db71 100644 --- a/nixos/modules/programs/ibus.nix +++ b/nixos/modules/programs/ibus.nix @@ -46,6 +46,6 @@ in IBUS_COMPONENT_PATH = "${env}/share/ibus/component"; }; - services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon -d -t none"; + services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon --daemonize --xim --cache=none"; }; } From d23ed364b5423eb570ea898b0af641c471928a60 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 11 Mar 2015 21:44:01 +0100 Subject: [PATCH 083/223] Add ibus-qt. --- nixos/modules/programs/ibus.nix | 2 +- .../development/libraries/ibus-qt/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ibus-qt/default.nix diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix index ee3a734db71..b8702a743d8 100644 --- a/nixos/modules/programs/ibus.nix +++ b/nixos/modules/programs/ibus.nix @@ -30,7 +30,7 @@ in environment.systemPackages = [ pkgs.ibus ]; gtkPlugins = [ pkgs.ibus ]; - qtPlugins = [ pkgs.ibus ]; + qtPlugins = [ pkgs.ibus-qt ]; environment.variables = let diff --git a/pkgs/development/libraries/ibus-qt/default.nix b/pkgs/development/libraries/ibus-qt/default.nix new file mode 100644 index 00000000000..c538d36ec59 --- /dev/null +++ b/pkgs/development/libraries/ibus-qt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: + +stdenv.mkDerivation rec { + name = "ibus-qt-${version}"; + version = "1.3.2"; + + src = fetchurl { + url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76"; + }; + + buildInputs = [ + ibus cmake pkgconfig qt4 icu doxygen + ]; + + cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/ibus/; + description = "Qt4 interface to the ibus input method"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8375066920..a897298ee29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4972,6 +4972,8 @@ let ibus = callPackage ../development/libraries/ibus { }; + ibus-qt = callPackage ../development/libraries/ibus-qt { }; + icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { From 798ddb7fd310e224066733a18712eb2ce002dc62 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Mar 2015 02:30:53 +0100 Subject: [PATCH 084/223] python-nbxmpp: Update to version 0.5.2. After the update to Gajim 0.16.1 in 2d7dd6c, it bails out on start up with a message requiring up-to-date nbxmpp. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9eb9078f62..d38b485423e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6596,12 +6596,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5.1"; + name = "nbxmpp-0.5.2"; src = pkgs.fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/6"; - sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; + url = "https://python-nbxmpp.gajim.org/downloads/7"; + sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn"; }; meta = { From 648c451a0c1c05817fe786f42833a6d1b8920ada Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 13:13:33 -0700 Subject: [PATCH 085/223] libestr: 0.1.9 -> 0.1.10 --- pkgs/development/libraries/libestr/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 271311cf46c..ad37f9010c5 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libestr-0.1.9"; + +stdenv.mkDerivation rec { + name = "libestr-0.1.10"; + src = fetchurl { - url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz; - sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42"; + url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; + sha256 = "0g3hmh3wxgjbn5g6cgy2l0ja806jd0ayp22bahcds3kmdq95wrdx"; + }; + + meta = with stdenv.lib; { + homepage = http://libestr.adiscon.com/; + description = "some essentials for string handling"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From e37ff9fde171242c9107dc9129399b3749f29171 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 13:52:32 -0700 Subject: [PATCH 086/223] pgpool: 3.4.0 -> 3.4.1 --- pkgs/servers/sql/pgpool/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 194f4b2bcb3..c0b8403a9bc 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, postgresql }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.0"; + name = "pgpool-II-3.4.1"; src = fetchurl { url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "1aind5rbdld5ip92xlh4f6dgvdc4zxzgzi5n33xbvdrsrvagbc4j"; + sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c21b2689bec..b3663e99347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8254,6 +8254,10 @@ let postgresql = postgresql93; }; + pgpool94 = callPackage ../servers/sql/pgpool/default.nix { + postgresql = postgresql94; + }; + pgpool = pgpool92; postgresql = postgresql92; From b36904d9363646bb30b893bffec8fba4bafb04cd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 14:13:39 -0700 Subject: [PATCH 087/223] libdbi: 0.8.3-1 -> 0.9.0 --- pkgs/development/libraries/libdbi/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 11bb4965a4e..4f6b9dd099d 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdbi-0.8.3"; + name = "libdbi-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi/${name}.tar.gz"; - sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j"; + sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; - configureFlags = "--disable-docs"; - - meta = { + meta = with stdenv.lib; { + homepage = http://libdbi.sourceforge.net/; description = "DB independent interface to DB"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From 1e873e636aed61df5d87d8adb57568e269890c8b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 14:32:21 -0700 Subject: [PATCH 088/223] jemalloc: Add derivation --- .../development/libraries/jemalloc/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/jemalloc/default.nix diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix new file mode 100644 index 00000000000..b08f5b7dd76 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jemalloc-3.6.0"; + + src = fetchurl { + url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; + sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"; + }; + + meta = with stdenv.lib; { + homepage = http://www.canonware.com/jemalloc/index.html; + description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3663e99347..1d6d4aa29e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5967,6 +5967,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; + jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; jetty_util = callPackage ../development/libraries/java/jetty-util { }; From 6c82932799ea2eda74d65d85d192ff7bcd227301 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 14:12:00 -0700 Subject: [PATCH 089/223] mariadb: 10.0.16 -> 10.0.17 --- pkgs/servers/sql/mariadb/default.nix | 54 ++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6280f2a8266..fecf3709f69 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,21 +1,55 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }: +{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2 +, libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames +}: +with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.16"; + version = "10.0.17"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1r6dxzgzwl0qshw67168sjnzzwspmwb7kl618f23wkhp7rgll4s4"; + sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww"; }; - buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libaio - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ] + ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; - cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + cmakeFlags = [ + "-DBUILD_CONFIG=mysql_release" + "-DDEFAULT_CHARSET=utf8" + "-DDEFAULT_COLLATION=utf8_general_ci" + "-DENABLED_LOCAL_INFILE=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + "-DWITH_READLINE=ON" + "-DWITH_ZLIB=system" + "-DWITH_SSL=system" + "-DWITH_PCRE=system" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_EXTRA_CHARSETS=complex" + "-DWITH_EMBEDDED_SERVER=ON" + "-DWITH_ARCHIVE_STORAGE_ENGINE=1" + "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" + "-DWITH_INNOBASE_STORAGE_ENGINE=1" + "-DWITH_PARTITION_STORAGE_ENGINE=1" + "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" + "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" + ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; @@ -30,13 +64,13 @@ stdenv.mkDerivation rec { --replace basedir=\"\" basedir=\"$out\" ''; - passthru.mysqlVersion = "5.5"; + passthru.mysqlVersion = "5.6"; - meta = { + meta = with stdenv.lib; { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ]; platforms = stdenv.lib.platforms.all; }; } From c56383e448bdd807bed328d2d80e8021f82bfb11 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 15:01:23 -0700 Subject: [PATCH 090/223] mariadb: Make the default mysql implementation --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d6d4aa29e3..178f8f527b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8217,7 +8217,7 @@ let mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; - mysql = mysql51; + mysql = mariadb; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From 15d3ec0db05c448e1baa96dea9ebe0d0810ade27 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 15:28:01 -0700 Subject: [PATCH 091/223] libdbi-drivers: 0.8.3-1 -> 0.9.0 --- .../libraries/libdbi-drivers/default.nix | 66 ++++++++++++++----- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 6f61d9b3cad..542aa3cb340 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,31 +1,61 @@ -{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }: +{ stdenv, fetchurl, libdbi +, mysql ? null, sqlite ? null, postgresql ? null +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "libdbi-drivers-0.8.3-1"; + name = "libdbi-drivers-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz"; - sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa"; + sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite ]; + buildInputs = [ libdbi mysql sqlite postgresql ]; - configureFlags = - [ "--disable-docs" - "--enable-libdbi" - "--with-dbi-incdir=${libdbi}/include" - "--with-dbi-libdir=${libdbi}/lib" - ] ++ stdenv.lib.optionals (mysql != null) - [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" - ] ++ stdenv.lib.optionals (sqlite != null) - [ "--with-sqlite3" - "--with-sqlite3-incdir=${sqlite}/include/sqlite" - "--with-sqlite3-libdir=${sqlite}/lib/sqlite" - ]; + postPatch = '' + sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-docs" + "--enable-libdbi" + "--with-dbi-incdir=${libdbi}/include" + "--with-dbi-libdir=${libdbi}/lib" + ] ++ optionals (mysql != null) [ + "--with-mysql" + "--with-mysql-incdir=${mysql}/include/mysql" + "--with-mysql-libdir=${mysql}/lib/mysql" + ] ++ optionals (postgresql != null) [ + "--with-pgsql" + "--with-pgsql_incdir=${postgresql}/include" + "--with-pgsql_libdir=${postgresql}/lib" + ] ++ optionals (sqlite != null) [ + "--with-sqlite3" + "--with-sqlite3-incdir=${sqlite}/include/sqlite" + "--with-sqlite3-libdir=${sqlite}/lib/sqlite" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # Remove the unneeded var/lib directories + rm -rf $out/var + ''; meta = { + homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; + platforms = platforms.all; + license = licenses.lgpl21; + maintainers = with maintainers; [ wkennington ]; }; } From 4933a342797c8a18e2794eac28917842987ad71d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:12:11 -0700 Subject: [PATCH 092/223] systemd: Only build on linux --- pkgs/top-level/all-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 178f8f527b2..65c70aa5107 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9234,9 +9234,10 @@ let sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = callPackage ../os-specific/linux/systemd { - linuxHeaders = linuxHeaders_3_14; - }; + systemd = if !stdenv.isLinux then null else + callPackage ../os-specific/linux/systemd { + linuxHeaders = linuxHeaders_3_14; + }; systemtap = callPackage ../development/tools/profiling/systemtap { inherit (gnome) libglademm; From 76abe50fc44ad94357d92782cd632698b65e6e6b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:12:37 -0700 Subject: [PATCH 093/223] liblogging: 1.0.4 -> 1.0.5 --- .../libraries/liblogging/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 7a754a28e3d..aa75acb7d6d 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, systemd }: +{ stdenv, fetchurl, pkgconfig +, systemd ? null +}: stdenv.mkDerivation rec { - name = "liblogging-1.0.4"; + name = "liblogging-1.0.5"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc"; + sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; }; buildInputs = [ pkgconfig systemd ]; - meta = { + configureFlags = [ + "--enable-rfc3195" + "--enable-stdlog" + (if systemd != null then "--enable-journal" else "--disable-journal") + "--enable-man-pages" + ]; + + meta = with stdenv.lib; { + homepage = http://www.liblogging.org/; description = "Lightweight signal-safe logging library"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From 3b72e1f1081982ab5b7ee218c3c6f29da33a7825 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:13:12 -0700 Subject: [PATCH 094/223] liblognorm: Add derivation --- .../libraries/liblognorm/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/liblognorm/default.nix diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix new file mode 100644 index 00000000000..f9095be8425 --- /dev/null +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre }: + +stdenv.mkDerivation rec { + name = "liblognorm-1.1.1"; + + src = fetchurl { + url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; + sha256 = "1wi28n5ahajvl64wfn7jpvnskccd6837i0cyq8w8cvrm362b6pd7"; + }; + + buildInputs = [ pkgconfig libestr json_c pcre ]; + + configureFlags = [ "--enable-regexp" ]; + + meta = with stdenv.lib; { + homepage = http://www.liblognorm.com/; + description = "help to make sense out of syslog data, or, actually, any event data that is present in text form"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65c70aa5107..1d96e47cc89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6319,6 +6319,8 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + liblognorm = callPackage ../development/libraries/liblognorm { }; + libltc = callPackage ../development/libraries/libltc { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; From 8c37f09ea5d98fbff0adc8632859da517bd95881 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:13:28 -0700 Subject: [PATCH 095/223] librelp: Add derivation --- .../development/libraries/librelp/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/librelp/default.nix diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix new file mode 100644 index 00000000000..626b5220ebf --- /dev/null +++ b/pkgs/development/libraries/librelp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: + +stdenv.mkDerivation rec { + name = "librelp-1.2.7"; + + src = fetchurl { + url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; + sha256 = "1lfpd06cchi1mhlxwq0xhmbx42b8isx9677v9h80c9vpf4f4lhrs"; + }; + + buildInputs = [ pkgconfig gnutls zlib ]; + + meta = with stdenv.lib; { + homepage = http://www.librelp.com/; + description = "a reliable logging library"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d96e47cc89..a3d57f16375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6355,6 +6355,8 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; + librelp = callPackage ../development/libraries/librelp { }; + libresample = callPackage ../development/libraries/libresample {}; librevenge = callPackage ../development/libraries/librevenge {}; From 5e84d6e7b771c4c81fc21a2eafc3f5cd64d57faa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:21:23 -0700 Subject: [PATCH 096/223] libnet: 1.2-rc2 -> 1.2-rc3 --- pkgs/development/libraries/libnet/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 783739dda71..1e445b20f68 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { name = "libnet-${version}"; - version = "1.2-rc2"; + version = "1.2-rc3"; src = fetchurl { url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; - sha256 = "1pc74p839a7wvhjdgy0scj7c4yarr6mqdqvj56k6sp8pkc763az7"; + sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } From e6a486058fd043383a451935f3b5baed24ede59a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 16:39:36 -0700 Subject: [PATCH 097/223] rdkafka: Cleanup --- .../development/libraries/rdkafka/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cd7cc2e5505..8ba2d52741f 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchgit, pkgs }: +{ stdenv, fetchFromGitHub, zlib, perl }: stdenv.mkDerivation rec { + name = "rdkafka-${version}"; version = "0.8.5"; - name = "rdkafka"; - # Maintenance repo for libtar (Arch Linux uses this) - src = fetchgit { - url = "https://github.com/edenhill/librdkafka.git"; - rev = "refs/tags/${version}"; - sha256 = "05a83hmpz1xmnln0wa7n11ijn08zxijdvpdswyymxbdlg69w31y1"; + src = fetchFromGitHub { + owner = "edenhill"; + repo = "librdkafka"; + rev = version; + sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; }; - patchPhase = "patchShebangs ."; - - buildInputs = [ pkgs.zlib pkgs.perl ]; + buildInputs = [ zlib perl ]; + + postPatch = '' + patchShebangs . + ''; meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.boothead ]; + maintainers = with maintainers; [ boothead wkennington ]; }; } From 5545212000db66914ad2287e32fe434d8daeca61 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:10:55 -0700 Subject: [PATCH 098/223] libmongo-client: Add derivation --- .../libraries/libmongo-client/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libmongo-client/default.nix diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix new file mode 100644 index 00000000000..4cbc51ea678 --- /dev/null +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "libmongo-client-0.1.8"; + + src = fetchFromGitHub { + owner = "algernon"; + repo = "libmongo-client"; + rev = name; + sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; + }; + + buildInputs = [ autoreconfHook pkgconfig ]; + propagatedBuildInputs = [ glib ]; + + postPatch = '' + # Fix when uses glib in public headers + sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in + ''; + + meta = with stdenv.lib; { + homepage = http://algernon.github.io/libmongo-client/; + description = "An alternative C driver for MongoDB"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3d57f16375..97adcfbbf61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1777,6 +1777,8 @@ let libmbim = callPackage ../development/libraries/libmbim { }; + libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; From 94a4bce09d0ba0be6b2c523120728d9745edd956 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:20:29 -0700 Subject: [PATCH 099/223] hiredis: Add derivation --- .../development/libraries/hiredis/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/hiredis/default.nix diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix new file mode 100644 index 00000000000..fc4b2b47959 --- /dev/null +++ b/pkgs/development/libraries/hiredis/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "hiredis-${version}"; + version = "0.12.1"; + + src = fetchgit { + url = "git://github.com/redis/hiredis"; + rev = "37c06facda57af9bad68f50c18edfa22d6ef76f7"; + sha256 = "1z1rzhh1659g8i5bl78k1i1imlz2prwirhzbkn6j7hvq4mxbf2yz"; + }; + + PREFIX = "\${out}"; + + meta = with stdenv.lib; { + homepage = https://github.com/redis/hiredis; + description = "Minimalistic C client for Redis >= 1.2"; + licenses = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97adcfbbf61..073208fcfb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5895,6 +5895,8 @@ let libusb = libusb1; }; + hiredis = callPackage ../development/libraries/hiredis { }; + hivex = callPackage ../development/libraries/hivex { inherit (perlPackages) IOStringy; }; From abb8507126cb42a3776d8183a597fd6215ff2e70 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:47:47 -0700 Subject: [PATCH 100/223] zeromq: Add default version --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073208fcfb6..e88f4ecfdfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7655,6 +7655,7 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + zeromq = zeromq4; cppzmq = callPackage ../development/libraries/cppzmq {}; From 048148ad970822c516aaef2bf7ab15751b7e3a7a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:48:10 -0700 Subject: [PATCH 101/223] zeromq3: Refactor --- pkgs/development/libraries/zeromq/3.x.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 33285897d11..50eba33670f 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "zeromq-3.2.4"; + name = "zeromq-3.2.5"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0n9gfhwgkwq08kvvgk5zxjga08v628ij5chddk5w4ravr10s35nz"; + sha256 = "0911r7q4i1x9gnfinj39vx08fnz59mf05vl75zdkws36lib3wr89"; }; buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "3"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platform = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From e0ba90ba4e0ce2ff1f9626e9d80805f62b76fe39 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:48:23 -0700 Subject: [PATCH 102/223] zeromq4: Refactor --- pkgs/development/libraries/zeromq/4.x.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index db4c8fb8b94..eaa719b92c9 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { name = "zeromq-4.0.5"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From bd43fc7103f14df620da9e7c05076f2a0958c7e5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:48:58 -0700 Subject: [PATCH 103/223] czmq: Refactor --- pkgs/development/libraries/czmq/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 8c513978cfd..69ef08b91d9 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zeromq4}: +{ stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { baseName="czmq"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; }; - buildInputs = [ zeromq4 ]; + buildInputs = [ zeromq ]; - meta = { - license = stdenv.lib.licenses.mpl20; + meta = with stdenv.lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From a5c221c299dce1714fe997bd675a04229f937211 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:49:17 -0700 Subject: [PATCH 104/223] rabbitmq-c: 0.4.1 -> 0.6.0 --- .../libraries/rabbitmq-c/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 84a7a9b4ccf..b9962c2a2d7 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, cmake, openssl, popt, xmlto }: +{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - version = "0.4.1"; name = "rabbitmq-c-${version}"; + version = "0.6.0"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93"; + src = fetchFromGitHub { + owner = "alanxz"; + repo = "rabbitmq-c"; + rev = "v${version}"; + sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5"; }; buildInputs = [ cmake openssl popt xmlto ]; - meta = { + meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; - platforms = with stdenv.lib.platforms; linux; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } From ce0a5ab6c27bc735203a24d12e1108c251bae522 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 11 Mar 2015 18:49:38 -0700 Subject: [PATCH 105/223] rsyslog: 7.6.3 -> 8.8.0 --- pkgs/tools/system/rsyslog/default.nix | 101 +++++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 95 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index d18c2737854..e253a4ef00e 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,23 +1,102 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}: +{ stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages +, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null +, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null +, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null +, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +}: -stdenv.mkDerivation { - name = "rsyslog-7.6.3"; +with stdenv.lib; +let + mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; +in +stdenv.mkDerivation rec { + name = "rsyslog-8.8.0"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz; - sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1"; + url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; + sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging]; + buildInputs = [ + pkgconfig libestr json_c zlib pythonPackages.docutils + krb5 systemd jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka + libmongo-client czmq rabbitmq-c hiredis + ]; - preConfigure = '' - export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" - ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + (mkFlag true "largefile") + (mkFlag true "regexp") + (mkFlag (krb5 != null) "gssapi-krb5") + (mkFlag true "klog") + (mkFlag true "kmsg") + (mkFlag (systemd != null) "imjournal") + (mkFlag true "inet") + (mkFlag (jemalloc != null) "jemalloc") + (mkFlag true "unlimited-select") + (mkFlag true "usertools") + (mkFlag (mysql != null) "mysql") + (mkFlag (postgresql != null) "pgsql") + (mkFlag (libdbi != null) "libdbi") + (mkFlag (net_snmp != null) "snmp") + (mkFlag (libuuid != null) "uuid") + (mkFlag (curl != null) "elasticsearch") + (mkFlag (gnutls != null) "gnutls") + (mkFlag (libgcrypt != null) "libgcrypt") + (mkFlag true "rsyslogrt") + (mkFlag true "rsyslogd") + (mkFlag true "mail") + (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag true "mmjsonparse") + (mkFlag true "mmaudit") + (mkFlag true "mmanon") + (mkFlag true "mmutf8fix") + (mkFlag true "mmcount") + (mkFlag true "mmsequence") + (mkFlag true "mmfields") + (mkFlag true "mmpstrucdata") + (mkFlag (openssl != null) "mmrfc5424addhmac") + (mkFlag (librelp != null) "relp") + (mkFlag (libgt != null) "guardtime") + (mkFlag (liblogging != null) "liblogging-stdlog") + (mkFlag (liblogging != null) "rfc3195") + (mkFlag true "imfile") + (mkFlag false "imsolaris") + (mkFlag true "imptcp") + (mkFlag true "impstats") + (mkFlag true "omprog") + (mkFlag (libnet != null) "omudpspoof") + (mkFlag true "omstdout") + (mkFlag (systemd != null) "omjournal") + (mkFlag true "pmlastmsg") + (mkFlag true "pmcisconames") + (mkFlag true "pmciscoios") + (mkFlag true "pmaixforwardedfrom") + (mkFlag true "pmsnare") + (mkFlag true "omruleset") + (mkFlag true "omuxsock") + (mkFlag true "mmsnmptrapd") + (mkFlag (hadoop != null) "omhdfs") + (mkFlag (rdkafka != null) "omkafka") + (mkFlag (libmongo-client != null) "ommongodb") + (mkFlag (czmq != null) "imzmq3") + (mkFlag (czmq != null) "imczmq") + (mkFlag (czmq != null) "omzmq3") + (mkFlag (czmq != null) "omczmq") + (mkFlag (rabbitmq-c != null) "omrabbitmq") + (mkFlag (hiredis != null) "omhiredis") + (mkFlag true "generate-man-pages") + ]; meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e88f4ecfdfe..818a3db8b23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -779,7 +779,11 @@ let syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; - rsyslog = callPackage ../tools/system/rsyslog { }; + rsyslog = callPackage ../tools/system/rsyslog { + libgcrypt = libgcrypt_1_6; + czmq = null; # Currently Broken + hadoop = null; # Currently Broken + }; mcrypt = callPackage ../tools/misc/mcrypt { }; From 356810b17830dbc6c1044ee586350e02bdf51a64 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 12 Mar 2015 09:00:56 +0300 Subject: [PATCH 106/223] cupsd: rename `cupsd.service` to `cups.service` --- nixos/modules/services/printing/cupsd.nix | 2 +- nixos/modules/virtualisation/parallels-guest.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 679aa81a13d..b573a356b35 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -183,7 +183,7 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.services.cupsd = + systemd.services.cups = { description = "CUPS Printing Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 141e7097405..2f40283b3e1 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -82,7 +82,7 @@ in systemd.services.prlshprint = { description = "Parallels Shared Printer Tool"; wantedBy = [ "multi-user.target" ]; - bindsTo = [ "cupsd.service" ]; + bindsTo = [ "cups.service" ]; serviceConfig = { Type = "forking"; ExecStart = "${prl-tools}/bin/prlshprint"; From e19ab844358a9318077e1285c4ecf0a82bbe4b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2015 11:18:58 +0100 Subject: [PATCH 107/223] encfs 1.8-rc1 -> 1.8 --- pkgs/tools/filesystems/encfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 2906e365cb6..4583dc1ba77 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl , pkgconfig, rlog }: -let version = "1.8-rc1"; in +let version = "1.8"; in stdenv.mkDerivation rec { name = "encfs-${version}"; src = fetchFromGitHub { - sha256 = "17a09pg7752nlbgm2nmrwhm90kv2z3dj20xs79qvvr6x7rdgzck8"; + sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; From e3b1b09779b7575f73224695602dfe5de348651c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 10:10:47 +0100 Subject: [PATCH 108/223] Add AppArmor 2.9 The 2.9 series brings features such as support for dbus, unix abstract sockets, ptrace mediation, and replaces Perl tools with equivalents implemented in Python. See [1] for details. The package expression has been changed to build each component (library, parser) separately. Additionally, Perl is now only used to build man pages and locale support has been removed. The user-land tools are currently broken (fail to import the Python module), but this isn't really a regression, as only two or three of the tools installed by the previous version were functional. The most important tool, aa-status, works, however. Lastly, dbus support is compiled in, but is untested and probably requires patching of dbus. [1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_9_0 --- .../linux/apparmor/2.9/default.nix | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 pkgs/os-specific/linux/apparmor/2.9/default.nix diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix new file mode 100644 index 00000000000..a8d8b2a9e1c --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -0,0 +1,196 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, perl, which +, glibc, flex, bison, python27, swig, dbus, pam +}: + +let + apparmor-series = "2.9"; + apparmor-patchver = "1"; + apparmor-version = "${apparmor-series}.${apparmor-patchver}"; + + apparmor-meta = component: with stdenv.lib; { + homepage = http://apparmor.net/; + description = "Linux application security system - ${component}"; + license = licenses.gpl2; + maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; + platforms = platforms.linux; + }; + + apparmor-sources = fetchurl { + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; + sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + }; + + libapparmor = stdenv.mkDerivation { + name = "libapparmor-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + autoconf + automake + bison + flex + dbus # requires patch to dbus ... + glibc + libtool + perl + pkgconfig + python27 + swig + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### libapparmor + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + ''; + + buildPhase = '' + ### libapparmor + cd ./libraries/libapparmor + ./autogen.sh + ./configure --prefix="$out" --with-python + make + ''; + + installPhase = '' + make install + ''; + + meta = apparmor-meta "library"; + }; + + apparmor-utils = stdenv.mkDerivation { + name = "apparmor-utils-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + python27 + libapparmor + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ''; + + buildPhase = '' + cd ./utils + make LANGS="" + ''; + + installPhase = '' + make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" + ''; + + meta = apparmor-meta "user-land utilities"; + }; + + apparmor-parser = stdenv.mkDerivation { + name = "apparmor-parser-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + bison + flex + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### apparmor-parser + substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" + substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ## techdoc.pdf still doesn't build ... + substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + ''; + + buildPhase = '' + cd ./parser + make LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include + ''; + + installPhase = '' + make install LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include DESTDIR="$out" DISTRO="unknown" + ''; + + meta = apparmor-meta "rule parser"; + }; + + apparmor-pam = stdenv.mkDerivation { + name = "apparmor-pam-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + pam + pkgconfig + which + ]; + + buildPhase = '' + cd ./changehat/pam_apparmor + make USE_SYSTEM=1 + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "PAM service"; + }; + + apparmor-profiles = stdenv.mkDerivation { + name = "apparmor-profiles-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + which + ]; + + buildPhase = '' + cd ./profiles + make + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "profiles"; + }; + + apparmor-kernel-patches = stdenv.mkDerivation { + name = "apparmor-kernel-patches-${apparmor-version}"; + src = apparmor-sources; + + phases = ''unpackPhase installPhase''; + + installPhase = '' + mkdir "$out" + cp -R ./kernel-patches "$out" + ''; + + meta = apparmor-meta "kernel patches"; + }; + +in + +{ + inherit libapparmor apparmor-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; +} From 65e41b4f08f11ba153763daf263afd968ea3cc1d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 11:24:37 +0100 Subject: [PATCH 109/223] Add AppArmor 2.9 to packages toplevel - Each component has its own name (libapparmor, apparmor-parser, etc) - The name apparmor still refers to the old version, for compatiblity; most users of this name probably want libapparmor. --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2efc9ea27ad..54df6449a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8446,6 +8446,13 @@ let perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; + libapparmor = apparmor_2_9.libapparmor; + apparmor-pam = apparmor_2_9.apparmor-pam; + apparmor-parser = apparmor_2_9.apparmor-parser; + apparmor-profiles = apparmor_2_9.apparmor-profiles; + apparmor-utils = apparmor_2_9.apparmor-utils; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; From 7a9a24a95e70f10ebd90eda94f08508f03942963 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 12 Mar 2015 10:11:25 +0100 Subject: [PATCH 110/223] Update AppArmor service module - Use AppArmor 2.9 - Enable PAM support --- nixos/modules/security/apparmor.nix | 84 +++++++++++++++++------------ 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index f29e7a5ad81..92f020edce5 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,43 +1,61 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types concatMapStrings; cfg = config.security.apparmor; in + { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; + #### interface + options = { - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - }; - }; + security.apparmor = { - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor ]; - systemd.services.apparmor = { - wantedBy = [ "local-fs.target" ]; - path = [ pkgs.apparmor ]; + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the AppArmor Mandatory Access Control system."; + }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - ExecStop = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - }; - }; - }; + profiles = mkOption { + type = types.listOf types.path; + default = []; + description = "List of files containing AppArmor profiles."; + }; + + }; + + }; + + #### implementation + config = mkIf cfg.enable { + + environment.systemPackages = [ + pkgs.apparmor-utils + ]; + + systemd.services.apparmor = { + wantedBy = [ "local-fs.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ) cfg.profiles; + ExecStop = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ) cfg.profiles; + }; + }; + + security.pam.services.apparmor.text = '' + ## The AppArmor service changes hats according to order: first try + ## user, then group, and finally fall back to a hat called "DEFAULT" + ## + ## For now, enable debugging as this is an experimental feature. + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + ''; + + }; } From 2e8cbfbc58fffd35a19082f828adf5d4132a4207 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 12 Mar 2015 11:57:54 +0100 Subject: [PATCH 111/223] Move ibus packages to the inputmethods directory. --- .../libraries => tools/inputmethods}/ibus-qt/default.nix | 0 .../libraries => tools/inputmethods}/ibus/default.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{development/libraries => tools/inputmethods}/ibus-qt/default.nix (100%) rename pkgs/{development/libraries => tools/inputmethods}/ibus/default.nix (100%) diff --git a/pkgs/development/libraries/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix similarity index 100% rename from pkgs/development/libraries/ibus-qt/default.nix rename to pkgs/tools/inputmethods/ibus-qt/default.nix diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix similarity index 100% rename from pkgs/development/libraries/ibus/default.nix rename to pkgs/tools/inputmethods/ibus/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a897298ee29..0b3059fbd41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -955,6 +955,10 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + ibus = callPackage ../tools/inputmethods/ibus { }; + + ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; + ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { }; biosdevname = callPackage ../tools/networking/biosdevname { }; @@ -4970,10 +4974,6 @@ let hyenae = callPackage ../tools/networking/hyenae { }; - ibus = callPackage ../development/libraries/ibus { }; - - ibus-qt = callPackage ../development/libraries/ibus-qt { }; - icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { From 6cd99a4eb266d3857f3b7506df28d7859a2c2f6c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 12 Mar 2015 13:08:42 +0100 Subject: [PATCH 112/223] Revert "systemd: Only build on linux" This reverts commit 4933a342797c8a18e2794eac28917842987ad71d. --- pkgs/top-level/all-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81a3e392dd7..3115081638f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9247,10 +9247,9 @@ let sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = if !stdenv.isLinux then null else - callPackage ../os-specific/linux/systemd { - linuxHeaders = linuxHeaders_3_14; - }; + systemd = callPackage ../os-specific/linux/systemd { + linuxHeaders = linuxHeaders_3_14; + }; systemtap = callPackage ../development/tools/profiling/systemtap { inherit (gnome) libglademm; From 0bc51eacd9de4ed5ef33daaf8a5abc53856f34d5 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 12 Mar 2015 16:40:34 +0000 Subject: [PATCH 113/223] dysnomia: bump development version --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 340a7704d7c..e6d224c36f6 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d"; + name = "dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd"; src = fetchurl { - url = http://hydra.nixos.org/build/20212674/download/1/dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d.tar.gz; - sha256 = "0z41gxh3idlfardm5hwy65qxy7drrbcl3dndinr2qksqx4yjafi1"; + url = http://hydra.nixos.org/build/20404955/download/1/dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd.tar.gz; + sha256 = "0dighcn7lihfnkyahw9da0fck8xh1jgbfpfhwndxg0x4bcp7v9f3"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 42d985df996fa8ce49b292088d8b458c7285c00e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 10:56:07 -0700 Subject: [PATCH 114/223] rsyslog-light: Add derivation --- pkgs/top-level/all-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f48b9f15a45..88634e3146b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -785,6 +785,32 @@ let hadoop = null; # Currently Broken }; + rsyslog-light = callPackage ../tools/system/rsyslog { + krb5 = null; + systemd = null; + jemalloc = null; + mysql = null; + postgresql = null; + libdbi = null; + net_snmp = null; + libuuid = null; + curl = null; + gnutls = null; + libgcrypt = null; + liblognorm = null; + openssl = null; + librelp = null; + libgt = null; + liblogging = null; + libnet = null; + hadoop = null; + rdkafka = null; + libmongo-client = null; + czmq = null; + rabbitmq-c = null; + hiredis = null; + }; + mcrypt = callPackage ../tools/misc/mcrypt { }; mstflint = callPackage ../tools/misc/mstflint { }; From c32437b16e44bb1981d3daff7a373cd2a662b0de Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 11:37:27 -0700 Subject: [PATCH 115/223] libressl: 2.1.3 -> 2.1.4 --- pkgs/development/libraries/libressl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index c35f0a7efe5..e15daf2d42d 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0z2g609526pc8zmz2frkmhlfgvn8cmj5agj5yq5b33s0f44kfbzb"; + sha256 = "0km0m4y442gf0sn4g31cljhvfi3l627fw4lljyd12x47j8sqbq78"; }; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } From edaa3a76434f61103b11cda3ee1dbf0e6da67e1f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 2 Mar 2015 19:04:27 +0300 Subject: [PATCH 116/223] xorg-server: add Xephyr (close #6715) --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5a2fd0ba46e..bf124282876 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -302,6 +302,7 @@ in ]; patches = commonPatches; configureFlags = [ + "--enable-kdrive" # not built by default "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway From 263ac41c187016f1d9a0d08c5af2698a2b2a15ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Mar 2015 19:58:34 +0100 Subject: [PATCH 117/223] texLiveModerntimeline: fix download by updating Unfortunately I only see them providing an unversioned tarball :-/ CC #6747. --- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index f7d8f1254c5..6cf9ac3e5ce 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,13 +1,13 @@ args: with args; rec { - version = "0.7"; + version = "0.8"; name = "moderntimeline-${version}"; src = fetchurl { urls = [ "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" ]; - sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; + sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8"; }; buildInputs = [texLive unzip]; From 07e49e6952d29e9f5dbf34f0df21949b6bbf47f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Mar 2015 20:14:44 +0100 Subject: [PATCH 118/223] libav*: maintenance updates, including security --- pkgs/development/libraries/libav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 04e85bcfc33..41a8b391eb3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; - libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_11 = libavFun "11.2" "52ba52cabe5d86b45ce62f56e11fa7912c6e5083"; + libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; + libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { From a5ae04f1795ea6b0d742cfa2f9d0d84ec01baa0c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 12:02:19 -0700 Subject: [PATCH 119/223] chromium: Update Tested that chromium, chromiumBeta, chromiumDev all build --- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index daefa263510..e1144a44afb 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "42.0.2305.3"; - sha256 = "00338x1x78wcvaxcnnq5cng30450gsyqnlwplgyq7zjsrpqpprvn"; - sha256bin32 = "1xxmyfmdksqpwwf3wxhxrxvqnvjxlwkhkrdzkmra7d74hz7mqjz7"; - sha256bin64 = "0q4hvvkjzy46x9hfhchywakzrd0jfwhxxsv96cz3yfcqwasf42x7"; + version = "43.0.2327.5"; + sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n"; + sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6"; + sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb"; }; beta = { - version = "41.0.2272.64"; - sha256 = "0jq864636527fpnrkdaalp73hjcd581imdk13bxfi6g4ic0sizkg"; - sha256bin32 = "12sisp6bk6qvgikzxi616d8cnrrgs2593kyq7sv3276wjz34a07m"; - sha256bin64 = "1vz89r43byd0shjvr6bvmwlsh97fx281hlzfv49q9k49piyfylgp"; + version = "42.0.2311.39"; + sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0"; + sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v"; + sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx"; }; stable = { - version = "40.0.2214.115"; - sha256 = "19d6zd71w3zvqwb0ncdapfwkckjgqmb1jfg228jvaispp9nvjq92"; - sha256bin32 = "1sv8sj0xp14q5693jcwwipinx539d5rgvhqcxm6b030024jjh8sr"; - sha256bin64 = "1zgb9g6fr29i7f9s1s1dcih1qjiz62ir90k0fsam9df99gzmmyc0"; + version = "41.0.2272.89"; + sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk"; + sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4"; + sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv"; }; } From b9f0cfd85aca3b4c22804001629d29fb47a11bda Mon Sep 17 00:00:00 2001 From: Frederic LeBel Date: Thu, 12 Mar 2015 12:41:41 -0400 Subject: [PATCH 120/223] Atom: updated to 0.187.0 --- pkgs/applications/editors/atom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0c0ddc3158a..a3cdbb6afb9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.171.0"; + version = "0.187.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0syl3rljk2k8j6fy8xq59qhf13b8a4awpi5cvn1kka56y0vmhxs5"; + sha256 = "0s6173dg5m52zc8kqwlgjn113d84cskrv9v29fb0nrvwvkv2xzmw"; name = "${name}.deb"; }; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/atom patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node + $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" wrapProgram $out/bin/apm \ From 92eaff008e90c982b095275cb5250ec0c1a60c24 Mon Sep 17 00:00:00 2001 From: "Luis G. Torres" Date: Thu, 12 Mar 2015 15:48:58 -0400 Subject: [PATCH 121/223] Added derivation for google ceres-solver optimization library for C++ --- lib/maintainers.nix | 1 + .../libraries/ceres-solver/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/ceres-solver/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cee9f0023e2..f46d9b80990 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -81,6 +81,7 @@ garrison = "Jim Garrison "; gavin = "Gavin Rogers "; gebner = "Gabriel Ebner "; + giogadi = "Luis G. Torres "; globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix new file mode 100644 index 00000000000..4dce56a8f1a --- /dev/null +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, eigen +, fetchurl +, cmake +, google-gflags ? null +, glog ? null +, runTests ? false +}: + +# google-gflags is required to run tests +assert runTests -> google-gflags != null; + +let + version = "1.10.0"; + + # glog currently doesn't build on darwin + # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 + useGlog = glog != null && !stdenv.isDarwin; + +in +stdenv.mkDerivation { + name = "ceres-solver-${version}"; + + src = fetchurl { + url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; + sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + }; + + buildInputs = [ cmake ] + ++ stdenv.lib.optional useGlog glog + ++ stdenv.lib.optional (google-gflags != null) google-gflags; + + inherit eigen; + + doCheck = runTests; + + checkTarget = "test"; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + ${if !useGlog then "-DMINIGLOG=ON" else ""} + "; + + meta = with stdenv.lib; { + description = "C++ library for modeling and solving large, complicated optimization problems"; + license = licenses.bsd3; + homepage = "http://ceres-solver.org"; + maintainers = with stdenv.lib.maintainers; [ giogadi ]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88634e3146b..75425a036d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,6 +697,10 @@ let cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { + google-gflags = null; # only required for examples/tests + }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; From e0d91fa1b9b1c9ea43b9cc1099f42b0bb903edaf Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 Mar 2015 21:02:34 +0100 Subject: [PATCH 122/223] levmar: update from 2.5 to 2.6 --- pkgs/development/libraries/levmar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 4e6dd6d5b02..c5b0c715620 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "levmar-2.5"; + name = "levmar-2.6"; src = fetchurl { url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; - sha256 = "0xcx9fvymr0j5kmfy5cqaa2lxf1c64vv25z2a28w43pkxz1nl3xp"; + sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; }; patchPhase = '' From 9cda91bcd88194d6d19c82106d64bafe39499774 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 12 Mar 2015 21:19:03 +0100 Subject: [PATCH 123/223] pmd: update from 4.2.6 to 5.2.3 --- pkgs/development/tools/analysis/pmd/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 2709caaab06..7098771cc6e 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pmd-4.2.6"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "pmd-${version}"; + version = "5.2.3"; + + buildInputs = [ unzip ]; src = fetchurl { - url = mirror://sourceforge/pmd/pmd-bin-4.2.6.zip ; - sha256 = "0gg1px2jmqn09f5vjzgy9gck37qjm9p2d7gf9grsmrr2xncbipp8"; + url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; + sha256 = "03frkyiii7304qrcypdqcxqxjf5n3p59zjib0r802mbbx1nzcisn"; }; installPhase = '' From 2ec1f1203b2f979be187842b6a602d0532854846 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 14:12:21 -0700 Subject: [PATCH 124/223] rsyslog: Make compatible with non-linux --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88634e3146b..62e3a67a529 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -783,6 +783,7 @@ let libgcrypt = libgcrypt_1_6; czmq = null; # Currently Broken hadoop = null; # Currently Broken + systemd = if stdenv.isLinux then systemd else null; }; rsyslog-light = callPackage ../tools/system/rsyslog { From c43b787f960cca5f66328880e816576775adfa27 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 8 Mar 2015 23:35:25 -0400 Subject: [PATCH 125/223] unibilium: new package Unibilium is a very basic terminfo library. It doesn't depend on curses or any other library. It also doesn't use global variables, so it should be thread-safe. --- .../libraries/unibilium/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/unibilium/default.nix diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix new file mode 100644 index 00000000000..11f3294b289 --- /dev/null +++ b/pkgs/development/libraries/unibilium/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + name = "unibilium-${version}"; + + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "mauke"; + repo = "unibilium"; + rev = "v${version}"; + sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ]; + + meta = with lib; { + description = "A very basic terminfo library"; + license = with licenses; [ lgpl3Plus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62e3a67a529..5d4cca4cd08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7501,6 +7501,8 @@ let uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; + unibilium = callPackage ../development/libraries/unibilium { }; + unicap = callPackage ../development/libraries/unicap {}; tsocks = callPackage ../development/libraries/tsocks { }; From 4b2b30ea249b110b4c895256216dc8af155ffcb6 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 8 Mar 2015 23:49:13 -0400 Subject: [PATCH 126/223] libtermkey: new package Allows easy processing of keyboard entry from terminal-based programs. --- .../libraries/libtermkey/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libtermkey/default.nix diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix new file mode 100644 index 00000000000..4316b2dda6b --- /dev/null +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: + +stdenv.mkDerivation rec { + name = "libtermkey-${version}"; + + version = "0.17"; + + src = fetchzip { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; + sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ncurses ]; + + meta = with lib; { + description = "Terminal keypress reading library"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d4cca4cd08..f813179e7df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1802,6 +1802,8 @@ let liboauth = callPackage ../development/libraries/liboauth { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; + libtidy = callPackage ../development/libraries/libtidy { }; libtirpc = callPackage ../development/libraries/ti-rpc { }; From b40eee79a73716af09ff41ae67cdac38001c8de4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Mar 2015 22:22:39 +0100 Subject: [PATCH 127/223] youtube-dl: Update to version 2015.03.09. With the old version, not even YouTube videos are working anymore. Signed-off-by: aszlig --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b423aa301f9..f6332874b3a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip, pandoc }: let - version = "2015.01.30.2"; + version = "2015.03.09"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "00ymx254qgic9ka7wb41cinv1w0ijq6l0f5k2cfspi958jqql9lm"; + sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz"; }; buildInputs = [ python ]; From f11cf895d19bb5158c21624976ed3e739f4cbded Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 12 Mar 2015 14:00:27 +0100 Subject: [PATCH 128/223] Fix frei0r url --- pkgs/development/libraries/frei0r/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index ca2895f3c89..f3c9b95d6b4 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4"; src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/frei0r-plugins-1.4.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; }; From c96aff8eb9c878e2f6f33c78d8924760b09eb3ea Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 12 Mar 2015 14:00:14 +0100 Subject: [PATCH 129/223] Add sqldeveloper derivation --- .../tools/database/sqldeveloper/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/tools/database/sqldeveloper/default.nix diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix new file mode 100644 index 00000000000..031c004ef52 --- /dev/null +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -0,0 +1,48 @@ +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7}: + +stdenv.mkDerivation rec { + version = "4.0.3.16.84"; + name = "sqldeveloper-${version}"; + + src = requireFile { + name = "${name}-no-jre.zip"; + url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; + sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + }; + + buildInputs = [ makeWrapper unzip ]; + + buildCommand = '' + mkdir -p $out/bin + # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed + echo -e '#!/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && bash sqldeveloper $*' >> $out/bin/sqldeveloper + + cd $out + unzip ${src} + cp -r sqldeveloper/* $out/ + # Activate the needed shell script + rm $out/sqldeveloper.sh + chmod +x $out/bin/sqldeveloper + chmod +x $out/sqldeveloper/bin/sqldeveloper + + wrapProgram $out/bin/sqldeveloper \ + --set JAVA_HOME "${oraclejdk7}" + ''; + + meta = with stdenv.lib; { + 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 + traditional and Cloud deployments. SQL Developer offers complete + end-to-end development of your PL/SQL applications, a worksheet for + running queries and scripts, a DBA console for managing the database, + a reports interface, a complete data modeling solution, and a migration + platform for moving your 3rd party databases to Oracle. + ''; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html; + license = licenses.unfree; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f48b9f15a45..32cf949f494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4217,6 +4217,8 @@ let smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; From 9567ba46019575d08055681f6d9f579eff86c568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 12 Mar 2015 22:46:47 +0100 Subject: [PATCH 130/223] xfce: 4.10 -> 4.12 (close #6610) --- pkgs/desktops/xfce/core/exo.nix | 5 +++-- pkgs/desktops/xfce/core/garcon.nix | 11 ++++++----- pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 11 +++++------ pkgs/desktops/xfce/core/libxfce4ui.nix | 5 +++-- pkgs/desktops/xfce/core/libxfce4util.nix | 5 +++-- pkgs/desktops/xfce/core/thunar-volman.nix | 7 ++++--- pkgs/desktops/xfce/core/thunar.nix | 4 ++-- pkgs/desktops/xfce/core/tumbler.nix | 4 ++-- pkgs/desktops/xfce/core/xfce4-appfinder.nix | 6 +++--- pkgs/desktops/xfce/core/xfce4-dev-tools.nix | 4 ++-- pkgs/desktops/xfce/core/xfce4-panel.nix | 6 +++--- pkgs/desktops/xfce/core/xfce4-power-manager.nix | 6 +++--- pkgs/desktops/xfce/core/xfce4-session.nix | 14 +++----------- .../core/xfce4-settings-default-icon-theme.patch | 9 ++++----- pkgs/desktops/xfce/core/xfce4-settings.nix | 12 +++++------- pkgs/desktops/xfce/core/xfconf.nix | 5 +++-- pkgs/desktops/xfce/core/xfdesktop.nix | 6 +++--- pkgs/desktops/xfce/core/xfwm4.nix | 7 +++---- pkgs/desktops/xfce/default.nix | 4 +++- 19 files changed, 63 insertions(+), 68 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 694db49f589..7588616ac1f 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; + sha256 = "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 44f5a95224e..8f8cfff76cd 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }: stdenv.mkDerivation rec { p_name = "garcon"; - ver_maj = "0.2"; - ver_min = "1"; + ver_maj = "0.4"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1xq14wayk07cil04yhrdkjhacz9dbldcl9i59sbrgrgznaw49dj8"; + sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib libxfce4util ]; + buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 360e4a0a250..de95caddff1 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, enableGtk3Support ? false, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; - ver_maj = "3.0"; - ver_min = "1"; + ver_maj = "2.10"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb"; + sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: gtk3 - buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk3; + buildInputs = [ pkgconfig intltool gtk ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index cb2975d8214..1739cfbb87a 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4ui"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; + sha256 = "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 8483aec7a46..6893d7cfb20 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4util"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78"; + sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic utility non-GUI functions for Xfce"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 5ce88921fa8..b53ee4c45c5 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { p_name = "thunar-volman"; ver_maj = "0.8"; - ver_min = "0"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; + sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + buildInputs = [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index fdf4211f099..abcfd656c50 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { p_name = "thunar"; ver_maj = "1.6"; - ver_min = "3"; + ver_min = "6"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; - sha256 = "17api7nc3h93k2mzrfmw6ygc0fqmg78ja0qbkzd9rhhsi3v0c9ws"; + sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index fab6152c99a..1fc895ea412 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; ver_maj = "0.1"; - ver_min = "30"; + ver_min = "31"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7"; + sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index 01848d66696..25bd04f9ec4 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-appfinder"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5"; + sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index 671f57faeb3..5541011a501 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-dev-tools"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp"; + sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 7fa8862ea3b..5a8cc9dc0e5 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-panel"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1mkmhhmy70izja6d6di65hay9ybqi8615pwjbx0lgqk53gnm4c2p"; + sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 2a1e772e4a5..c75eb787757 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; - ver_maj = "1.3"; - ver_min = "2"; + ver_maj = "1.4"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j"; + sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index ac268184ded..0f2c30befb7 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -6,23 +6,15 @@ stdenv.mkDerivation rec { p_name = "xfce4-session"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "10zwki7v55a325abr57wczcb5g7ml99cqk1p8ls8qycqqfyzlm01"; + sha256 = "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - patches = [(fetchpatch { - name = "suspend+hibernate-via-logind.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch" - + "?h=packages/xfce4-session&id=f84637fa2b"; - sha256 = "1pnm1w9invyxjdbfm7p0brf9krl9jy8ab2ilwvizymp5i0vnj0xc"; - })]; - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch index 51ac265dcb1..2683b3c3dfd 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch +++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch @@ -1,12 +1,11 @@ -diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml ---- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml 2013-05-05 18:12:54.000000000 +0200 -+++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml 2013-08-15 15:57:48.538586286 +0200 +--- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100 ++++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100 @@ -7,7 +7,7 @@ - + - + - + \ No newline at end of file diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index ee5ae15fca1..4c2de64561d 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }: +, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: #TODO: optional packages stdenv.mkDerivation rec { p_name = "xfce4-settings"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi"; + sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-settings-default-icon-theme.patch ]; buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade + [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - #gtk libxfce4util libxfcegui4 libwnck dbus_glib - #xfconf libglade xorg.iceauth ]; configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 9ed2be4a740..f12f96895cd 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfconf"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; + sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 6353f6d6c33..45a89b93748 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; - ver_maj = "4.10"; - ver_min = "3"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9"; + sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index 4b190889c85..7e4c57ad941 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { p_name = "xfwm4"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0h57gwjs3j5f8ly0gmhl620338fg4qvlzs8gpqs9wxzblvxl831q"; + sha256 = "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: kde systray, docs buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf libwnck libstartup_notification diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index d769072acb7..459158a136a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,6 @@ -{ config, pkgs, newScope }: let +{ config, pkgs, newScope }: + +let callPackage = newScope (deps // xfce_self); From 208d1f24db9966c18e1a3aca3b99ec4eae362607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 12 Mar 2015 22:52:38 +0100 Subject: [PATCH 131/223] xfce: more update fallout - forgotten mousepad update, including some wrapping magic - dealing with panel plugins (either fix or mark as broken) CC maintainer @AndersonTorres. - remove some libxfcegui4 occurrences, as it's being phased out - minor stuff --- .../services/x11/desktop-managers/xfce.nix | 1 - pkgs/desktops/xfce/applications/mousepad.nix | 20 ++++++++++--------- pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 4 ++-- .../panel-plugins/xfce4-cpufreq-plugin.nix | 6 +++--- .../panel-plugins/xfce4-cpugraph-plugin.nix | 4 ++-- .../xfce/panel-plugins/xfce4-dict-plugin.nix | 1 + .../xfce/panel-plugins/xfce4-notes-plugin.nix | 1 + .../xfce/panel-plugins/xfce4-verve-plugin.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6a14a163c19..fce5bf11f05 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -46,7 +46,6 @@ in pkgs.which # Needed by the xfce's xinitrc script. pkgs.xfce.exo pkgs.xfce.gtk_xfce_engine - pkgs.xfce.libxfcegui4 # For the icons. pkgs.xfce.mousepad pkgs.xfce.ristretto pkgs.xfce.terminal diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 1e1ef0cf846..4d6ac29f53d 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4 -, gtk, gtksourceview, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util +, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }: stdenv.mkDerivation rec { p_name = "mousepad"; - ver_maj = "0.3"; + ver_maj = "0.4"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; + sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libxfce4util libxfcegui4 - gtk gtksourceview dbus dbus_glib + [ pkgconfig intltool libxfce4util + gtk gtksourceview dbus dbus_glib makeWrapper ]; - # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax - # highlighting (in fact Mousepad segfaults without it). - propagatedUserEnvPkgs = [ gtksourceview ]; + preFixup = '' + wrapProgram "$out/bin/mousepad" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" + ''; meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index de95caddff1..b66faf2390b 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; ver_maj = "2.10"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0rqrnjxx1lzla7wp2fadyixs6jy0js6xh005pgwyqbigpl0v7hy1"; + sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index f2a8ef4d9ea..072da2bc576 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-cpufreq-plugin"; - ver_maj = "1.0"; - ver_min = "0"; + ver_maj = "1.1"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index ad9c45820af..7aca910b8a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index ede0495b8de..3be77ab77ca 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 8e402edbeb6..eba05af69c0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index e73ad925630..603a68cc5f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; ver_maj = "1.0"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh"; + sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813179e7df..657f3ac44c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12962,8 +12962,8 @@ let kde5 = kf5_stable // plasma5_stable // kdeApps_stable; - xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xfce = xfce4-12; + xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; From decf15fd57c8f26079cdfc7572f1097decfc296f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Thu, 12 Mar 2015 19:15:48 +0100 Subject: [PATCH 132/223] grub: make sure grub builds again (close #6774) --- pkgs/tools/misc/grub/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index b1e5e4dbd1c..00b0c31201a 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}: +{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}: stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # Autoconf/automake required for the splashimage patch. - buildInputs = [autoconf automake]; + buildInputs = [autoconf automake texinfo]; prePatch = '' unpackFile $gentooPatches @@ -47,6 +47,7 @@ stdenv.mkDerivation { preConfigure = '' autoreconf + automake --add-missing ''; passthru.grubTarget = ""; From e07ea5cf77601325b16f51fb457b90d5aadfab6f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Mar 2015 17:34:22 -0700 Subject: [PATCH 133/223] samba4: Fix linking and absolute paths --- pkgs/servers/samba/4.x.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 362885417b7..2cc3cc69d3f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -56,6 +56,11 @@ stdenv.mkDerivation rec { zlib ncurses libcap ]; + postPatch = '' + # Removes absolute paths in scripts + sed -i 's,/sbin/,,g' ctdb/config/functions + ''; + enableParallelBuilding = true; configureFlags = [ @@ -111,6 +116,19 @@ stdenv.mkDerivation rec { stripAllList = [ "bin" "sbin" ]; + postFixup = '' + export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" + read -r -d "" SCRIPT << EOF + [ -z "\$SAMBA_LIBS" ] && exit 1; + BIN='{}'; + OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; + ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; + patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; + patchelf --shrink-rpath "\$BIN"; + EOF + find $out -type f -exec $SHELL -c "$SCRIPT" \; + ''; + meta = with stdenv.lib; { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; From 8b2f21a667f20daccb0b1c7c3279a000448ceeb3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Mar 2015 09:23:25 +0100 Subject: [PATCH 134/223] syncthing 0.10.25 -> 0.10.26 --- 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 cc29aeafef9..b7f4c8abde3 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.25"; + version = "0.10.26"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "fcb6fbcd37bdcf07d2960d143209b7697ee705286754ead4cc5e6bd95cd0acb8"; + sha256 = "023vnns8ns2pgvqjisw466mw7323rv61cbl1indpfai412y7xjbk"; }; subPackages = [ "cmd/syncthing" ]; From 14e5333e3c39282324113d327b385ee68ac02e70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Mar 2015 11:16:01 +0100 Subject: [PATCH 135/223] hackage-packages: re-generate from Hackage 2015-03-12T12:28:02+0100 Resolves https://github.com/peti/jailbreak-cabal/issues/5. --- .../configuration-ghc-7.10.x.nix | 3 - .../haskell-modules/hackage-packages.nix | 566 +++++++++++------- 2 files changed, 358 insertions(+), 211 deletions(-) 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 219fe85b176..a70597e6ee5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,9 +89,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # https://github.com/peti/jailbreak-cabal/issues/5 - ReadArgs = dontCheck super.ReadArgs; - # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68ea13ab775..5c5ef83b10b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1748,6 +1748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "CLI" = callPackage + ({ mkDerivation, base, directory, doctest, split, time }: + mkDerivation { + pname = "CLI"; + version = "0.1.0.0"; + sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall"; + buildDepends = [ base directory split time ]; + testDepends = [ base doctest ]; + description = "CLI tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "CMCompare" = callPackage ({ mkDerivation, array, base, BiobaseInfernal, BiobaseXNA, cmdargs , containers, lens @@ -4866,12 +4878,12 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw }: + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "1.4.0.2"; - sha256 = "10sy0zag1wfrrq137azv3xazcgs21zb6bp84xzh518qbhiiycjhg"; - buildDepends = [ base OpenGLRaw ]; + version = "1.5.0.0"; + sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j"; + buildDepends = [ base OpenGLRaw transformers ]; extraLibraries = [ freeglut mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -4902,11 +4914,11 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.4"; - sha256 = "1bjc33cnlcb29hfyq2141cj2g2pklg5296hg1jpg246j0bcy9fcf"; + version = "0.8.5"; + sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; buildDepends = [ - array base bytestring containers cpphs directory filepath - JuicyPixels linear OpenGL OpenGLRaw transformers vector + array base bytestring containers directory filepath JuicyPixels + linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; @@ -7782,6 +7794,7 @@ self: { version = "5.2.0.16"; sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s"; buildDepends = [ array base containers StateVar transformers ]; + jailbreak = true; homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; @@ -10778,12 +10791,12 @@ self: { winmm = null; winspool = null;}; "ObjectName" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "ObjectName"; - version = "1.0.1.1"; - sha256 = "18bqaqxzafhmnf1r4qc0qnxdiv00i4zis89yinvpwjqbiwlwakda"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg"; + buildDepends = [ base transformers ]; homepage = "https://github.com/svenpanne/ObjectName"; description = "Explicitly handled object names"; license = stdenv.lib.licenses.bsd3; @@ -10981,12 +10994,12 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, mesa }: + ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.3.0.0"; - sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln"; - buildDepends = [ base ]; + version = "2.4.0.0"; + sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -11490,18 +11503,18 @@ self: { "Plot-ho-matic" = callPackage ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers - , data-default-class, generic-accessors, glib, gtk, lens, linear - , spatial-math, stm, text, time + , data-default-class, generic-accessors, glib, gtk, lens, text + , time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.0"; - sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg"; + version = "0.5.0.2"; + sha256 = "0i55milm63y0djnni3sg40pydxw5ls4gjsj18g8f5rbbdjx6y95q"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo Chart Chart-cairo containers data-default-class - generic-accessors glib gtk lens linear spatial-math stm text time + generic-accessors glib gtk lens text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -12302,8 +12315,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.1"; - sha256 = "0ifs2gca5sgmaqrby3fc410n5k357102c8jh3fh77rhdc3m8l8bd"; + version = "0.0.2"; + sha256 = "06w5q8xb4n5428ja1834z18rn6zl5cqdizcvj7519a2xy9m5qda5"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -13504,12 +13517,12 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.0.1.1"; - sha256 = "0h2cykrbnq4aq8dmi59mmnagvzz00lfagqx3476y2ygqc7v1iisl"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1"; + buildDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; @@ -18468,6 +18481,7 @@ self: { base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; + jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -18945,8 +18959,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.0"; - sha256 = "1z0wky3xhkgayxf6fzrj7dnll6r948vgqsvfhhjh32ybadmi97bm"; + version = "1.4.2"; + sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19672,12 +19686,11 @@ self: { pname = "arithmoi"; version = "0.4.1.1"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "d12980bee5be68b204594ee91c026599ec930613be6c05106ea27d93d96c0433"; + editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - jailbreak = true; homepage = "https://bitbucket.org/dafis/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; @@ -19899,8 +19912,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.0"; - sha256 = "0r3an905by72w7r9pd00rf7fn061v668bh4x6apllmpxid7a7pm7"; + version = "0.2.1.1"; + sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25449,6 +25462,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "broccoli" = callPackage + ({ mkDerivation, base, stm, unamb }: + mkDerivation { + pname = "broccoli"; + version = "0.2.0.1"; + sha256 = "0kish92mch22jlpg86iq6y73jmmsjg1yl7s2f15y6vwfdvbhv8zz"; + buildDepends = [ base stm unamb ]; + description = "Small library for interactive functional programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bsd-sysctl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25661,10 +25685,9 @@ self: { ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { pname = "buildable"; - version = "0.1.0.2"; - sha256 = "1p9xi5ms7rxgzn5jxv5nv8bynyfb9ll952k0j7di5s7zbga8v1pg"; + version = "0.1.0.3"; + sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; buildDepends = [ base bytestring containers dlist text ]; - jailbreak = true; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -26536,8 +26559,8 @@ self: { }: mkDerivation { pname = "cabal-db"; - version = "0.1.11"; - sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7"; + version = "0.1.12"; + sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26671,6 +26694,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, data-default, directory + , filepath, mtl, process, template-haskell, temporary, transformers + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.1.0.1"; + sha256 = "1a7yavkja9ghrr7pf9j8hkg4fg1xl6g4fn82hwc56snmvlpc0ms5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring Cabal data-default directory filepath mtl process + template-haskell temporary transformers + ]; + description = "Simple interface to Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -30403,18 +30444,22 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, containers, hierarchical-clustering - , mwc-random, tasty, tasty-hunit, vector + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, primitive, split, tasty, tasty-hunit + , tasty-quickcheck, vector }: mkDerivation { pname = "clustering"; - version = "0.1.0"; - sha256 = "04x6q7da64b2v326mbralkc13zb3b5x1fwdc3by703hf7mv28kd4"; - buildDepends = [ base containers vector ]; - testDepends = [ - base hierarchical-clustering mwc-random tasty tasty-hunit vector + version = "0.1.1"; + sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + buildDepends = [ + base binary containers matrices mwc-random primitive vector ]; - description = "fast clustering algorithms"; + testDepends = [ + base binary hierarchical-clustering mwc-random split tasty + tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; }) {}; @@ -30911,6 +30956,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "collection-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "collection-json"; + version = "0.1.0.0"; + sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; + buildDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/danchoi/collection-json.hs"; + description = "Collection+JSON hypermedia type tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "collections" = callPackage ({ mkDerivation, array, base, bytestring, containers, QuickCheck }: mkDerivation { @@ -31216,8 +31273,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.3"; - sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj"; + version = "4.2.4"; + sha256 = "0wycd7ir3bjrf9k1fh81jl09lk9s99fg8z25lwhb8bc70q50sab8"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -32582,15 +32639,15 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, foreign-var, semigroups, transformers + ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: mkDerivation { pname = "contravariant"; - version = "1.2.2.1"; - sha256 = "0w1kgx85wbf96f1hr50b6nh9pqjbqbn4axfd419b38xy09j61j75"; + version = "1.3"; + sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; buildDepends = [ - base foreign-var semigroups transformers transformers-compat void + base semigroups StateVar transformers transformers-compat void ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -34785,9 +34842,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, pretty }: mkDerivation { pname = "cuda"; - version = "0.6.5.1"; - sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; - editedCabalFile = "4a72db38c131b220e445e389755d48338769d9a08e826244dcfb7b1182c21c00"; + version = "0.6.6.0"; + sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring pretty ]; @@ -34824,7 +34880,6 @@ self: { sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg"; buildDepends = [ base cuda ]; buildTools = [ c2hs ]; - jailbreak = true; homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; @@ -38411,6 +38466,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rubiks-cube" = callPackage + ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: + mkDerivation { + pname = "diagrams-rubiks-cube"; + version = "0.1.0.0"; + sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv"; + buildDepends = [ base data-default-class diagrams-lib lens ]; + homepage = "https://github.com/timjb/rubiks-cube"; + description = "Library for drawing the Rubik's Cube"; + license = stdenv.lib.licenses.mit; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg , bytestring, colour, containers, diagrams-core, diagrams-lib @@ -44273,8 +44340,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck }: mkDerivation { pname = "farmhash"; - version = "0.1.0.1"; - sha256 = "1dm3msrlrfhm20qc1d5a42w4sspmdwgmdkm75xprmyvpyivh2alb"; + version = "0.1.0.2"; + sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec QuickCheck ]; homepage = "https://github.com/abhinav/haskell-farmhash"; @@ -44892,6 +44959,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "feldspar-signal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "feldspar-signal"; + version = "0.0.0.1"; + sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; + buildDepends = [ base ]; + homepage = "https://github.com/markus-git/feldspar-signal"; + description = "Signal Processing extension for Feldspar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48097,12 +48176,13 @@ self: { ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { pname = "gearbox"; - version = "1.0.0.2"; - sha256 = "15ip1vb1b82ympfylm1m1hxw2nkcmhnqhj2bl4v8mw61zcvznky7"; + version = "1.0.0.3"; + sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGLRaw Vec ]; jailbreak = true; + homepage = "http://code.mathr.co.uk/gearbox"; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -48243,8 +48323,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.1.0.0"; - sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5"; + version = "0.1.0.1"; + sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; buildDepends = [ base linear spatial-math ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -48782,8 +48862,8 @@ self: { }: mkDerivation { pname = "ghc-core-html"; - version = "0.1.1"; - sha256 = "0l0474kpzvzzwkbz9mcjl4fnasznb1crynjcsk3hmnjq8syhmm97"; + version = "0.1.2"; + sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -48879,16 +48959,19 @@ self: { "ghc-exactprint" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb + , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.0.1"; - sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx"; - buildDepends = [ base containers ghc ghc-paths syb ]; + version = "0.1.1.0"; + sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + buildDepends = [ + base containers directory filepath ghc ghc-paths ghc-syb-utils mtl + syb + ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils - HUnit mtl random syb + HUnit mtl random stm syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -49316,8 +49399,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.3.5"; - sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx"; + version = "0.3.6"; + sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -50171,8 +50254,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.3"; - sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; + version = "0.7.2.4"; + sha256 = "0kv8yyxixhhiqbicyd1w1fmpv7szf5h5wxs8b57sf76hww7gq0fn"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -52472,13 +52555,12 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.1"; - sha256 = "0r368b4gw32yxi7xx85ljaw72plbw1i659kwjqiigmd2s54ids5h"; + version = "0.2.0.3"; + sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; buildDepends = [ base cairo containers filepath gtk ]; - jailbreak = true; - homepage = "http://gitorious.org/maximus/gulcii"; + homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -53269,8 +53351,8 @@ self: { }: mkDerivation { pname = "hack2-handler-snap-server"; - version = "2014.11.17"; - sha256 = "0cfc2d6px0n33a3wl7s7k0l7nq9rfi1lxchlwjjb6wyp4f6mg4bb"; + version = "2015.3.9"; + sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7"; buildDepends = [ air base blaze-builder bytestring case-insensitive containers data-default directory enumerator hack2 mtl network snap-core @@ -54025,8 +54107,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.6.0"; - sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb"; + version = "4.6.7.0"; + sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54045,7 +54127,6 @@ self: { system-filepath tagsoup test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; @@ -54406,16 +54487,16 @@ self: { "handsy" = callPackage ({ mkDerivation, base, bytestring, data-default-class, operational - , process, process-extras, retry, shell-escape, split, tasty - , tasty-hunit, tasty-th, transformers + , process-extras, retry, shell-escape, split, tasty, tasty-hunit + , tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.12"; - sha256 = "0awiffsgwa2vmib9yq9zamkr4zm1vw9xxj3g47d1ljq3jg93nn3f"; + version = "0.0.13"; + sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5"; buildDepends = [ - base bytestring data-default-class operational process - process-extras retry shell-escape split transformers + base bytestring data-default-class operational process-extras retry + shell-escape split transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-th ]; homepage = "https://github.com/utdemir/handsy"; @@ -56220,8 +56301,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.10"; - sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2"; + version = "0.3.0.12"; + sha256 = "1kh1xglqcz8yg1660ham0k4y0mxs63x75hv9xxjk2ms5386jpj6c"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet @@ -59293,8 +59374,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.6"; - sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; + version = "1.2.7"; + sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6"; buildDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -61253,8 +61334,8 @@ self: { }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.4"; - sha256 = "0xs56kszgwm2hz1fl2cajzbygm8n3883bz3j7qqckw14iw81c25b"; + version = "0.1.0.6"; + sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw"; buildDepends = [ base bindings-DSL bytestring ]; testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; @@ -66707,8 +66788,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.3"; - sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n"; + version = "0.2.4"; + sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -66762,8 +66843,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.8"; - sha256 = "10vflra58ndyq861zswshpcnqdx9acglb2m8f2yzha0slihwda77"; + version = "0.4.8.1"; + sha256 = "08dd730ix5j0y7jrzrb8d0i153g2jmvklj97npdizmqhwxjfwiis"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -68344,6 +68425,7 @@ self: { base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; @@ -68360,6 +68442,7 @@ self: { buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli-args/"; description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; @@ -68372,6 +68455,7 @@ self: { version = "0.14"; sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; buildDepends = [ base hydrogen-parsing hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; @@ -68396,6 +68480,7 @@ self: { version = "0.14"; sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; buildDepends = [ base containers hydrogen-prelude parsec ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; @@ -68409,8 +68494,8 @@ self: { }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.14"; - sha256 = "05xpxgvpllay8rqs5hbkr5pf8i1aanr72651xkz02qp864g0i822"; + version = "0.15"; + sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; buildDepends = [ array base cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network nicify process random @@ -68434,6 +68519,7 @@ self: { base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-syntax/"; description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; @@ -68613,8 +68699,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.4.2"; - sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28"; + version = "0.4.2.1"; + sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi"; buildDepends = [ base containers unordered-containers ]; testDepends = [ base containers directory doctest filepath unordered-containers @@ -71711,8 +71797,8 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.2"; - sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr"; + version = "1.3"; + sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -73141,8 +73227,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.3.8"; - sha256 = "1128ik8ad4s5nd2c4vjs7nm9db44hyd6w0z19642klyrxlhmr67w"; + version = "1.3.9.1"; + sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73781,6 +73867,7 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -74849,14 +74936,14 @@ self: { , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv , lens, lens-aeson, luautils, mtl, operational , optparse-applicative, parallel-io, parsec, parsers, pcre-utils - , process, regex-pcre-builtin, scientific, split, stateWriter, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml + , process, regex-pcre-builtin, scientific, split, stm + , strict-base-types, temporary, text, time, transformers-compat + , unix, unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.0.1"; - sha256 = "1bhhbr50xzb095nikfhc99sd5qmhzd81rg0z922x807r38kkdgnx"; + version = "1.1.0"; + sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74865,14 +74952,13 @@ self: { Glob hashable hruby hslogger hslua hspec http-conduit http-types iconv lens lens-aeson luautils mtl operational optparse-applicative parallel-io parsec parsers pcre-utils process regex-pcre-builtin - scientific split stateWriter stm strict-base-types text time - transformers unix unordered-containers vector yaml + scientific split stm strict-base-types text time + transformers-compat unix unordered-containers vector yaml ]; testDepends = [ ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -75554,7 +75640,7 @@ self: { pname = "lens"; version = "4.7"; sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "a991d37b9cd348226fcdd0b99b079bede892c172b1ddf8a88142b01f80cd5775"; + editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -75589,6 +75675,7 @@ self: { pname = "lens"; version = "4.8"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; + editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -76919,8 +77006,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.4.0.0"; - sha256 = "0kq4xcpgzrpadibh5ahli5pvb5rd9h1gnd1dzxddjz3plgxil803"; + version = "0.4.0.1"; + sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -78123,8 +78210,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.0.1"; - sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag"; + version = "0.13.1"; + sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -78746,8 +78833,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.3"; - sha256 = "0fr8f641rkazi4ff5s0gr72v5chd2f7dl600v8rj4fp2vmxwwhjc"; + version = "0.4.0.4"; + sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12"; buildDepends = [ base blaze-builder lucid text transformers ]; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; @@ -79046,6 +79133,7 @@ self: { pname = "machines"; version = "0.4.1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; + editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -81022,6 +81110,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mgeneric" = callPackage + ({ mkDerivation, base, containers, lens, mtl, template-haskell }: + mkDerivation { + pname = "mgeneric"; + version = "0.0.0.0"; + sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + buildDepends = [ base containers lens mtl template-haskell ]; + homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; + description = "Generics with multiple parameters"; + license = stdenv.lib.licenses.mit; + }) {}; + "mi" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, split , template-haskell @@ -84418,6 +84518,7 @@ self: { async base contravariant managed mmorph pipes pipes-concurrency transformers ]; + jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84573,7 +84674,7 @@ self: { homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mysql; inherit (pkgs) zlib;}; + }) { mysql = null; inherit (pkgs) zlib;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -85583,6 +85684,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-i2p" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec + , hspec-attoparsec, hspec-expectations, mtl, network + , network-attoparsec, network-simple, text, transformers, uuid + }: + mkDerivation { + pname = "network-anonymous-i2p"; + version = "0.9.2"; + sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + buildDepends = [ + attoparsec base bytestring exceptions mtl network + network-attoparsec network-simple text transformers uuid + ]; + testDepends = [ + attoparsec base bytestring exceptions hspec hspec-attoparsec + hspec-expectations mtl network network-simple transformers uuid + ]; + homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; + description = "Haskell API for I2P anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -85689,8 +85812,8 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.0.2"; - sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; + version = "1.1.1"; + sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons system-fileio @@ -86744,15 +86867,15 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw - , spatial-math, time + ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT + , OpenGLRaw, spatial-math, time }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.2"; - sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y"; + version = "0.7.1.1"; + sha256 = "0mkjzw3n4a5zi9ygpys1w2xdvdycvgylflz8fj6sxdc3r9m1icy9"; buildDepends = [ - base binary cereal GLUT OpenGLRaw spatial-math time + base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; @@ -87621,6 +87744,7 @@ self: { version = "0.5"; sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; buildDepends = [ base contravariant ghc-prim transformers ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -87696,7 +87820,7 @@ self: { pname = "opaleye"; version = "0.3.1"; sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "aad8d4a8bcd52a4668a5f04362af0a1443924b44369f753a184ae170a9a5ca9d"; + editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; buildDepends = [ attoparsec base case-insensitive contravariant old-locale postgresql-simple pretty product-profunctors profunctors semigroups @@ -89950,8 +90074,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.0.1"; - sha256 = "00w6r2zpw5h2db7h8k3y6l1kryi8jvn1rf5wamx0a634ga606czc"; + version = "0.1.1.0"; + sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -90921,17 +91045,19 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, bytestring, Cabal, configurator, directory - , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui + ({ mkDerivation, array, base, bytestring, Cabal, configurator + , directory, filepath, HTTP, network-uri, process, tagsoup, text + , vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.6"; - sha256 = "1vgvf7xbzkmb5nbxgaf552i18p22pkj9wgyz3mhbg1m0j2jr1dnj"; + version = "7.77"; + sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; + editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal configurator directory filepath HTTP + array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; @@ -93367,8 +93493,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.30.0.0"; - sha256 = "0srmjh4hzsg341bjgixz4kvhlc15bbzyx2spcd8hi25m0l0ji0m9"; + version = "0.32.0.0"; + sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -93591,13 +93717,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_2_1" = callPackage + "pretty_1_1_3_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.2.1"; - sha256 = "128bgw9qgm256f28ffb49dvqs9js01m9q6mj6dhg4nlcbpz5fhav"; - editedCabalFile = "ebd25419c2eacdf4212ba30592975908255c84b928a228fe5b045bc4f32c102a"; + version = "1.1.3.1"; + sha256 = "0v1g7gr8nki1bka5dxagayx9azj2gyyd5y23202pnk53synj2lzh"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -94184,7 +94309,7 @@ self: { pname = "product-profunctors"; version = "0.6"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "d0b625cde02d967598b57bca429c61e9496b164b36db238b8f896d649230f4d1"; + editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -94473,8 +94598,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.1.0"; - sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; + version = "2.2.0"; + sha256 = "15y4affp5bipjg33ybkm8wwms54cx8a0dh8c9c328dz9x7cf9bgp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97008,6 +97133,7 @@ self: { version = "1.0.1.0"; sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; buildDepends = [ base readline StateVar ]; + jailbreak = true; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -97083,10 +97209,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.2.1"; - sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "0kyhvdpk6xr111yyd828f6sdfc4f7ayhdmwsyml6j4c7npxb1g6i"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -99098,9 +99222,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.0"; - sha256 = "1z0227d43dj3c1yh74lh71qihggj21pl7i6mwarb6kam2ziwp7mk"; - editedCabalFile = "4940711977084fce3b86efa958906ba38df63ac450eaf7093ef36268a4c25fe7"; + version = "0.17.0.1"; + sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -99111,7 +99234,6 @@ self: { base fclabels haskell-src-exts HUnit rest-core test-framework test-framework-hunit ]; - jailbreak = true; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102209,8 +102331,8 @@ self: { }: mkDerivation { pname = "search"; - version = "0.1"; - sha256 = "1d996dkirvv22kkli5vpaxy2ismyiwd4jyzfvbxyqc79lqanf2gh"; + version = "0.1.0.1"; + sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw"; buildDepends = [ base ghc-prim profunctors semigroupoids tagged transformers ]; @@ -102601,8 +102723,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.1"; - sha256 = "0vakqqdhjn7a049k1sx86ah5x85c005hrxri2xl9qcd690bvrs6f"; + version = "0.3.2"; + sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -104513,14 +104635,13 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.3.0"; - sha256 = "0blr8j52q8q1mdmb66byll3pnhzqmrlwc8jjz40km86bj73n1c7h"; + version = "0.3.1"; + sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; buildDepends = [ base containers deepseq directory filepath MonadCatchIO-transformers mtl old-locale SafeSemaphore text time transformers ]; - jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -105653,9 +105774,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.13.3.2"; - sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; - editedCabalFile = "2ffeb6e3e6d6d54819bc8c7d58c4bdabf1911599c4e83ededbda4f5719c0298f"; + version = "0.14.0"; + sha256 = "11vf7v1aqbm1lzb5jjjna6j8gj7757xkc8zk820z9d73ak8bq7m8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -105791,6 +105911,7 @@ self: { 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; @@ -105825,6 +105946,7 @@ self: { async base containers monad-loops MonadCatchIO-transformers snap stm time transformers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; @@ -106000,6 +106122,7 @@ self: { sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106099,6 +106222,7 @@ self: { base bytestring css-text directory filepath lens snap text utf8-string ]; + jailbreak = true; homepage = "https://github.com/zmthy/snaplet-css-min"; description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; @@ -106128,8 +106252,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.10"; - sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; + version = "0.3.3.11"; + sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -106394,6 +106518,7 @@ self: { MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106445,6 +106570,7 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text ]; + jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -106461,6 +106587,7 @@ self: { buildDepends = [ base configurator hedis lens mtl network snap text transformers ]; + jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106602,6 +106729,7 @@ self: { SafeSemaphore snap snap-core sqlite-simple stm test-framework test-framework-hunit text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -114312,18 +114440,20 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty , tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.0.2.0"; - sha256 = "1k8p8l8fvvc9qrw0qgbbfy9r6h3i1mfkmfzy1g2rsq9kcsc0821r"; - buildDepends = [ base stm time unordered-containers ]; + version = "1.0.3.0"; + sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base retry stm time unordered-containers ]; testDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck - time transformers + base bytestring QuickCheck retry stm tasty tasty-hunit + tasty-quickcheck time transformers ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; @@ -114562,14 +114692,14 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.29"; - sha256 = "05p6iga6lzshk6vzywpxd6g53r7hqyvs1rq90v00lpxkiwyqxs6i"; + version = "0.4.30"; + sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers websockets ]; - homepage = "http://yaxu.org/tidal/"; + homepage = "http://tidal.lurk.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117961,8 +118091,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2.1"; - sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + version = "0.1"; + sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q"; buildDepends = [ base containers contravariant mtl transformers transformers-compat ]; @@ -119926,16 +120056,17 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, mtl, pcre-heavy - , stringable, text + ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy + , QuickCheck, stringable, text }: mkDerivation { pname = "validate-input"; - version = "0.1.0.0"; - sha256 = "1xbpgc2zkaszjydy15ir11vlrwg4pgclm6ldnjxmv3p2v1cswxq6"; + version = "0.2.0.0"; + sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls"; buildDepends = [ base bytestring either mtl pcre-heavy stringable text ]; + testDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; @@ -120120,8 +120251,8 @@ self: { }: mkDerivation { pname = "vcache-trie"; - version = "0.1"; - sha256 = "0aln3vin1jah4c7hnhdbm4w5vsiqf3kgf48z6xdyzc0zwhv7mf1k"; + version = "0.1.1"; + sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk"; buildDepends = [ array base bytestring bytestring-builder vcache ]; homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; @@ -121759,23 +121890,22 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, haddock, hlint, hspec - , http-types, HUnit, network, process, regex-compat, stm, text - , token-bucket, transformers, unordered-containers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, haddock, hlint + , hspec, http-types, HUnit, network, process, regex-compat, stm + , token-bucket, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.1.0.1"; - sha256 = "1404i9f8pcvhpa2kjz5rc7r18f5dk7889v576i5k41faxb749ig0"; + version = "0.2.0.0"; + sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; buildDepends = [ - base bytestring http-types network stm text token-bucket - transformers unordered-containers wai + base containers http-types network stm token-bucket transformers + wai ]; testDepends = [ base bytestring haddock hlint hspec http-types HUnit process - regex-compat stm transformers unordered-containers wai wai-extra + regex-compat stm transformers wai wai-extra ]; - jailbreak = true; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122067,6 +122197,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "waitra" = callPackage + ({ mkDerivation, aeson, base, http-types, regex-applicative, tasty + , tasty-hunit, text, wai, wai-extra + }: + mkDerivation { + pname = "waitra"; + version = "0.0.2.0"; + sha256 = "1hzwxwaw5w38bmsyh15mggrawjbfn1bnkjjjv4aigynv19kdjf03"; + buildDepends = [ + aeson base http-types regex-applicative text wai + ]; + testDepends = [ + aeson base http-types regex-applicative tasty tasty-hunit wai + wai-extra + ]; + homepage = "https://github.com/futurice/waitra"; + description = "A very simple Wai router"; + license = stdenv.lib.licenses.mit; + }) {}; + "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec @@ -122137,8 +122287,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.2"; - sha256 = "1jhra0iq7iph4cn5lq98892rapzws2nsf1pyb70gpww4l3bgjfzd"; + version = "3.0.3"; + sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -123184,13 +123334,13 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.1.1"; - sha256 = "1i0jvxc1llcq5aayzgqhkz51mqh96pdadml6gi94h2z3yj20nicg"; + version = "0.1.2.1"; + sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of catMaybes"; + description = "Generalization of filter and catMaybes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124144,8 +124294,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.0"; - sha256 = "1388nw6ikk8myqq9h9if3fkdlxhzj7fs9l3hyfiv77k499j3iln9"; + version = "0.2.1"; + sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126326,8 +126476,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.4"; - sha256 = "0xd5rx9gpaj8m5v1ln3lgi6xhk2lw43c8ykdiqhp3583aybjkvnm"; + version = "1.4.5"; + sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -126401,8 +126551,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.1"; - sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb"; + version = "1.4.8.2"; + sha256 = "0syfgwyj5cgs2rl26g8mz2sz3vr39g813ljz441asrqv80mz4xww"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -126579,8 +126729,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.4"; - sha256 = "1vy4gscw3rgglbiq0v4l0zjmvan2sk6sgd93402hw64xwxwzc35c"; + version = "1.4.4.1"; + sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -127881,7 +128031,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base @@ -127923,7 +128073,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq4-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions @@ -127944,7 +128094,7 @@ self: { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath From fdd821f1ef78f65c5f3725cd37e2e0f3649d581d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Mar 2015 13:19:49 +0100 Subject: [PATCH 136/223] configuration-ghc-7.8.x.nix: remove amazonka-related overrides These overrides allow us to build amazonka packages, but we have no way to actually use those build results within Nix, because the replaced GHC core libraries collide with the real ones when we try to compose a ghc-with-packages environment. Closes https://github.com/NixOS/nixpkgs/issues/6584. --- .../configuration-ghc-7.8.x.nix | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 568a4d46c54..bd308b7f420 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -98,44 +98,3 @@ self: super: { incremental-computing = dontCheck super.incremental-computing; } - -// # packages relating to amazonka - -(let - Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; - amazonkaEnv = self: super: { - mkDerivation = drv: super.mkDerivation (drv // { - doCheck = false; - hyperlinkSource = false; - buildTools = (drv.buildTools or []) ++ [ ( - if pkgs.stdenv.lib.elem drv.pname [ - "Cabal" - "time" - "unix" - "directory" - "process" - "jailbreak-cabal" - ] then null else Cabal - ) ]; - }); - mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_3_0; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - hscolour = super.hscolour; - time = self.time_1_5_0_1; - unix = self.unix_2_7_1_0; - directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); - inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch amazonka-glacier amazonka-ecs; - }; - amazonka = super.amazonka.overrideScope amazonkaEnv; - amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv; - amazonka-core = super.amazonka-core.overrideScope amazonkaEnv; - amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv; - amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv; - amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv; - amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv; -in { - inherit amazonkaEnv; - inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm; -}) From db42c89325f0f4106b540ec6fed9f243234e6b24 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Mar 2015 11:03:33 +0100 Subject: [PATCH 137/223] Add syncthing-gtk --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 685d12c885c..2e1b93277aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10894,6 +10894,35 @@ let }; }; + syncthing-gtk = buildPythonPackage rec { + version = "0.6.2"; + name = "syncthing-gtk-${version}"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "0dfs5kzdj9ld20i23w6ldj7z761rwnnbqkr0l12wkgcxi58jcqds"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.syncthing pygobject3 dateutil pkgs.gtk3 pyinotify pkgs.libnotify pkgs.psmisc ]; + + patchPhase = '' + substituteInPlace "scripts/syncthing-gtk" \ + --replace "/usr/share" "$out/share" \ + ''; + + + meta = with stdenv.lib; { + description = " GTK3 & python based GUI for Syncthing "; + maintainers = [ maintainers.DamienCassou ]; + platforms = pkgs.syncthing.meta.platforms; + homepage = "https://github.com/syncthing/syncthing-gtk"; + license = stdenv.lib.licenses.gpl2; + }; + }; + tarsnapper = buildPythonPackage rec { name = "tarsnapper-0.2.1"; disabled = isPy3k; From 53663772f30719433b8e1ba14e25d57b3bfdd896 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 13 Mar 2015 07:06:20 -0400 Subject: [PATCH 138/223] haskell: aeson-schema missing test suite For some reason the .tar.gz on hackage is missing most of the files for the test suite. I've opened an issue on it (https://github.com/timjb/aeson-schema/issues/9), but it's not yet been acted on. In the meantime, simply disabling the test suite seems most sensible. @peti, could you merge this? --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cd77d8ef2df..f9a6f2bd203 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -276,6 +276,7 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw + aeson-schema = dontCheck super.aeson-schema; # http://hydra.cryp.to/build/576244/nixlog/2/raw apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials From 75ba60aded9f29a8f614d64ca3e4219fb7a12c5b Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 13 Mar 2015 12:23:05 +0100 Subject: [PATCH 139/223] pythonPackages: MySQL_python: added openssl as buildInput --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 685d12c885c..ac175c448ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6529,7 +6529,7 @@ let sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pkgs.openssl ]; propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; From 86062d7a952c9e8cdb0b370cedf1b010e0864bb4 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Fri, 13 Mar 2015 12:00:10 +0100 Subject: [PATCH 140/223] Adapt code according to @lethalman's review - Use ${bash}/bin/bash - We cannot use oraclejre7 because sqldeveloper wants a jdk. --- pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 031c004ef52..9a0afdc8e1d 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7}: +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: stdenv.mkDerivation rec { version = "4.0.3.16.84"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed - echo -e '#!/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && bash sqldeveloper $*' >> $out/bin/sqldeveloper + echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper cd $out unzip ${src} From 328651bfacec1d487a839dce31bda13756eea90b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 13 Mar 2015 14:55:08 +0100 Subject: [PATCH 141/223] pycharm: Update to 4.0.5 --- pkgs/applications/editors/idea/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 429de65b568..3bb0100c5fc 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -254,25 +254,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; + sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; + sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg"; }; }; From 8eb7034766e1f99c536c7397d0cf4bb3d44e8ce8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 13 Mar 2015 16:12:12 +0100 Subject: [PATCH 142/223] calibre: update from 2.20.0 to 2.21.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ee064865d34..9f5c9e3c107 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.20.0"; + name = "calibre-2.21.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13246f4vxz4ps3c549hrnwdkwic5jsf7g1faham38z1ixd094lkd"; + sha256 = "1adig2jxwbmsxcs36jaybhc8zdb8mnkc23kabw0c72izrsg4c5gb"; }; inherit python; From 75d3a321d643d14bcf2f2ac4e398252d62479d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= Date: Fri, 13 Mar 2015 18:53:00 +0100 Subject: [PATCH 143/223] IDEA-PhpStorm version bump to 8.0.3 --- pkgs/applications/editors/idea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 3bb0100c5fc..ba4a4173da7 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -278,13 +278,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.2"; - build = "PS-139.732"; + version = "8.0.3"; + build = "PS-139.1348"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; + sha256 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; }; }; From fe8072ee7f8e47ff8a7644bc522f1eec2c65989a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Mar 2015 13:17:38 -0500 Subject: [PATCH 144/223] kf57: add meta.branch to fix monitor --- .../libraries/kde-frameworks-5.7/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index c53ae595e5e..c87161a725e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,6 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: + let inherit (parseDrvName drv.version) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -40,6 +41,8 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); } // (drv.meta or {}); }); @@ -108,12 +111,16 @@ let [ ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; + meta = + let inherit (parseDrvName super.extra-cmake-modules.name) version; in + { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + }; }; frameworkintegration = super.frameworkintegration // { From 628594fd7911093a26f0a6b9a3c61ffae5af9fdf Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 13 Mar 2015 19:27:30 +0100 Subject: [PATCH 145/223] Fix URL for emacs evil package --- pkgs/top-level/emacs-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 57d5410a3bf..331cde10f35 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -320,9 +320,9 @@ let self = _self // overrides; pname = "evil"; version = "20141020"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; packageRequires = [ goto-chg undo-tree ]; meta = { @@ -504,9 +504,9 @@ let self = _self // overrides; pname = "goto-chg"; version = "1.6"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; files = [ "lib/goto-chg.el" ]; meta = { license = gpl3Plus; }; From 7f07b33e4dcdfbb27153384a55587d11bfe3fdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 13 Mar 2015 15:30:31 -0300 Subject: [PATCH 146/223] Add ocaml-xml-light --- .../ocaml-modules/xml-light/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/xml-light/default.nix diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix new file mode 100644 index 00000000000..5eb4fbfd6b1 --- /dev/null +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "xml-light"; + version = "2.4"; +in +stdenv.mkDerivation { + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/ncannasse/${pname}/archive/${version}.tar.gz"; + sha256 = "10b55qf6mvdp11ny3h0jv6k6wrs78jr9lhsiswl0xya7z8r8j0a2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + buildPhase = '' + make all + make opt + ''; + + installPhase = '' + make install_ocamlfind + mkdir -p $out/share + cp -vai doc $out/share/ + ''; + + meta = { + description = "Minimal Xml parser and printer for OCaml"; + longDescription = '' + Xml-Light provides functions to parse an XML document into an OCaml + data structure, work with it, and print it back to an XML + document. It support also DTD parsing and checking, and is + entirely written in OCaml, hence it does not require additional C + library. + ''; + homepage = "http://tech.motion-twin.com/xmllight.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90dbe36e100..1ee447f806b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4095,6 +4095,8 @@ let xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; From 9be119bb0ec7dc4b93180eb2f24bc9f6754c4a55 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 13 Mar 2015 21:07:46 +0000 Subject: [PATCH 147/223] disnix: bump to version 0.3 --- .../package-management/disnix/DisnixWebService/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 16f90ec5ca2..4e143bed519 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213076/download/4/DisnixWebService-0.3.tar.bz2; - sha256 = "0m3hk8nfgfnmd503pkpb6n2z944haq2n22d44q6n6zzqnfkjm175"; + url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index ee1e70a8582..98213d9cf34 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7"; + name = "disnix-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213001/download/4/disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7.tar.gz; - sha256 = "08f16gi8dg39ll5ph6rs4wdw9dg4sdgnikpg1x40slzcrckvnkhm"; + url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz; + sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 4e8f7cc17ec..52312ca7191 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add"; + name = "disnixos-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/20213021/download/3/disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add.tar.gz; - sha256 = "1dc9q8i9vhw0851w9b7giv570rly172mmqfr6khr2r88npc642xc"; + url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz; + sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index e6d224c36f6..6fa95f060d7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd"; + name = "dysnomia-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20404955/download/1/dysnomia-0.3preb3e6daec5cf4cded5d6b53b5913b93a71315ccbd.tar.gz; - sha256 = "0dighcn7lihfnkyahw9da0fck8xh1jgbfpfhwndxg0x4bcp7v9f3"; + url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz; + sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 48c6daf49152afb69acc97a8ba311ab492eceea3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Mar 2015 15:07:29 +0100 Subject: [PATCH 148/223] jedit: update from 5.1.0 to 5.2.0 --- .../editors/jedit/build.xml.patch | 47 ++++++++++--------- pkgs/applications/editors/jedit/default.nix | 8 ++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch index 2dabaaaed0c..2f630f18ab7 100644 --- a/pkgs/applications/editors/jedit/build.xml.patch +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -1,6 +1,6 @@ ---- a/build.xml 2013-07-28 18:03:55.000000000 +0100 -+++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 -@@ -42,16 +42,6 @@ +--- a/build.xml 2015-02-04 08:47:37.000000000 +0100 ++++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 +@@ -43,16 +43,6 @@ @@ -17,7 +17,7 @@ -@@ -89,51 +79,8 @@ +@@ -90,51 +80,8 @@ value="true"/> @@ -39,7 +39,7 @@ - - +- unless="ivy.done"> - - +- unless="ivy.done"> - - -@@ -238,37 +185,6 @@ +@@ -239,37 +186,6 @@ @@ -108,13 +108,14 @@ - +- description="run unit tests" +- unless="skip.tests"> - - - + + +- -@@ -611,7 +503,7 @@ +@@ -622,7 +512,7 @@ -@@ -655,7 +547,7 @@ +@@ -668,7 +558,7 @@ -@@ -679,7 +571,7 @@ +@@ -692,7 +582,7 @@ -@@ -703,7 +595,7 @@ +@@ -716,7 +606,7 @@ -@@ -838,7 +730,7 @@ +@@ -851,7 +741,7 @@ -@@ -1143,7 +1035,7 @@ +@@ -1154,7 +1044,7 @@ -@@ -1271,7 +1163,7 @@ +@@ -1295,7 +1185,7 @@ -@@ -1567,7 +1459,7 @@ +@@ -1592,7 +1482,7 @@ Date: Wed, 11 Mar 2015 15:07:18 +0100 Subject: [PATCH 149/223] tagainijisho: update from 1.0.2 to 1.0.3 --- pkgs/applications/office/tagainijisho/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bee1b738d12..9283ee1274c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, qt4, cmake, sqlite}: +{ stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { - name = "tagainijisho-1.0.2"; + name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; - sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; buildInputs = [ qt4 cmake sqlite ]; From d38c414d94881127a9ad47708f94f14b23beea36 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Mar 2015 21:30:41 +0100 Subject: [PATCH 150/223] Adds Qarte Qarte allows you to browse into the archives of arte+7 & arteLiveWeb sites and to record your preferred videos. Homepage: https://launchpad.net/qarte --- pkgs/applications/video/qarte/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/video/qarte/default.nix diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix new file mode 100644 index 00000000000..a7e8cd8c1b9 --- /dev/null +++ b/pkgs/applications/video/qarte/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: + +stdenv.mkDerivation { + name = "qarte-2.2.0"; + src = fetchbzr { + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; + rev = "146"; + sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv qarte $out/bin/ + substituteInPlace $out/bin/qarte \ + --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/share' "$out/share" + wrapProgram $out/bin/qarte \ + --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PATH : "${rtmpdump}/bin" + + mkdir -p $out/share/man/man1/ + mv qarte.1 $out/share/man/man1/ + + mkdir -p $out/share/qarte + mv * $out/share/qarte/ + ''; + + meta = { + homepage = https://launchpad.net/qarte; + description = "A recorder for Arte TV Guide and Arte Concert"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f2f72e4082..b9d38854f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2440,6 +2440,10 @@ let openmpi = callPackage ../development/libraries/openmpi { }; + qarte = callPackage ../applications/video/qarte { + sip = pythonPackages.sip_4_16; + }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; From f4146b7f2db8c28628147841522d721159fbfe40 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 13 Mar 2015 16:27:04 -0500 Subject: [PATCH 151/223] kf57: fix evaluation --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index c87161a725e..605ed4a0567 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,7 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: - let inherit (parseDrvName drv.version) version; in + let inherit (builtins.parseDrvName drv.version) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; From e30f14b791053a1d8634b0ba049a5e9d49f76452 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 13 Mar 2015 22:25:24 -0700 Subject: [PATCH 152/223] update doomseeker to v0.12.2b --- pkgs/applications/misc/doomseeker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 404fb955386..da3b364f3eb 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,10 +1,10 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-0.12.1b"; + name = "doomseeker-0.12.2b"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "110yg3w3y1x8p4gqpxb6djxw348caj50q5liq8ssb5mf78v8gk6b"; + sha256 = "1bcrxc3g9c6b4d8dbm2rx0ldxkqc5fc91jndkwiaykf8hajm0jnr"; }; cmakeFlags = '' From 9c4cbaa553cef4ebbfa375f455ced63d141b0ba6 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 14 Mar 2015 12:08:22 +0000 Subject: [PATCH 153/223] Fix mpd configuration (enclosing quotes needed). --- nixos/modules/services/audio/mpd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 9abfb41087b..5afe5f8f46f 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -17,10 +17,10 @@ let log_file "syslog" user "${cfg.user}" group "${cfg.group}" - ${if cfg.network.host != "any" then - "bind_to_address ${cfg.network.host}" else ""} - ${if cfg.network.port != 6600 then - "port ${toString cfg.network.port}" else ""} + + ${optionalString (cfg.network.host != "any") ''bind_to_address "${cfg.network.host}"''} + ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${cfg.extraConfig} ''; From 5078d49248e29bacd442fac889123c2c0a68e13e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 14 Mar 2015 11:47:11 +0100 Subject: [PATCH 154/223] Add package: mpdscribble --- pkgs/tools/misc/mpdscribble/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/mpdscribble/default.nix diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix new file mode 100644 index 00000000000..3b276a7117f --- /dev/null +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "mpdscribble-${version}"; + version = "0.22"; + + src = fetchurl { + url = + "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + }; + + buildInputs = [ mpd_clientlib curl glib pkgconfig ]; + + preConfigure = '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = with stdenv.lib; { + description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 166e5365db7..9e87229f814 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8189,6 +8189,8 @@ let mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpdscribble = callPackage ../tools/misc/mpdscribble { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; From f1f3c2c77523b128c9ff5006be693b2eec53151e Mon Sep 17 00:00:00 2001 From: _1126 Date: Sat, 14 Mar 2015 14:36:25 +0100 Subject: [PATCH 155/223] torbrowser: bump version to 4.0.4 --- 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 150cb49a9c4..750ab370872 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.3"; + version = "4.0.4"; 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 - "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else - "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha"; + "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else + "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; }; patchPhase = '' From 9ba702765292698f6a0d37d99563b354a5245146 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:54:59 +0100 Subject: [PATCH 156/223] pkgs/development/libraries/kde-frameworks-5.7: fix evaluation --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 605ed4a0567..c7fdbc060ec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,7 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: - let inherit (builtins.parseDrvName drv.version) version; in + let inherit (builtins.parseDrvName drv.name) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -112,7 +112,7 @@ let ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; meta = - let inherit (parseDrvName super.extra-cmake-modules.name) version; in + let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in { license = with stdenv.lib.licenses; [ bsd2 ]; platforms = stdenv.lib.platforms.linux; From d54c94c189af96a40edc8cc845a0cc6988534a6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 15:05:34 +0100 Subject: [PATCH 157/223] pkgs/development/haskell-modules/configuration-common.nix: cosmetic --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f9a6f2bd203..1594a6e9579 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -627,9 +627,6 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = markBroken super.xcffib; - # https://github.com/snapframework/snap/issues/141 - # snap = overrideCabal super.snap (drv: { preConfigure = "sed -i -e 's|lens .*<4.8|lens|' snap.cabal"; }); - } // { # Not on Hackage. From 4835813cb6718359e16e4ffcfeb538102b60823b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 14 Mar 2015 09:08:15 -0700 Subject: [PATCH 158/223] judy: clang doesnt know -fno-aggressive-loop-optimizations --- pkgs/development/libraries/judy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 4bca61d5b14..13b50286380 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # http://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = '' + preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; From d3f69cdf67a823285c6164f7596da5757169f99e Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sat, 14 Mar 2015 09:09:09 -0700 Subject: [PATCH 159/223] mariadb: oqgraph fails to build on darwin --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fecf3709f69..23a09f1d54e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DWITH_PARTITION_STORAGE_ENGINE=1" "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 5b947b82e61a57e8b5e3049625deb4419d501745 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 28 Feb 2015 12:25:33 +0000 Subject: [PATCH 160/223] lighttable: update to 0.7.2 --- pkgs/applications/editors/lighttable/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 852af584e90..d0ef3198a36 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -15,20 +15,20 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "LightTable-${version}"; - version = "0.6.7"; + version = "0.7.2"; src = if stdenv.system == "i686-linux" then fetchurl { name = "LightTableLinux.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux.tar.gz; - sha256 = "3b09f9665ed1b4abb7c1ca16286ac7222caf6dc124059be6db4cb9f5fd041e73"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz"; + sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i"; } else fetchurl { name = "LightTableLinux64.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux64.tar.gz; - sha256 = "710d670ccc30aadba521ccb723388679ee6404aac662297a005432c811d59e82"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz"; + sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c"; }; buildInputs = [ makeWrapper ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable From 79e9ca33c819e16b92db4887526ce725fcf24843 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 14 Mar 2015 18:33:05 +0000 Subject: [PATCH 161/223] lighttable: rename package LightTable to lighttable --- pkgs/applications/editors/lighttable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d0ef3198a36..d4fa56898c3 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -14,7 +14,7 @@ in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "LightTable-${version}"; + name = "lighttable-${version}"; version = "0.7.2"; src = From 01935e880b7b719c31f485d3e44d4a0e89e27821 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 Mar 2015 21:42:07 +0100 Subject: [PATCH 162/223] stunt-rally: fix hashes and add meta.platforms (closes #6712) --- pkgs/games/stuntrally/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index d9de1254915..2c41a11ab57 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; rev = "refs/tags/${version}"; - sha256 = "0zyzkac11dv9c1rxknydkisg2iw1rmi72psidl7jmq8v3rrqxk4r"; + sha256 = "1lsh7z7sjfwpdybg6vbwqx1zxsgbfp2n60n7xl33v225p32qh1qf"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; rev = "refs/tags/${version}"; - sha256 = "1j237dbhd1ik5mj8whbvlff5da9vzzgiskcj5nzfpw1vb1jpdjvd"; + sha256 = "1614j6q1d2f69l58kkqndndvf6svcghhw8pzc2s1plf6k87h67mg"; }; preConfigure = '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/vdrift-ogre/; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } From a8a350e679f20b782fad879d15939b332cdeb628 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 15 Mar 2015 00:04:55 +0100 Subject: [PATCH 163/223] Add Elanthec PS/2 Trackpoint (Thinkpad L430) --- nixos/modules/tasks/trackpoint.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 5d1bb631b54..778cdc5d30d 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -16,7 +16,7 @@ with lib; Enable sensitivity and speed configuration for trackpoints. ''; }; - + sensitivity = mkOption { default = 128; example = 255; @@ -44,7 +44,7 @@ with lib; Enable scrolling while holding the middle mouse button. ''; }; - + }; }; @@ -70,7 +70,7 @@ with lib; '' Section "InputClass" Identifier "Trackpoint Wheel Emulation" - MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" + MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" From 7c8247a8c50c1a4aa56fa5cfd3dae33f1aeae2ac Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:38:33 +0100 Subject: [PATCH 164/223] grsecurity: Update stable and test patches stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203 test: 3.1-3.18.9-201503071142 -> 3.1-3.19.1-201503122205 --- nixos/modules/security/grsecurity.nix | 4 ++-- pkgs/build-support/grsecurity/default.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.18.nix | 1 - pkgs/os-specific/linux/kernel/patches.nix | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 66eeab7503d..8cd40093348 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.18. + Enable the testing grsecurity patch, based on Linux 3.19. ''; }; @@ -245,7 +245,7 @@ in message = '' If grsecurity is enabled, you must select either the stable patch (with kernel 3.14), or the testing patch (with - kernel 3.18) to continue. + kernel 3.19) to continue. ''; } { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable); diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index b2bffc781b3..7bafd78d76a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_18 test-patch; + else mkKernel pkgs.linux_3_19 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 93ddecbf4a5..154c9633cdb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "3.18.9"; - # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c2d35ce4d2e..f239d459967 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.35"; - revision = "201503071140"; + revision = "201503092203"; branch = "stable"; - sha256 = "076kmzyrmg8g82xhaccysdgblfkdd21rfn8wvdpf6kxavg8xn855"; + sha256 = "0l8m0ixh0qcgwy8vcmfl8pal93wc03ahc3ci3sca79nx33a050v9"; }; grsecurity_unstable = grsecPatch - { kversion = "3.18.9"; - revision = "201503071142"; + { kversion = "3.19.1"; + revision = "201503122205"; branch = "test"; - sha256 = "0acrz6v827y8pdrl26wb652hmq0qglkwdgq0ffrw6k052f5lpfx2"; + sha256 = "0g22wfmlim163gmsl4cn4nq4zif8zni3cpkk7cr93z92r9kafp4y"; }; grsec_fix_path = From d54cac725fa2ebff3c5b120a0937ed9d96ba8e88 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 05:11:39 +0100 Subject: [PATCH 165/223] pythonPackages.coverage: Fix hash --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c629c9eba1..fa16501e892 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1797,7 +1797,7 @@ let src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; + md5 = "055d82e6849d882ec6cf2ae1faca8e56"; }; meta = { From c6c301640695e6776e77a9c65aa69f3e72fc4e84 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:37:03 +0100 Subject: [PATCH 166/223] flashplayer: Update from 11.2.202.442 -> 11.2.202.451 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4ae7fca5398..26ba5c51480 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.442"; + version = "11.2.202.451"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "08ni1mllp98d7wawz35lx8ydymya8nspb90mq29ivbyrkx5aal28"; + sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "00728q8jp40llpsfw2n5q9w29isyy3a64xlisjizyh3chb6bkkdm"; + sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds"; } else throw "Flash Player is not supported on this platform"; From d848e346167d5a57038053458e392bbd7b6b3e98 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:37:12 +0100 Subject: [PATCH 167/223] pax-utils: Update from 1.0.1 -> 1.0.2 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 28bf24babdc..80e87d8aacc 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0v14dvkg19yabh0ijy8fbrvapxvc36dwhvp90py3baq7qb44wrc7"; + sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; }; makeFlags = [ From aa708af8d474cd0c5b7f061db79d184693a716db Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 14 Mar 2015 13:45:22 +0100 Subject: [PATCH 168/223] Change current version of uncrustify to 0.61 --- pkgs/development/tools/misc/uncrustify/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index cf1ec5edbcd..27e59af34fc 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify-0.60"; + name = "uncrustify"; + version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}.tar.gz"; - sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa"; + url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; meta = with stdenv.lib; { From 1207bc606e29ed51f9b24b3085837fb1613ec3d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:08:30 +0100 Subject: [PATCH 169/223] hackage-packages.nix: re-generate from Hackage 2015-03-14T13:08:30+0100 --- .../haskell-modules/hackage-packages.nix | 404 ++++++++++++------ 1 file changed, 284 insertions(+), 120 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5c5ef83b10b..38f1825bc86 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3986,8 +3986,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "EstProgress"; - version = "0.1.0.0"; - sha256 = "16krghh2x6m0bzwrzgalry5rl9gp7x19w5n00dhbg0q28mk668sv"; + version = "0.2.0.0"; + sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3"; buildDepends = [ base mtl ]; homepage = "http://alkalisoftware.net"; description = "Methods for estimating the progress of functions"; @@ -4746,6 +4746,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base bimap ]; + jailbreak = true; homepage = "https://github.com/xnil/GGg"; description = "GGg cipher"; license = stdenv.lib.licenses.mit; @@ -8828,6 +8829,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Kalman" = callPackage + ({ mkDerivation, base, hmatrix }: + mkDerivation { + pname = "Kalman"; + version = "0.1.0.0"; + sha256 = "0l4z7l90s14z24rlzdpl1rh7vjgpk7adbavza6k3144p1an5rfqp"; + buildDepends = [ base hmatrix ]; + homepage = "https://github.com/idontgetoutmuch/Kalman"; + description = "A slightly extended Kalman filter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -10186,6 +10199,7 @@ self: { version = "0.1.0.1"; sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; buildDepends = [ array base bimap containers Munkres ]; + jailbreak = true; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12315,8 +12329,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.2"; - sha256 = "06w5q8xb4n5428ja1834z18rn6zl5cqdizcvj7519a2xy9m5qda5"; + version = "0.0.3"; + sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -22866,10 +22880,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "bimap"; - version = "0.2.4"; - sha256 = "1ib54plfsxzmf9wbbdayfdsrcx4s5ffna3ca5ps928fy78wsx4fr"; + version = "0.3.0"; + sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1"; buildDepends = [ base containers ]; - homepage = "http://code.haskell.org/bimap"; + homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -25463,12 +25477,12 @@ self: { }) {}; "broccoli" = callPackage - ({ mkDerivation, base, stm, unamb }: + ({ mkDerivation, base, stm, time }: mkDerivation { pname = "broccoli"; - version = "0.2.0.1"; - sha256 = "0kish92mch22jlpg86iq6y73jmmsjg1yl7s2f15y6vwfdvbhv8zz"; - buildDepends = [ base stm unamb ]; + version = "0.3.0.0"; + sha256 = "0jdrly4xm2fdxr7vbqk4zhf3aya50m0gryrpnn0alc3kbrpbh8l6"; + buildDepends = [ base stm time ]; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26417,8 +26431,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.23.1"; - sha256 = "1vzng536z711hvv0ln40d863hwi103iywkhdsziy62nmxdq1afy5"; + version = "0.24.1"; + sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26700,8 +26714,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.1.0.1"; - sha256 = "1a7yavkja9ghrr7pf9j8hkg4fg1xl6g4fn82hwc56snmvlpc0ms5"; + version = "0.2.0.0"; + sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29058,8 +29072,8 @@ self: { ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { pname = "chesshs"; - version = "0.2.0"; - sha256 = "1v9qhnknqn8bsxzdcwskhssmmhbrr0d1rrxqm6ssf6j2jvv3diay"; + version = "0.2.1"; + sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv"; buildDepends = [ array attoparsec base bytestring containers ]; homepage = "http://arnovanlumig.com/chesshs.html"; description = "Simple library for validating chess moves and parsing PGN files"; @@ -29538,6 +29552,7 @@ self: { base containers optparse-applicative plailude pretty-tree safe split ]; + jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -29655,62 +29670,64 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, containers, directory, filepath, ghc, ghc-paths - , hashable, haskeline, lens, mtl, process, text, transformers - , unbound, unix, unordered-containers + , clash-prelude, clash-systemverilog, clash-vhdl, containers + , directory, filepath, ghc, hashable, haskeline, lens, mtl, process + , text, transformers, unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.4.1"; - sha256 = "0s6q7xld7v673r7bsr2sj64gdlfrzkf46ginqrcr2dmvbiwkkjrk"; + version = "0.5"; + sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj"; isLibrary = false; isExecutable = true; buildDepends = [ - array base bifunctors bytestring clash-lib clash-prelude containers - directory filepath ghc ghc-paths hashable haskeline lens mtl - process text transformers unbound unix unordered-containers + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-vhdl containers directory filepath ghc + hashable haskeline lens mtl process text transformers + unbound-generics unix unordered-containers ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , concurrent-supply, containers, contravariant, deepseq, directory - , errors, fgl, filepath, hashable, lens, ListLike, mtl, pretty - , process, template-haskell, text, time, transformers, unbound - , unordered-containers, uu-parsinglib, wl-pprint-text + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text }: mkDerivation { pname = "clash-lib"; - version = "0.4.1"; - sha256 = "001jldfwbfl3cvsqkd2q9qhpdv0najagzvzz94rx6jf4wal9dsx1"; + version = "0.5"; + sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng"; buildDepends = [ aeson attoparsec base bytestring concurrent-supply containers - contravariant deepseq directory errors fgl filepath hashable lens - ListLike mtl pretty process template-haskell text time transformers - unbound unordered-containers uu-parsinglib wl-pprint-text + deepseq directory errors fgl filepath hashable lens mtl pretty + process template-haskell text time transformers unbound-generics + unordered-containers uu-parsinglib wl-pprint-text ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude" = callPackage ({ mkDerivation, base, data-default, ghc-prim, integer-gmp - , template-haskell, th-lift + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.6.0.1"; - sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7"; + version = "0.7"; + sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; buildDepends = [ - base data-default ghc-prim integer-gmp template-haskell th-lift + base data-default ghc-prim integer-gmp singletons template-haskell + th-lift ]; homepage = "http://christiaanb.github.io/clash2/"; description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -29721,10 +29738,45 @@ self: { version = "0.1.0.0"; sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34"; buildDepends = [ base clash-prelude containers mtl QuickCheck ]; + jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; }) {}; + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5"; + sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.5"; + sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "classify" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -32698,15 +32750,15 @@ self: { }: mkDerivation { pname = "control-monad-exception"; - version = "0.11.1"; - sha256 = "1lzv5xggc7nyw62jq9plc3lzg06yx3sbd9jzji0pc6xcbqn2m4qn"; + version = "0.11.2"; + sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p"; buildDepends = [ base failure lifted-base monad-control monadloc transformers transformers-base ]; homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34939,12 +34991,12 @@ self: { }) {}; "current-locale" = callPackage - ({ mkDerivation, base, old-locale, process }: + ({ mkDerivation, base, old-locale, process, split }: mkDerivation { pname = "current-locale"; - version = "0.1.0.1"; - sha256 = "185fgzh8nvf2gl5hzg3xmab4xlp2wm2nw485g5nikzx99y3zr1b6"; - buildDepends = [ base old-locale process ]; + version = "0.2.0.1"; + sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; + buildDepends = [ base old-locale process split ]; homepage = "https://github.com/koterpillar/current-locale"; description = "Get the current system locale in System.Locale format"; license = stdenv.lib.licenses.mit; @@ -41169,31 +41221,33 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, base, bytestring, cairo, casadi-bindings - , casadi-bindings-core, cereal, Chart, Chart-cairo, Chart-gtk - , cmdargs, colour, containers, data-default, data-default-class - , distributive, glib, gtk, hmatrix, HUnit, jacobi-roots, lens - , linear, mtl, not-gloss, process, QuickCheck, reflection + ({ mkDerivation, base, binary, bytestring, casadi-bindings + , casadi-bindings-core, Chart, Chart-gtk, cmdargs, colour + , containers, data-default-class, distributive, generic-accessors + , hmatrix, hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl + , not-gloss, Plot-ho-matic, process, QuickCheck, reflection , semigroups, spatial-math, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , unordered-containers, vector, zeromq4-haskell + , test-framework-hunit, test-framework-quickcheck2 + , unordered-containers, vector, vector-binary-instances + , zeromq4-haskell }: mkDerivation { pname = "dynobud"; - version = "1.1.0.0"; - sha256 = "1bgzas5ywvvym0xgi1bajkx2z65wpzrc6p2r77dk0wlmdrpgb1rf"; + version = "1.3.0.0"; + sha256 = "1zxwx777n08flmwcd7c9w8rkkcpvkzagwhy0axaxl9n0anyf8q1i"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cairo casadi-bindings casadi-bindings-core cereal - Chart Chart-cairo Chart-gtk cmdargs colour containers data-default - data-default-class distributive glib gtk hmatrix jacobi-roots lens - linear mtl not-gloss process reflection semigroups spatial-math stm - text time unordered-containers vector zeromq4-haskell + base binary bytestring casadi-bindings casadi-bindings-core Chart + Chart-gtk cmdargs colour containers data-default-class distributive + generic-accessors hmatrix jacobi-roots lens linear mtl not-gloss + Plot-ho-matic process reflection semigroups spatial-math stm + unordered-containers vector vector-binary-instances zeromq4-haskell ]; testDepends = [ - base casadi-bindings hmatrix HUnit linear QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector + base binary casadi-bindings hmatrix hmatrix-gsl HUnit linear + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -43327,18 +43381,18 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, filepath, http-conduit, http-types, network, process - , regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, bytestring, conduit + , conduit-extra, directory, filepath, http-conduit, http-types + , network, process, regex-compat, transformers, utf8-string }: mkDerivation { pname = "eternal"; - version = "0.0.9"; - sha256 = "0kp25p26fsyqn4877wqjhbwfy7m0fnh7lfw0p5njmlx6kqbwi79n"; + version = "0.1.0"; + sha256 = "1ixxv6m9vj5ygry28c9zi3swhivl48r9cf4kj0r8yraqwv1givda"; buildDepends = [ - base bytestring conduit conduit-extra directory filepath - http-conduit http-types network process regex-compat transformers - utf8-string + base base-unicode-symbols bytestring conduit conduit-extra + directory filepath http-conduit http-types network process + regex-compat transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43436,15 +43490,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, happy, hlint, hspec, process, regex-posix - , xml + ({ mkDerivation, base, directory, happy, hlint, hspec, process + , regex-posix, xml }: mkDerivation { pname = "euler"; - version = "0.6.0"; - sha256 = "0dqm4cq9hb7l6xa84y53v6l226f8qfw5avpbsc0zikx50jlz0q2g"; + version = "0.7.0"; + sha256 = "0n3sngaa8zz7wlaqhk2lk7s0klcnq7p1vws9aic5mchrh24nm0sz"; buildDepends = [ base ]; - testDepends = [ base happy hlint hspec process regex-posix xml ]; + testDepends = [ + base directory happy hlint hspec process regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -44514,8 +44570,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.0"; - sha256 = "1xrsa9hj70792fv8lbd820n7k44q2xhjzplzc4j7np4l8nd9n6l5"; + version = "0.23.1.1"; + sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -46536,8 +46592,8 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.3.0.9"; - sha256 = "109n0rlwpbrpsa0j4vcab61zmc1j01ln141v19zjv4dm5al14bd5"; + version = "0.3.0.10"; + sha256 = "0s3q1az0fvx1kn79nsz3d7d4gampcz4yyp9nmqj9baip1lws6k36"; buildDepends = [ base containers data-default-class lens vector-space vector-space-points @@ -54583,18 +54639,24 @@ self: { }) { pfq = null;}; "hapistrano" = callPackage - ({ mkDerivation, base, either, filepath, lens, old-locale, process - , time, transformers + ({ mkDerivation, base, base-compat, directory, either, filepath + , hspec, mtl, old-locale, process, temporary, time, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.1.0.2"; - sha256 = "172hdvs8rnxwv3dy56024f4yc9f9hbs03wz3hfpdcqfj0a9lix65"; + version = "0.2.0.1"; + sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; isLibrary = true; isExecutable = true; buildDepends = [ - base either filepath lens old-locale process time transformers + base base-compat either filepath mtl old-locale process time + transformers ]; + testDepends = [ + base base-compat directory either filepath hspec mtl old-locale + process temporary time transformers + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -60475,8 +60537,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.0"; - sha256 = "0kdy3rdjh4kjlxqfdqxnnaa9cw4avpykqv6ryvw95nxqqraqpm65"; + version = "4.4.1"; + sha256 = "1hc71zzc8apl619449g9sp50wc6qprzd91c69rr3zf1pi77208qg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60487,6 +60549,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72386,8 +72449,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9"; - sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j"; + version = "0.9.1"; + sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; buildDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -75531,8 +75594,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.2"; - sha256 = "0inj841fdh6d8d2i5r2mnsw14fxzdcg92n91gfbaginds4mhjf7d"; + version = "0.3.1.3"; + sha256 = "16v7740xi825n3wmzb9p9svvs88mi5j7m94xqhbb2vhrvsn96phn"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -77816,8 +77879,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.4.3"; - sha256 = "0mxi58dihbwj4534swhy5zlga5w1q2h4jrfvi33kw0pf12hvxqjv"; + version = "3.4.4.4"; + sha256 = "1rx07pk6g46k4652mznga7v51pp6bi32h3wk0dnmihn8n4536m4x"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -86872,8 +86935,8 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.1.1"; - sha256 = "0mkjzw3n4a5zi9ygpys1w2xdvdycvgylflz8fj6sxdc3r9m1icy9"; + version = "0.7.2.1"; + sha256 = "0jkdfkkacb4qsf9f229z79ihrzm9xsgc7pnw96ainmnhjgvfmihj"; buildDepends = [ base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time ]; @@ -87424,17 +87487,17 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, free, hashable - , profunctors, stm, transformers, unordered-containers, void - , witherable + ({ mkDerivation, base, containers, either, exceptions, free + , hashable, monad-stm, profunctors, stm, transformers + , unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.0.1"; - sha256 = "1jycikj070mkrw43h44ynvh2f73n1p2ajxyxy7r0a57hl9l6rwba"; + version = "1.0.2"; + sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; buildDepends = [ - base containers either free hashable profunctors stm transformers - unordered-containers void witherable + base containers either exceptions free hashable monad-stm + profunctors stm transformers unordered-containers void witherable ]; homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; @@ -92004,8 +92067,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { pname = "plailude"; - version = "0.5.1"; - sha256 = "0c9q2pb7v1qv9v7xl8vcj3jncqsphz13accppxd7k6chmirrdnkh"; + version = "0.6.0"; + sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; buildDepends = [ base bytestring mtl time unix ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; @@ -93652,6 +93715,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocess-haskell" = callPackage + ({ mkDerivation, base, base-unicode-symbols, basic-prelude + , bytestring, Cabal, containers, cpphs, deepseq, directory + , file-embed, foldl, haskell-src-exts, here, system-filepath + , temporary, text, turtle, unix + }: + mkDerivation { + pname = "preprocess-haskell"; + version = "0.0.1.1"; + sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r"; + buildDepends = [ + base base-unicode-symbols basic-prelude bytestring Cabal containers + cpphs deepseq directory file-embed foldl haskell-src-exts here + system-filepath temporary text turtle unix + ]; + description = "Preprocess Haskell Repositories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "preprocessor-tools" = callPackage ({ mkDerivation, base, mtl, parsec, syb }: mkDerivation { @@ -94598,8 +94680,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.2.0"; - sha256 = "15y4affp5bipjg33ybkm8wwms54cx8a0dh8c9c328dz9x7cf9bgp"; + version = "2.2.1"; + sha256 = "0dc1km96k58m98ww7z2n8d167ihr5b7vws4y2va4nl30ghpfga56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97593,6 +97675,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , lens, mtl, primitive, semigroups, template-haskell, these + }: + mkDerivation { + pname = "reflex"; + version = "0.0.1"; + sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + buildDepends = [ + base containers dependent-map dependent-sum lens mtl primitive + semigroups template-haskell these + ]; + jailbreak = true; + description = "Higher-order Functional Reactive Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { @@ -101309,11 +101408,12 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.9.3"; - sha256 = "1vb8j6qm6n4v3621y3gz1hf8h1lygp624c4i3s5kzx6vxmm9d368"; + version = "2.9.6"; + sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; buildDepends = [ array base bytestring containers directory minisat mtl process ]; + testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; @@ -102131,6 +102231,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scroll" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, IfElse, monad-loops, mtl, ncurses + , optparse-applicative, random, text, vector + }: + mkDerivation { + pname = "scroll"; + version = "1.20150313"; + sha256 = "1q9zmdhqbz6w20fcf2gvv92ln7461b0ksr98a3kghqz3d7p5w0m3"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring case-insensitive containers data-default IfElse + monad-loops mtl ncurses optparse-applicative random text vector + ]; + homepage = "https://joeyh.name/code/scroll/"; + description = "scroll(6), a roguelike game"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "scrypt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -110875,6 +110995,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syncthing-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , derive, either, http-client, http-client-tls, lens, old-locale + , quickcheck-instances, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wreq + }: + mkDerivation { + pname = "syncthing-hs"; + version = "0.1.0.0"; + sha256 = "1yz37c01s2740idh5w8mvidjzd5fwy9sh2x2qdqivasg3c3kscic"; + buildDepends = [ + aeson base bytestring connection containers either http-client + http-client-tls lens old-locale regex-posix text time transformers + unordered-containers wreq + ]; + testDepends = [ + aeson base bytestring connection containers derive either + http-client http-client-tls lens old-locale quickcheck-instances + regex-posix tasty tasty-hunit tasty-quickcheck text time + transformers unordered-containers wreq + ]; + homepage = "https://github.com/jetho/syncthing-hs"; + description = "Haskell bindings for the Syncthing REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "synt" = callPackage ({ mkDerivation, argparser, base, haskell-src-exts, hpc, hspec , regexpr, split, Synt @@ -114018,8 +114165,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.3.0.5"; - sha256 = "1xirbzcnsb8lvadsz8m6jg8yxc3wrf40dnvs66kdmhwjbg6kv4rh"; + version = "0.3.0.6"; + sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j"; buildDepends = [ base containers syb template-haskell ]; testDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -115291,6 +115438,23 @@ self: { license = "unknown"; }) {}; + "titlecase" = callPackage + ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "titlecase"; + version = "0.1.0.0"; + sha256 = "09zq7z3icziad12ssn663l32k6c5z31azzlhg789q635ab3dckn0"; + buildDepends = [ base blaze-markup semigroups text ]; + testDepends = [ + base semigroups tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/nkaretnikov/titlecase"; + description = "Convert English words to title case"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tkhs" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit, utf8-string, vty @@ -127850,20 +128014,20 @@ self: { "yst" = callPackage ({ mkDerivation, aeson, base, containers, csv, directory, filepath - , HDBC, HDBC-sqlite3, HStringTemplate, old-locale, old-time, pandoc - , parsec, scientific, split, text, time, unordered-containers - , xhtml, yaml + , HDBC, HDBC-sqlite3, HStringTemplate, lucid, old-locale, old-time + , pandoc, parsec, scientific, split, text, time + , unordered-containers, yaml }: mkDerivation { pname = "yst"; - version = "0.4.1.1"; - sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; + version = "0.5.0.1"; + sha256 = "10fj095za1ga7hv76g9gjcc9narp3bnpfb71vs3j3ldfihxk6syv"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base containers csv directory filepath HDBC HDBC-sqlite3 - HStringTemplate old-locale old-time pandoc parsec scientific split - text time unordered-containers xhtml yaml + HStringTemplate lucid old-locale old-time pandoc parsec scientific + split text time unordered-containers yaml ]; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; From 09c9a987173b856c5d1e2ad6ddb5c36ec34c1c31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:09:51 +0100 Subject: [PATCH 170/223] aeson-schema: track the issue URL --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1594a6e9579..6d6c8c89840 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -276,7 +276,7 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw - aeson-schema = dontCheck super.aeson-schema; # http://hydra.cryp.to/build/576244/nixlog/2/raw + aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials From 26223831dc0ba50eb1f190f5fa080dc2b138989e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:32:03 +0100 Subject: [PATCH 171/223] ghc-6.12.3: cosmetic clean up --- pkgs/development/compilers/ghc/6.12.3.nix | 47 +---------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 05eff1b5d90..2364fe1d5b9 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "${buildMK}" > mk/build.mk ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.cc}/bin/gcc" ]; @@ -36,50 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; - - # TODO: requires a comment as to what it does and why it is needed. - passthru = { - corePackages = [ - [ "Cabal" "1.8.0.2" ] - [ "array" "0.3.0.0" ] - [ "base" "3.0.3.2" ] - [ "base" "4.2.0.0" ] - [ "bin-package-db" "0.0.0.0" ] - [ "bytestring" "0.9.1.5" ] - [ "containers" "0.3.0.0" ] - [ "directory" "1.0.1.0" ] - [ "dph-base" "0.4.0" ] - [ "dph-par" "0.4.0" ] - [ "dph-prim-interface" "0.4.0" ] - [ "dph-prim-par" "0.4.0" ] - [ "dph-prim-seq" "0.4.0" ] - [ "dph-seq" "0.4.0" ] - [ "extensible-exceptions" "0.1.1.1" ] - [ "ffi" "1.0" ] - [ "filepath" "1.1.0.3" ] - [ "ghc" "6.12.1" ] - [ "ghc-binary" "0.5.0.2" ] - [ "ghc-prim" "0.2.0.0" ] - [ "haskell98" "1.0.1.1" ] - [ "hpc" "0.5.0.4" ] - [ "integer-gmp" "0.2.0.0" ] - [ "old-locale" "1.0.0.2" ] - [ "old-time" "1.0.0.3" ] - [ "pretty" "1.0.1.1" ] - [ "process" "1.0.1.2" ] - [ "random" "1.0.0.2" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.2" ] - [ "template-haskell" "2.4.0.0" ] - [ "time" "1.1.4" ] - [ "unix" "2.4.0.0" ] - [ "utf8-string" "0.3.4" ] - ]; - }; } From 3f712f84489b262763538d367233400b39112d31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 13:32:26 +0100 Subject: [PATCH 172/223] ghc-6.10.4: cosmetic clean up --- pkgs/development/compilers/ghc/6.10.4.nix | 38 ++--------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 3c5a52c0c40..ee7ca20ddf7 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -5,16 +5,14 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; buildInputs = [ghc libedit perl gmp]; - configureFlags=[ + configureFlags = [ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-gcc=${stdenv.cc}/bin/gcc" @@ -23,38 +21,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; inherit (ghc.meta) license platforms; }; - - passthru = { - corePackages = [ - [ "Cabal" "1.6.0.3" ] - [ "array" "0.2.0.0" ] - [ "base" "3.0.3.1" ] - [ "base" "4.1.0.0" ] - [ "bytestring" "0.9.1.4" ] - [ "containers" "0.2.0.1" ] - [ "directory" "1.0.0.3" ] - [ "extensible-exceptions" "0.1.1.0" ] - [ "filepath" "1.1.0.2" ] - [ "ghc" "6.10.4" ] - [ "ghc-prim" "0.1.0.0" ] - [ "haddock" "2.4.2" ] - [ "haskell98" "1.0.1.0" ] - [ "hpc" "0.5.0.3" ] - [ "integer" "0.1.0.1" ] - [ "old-locale" "1.0.0.1" ] - [ "old-time" "1.0.0.2" ] - [ "packedstring" "0.1.0.1" ] - [ "pretty" "1.0.1.0" ] - [ "process" "1.0.1.1" ] - [ "random" "1.0.0.1" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.1" ] - [ "template-haskell" "2.3.0.1" ] - [ "unix" "2.3.2.0" ] - ]; - }; } From adb3e894b2c1c06c4f42aead4081e6a450cab9c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:07:41 +0100 Subject: [PATCH 173/223] configuration-common.nix: update comments for GLFW packages --- 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 6d6c8c89840..58614672491 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -282,7 +282,7 @@ self: super: { aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # http://hydra.cryp.to/build/497379/log/raw + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 @@ -316,7 +316,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; + GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; From 3b8a7f2f70285b9037e2f411f9e1ad0b5a55f112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:09:20 +0100 Subject: [PATCH 174/223] haskell-amazonka does not compile with ghc-7.8.x. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index bd308b7f420..dc43d296ba3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -79,6 +79,7 @@ self: super: { tidal-midi = dontDistribute super.tidal-midi; # These packages need mtl 2.2.x directly or indirectly via dependencies. + amazonka = markBroken super.amazonka; apiary-purescript = markBroken super.apiary-purescript; clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; From a33042af5b11072393618caa9b55ab6658a46bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:16:39 +0100 Subject: [PATCH 175/223] haskell-al: jailbreal to fix build with c2hs 0.24.1 --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58614672491..f08bea73483 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,7 +58,8 @@ self: super: { }); # The package doesn't know about the AL include hierarchy. - al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; + # https://github.com/phaazon/al/issues/1 + al = doJailbreak (appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"); # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices; From da1617cb2b549cc71427bd7fc849dd4e4b5980c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:34:35 +0100 Subject: [PATCH 176/223] haskell-exceptions: update test suite issue link --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f08bea73483..a0ea10ae4f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -502,7 +502,7 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/40 + # https://github.com/ekmett/exceptions/issues/42 exceptions = dontCheck super.exceptions; # https://github.com/NixOS/nixpkgs/issues/6350 From 53b66200271fce1cc2adf78de3a72dead9d9f04a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:36:48 +0100 Subject: [PATCH 177/223] haskell-hindent: upstream has fixed the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a0ea10ae4f0..07fe3d5e747 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -422,9 +422,6 @@ self: super: { # Needs llvm to compile. bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm; - # https://github.com/chrisdone/hindent/issues/83 - hindent = dontCheck super.hindent; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; From 519e1cefeece3336075716852d6b91fec2436716 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:44:35 +0100 Subject: [PATCH 178/223] haskell-xcffib: upstream fix the build issue (but the test suite still fails) --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 07fe3d5e747..4966ca6d115 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -623,7 +623,7 @@ self: super: { blip = markBroken super.blip; # https://github.com/tych0/xcffib/issues/37 - xcffib = markBroken super.xcffib; + xcffib = dontCheck super.xcffib; } // { From 9370137501654d9cabf764265b53a06cce609307 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:55:25 +0100 Subject: [PATCH 179/223] hackage-packages.nix: re-generate from Hackage 2015-03-14T14:55:25+0100 --- .../haskell-modules/hackage-packages.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38f1825bc86..6b39849d1f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17211,8 +17211,8 @@ self: { ({ mkDerivation, base, c2hs, openal }: mkDerivation { pname = "al"; - version = "0.1.1.2"; - sha256 = "0cb6vvjc23nb7qfdkyc7g197rgb7shjyxv6q5kd9jdxr3rl1apf4"; + version = "0.1.1.3"; + sha256 = "09ppkvzkka3c5hiawkz7lcrwp6sa8bhbg10m9hfp9rk4g9339czy"; buildDepends = [ base ]; buildTools = [ c2hs ]; extraLibraries = [ openal ]; @@ -25338,18 +25338,12 @@ self: { }) {}; "boundingboxes" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, random - , test-framework, test-framework-quickcheck2, test-framework-th - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "boundingboxes"; - version = "0.2.2"; - sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx"; + version = "0.2.3"; + sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; buildDepends = [ base lens ]; - testDepends = [ - base lens linear QuickCheck random test-framework - test-framework-quickcheck2 test-framework-th - ]; homepage = "https://github.com/fumieval/boundingboxes"; description = "A generic boundingbox for an arbitrary vector"; license = stdenv.lib.licenses.bsd3; @@ -41861,14 +41855,14 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.0.0"; - sha256 = "1957jq0fv3migj9807ifa0iws8x8ysxz0a6mhrvblvz0dl175vr6"; - buildDepends = [ base vector ]; + version = "1.1.2"; + sha256 = "1ingg4mdhd9h25as5i4w16g2v47msy4r1f9winijsnw1043f8ayr"; + buildDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; - description = "Haskel binding for Eigen library"; + description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; }) {}; From a996d94d6b295cf5eb71fd5db70076ac7e8c151b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:56:48 +0100 Subject: [PATCH 180/223] haskell-al: upstream has fixed the build --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4966ca6d115..859e7ea8fb9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -59,7 +59,7 @@ self: super: { # The package doesn't know about the AL include hierarchy. # https://github.com/phaazon/al/issues/1 - al = doJailbreak (appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"); + al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices; From 46f2aab0a5951482e6edebaca1343668e8d511b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Mar 2015 14:57:41 +0100 Subject: [PATCH 181/223] haskell-boundingboxes: upstream has fixed the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 859e7ea8fb9..b1f5075bcb1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -286,7 +286,6 @@ self: super: { bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; - boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw From d8d4972544e7d3af275a337e125512f1ac0fed50 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 15 Mar 2015 14:42:40 +0100 Subject: [PATCH 182/223] xmlto: update from 0.0.25 to 0.0.26 --- pkgs/tools/typesetting/xmlto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index a1eee51b34d..49fe7dc681f 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -3,10 +3,10 @@ , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.25"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0dp5nxq491gymq806za0dk4hngfmq65ysrqbn0ypajqbbl6vf71n"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' From a2c488e6c05d3dfc9b3a83ba9b6adc1eb5470866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 14:42:22 +0100 Subject: [PATCH 183/223] digiKam: fix gphoto camera support --- pkgs/applications/graphics/digikam/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2551a985312..123453ee40b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, +lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, libusb1, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, shared_desktop_ontologies, marble, mysql, libpgf }: @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + enableParallelBuilding = true; meta = { From 849df05f6c6651140a18f7893b225ad37a84a447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 14:55:32 +0100 Subject: [PATCH 184/223] digiKam: tidy up, and add myself to the maintainers --- .../applications/graphics/digikam/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 123453ee40b..5ace07f827b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, libusb1, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, mysql, libpgf }: +{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake +, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff +, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 +, qimageblitz, qjson, qt4, soprano +}: stdenv.mkDerivation rec { name = "digikam-4.6.0"; @@ -13,22 +15,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ]; + buildInputs = [ + boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun + libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf + libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; enableParallelBuilding = true; meta = { description = "Photo Management Program"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; inherit (kdelibs.meta) platforms; }; } From 6fa7dcfe242ef8a12f0425e7610f1b978a6d1e15 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sun, 15 Mar 2015 18:04:06 +0000 Subject: [PATCH 185/223] ipv6calc: Update SHA Upstream seems to have overwritten the tarball therefore changing the SHA sum. --- pkgs/tools/networking/ipv6calc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 23c484e9479..6dcb6e7f317 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd"; + sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; buildInputs = [ geoip getopt openssl perl ]; From dec05e9b285da308beaae85d063ba5c789b25895 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 15 Mar 2015 14:00:54 -0700 Subject: [PATCH 186/223] mesos-dns: Update to newer commit Notable upstream changes: - Support for multiple ports per task - Records generated for mesos master nodes - SRV records resolve to hostnames rather than IPs - Query handling is now properly case-insensitive - Better AAAA record handling --- pkgs/servers/dns/mesos-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix index 5b7d96c14cf..bf672aa89d8 100644 --- a/pkgs/servers/dns/mesos-dns/default.nix +++ b/pkgs/servers/dns/mesos-dns/default.nix @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mesosphere"; repo = "mesos-dns"; - rev = "29940029d4b0c17142373c3280a8b452722b665b"; - sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n"; + rev = "f37051fc5a723eb021797e7d57d92755c011a28e"; + sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15"; }; # Avoid including the benchmarking test helper in the output: From eee31a2c979b59de6ac966f74ef2530a8f962e65 Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Sun, 15 Mar 2015 23:03:14 +0100 Subject: [PATCH 187/223] Update sqlite to 3.8.8.3 --- pkgs/development/libraries/sqlite/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 32118e182ac..98a71993253 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.7.4"; + name = "sqlite-3.8.8.3"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz"; - sha1 = "70ca0b8884a6b145b7f777724670566e2b4f3cde"; + url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz"; + sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco np ]; }; } From 511f95fee01a91acd9d6d5fde780eb48b9062900 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:26:19 +0100 Subject: [PATCH 188/223] Add deferred derivation --- pkgs/top-level/emacs-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 331cde10f35..fc423ffe5d9 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -263,6 +263,29 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + deferred = melpaBuild rec { + version = "0.3.2"; + pname = "deferred"; + + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-${pname}"; + rev = "896d4b53210289afe489e1ee7db4e12cb9248109"; + sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0"; + }; + + meta = { + description = "Simple asynchronous functions for emacs-lisp"; + longDescription = '' + deferred.el provides facilities to manage asynchronous tasks. + The API and implementations were translated from JSDeferred (by cho45) + and Mochikit.Async (by Bob Ippolito) in JavaScript. + ''; + homepage = https://github.com/kiwanami/emacs-deferred; + license = gpl3Plus; + }; + }; + diminish = melpaBuild rec { pname = "diminish"; version = "0.44"; From d7bda5c580a32c61669d81321454c15db0eead78 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:26:43 +0100 Subject: [PATCH 189/223] Add request derivation --- pkgs/top-level/emacs-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index fc423ffe5d9..ea390cfbfe3 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -719,6 +719,31 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + request = melpaBuild rec { + pname = "request"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-${pname}"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; From 79f368928908e8f6bd28ab1e94ae5fe45b762586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Mar 2015 23:35:33 +0100 Subject: [PATCH 190/223] Blender: enable blenderplayer --- pkgs/applications/misc/blender/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3a86c282193..27eced335dc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" + "-DWITH_PLAYER=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" From c3f489446de442fe7013901d707d8790e77d1330 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:56:36 +0100 Subject: [PATCH 191/223] Add request-deferred derivation --- pkgs/top-level/emacs-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ea390cfbfe3..25d682a7b61 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -744,6 +744,33 @@ let self = _self // overrides; }; }; + request-deferred = melpaBuild rec { + pname = "request-deferred"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-request"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + packageRequires = [ request deferred ]; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; From d8072196bd8af2b13b5e679c24d684f708d92d61 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 15 Mar 2015 23:56:47 +0100 Subject: [PATCH 192/223] Add org-trello derivation --- pkgs/top-level/emacs-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 25d682a7b61..035ba621186 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -681,6 +681,28 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + org-trello = melpaBuild rec { + pname = "org-trello"; + version = "0.6.9.2"; + src = fetchFromGitHub { + owner = "org-trello"; + repo = pname; + rev = "5656f32d3624b3c82014658aef88ffa47c0fca7b"; + sha256 = "0781prmxbx3lmylma63vw80rix7dmhy8861jz4cbqmkfid6d3x73"; + }; + packageRequires = [ request-deferred deferred dash s ]; + files = [ "org-trello-*.el" ]; + meta = { + description = "Org minor mode - 2-way sync org & trello"; + longDescription = '' + Org-trello is an emacs minor mode that extends org-mode with + Trello abilities. + ''; + homepage = https://org-trello.github.io; + license = gpl3Plus; + }; + }; + pkg-info = melpaBuild rec { pname = "pkg-info"; version = "20140610"; From 7e94f7943300cd292d0ad1f45406807b208a0e10 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 15 Mar 2015 18:57:44 -0400 Subject: [PATCH 193/223] hs-mesos: fix build mesos was propagating the wrong protobuf version, and the cabal file referenced some impure paths. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cd77d8ef2df..41dc6ef911f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -199,6 +199,12 @@ self: super: { # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + # Upstream notified by e-mail. permutation = dontCheck super.permutation; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813179e7df..99134afdad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4449,7 +4449,7 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; }; mesos-dns = callPackage ../servers/dns/mesos-dns { }; From 77c40224d206842d0ccc9aff3113977fc2e73b96 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 16 Mar 2015 00:07:00 +0000 Subject: [PATCH 194/223] snort: 2.9.7.0 -> 2.9.7.2 This includes a slight refactor. 2014-11-24 - Snort 2.9.7.2 [*] New additions * Application Identification Preprocessor, when used in conjunction with open app ID detector content, that will identify application protocol, client, server, and web applications (including those using SSL) and include the info in Snort alert data. In addition, a new rule option keyword 'appid' that can be used to constrain Snort rules based on one or more applications that are identified for the connection. See README.appid for details. * A new protected_content rule option that is used to match against a content that is hashed. It can be used to obscure the full context of the rule from the administrator. * Protocol Aware Flushing (PAF) improvements for SMTP, POP, and IMAP to more accurately process different portions of email messages and file attachments. * Added ability to test normalization behavior without modifying network traffic. When configured using na_policy_mode:inline-test, statistics will be gathered on packet normalizations that would have occurred, allowing less disruptive testing of inline deployments. * The HTTP Inspection preprocessor now has the ability to decompress DEFLATE and LZMA compressed flash content and DEFLATE compressed PDF content from http responses when configured with the new decompress_swf and decompress_pdf options. This enhancement can be used with existing rule options that already match against decompressed equivalents. * Added improved XFF support to HttpInspect. It is now possible to specify custom HTTP headers to use in place of 'X-Fowarded-For'. In situations where traffic may contain multiple XFF-like headers, it is possible to specify which headers hold precedence. * Added control socket command to dump packets. * The Stream5 preprocessor functionality is now split between the new Session and Stream preprocessors. * Added decoding capaiblity for Cisco FabricPath [*] Improvements * Update active response to allow for responses of 1500+ bytes that span multiple TCP packets. * Check limits of multiple configurations to not exceed a maximum ID of 4095. * Updated the error output of byte_test, byte_jump, byte_extract to including details on offending options for a given rule. * Update build and install scripts to install preprocessor and engine libraries into user specified libdir. * Improved performance of IP Reputation preprocessor. * The control socket will now report success when reloading empty IP Reputation whitelists/blacklists. * All TCP normalizations can now be enabled individually. See README.normalize for details on using the new options. For consistency with other options, the "urp" tcp normalization keyword now enables the normalization instead of disabling it. * Lowered memory demand of Unicode -> ASCII mapping in HttpInspect. * Updated profiler output to remove duplicate results when using multiple configurations. * Improved performance of FTP reassembly. --- pkgs/applications/networking/ids/snort/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3f99094ffd4..257b676686b 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.7.0"; + version = "2.9.7.2"; + name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; + sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; From 6a8a739d689c1e8fd6699edda2cc7bd7d2cf3062 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 16 Mar 2015 00:32:16 +0000 Subject: [PATCH 195/223] gnupg21: Add texinfo as a dependency This adds texinfo as a dependency, without which the build will fail. --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index cebb61e62d5..db71408d12d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo , pcsclite }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 - autoreconfHook gettext + autoreconfHook gettext texinfo ]; configureFlags = From 6e45fb5a55d4e1623d12ee7aabc5232dc06de670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:14:50 +0100 Subject: [PATCH 196/223] planetaryannihilation: fix build --- pkgs/games/planetaryannihilation/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bbf12065cc7..a94f388b322 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -29,13 +29,12 @@ stdenv.mkDerivation { cp -R * $out/ mv $out/*.so $out/lib - rm $out/libstdc++.so.6 ln -s $out/PA $out/bin/PA ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" From bd35fa526b27a7a2abb943d0521477e3ee6be2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:42:12 +0100 Subject: [PATCH 197/223] add cbatticon --- pkgs/applications/misc/cbatticon/default.nix | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/cbatticon/default.nix diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix new file mode 100644 index 00000000000..78cd08e212c --- /dev/null +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "cbatticon-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/valr/cbatticon/archive/${version}.zip"; + sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ gtk libnotify unzip glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A lightweight and fast battery icon that sits in your system tray"; + homepage = https://github.com/valr/cbatticon; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} From c8016e5b31bbbda48c43ba558a1f55099a97352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 16 Mar 2015 09:44:22 +0100 Subject: [PATCH 198/223] batti: mark as broken --- pkgs/applications/misc/batti/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 9bf481189e3..a2b3c15f044 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2170fe62c93..b5cfc40c000 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9837,6 +9837,8 @@ let batti = callPackage ../applications/misc/batti { }; + cbatticon = callPackage ../applications/misc/cbatticon { }; + bazaar = callPackage ../applications/version-management/bazaar { }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { From e9cd877921cc4164aa0ba57ae1fd7526ec6440c3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 8 Mar 2015 21:35:04 +0100 Subject: [PATCH 199/223] nixos: resolve uid/gid conflicts This patch resolves all uid/gid conflicts except for nobody/nogroup (seems to make sense that these are the same). All conflicts where determined mechanically, but resolutions were manual. This patch also marks uids/gids with no corresponding group/user as "unused" (aka. reserved). Briefly, - tss group conflicts with dhcpcd The tss group id conflicts with dhcpcd: assign a new number and add a corresponding tss user. - elasticsearch uid conflicts with haproxy gid - resolve firebird/munin conflict - fix fourstorehttp{,d} typo - fix ghostOne typo: the service module refers to gids.ghostone, so use that in ids - memcached uid conflicts with users gid - nagios uid conflicts with disks gid - nscd uid conflicts with wheel gid - ntp uid conflicts with tty gid - resolve postfix/postdrop id uid - redis uid conflicts with keys gid - sshd uid conflicts with kmem gid - tcryptd uid conflicts with openldap gid - unifi uid conflicts with docker gid - uptimed uid conflicts with utmp gid - zope2 uid conflicts with connman gid - tomcat uid/gid mismatch --- nixos/modules/misc/ids.nix | 113 ++++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 19 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 158609dcf79..eec2f1bb6f6 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -27,28 +27,38 @@ ids.uids = { root = 0; - nscd = 1; - sshd = 2; - ntp = 3; + #wheel = 1; # unused + #kmem = 2; # unused + #tty = 3; # unused messagebus = 4; # D-Bus haldaemon = 5; - nagios = 6; + #disk = 6; # unused vsftpd = 7; ftp = 8; bitlbee = 9; avahi = 10; + nagios = 11; atd = 12; - zabbix = 13; - postfix = 14; + postfix = 13; + #postdrop = 14; # unused dovecot = 15; tomcat = 16; + #audio = 17; # unused + #floppy = 18; # unused + #uucp = 19; # unused + #lp = 20; # unused pulseaudio = 22; # must match `pulseaudio' GID gpsd = 23; + #cdrom = 24; # unused + #tape = 25; # unused + #video = 26; # unused + #dialout = 27; # unused polkituser = 28; - uptimed = 29; + #utmp = 29; # unused ddclient = 30; davfs2 = 31; privoxy = 32; + #disnix = 33; # unused osgi = 34; tor = 35; cups = 36; @@ -70,18 +80,25 @@ fprot = 52; bind = 53; wwwrun = 54; + #adm = 55; # unused spamd = 56; + #networkmanager = 57; # unused nslcd = 58; + #scanner = 59; # unused nginx = 60; chrony = 61; + #systemd-journal = 62; # unused smtpd = 63; smtpq = 64; supybot = 65; iodined = 66; + #libvirtd = 67; # unused graphite = 68; statsd = 69; transmission = 70; postgres = 71; + #vboxusers = 72; # unused + #vboxsf = 73; # unused smbguest = 74; # unused varnish = 75; datadog = 76; @@ -102,13 +119,13 @@ minidlna = 91; elasticsearch = 92; tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. - zope2 = 94; + #connman = 94; # unused firebird = 95; - redis = 96; + #keys = 96; # unused haproxy = 97; mongodb = 98; openldap = 99; - memcached = 100; + #users = 100; # unused cgminer = 101; munin = 102; logcheck = 103; @@ -129,6 +146,7 @@ foundationdb = 118; newrelic = 119; starbound = 120; + #grsecurity = 121; # unused hydra = 122; spiped = 123; teamspeak = 124; @@ -138,7 +156,7 @@ znc = 128; polipo = 129; mopidy = 130; - unifi = 131; + #docker = 131; # unused gdm = 132; dhcpd = 133; siproxd = 134; @@ -180,7 +198,19 @@ panamax = 170; marathon = 171; exim = 172; + #fleet = 173; # unused + #input = 174; # unused sddm = 175; + tss = 176; + memcached = 177; + nscd = 178; + ntp = 179; + zabbix = 180; + redis = 181; + sshd = 182; + unifi = 183; + uptimed = 184; + zope2 = 185; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -200,15 +230,16 @@ ftp = 8; bitlbee = 9; avahi = 10; + #nagios = 11; # unused atd = 12; postfix = 13; postdrop = 14; dovecot = 15; + tomcat = 16; audio = 17; floppy = 18; uucp = 19; lp = 20; - tomcat = 21; pulseaudio = 22; # must match `pulseaudio' UID gpsd = 23; cdrom = 24; @@ -217,21 +248,30 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; + #ddclient = 30; # unused davfs2 = 31; privoxy = 32; disnix = 33; osgi = 34; tor = 35; - ghostOne = 40; + #cups = 36; # unused + #foldingathome = 37; # unused + #sabnzd = 38; # unused + #kdm = 39; # unused + ghostone = 40; git = 41; fourstore = 42; - fourstorehttpd = 43; + fourstorehttp = 43; virtuoso = 44; + #rtkit = 45; # unused dovecot2 = 46; + #dovenull = 47; # unused + #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; fprot = 52; + #bind = 53; # unused wwwrun = 54; adm = 55; spamd = 56; @@ -239,6 +279,7 @@ nslcd = 58; scanner = 59; nginx = 60; + #chrony = 61; # unused systemd-journal = 62; smtpd = 63; smtpq = 64; @@ -246,6 +287,7 @@ iodined = 66; libvirtd = 67; graphite = 68; + #statsd = 69; # unused transmission = 70; postgres = 71; vboxusers = 72; @@ -268,11 +310,17 @@ quassel = 89; amule = 90; minidlna = 91; - haproxy = 92; - openldap = 93; + #elasticsearch = 92; # unused + #tcpcryptd = 93; # unused connman = 94; - munin = 95; + firebird = 95; keys = 96; + haproxy = 97; + #mongodb = 98; # unused + openldap = 99; + munin = 102; + #logcheck = 103; # unused + #nix-ssh = 104; # unused dictd = 105; couchdb = 106; searx = 107; @@ -280,8 +328,12 @@ jenkins = 109; systemd-journal-gateway = 110; notbit = 111; + #ngircd = 112; # unused btsync = 113; + #minecraft = 114; # unused monetdb = 115; + #ripped = 116; # unused + #murmur = 117; # unused foundationdb = 118; newrelic = 119; starbound = 120; @@ -291,39 +343,62 @@ teamspeak = 124; influxdb = 125; nsd = 126; - firebird = 127; + #gitolite = 127; # unused znc = 128; polipo = 129; mopidy = 130; docker = 131; gdm = 132; - tss = 133; + #dhcpcd = 133; # unused siproxd = 134; mlmmj = 135; + #neo4j = 136; # unused riemann = 137; riemanndash = 138; + #radvd = 139; # unused + #zookeeper = 140; # unused + #dnsmasq = 141; # unused uhub = 142; + #yandexdisk = 143; # unused + #collectd = 144; # unused + #consul = 145; # unused mailpile = 146; redmine = 147; seeks = 148; prosody = 149; i2pd = 150; + #dnscrypt-proxy = 151; # unused systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; + #etcd = 156; # unused + #docker-registry = 157; # unused hbase = 158; opentsdb = 159; scollector = 160; bosun = 161; kubernetes = 162; + #peerflix = 163; # unused + #chronos = 164; # unused gitlab = 165; nylon = 168; panamax = 170; + #marathon = 171; # unused exim = 172; fleet = 173; input = 174; sddm = 175; + tss = 176; + #memcached = 177; # unused + #nscd = 178; # unused + #ntp = 179; # unused + #zabbix = 180; # unused + #redis = 181; # unused + #sshd = 182; # unused + #unifi = 183; # unused + #uptimed = 184; # unused + #zope2 = 185; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal From 3518b761ba2723970fa2744a31c9208e00e44bba Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 8 Mar 2015 21:36:30 +0100 Subject: [PATCH 200/223] TCSD: use tss user/group instead of nginx For some reason TCSD is configured to use the nginx uid/gid. Use the newly created tss uid/gid instead. --- nixos/modules/services/hardware/tcsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d7f6c188feb..220b154bd97 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -128,12 +128,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; - uid = config.ids.uids.nginx; + uid = config.ids.uids.tss; }); users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; - gid = config.ids.gids.nginx; + gid = config.ids.gids.tss; }); }; } From 62d8b22931242ebd1ea88e0207f7b0f9bb3a4ba2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Mar 2015 11:02:07 +0100 Subject: [PATCH 201/223] hackage-packages.nix: re-generate from Hackage 2015-03-15T11:02:07+0100 --- .../haskell-modules/hackage-packages.nix | 242 +++++++++++++----- 1 file changed, 175 insertions(+), 67 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b39849d1f9..f93da206181 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -27507,18 +27507,15 @@ self: { }) {}; "calculator" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, parsec - , QuickCheck - }: + ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.2.2.0"; - sha256 = "18v58sgbx1g5bir0vwgbhfs347p95f36jw3fqj4nfzs5na0rrrvz"; + version = "0.3.0.1"; + sha256 = "067rnx1ixdnhqan2kwscqh6325ml523km7dg2apx1ksm51hl3gvc"; isLibrary = false; isExecutable = true; - buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; - testDepends = [ base containers mtl parsec QuickCheck ]; - jailbreak = true; + buildDepends = [ base containers haskeline parsec ]; + testDepends = [ base containers parsec QuickCheck ]; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; @@ -28039,8 +28036,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.1"; - sha256 = "1vza24ikj3ixryh2hf2xj28m1zjclqq9lsxp57pwzjx31djkb54s"; + version = "0.4.2.2"; + sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq ghc-prim text unordered-containers vector @@ -32107,8 +32104,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.0"; - sha256 = "1q4iq9wmiazv743gdypqc9797z1c0gdk1lzyzvlk4811ka263508"; + version = "1.1.7.1"; + sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -32603,6 +32600,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "context-free-grammar" = callPackage + ({ mkDerivation, array, base, containers, control-monad-omega + , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "context-free-grammar"; + version = "0.0.1"; + sha256 = "11xns7rfxb9s9adzkd2v1s46s8lay6yd32r83p63k96z570ccpj2"; + buildDepends = [ + array base containers control-monad-omega dlist mtl pretty + template-haskell + ]; + testDepends = [ + base containers HUnit pretty QuickCheck quickcheck-properties + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "http://github.com/nedervold/context-free-grammar"; + description = "Basic algorithms on context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -39756,6 +39778,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-zookeeper" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , distributed-process, distributed-process-monad-control + , enclosed-exceptions, hspec, hzk, lifted-base, monad-control, mtl + , network, network-transport, network-transport-tcp, transformers + }: + mkDerivation { + pname = "distributed-process-zookeeper"; + version = "0.2.0.0"; + sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers deepseq distributed-process hzk + mtl network network-transport network-transport-tcp transformers + ]; + testDepends = [ + base bytestring deepseq distributed-process + distributed-process-monad-control enclosed-exceptions hspec hzk + lifted-base monad-control network network-transport + network-transport-tcp transformers + ]; + jailbreak = true; + homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; + description = "A Zookeeper back-end for Cloud Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-static" = callPackage ({ mkDerivation, base, binary, bytestring, containers, rank1dynamic }: @@ -41858,9 +41908,10 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.1.2"; - sha256 = "1ingg4mdhd9h25as5i4w16g2v47msy4r1f9winijsnw1043f8ayr"; + version = "1.2.5"; + sha256 = "1xhi89zy0yf1p3xgjb07870mm9lrqpcrmikcs23kc3mhzwfjyd37"; buildDepends = [ base primitive vector ]; + testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; @@ -43736,12 +43787,12 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8.0.1"; - sha256 = "0qsbcmhr5ilmdw4wc3f316nsnrmhlqzrgdi15a6sv72nlk09kwsb"; + version = "0.8.0.2"; + sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"; buildDepends = [ base mtl stm transformers transformers-compat ]; testDepends = [ base mtl QuickCheck stm test-framework test-framework-quickcheck2 - transformers + transformers transformers-compat ]; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; @@ -46330,8 +46381,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.0.0"; - sha256 = "02sh7q9l874rbjdwj66grz0y0cbnd2wc5413x4mrvg095i8g9zww"; + version = "0.2.1.0"; + sha256 = "0lzn1wrqq7mnxlf8axb4nj90mq9c4w299dilp9k4s4s9lzag2gib"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -50304,8 +50355,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.4"; - sha256 = "0kv8yyxixhhiqbicyd1w1fmpv7szf5h5wxs8b57sf76hww7gq0fn"; + version = "0.7.3"; + sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -59892,19 +59943,19 @@ self: { }) {}; "hfoil" = callPackage - ({ mkDerivation, base, directory, gloss, haskeline, hmatrix, HTTP - , MissingH, transformers + ({ mkDerivation, base, directory, haskeline, hmatrix, HTTP, linear + , not-gloss, parsec, transformers }: mkDerivation { pname = "hfoil"; - version = "0.1.2"; - sha256 = "0q52xj7bajs8kn66cg7vfgbxp66nwnfl832csrz3bygi9vhv8kxw"; + version = "0.2.0"; + sha256 = "1749408l0abnh6d2dnh7dn30spp7798q862sfrr7kp8c1kcpx0wc"; isLibrary = true; isExecutable = true; buildDepends = [ - base directory gloss haskeline hmatrix HTTP MissingH transformers + base directory haskeline hmatrix HTTP linear not-gloss parsec + transformers ]; - jailbreak = true; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65117,6 +65168,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsilop" = callPackage + ({ mkDerivation, base, haskeline }: + mkDerivation { + pname = "hsilop"; + version = "0.1.0.0"; + sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base haskeline ]; + homepage = "https://github.com/Rnhmjoj/hsilop"; + description = "RPN calculator"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsimport" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre , filepath, haskell-src-exts, lens, mtl, split, tasty, tasty-golden @@ -73737,8 +73802,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.6"; - sha256 = "14r28h3pywv87ksnw65jid90v2d3s4lzxm0m7i6wvww5080z804a"; + version = "2.16.8"; + sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -75588,8 +75653,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.3"; - sha256 = "16v7740xi825n3wmzb9p9svvs88mi5j7m94xqhbb2vhrvsn96phn"; + version = "0.3.2.0"; + sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -77409,6 +77474,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lipsum-gen" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "lipsum-gen"; + version = "0.1.0.2"; + sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; + buildDepends = [ base QuickCheck ]; + description = "Generators for random sequences of English-like nonsense text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip @@ -85788,8 +85864,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.12.1"; - sha256 = "0nxd4rn4n87m5h3wi72rrm0bm7nx9b23bqsjbz3q05wi77cmg8c9"; + version = "0.12.2"; + sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; buildDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -86936,7 +87012,6 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -87798,10 +87873,9 @@ self: { ({ mkDerivation, base, contravariant, ghc-prim, transformers }: mkDerivation { pname = "one-liner"; - version = "0.5"; - sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; + version = "0.5.1"; + sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0"; buildDepends = [ base contravariant ghc-prim transformers ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -92178,6 +92252,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-gtk-ui" = callPackage + ({ mkDerivation, base, cairo, colour, fixed-vector, gtk, hmatrix + , plot, text, vector + }: + mkDerivation { + pname = "plot-gtk-ui"; + version = "0.0.3.0"; + sha256 = "12slwfhhrzjyscxbs5f8nqayqcbk1lh7b4cla419lbwixhbs3zbg"; + buildDepends = [ + base cairo colour fixed-vector gtk hmatrix plot text vector + ]; + homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; + description = "A quick way to use Mathematica like Manipulation abilities"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "plot-gtk3" = callPackage ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }: mkDerivation { @@ -96219,8 +96309,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.3"; - sha256 = "01bmh77cjcz7phl4fzn97hzjnjx3wicr12m7nrdyflw2zckxycwl"; + version = "0.4.2"; + sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s"; buildDepends = [ base containers parsec ]; testDepends = [ base Cabal containers hspec parsec QuickCheck ]; jailbreak = true; @@ -97285,8 +97375,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.3.0"; - sha256 = "0kyhvdpk6xr111yyd828f6sdfc4f7ayhdmwsyml6j4c7npxb1g6i"; + version = "0.3.1"; + sha256 = "11ddiz2i4rx0rydcm82j8gwf9zr26if78ij539hfdyi2zbvyri85"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -102228,17 +102318,18 @@ self: { "scroll" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, IfElse, monad-loops, mtl, ncurses - , optparse-applicative, random, text, vector + , optparse-applicative, random, text, unix, vector }: mkDerivation { pname = "scroll"; - version = "1.20150313"; - sha256 = "1q9zmdhqbz6w20fcf2gvv92ln7461b0ksr98a3kghqz3d7p5w0m3"; + version = "1.20150314"; + sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring case-insensitive containers data-default IfElse - monad-loops mtl ncurses optparse-applicative random text vector + monad-loops mtl ncurses optparse-applicative random text unix + vector ]; homepage = "https://joeyh.name/code/scroll/"; description = "scroll(6), a roguelike game"; @@ -104111,8 +104202,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.2"; - sha256 = "1njnmhs5y6nmmy8yrx87x98aqsjkivrsyxz01ybdjg0y7n5r1cva"; + version = "0.6.3"; + sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -104452,6 +104543,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signals" = callPackage + ({ mkDerivation, array, base, constraints, containers, data-reify + , exception-mtl, exception-transformers, language-c-quote + , mainland-pretty, mtl, operational + }: + mkDerivation { + pname = "signals"; + version = "0.0.0.1"; + sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2"; + buildDepends = [ + array base constraints containers data-reify exception-mtl + exception-transformers language-c-quote mainland-pretty mtl + operational + ]; + homepage = "https://github.com/markus-git/signals"; + description = "Stream Processing for Embedded Domain Specific Languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -104963,8 +105073,8 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.0"; - sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + version = "0.4.1"; + sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl parsec pretty ]; @@ -108601,8 +108711,8 @@ self: { }: mkDerivation { pname = "stable-tree"; - version = "0.6.1"; - sha256 = "02asd3qrnydmw70ibf2w2q6phkvrls1yvlrbwmwhqz839ry0jhyx"; + version = "0.7.0"; + sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110998,18 +111108,17 @@ self: { }: mkDerivation { pname = "syncthing-hs"; - version = "0.1.0.0"; - sha256 = "1yz37c01s2740idh5w8mvidjzd5fwy9sh2x2qdqivasg3c3kscic"; + version = "0.1.1.0"; + sha256 = "0377mykydnwdbwjbbfr56nrdh2c18ik5m9jj2wgw7qg2npnfyj2v"; buildDepends = [ aeson base bytestring connection containers either http-client http-client-tls lens old-locale regex-posix text time transformers unordered-containers wreq ]; testDepends = [ - aeson base bytestring connection containers derive either - http-client http-client-tls lens old-locale quickcheck-instances - regex-posix tasty tasty-hunit tasty-quickcheck text time - transformers unordered-containers wreq + aeson base bytestring containers derive either lens + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + transformers wreq ]; homepage = "https://github.com/jetho/syncthing-hs"; description = "Haskell bindings for the Syncthing REST API"; @@ -115583,21 +115692,20 @@ self: { }) {}; "tn" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , optparse-applicative, text, time + ({ mkDerivation, base, bytestring, containers, directory, process + , safe, text, time, yaml }: mkDerivation { pname = "tn"; - version = "0.2.0.0"; - sha256 = "0m402p4ik8z07dj08wm0jy6w82fzgmsrf1v4v2chg9qb505qigm4"; + version = "1.0.2"; + sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring optparse-applicative text time + base bytestring containers directory process safe text time yaml ]; - jailbreak = true; - description = "A journaling program for Linux"; - license = stdenv.lib.licenses.bsd3; + description = "A simple daily journal program"; + license = stdenv.lib.licenses.gpl3; }) {}; "tnet" = callPackage @@ -128014,8 +128122,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.0.1"; - sha256 = "10fj095za1ga7hv76g9gjcc9narp3bnpfb71vs3j3ldfihxk6syv"; + version = "0.5.0.2"; + sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; isLibrary = false; isExecutable = true; buildDepends = [ From 42ab5ea077f1a7b4ab2d36cc5007af69bb853000 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 12:54:30 +0100 Subject: [PATCH 202/223] hackage-packages: re-generate from Hackage 2015-03-16T12:54:30+0100 --- .../haskell-modules/hackage-packages.nix | 200 +++++++++++++----- 1 file changed, 142 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f93da206181..f1d5d43de05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12790,8 +12790,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.2"; - sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh"; + version = "0.3.3"; + sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr"; buildDepends = [ array base mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -20915,6 +20915,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "auto" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , profunctors, random, semigroups, transformers + }: + mkDerivation { + pname = "auto"; + version = "0.2.0.3"; + sha256 = "1aplwr8lgl3x0sskjwlp85zrqj13468r9ddn5rzbaqj4j3kbpvcx"; + buildDepends = [ + base bytestring cereal containers deepseq profunctors random + semigroups transformers + ]; + jailbreak = true; + homepage = "https://github.com/mstksg/auto"; + description = "Denotative, locally stateful programming DSL & platform"; + license = stdenv.lib.licenses.mit; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21597,8 +21615,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.2.5"; - sha256 = "0n5zc0k5fdpcljvrw38ma7x8q3dbqjbw98ji2mqb4rxbkqxz75jh"; + version = "0.3.1"; + sha256 = "13j69i6jmx4qibavr7rwwrnmabf7l5rqd8hs308n0xdnwmvfldbx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25471,12 +25489,12 @@ self: { }) {}; "broccoli" = callPackage - ({ mkDerivation, base, stm, time }: + ({ mkDerivation, base, containers, stm, time }: mkDerivation { pname = "broccoli"; - version = "0.3.0.0"; - sha256 = "0jdrly4xm2fdxr7vbqk4zhf3aya50m0gryrpnn0alc3kbrpbh8l6"; - buildDepends = [ base stm time ]; + version = "0.4.1.0"; + sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; + buildDepends = [ base containers stm time ]; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30557,6 +30575,18 @@ self: { license = "unknown"; }) {}; + "cmark" = callPackage + ({ mkDerivation, base, mtl, syb, text }: + mkDerivation { + pname = "cmark"; + version = "0.1.0.1"; + sha256 = "0js8hhl6j16yywq27rz4jcyibac7zwkkryjqfsdq6wapb3z0d4ad"; + buildDepends = [ base mtl syb text ]; + homepage = "https://github.com/jgm/commonmark-hs"; + description = "Haskell bindings to libcmark, CommonMark parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmath" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41872,18 +41902,23 @@ self: { }) {}; "ehs" = callPackage - ({ mkDerivation, base, dlist, haskell-src-meta, parsec - , template-haskell + ({ mkDerivation, base, bytestring, haskell-src-meta, parsec + , template-haskell, text, time, transformers }: mkDerivation { pname = "ehs"; - version = "0.1.0.1"; - sha256 = "1g1mq956jd9fnh17zzgpyfc4b8pc10iqfgmm691hskx6wf6lc641"; + version = "0.7.0"; + sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; + editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base dlist haskell-src-meta parsec template-haskell + base bytestring haskell-src-meta parsec template-haskell text time + transformers ]; + jailbreak = true; homepage = "http://github.com/minpou/ehs/"; - description = "embedded Haskell by using quasiquotes"; + description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; }) {}; @@ -41908,8 +41943,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.2.5"; - sha256 = "1xhi89zy0yf1p3xgjb07870mm9lrqpcrmikcs23kc3mhzwfjyd37"; + version = "2.0.1"; + sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; buildDepends = [ base primitive vector ]; testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; @@ -42849,11 +42884,11 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.1.0"; - sha256 = "1rlqb5wcqws0rz66cd704swmcx93617ai25hsx4ah45r18qs3qsh"; + version = "0.2.0"; + sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; - homepage = "http://example.com/"; + homepage = "https://supki.github.io/envparse"; description = "Parse environment variables"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -43426,18 +43461,15 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, conduit - , conduit-extra, directory, filepath, http-conduit, http-types - , network, process, regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, transformers + , utf8-string }: mkDerivation { pname = "eternal"; - version = "0.1.0"; - sha256 = "1ixxv6m9vj5ygry28c9zi3swhivl48r9cf4kj0r8yraqwv1givda"; + version = "0.1.1"; + sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9"; buildDepends = [ - base base-unicode-symbols bytestring conduit conduit-extra - directory filepath http-conduit http-types network process - regex-compat transformers utf8-string + base base-unicode-symbols transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43540,8 +43572,8 @@ self: { }: mkDerivation { pname = "euler"; - version = "0.7.0"; - sha256 = "0n3sngaa8zz7wlaqhk2lk7s0klcnq7p1vws9aic5mchrh24nm0sz"; + version = "0.8.0"; + sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; buildDepends = [ base ]; testDepends = [ base directory happy hlint hspec process regex-posix xml @@ -44972,6 +45004,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed-crawl" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection + , http-conduit, http-types, hxt, text, transformers + }: + mkDerivation { + pname = "feed-crawl"; + version = "0.1.0.0"; + sha256 = "1q68z0288sl4il2i2mm94b51xgfdzxvljralqd6rr650qbgbbbgy"; + buildDepends = [ + base bytestring conduit connection http-conduit http-types hxt text + transformers + ]; + homepage = "https://github.com/danchoi/feed-crawl"; + description = "Feed crawling utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -55700,8 +55749,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.3.1"; - sha256 = "1ybsdzm5lzx8zwf9dcw1f6sf29xk4j9whcs578d6fmif2ggm7gym"; + version = "1.2.3.2"; + sha256 = "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc"; buildDepends = [ base bytestring ghc-prim integer-gmp text ]; testDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -59948,8 +59997,8 @@ self: { }: mkDerivation { pname = "hfoil"; - version = "0.2.0"; - sha256 = "1749408l0abnh6d2dnh7dn30spp7798q862sfrr7kp8c1kcpx0wc"; + version = "0.2.0.1"; + sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61274,8 +61323,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "0.24"; - sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc"; + version = "0.24.1"; + sha256 = "0k09bdr3y975581mpqpmg4jynghl8v4j2386nzqprh0k6a602nv8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61370,8 +61419,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "0.24"; - sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns"; + version = "0.24.1"; + sha256 = "1clzy72f34b497hsjkfjpgkhmn0dl19an9j4r11mn2q8z06106nc"; buildDepends = [ array base blaze-markup bytestring cmdargs containers csv Decimal directory filepath HUnit mtl old-locale old-time parsec pretty-show @@ -61617,8 +61666,8 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.16.1.4"; - sha256 = "1bxhps1imw3iik0wvwa4x95kqa1qsm5jqwz16nalaclg2cynaaws"; + version = "0.16.1.5"; + sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq"; buildDepends = [ array base binary bytestring deepseq random split storable-complex vector @@ -61657,12 +61706,12 @@ self: { }) {}; "hmatrix-glpk" = callPackage - ({ mkDerivation, base, glpk, hmatrix }: + ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.4.0.2"; - sha256 = "0ixsybmhm3fiwb3kgxm0bgnbbxkgv0k42k8phd7k78mhhsd5jmng"; - buildDepends = [ base hmatrix ]; + version = "0.4.1.0"; + sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi"; + buildDepends = [ base containers hmatrix ]; extraLibraries = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; @@ -78290,8 +78339,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.9.3"; - sha256 = "1l07pi7lnwyk3y747f7bgr1200p6apyfn7bch5v30kh7dy0wyi8m"; + version = "0.10.0.1"; + sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -89185,14 +89234,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.1"; - sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq"; + version = "1.12.4.2"; + sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -91515,6 +91564,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pinboard" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , HsOpenSSL, http-streams, http-types, io-streams, mtl, old-locale + , random, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pinboard"; + version = "0.1"; + sha256 = "1zm2qad94dsdglqb79jphac81cff5sjyya8644nbsz10jl39y508"; + buildDepends = [ + aeson base bytestring containers either HsOpenSSL http-streams + http-types io-streams mtl old-locale random text time transformers + unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework , test-framework-quickcheck2, transformers @@ -109586,17 +109654,19 @@ self: { }) {}; "stomp-queue" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, mime, network, split - , stompl, time, utf8-string + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, mime, mtl, network-conduit-tls, split, stompl + , time, utf8-string }: mkDerivation { pname = "stomp-queue"; - version = "0.1.4"; - sha256 = "0qn6mnplwqzz05g1k8ib4q7ga6if2iw3y9a5yba61gn1ghhwhgl9"; + version = "0.2.0"; + sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr"; buildDepends = [ - attoparsec base bytestring mime network split stompl time - utf8-string + attoparsec base bytestring conduit conduit-extra mime mtl + network-conduit-tls split stompl time utf8-string ]; + jailbreak = true; homepage = "http://github.com/toschoo/mom"; description = "Stompl Client Library"; license = "LGPL"; @@ -113706,8 +113776,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.0.1"; - sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn"; + version = "0.8.0.2"; + sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -116014,6 +116084,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "touched" = callPackage + ({ mkDerivation, base, cmdargs, directory, process, time }: + mkDerivation { + pname = "touched"; + version = "0.1.0.3"; + sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base cmdargs directory process time ]; + jailbreak = true; + description = "Library (and cli) to execute a procedure on file change"; + license = stdenv.lib.licenses.mit; + }) {}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, containers , data-default-class, data-interval, deepseq, exceptions @@ -121442,8 +121526,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.2.7"; - sha256 = "158fycy2l6pahc0bb64vbadrs1xsw095f1m0d2802blb0h0z8ajn"; + version = "5.2.8"; + sha256 = "01wra0gfv94wbv0blrixix0bggjg9cg72axgg3r9brp7qmh1qv14"; isLibrary = true; isExecutable = true; buildDepends = [ From 9a971364ac68185e3aaec310396e5df017c0d42c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 16 Mar 2015 13:21:23 +0100 Subject: [PATCH 203/223] Patch gnome-control-center not to override VPN plugin paths. The network-manager vpn plugin configuration files contain the correct absolute paths to the plugin libraries in the store; however upstream (unsuccessfully) tries to find them in a predefined path. --- .../core/gnome-control-center/default.nix | 2 +- .../vpn_plugins_path.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index bcb49b6cafe..4a394b3b897 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./search_providers_dir.patch ]; + patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; meta = with stdenv.lib; { description = "Single sign-on framework for GNOME"; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch new file mode 100644 index 00000000000..e25105a303f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch @@ -0,0 +1,19 @@ +diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c +index 7dc23c2..fcb1384 100644 +--- a/panels/network/connection-editor/vpn-helpers.c ++++ b/panels/network/connection-editor/vpn-helpers.c +@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) + if (!so_path) + goto next; + +- /* Remove any path and extension components, then reconstruct path +- * to the SO in LIBDIR +- */ +- so_name = g_path_get_basename (so_path); +- g_free (so_path); +- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); +- g_free (so_name); +- + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " From 82ee506f43eb641bdca2a68ad1fa1bcc23d93ded Mon Sep 17 00:00:00 2001 From: Artyom Shalkhakov Date: Mon, 16 Mar 2015 19:58:55 +0600 Subject: [PATCH 204/223] Bump to ATS-0.2.12 --- pkgs/development/compilers/ats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 18fe0ffe204..002f34daa13 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats-${version}"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6"; + sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; }; # this is necessary because atxt files usually include some .hats files From 2479dc0c636995788301892b92c3c061477b4738 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 16 Mar 2015 15:39:52 +0100 Subject: [PATCH 205/223] add puredata-with-plugins: a wrapper for puredata, plus packages for the following plugins: cyclone helmholtz maxlib mrpeach puremapping timbreid zexy --- .../audio/pd-plugins/cyclone/default.nix | 41 +++++++++++++ .../audio/pd-plugins/helmholtz/default.nix | 42 +++++++++++++ .../audio/pd-plugins/maxlib/default.nix | 33 ++++++++++ .../audio/pd-plugins/mrpeach/default.nix | 60 +++++++++++++++++++ .../audio/pd-plugins/puremapping/default.nix | 30 ++++++++++ .../audio/pd-plugins/timbreid/default.nix | 35 +++++++++++ .../audio/pd-plugins/zexy/default.nix | 36 +++++++++++ pkgs/applications/audio/puredata/wrapper.nix | 23 +++++++ pkgs/top-level/all-packages.nix | 15 +++++ 9 files changed, 315 insertions(+) create mode 100644 pkgs/applications/audio/pd-plugins/cyclone/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/helmholtz/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/maxlib/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/mrpeach/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/puremapping/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/timbreid/default.nix create mode 100644 pkgs/applications/audio/pd-plugins/zexy/default.nix create mode 100644 pkgs/applications/audio/puredata/wrapper.nix diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix new file mode 100644 index 00000000000..30bdd534d40 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "cyclone-${version}"; + version = "0.1-alpha55"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + }; + + buildInputs = [ puredata ]; + + /*unpackPhase = ''*/ + /*unzip $src*/ + /*'';*/ + + patchPhase = '' + for file in `grep -r -l g_canvas.h` + do + sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file + done + for file in `grep -r -l m_imp.h` + do + sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file + done + ''; + + installPhase = '' + mkdir -p $out/cyclone + cp -r bin/* $out/cyclone + ''; + + meta = { + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments."; + homepage = http://puredata.info/downloads/cyclone; + license = stdenv.lib.licenses.tcltk; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix new file mode 100644 index 00000000000..edc8aeb6eb0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "helmholtz"; + + src = fetchurl { + url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + name = "helmholtz.zip"; + sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv helmholtz~/src/helmholtz\~.cpp . + mv helmholtz~/src/Helmholtz.cpp . + mv helmholtz~/src/include/ . + mv helmholtz~/src/Makefile . + rm -rf helmholtz~/src/ + rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.dll + rm -rf __MACOSX + ''; + + patchPhase = '' + sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile + sed -i "s@-Wl@@g" Makefile + ''; + + installPhase = '' + cp -r helmholtz~/ $out/ + ''; + + meta = { + description = "time domain pitch tracker for Pure Data"; + homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix new file mode 100644 index 00000000000..0d8b2dd8e2e --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "maxlib-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + sed -i "s@/usr@$out@g" Makefile + ''; + + postInstall = '' + mv $out/local/lib/pd-externals/maxlib/ $out + rm -rf $out/local/ + ''; + + meta = { + description = "A library of non-tilde externals for puredata, by Miller Puckette."; + homepage = http://puredata.info/downloads/maxlib; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix new file mode 100644 index 00000000000..1d553231ded --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "mrpeach-${version}"; + version = "1.1"; + + # this was to only usable url I could find: + # - The main url changes hash: http://pure-data.cvs.sourceforge.net/viewvc/pure-data/externals/mrpeach/?view=tar + # - There are lot's of places where this SW is available as part of a big pkg: pd-extended, pd-l2ork + # - It's just 211K + + src = fetchurl { + url = "http://slackonly.com/pub/korgie/sources/pd_mrpeach-2011.10.21.tar.gz"; + sha256 = "12jqba3jsdrk20ib9wc2wiivki88ypcd4mkzgsri9siywbbz9w8x"; + }; + + buildInputs = [puredata ]; + + patchPhase = '' + for D in net osc + do + sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile + for i in ${puredata}/include/pd/*; do + ln -s $i $D/ + done + done + ''; + + buildPhase = '' + for D in net osc + do + cd $D + make + cd .. + done + ''; + + installPhase = '' + for D in net osc + do + cd $D + make install + cd .. + done + ''; + + fixupPhase = '' + mv $out/lib/pd-externals/net $out + mv $out/lib/pd-externals/osc $out + rm -rf $out/lib + ''; + + meta = { + description = "A collection of Pd objectclasses for OSC-messages."; + homepage = http://puredata.info/downloads/osc; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix new file mode 100644 index 00000000000..f7f1969fe27 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "puremapping"; + + src = fetchurl { + url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; + name = "puremapping"; + sha256 = "1ygzxsfj3rnzjkpmgi4wch810q8s5vm1gdam6a938hbbvamafgvc"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/puremapping + mv puremapping/ $out + ''; + + meta = { + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system."; + homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix new file mode 100644 index 00000000000..f8a25256bb0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "timbreid-${version}"; + + src = fetchurl { + url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; + sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv timbreID-0.6.0-src/tID/* . + rm -rf timbreID-0.6.0-src/tID/ + rm -rf timbreID-0.6.0-src/INSTALL.txt + ''; + + installPhase = '' + mkdir -p $out/ + cp -r *.pd $out/ + cp -r *.pd_linux $out/ + cp -r *.wav $out/ + ''; + + meta = { + description = "A collection of audio feature analysis externals for puredata"; + homepage = http://williambrent.conflations.com/pages/research.html; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix new file mode 100644 index 00000000000..89a0f8191df --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, automake, puredata }: + +stdenv.mkDerivation rec { + name = "zexy-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; + }; + + buildInputs = [ autoconf automake puredata ]; + + patchPhase = '' + cd src/ + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + patchShebangs + ./bootstrap.sh + ./configure --enable-lpt=no --prefix=$out + ''; + + postInstall = '' + mv $out/lib/pd/extra/zexy $out + rm -rf $out/lib + ''; + + meta = { + description = "the swiss army knife for puredata"; + homepage = http://puredata.info/downloads/zexy; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix new file mode 100644 index 00000000000..0a30037b226 --- /dev/null +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, buildEnv, puredata, makeWrapper, plugins }: + +let +puredataFlags = map (x: "-path ${x}/") plugins; +drv = buildEnv { + name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version; + + paths = [ puredata ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${puredata}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pd \ + --add-flags "${toString puredataFlags}" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dcabd9bb21..9e1882ab584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9993,6 +9993,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + d4x = callPackage ../applications/misc/d4x { }; darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { @@ -10659,6 +10661,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -11082,6 +11086,8 @@ let vaapiSupport = config.mpv.vaapiSupport or false; }; + mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; + mrxvt = callPackage ../applications/misc/mrxvt { }; mudlet = callPackage ../games/mudlet { @@ -11152,6 +11158,8 @@ let lua = lua5; }; + maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; + mupdf = callPackage ../applications/misc/mupdf { openjpeg = openjpeg_2_0_1; }; @@ -11337,6 +11345,9 @@ let pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; + puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + + puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -11741,6 +11752,8 @@ let gtk = gtk3; }; + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -12328,6 +12341,8 @@ let zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + girara = callPackage ../applications/misc/girara { gtk = gtk3; stdenv = overrideCC stdenv gcc49; From c843cebeda96bbf95a26f74a7c29061ac12014aa Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 16 Mar 2015 10:23:26 -0700 Subject: [PATCH 206/223] emacs-packages: add two themes --- pkgs/top-level/emacs-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 035ba621186..fb1ee300b35 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -666,6 +666,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + monokai-theme = melpaBuild rec { + pname = "monokai-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "oneKelvinSmith"; + repo = "monokai-emacs"; + rev = "v${version}"; + sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz"; + }; + meta = { license = gpl3Plus; }; + }; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; org-plus-contrib = melpaBuild rec { @@ -1016,4 +1028,17 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + zenburn-theme = melpaBuild rec { + pname = "zenburn-theme"; + version = "2.2"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "zenburn-emacs"; + rev = "v${version}"; + sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv"; + }; + meta = { license = gpl3Plus; }; + }; + + }; in self From 30ec369a9903e30eeac645dc259fcf66b0bf26b9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 16 Mar 2015 18:38:21 +0100 Subject: [PATCH 207/223] xine-ui: update from 0.99.7 to 0.99.9 --- pkgs/applications/video/xine-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 9307b9e1d1b..6ae4100c827 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.7"; + name = "xine-ui-0.99.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; + sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; nativeBuildInputs = [ pkgconfig shared_mime_info ]; From 46658b8a19e30b2c0bce5571a541b886bb44d05f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 16 Mar 2015 19:34:36 +0100 Subject: [PATCH 208/223] Punctuation and capitalisation. --- pkgs/applications/audio/pd-plugins/cyclone/default.nix | 6 +----- pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 2 +- pkgs/applications/audio/pd-plugins/maxlib/default.nix | 2 +- pkgs/applications/audio/pd-plugins/mrpeach/default.nix | 2 +- pkgs/applications/audio/pd-plugins/puremapping/default.nix | 2 +- pkgs/applications/audio/pd-plugins/zexy/default.nix | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 30bdd534d40..b90c6a0ea36 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ puredata ]; - /*unpackPhase = ''*/ - /*unzip $src*/ - /*'';*/ - patchPhase = '' for file in `grep -r -l g_canvas.h` do @@ -32,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments."; + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = http://puredata.info/downloads/cyclone; license = stdenv.lib.licenses.tcltk; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index edc8aeb6eb0..9046ec0a87f 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "time domain pitch tracker for Pure Data"; + description = "Time domain pitch tracker for Pure Data"; homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 0d8b2dd8e2e..dc4d0375961 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library of non-tilde externals for puredata, by Miller Puckette."; + description = "A library of non-tilde externals for puredata, by Miller Puckette"; homepage = http://puredata.info/downloads/maxlib; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 1d553231ded..5f76b208e14 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A collection of Pd objectclasses for OSC-messages."; + description = "A collection of Pd objectclasses for OSC-messages"; homepage = http://puredata.info/downloads/osc; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index f7f1969fe27..fc7fc5ee3d0 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system."; + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; license = stdenv.lib.licenses.gpl1; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 89a0f8191df..68996e9e6e4 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "the swiss army knife for puredata"; + description = "The swiss army knife for puredata"; homepage = http://puredata.info/downloads/zexy; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; From 5f3a2cb0d1c364c8ab970047d96d8b0e19209154 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 15 Mar 2015 03:36:40 +0100 Subject: [PATCH 209/223] rustc: Re-enable parallel building --- pkgs/development/compilers/rustc/makeRustcDerivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 0059fd82227..913e65de59a 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; - enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 + enableParallelBuilding = true; preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; From 01d1ec25f744eb6d7a12a6f1149321aa3688b2aa Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 16 Mar 2015 18:42:15 +0100 Subject: [PATCH 210/223] rustc: Fix test failure due to hardcoded path to /home --- .../compilers/rustc/patches/alpha2.patch | 11 ++++++++++ .../compilers/rustc/patches/head.patch | 21 ++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/alpha2.patch index 8c15af5aca9..8165a42cf85 100644 --- a/pkgs/development/compilers/rustc/patches/alpha2.patch +++ b/pkgs/development/compilers/rustc/patches/alpha2.patch @@ -42,3 +42,14 @@ index ef849bb..e090b99 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index a0ecdaeb049..f82f85fb162 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -15,11 +15,11 @@ index ca59b1c..65ee7bf 100755 # do not fail if one of the above fails, as all we need is a working rustc! exit 0 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index 6bf7453..319f9af 100644 +index ed44bf8..2b84627 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs -@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, - paths: &[&Path]) -> ProcessOutput { +@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, + paths: &[&Path]) -> Output { let ar = match *maybe_ar_prog { Some(ref ar) => &ar[..], - None => "ar" @@ -28,10 +28,10 @@ index 6bf7453..319f9af 100644 let mut cmd = Command::new(ar); diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index ea5001a..911445c 100644 +index 3087a8e..578448f 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -350,8 +350,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri +@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -42,3 +42,14 @@ index ea5001a..911445c 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } From f41f7a0bb9a0ce5f728302f72e3438b7f373d26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Mar 2015 21:27:37 +0100 Subject: [PATCH 211/223] ddccontrol*: cleanup - remove doubled file for ddccontrol-db - adding stdenv to buildInputs is pointless - fix doubled http:// - whitespace, etc. --- pkgs/data/misc/ddccontrol-db/default.nix | 5 ++- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 37 -------------------- pkgs/tools/misc/ddccontrol/default.nix | 15 ++++---- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 199ed5b7eb0..3757b10754b 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { }; buildInputs = [ - stdenv perl perlPackages.libxml_perl libxml2 @@ -29,9 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = "http://http://ddccontrol.sourceforge.net/"; + homepage = "http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix deleted file mode 100644 index 199ed5b7eb0..00000000000 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv -, fetchurl -, perl -, perlPackages -, libxml2 -, pciutils -, pkgconfig -, gtk -}: - -let version = "20061014"; in -let verName = "${version}"; in -stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; - }; - buildInputs = - [ - stdenv - perl - perlPackages.libxml_perl - libxml2 - pciutils - pkgconfig - gtk - ]; - - meta = with stdenv.lib; { - description = "Monitor database for DDCcontrol"; - homepage = "http://http://ddccontrol.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; - }; -} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 3da2a14f4c7..2d5d10054b5 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -14,15 +14,14 @@ }: let version = "0.4.2"; in -let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-${verName}"; + name = "ddccontrol-${version}"; src = fetchurl { url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; }; buildInputs = - [ stdenv + [ intltool libtool autoconf @@ -35,25 +34,25 @@ stdenv.mkDerivation { gtk ddccontrol-db ]; - + prePatch = '' newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") mv configure.ac configure.ac.old oldPath="\$" oldPath+="{datadir}\/ddccontrol-db" sed "s/$oldPath/$newPath/" configure.ac - rm configure.ac.old + rm configure.ac.old ''; preConfigure = '' autoreconf --install ''; - + meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = "http://http://ddccontrol.sourceforge.net/"; + homepage = "http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } - \ No newline at end of file + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfbef1ac006..8df7d40e0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1010,7 +1010,7 @@ let ddccontrol = callPackage ../tools/misc/ddccontrol { }; ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; - + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; From eaa362db6e688954fbe934db532da473c2c6550c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Mar 2015 16:39:22 +0100 Subject: [PATCH 212/223] libiconv: cleanup - no more double callPackage --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dcabd9bb21..fc5f92a851d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1399,7 +1399,6 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { - libiconv = libiconvOrLibc; ruby = ruby_2_1_3; }; @@ -6427,10 +6426,7 @@ let # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = - if stdenv.isGlibc - then stdenv.cc.libc - else callPackage ../development/libraries/libiconv { }; + libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; libiconvReal = callPackage ../development/libraries/libiconv { }; From 8f5f0472868c656b697d704c68033370b1d92c71 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Mon, 16 Mar 2015 21:57:51 +0000 Subject: [PATCH 213/223] Added GNU APL, a free APL interpreter. It is an almost complete implementation of ISO 13751: Programming Language APL, Extended. --- .../interpreters/gnu-apl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/interpreters/gnu-apl/default.nix diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix new file mode 100644 index 00000000000..8600d17f366 --- /dev/null +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: + +stdenv.mkDerivation rec { + name = "gnu-apl-${version}"; + version = "1.4"; + + src = fetchurl { + url = "mirror://gnu/apl/apl-${version}.tar.gz"; + sha256 = "0fl9l4jb5wpnb54kqkphavi657z1cv15h9qj2rqy2shf33dk3nk9"; + }; + + buildInputs = [ liblapack readline gettext ncurses ]; + + postInstall = '' + cp -r support-files/ $out/share/doc/ + find $out/share/doc/support-files -name 'Makefile*' -delete + ''; + + meta = { + description = "Free interpreter for the APL programming language."; + homepage = http://www.gnu.org/software/apl/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + platforms = stdenv.lib.platforms.linux; + + longDescription = '' + GNU APL is a free interpreter for the programming language APL, with an + (almost) complete implementation of ISO standard 13751 aka. Programming + Language APL, Extended. GNU APL was written and is being maintained by + Jürgen Sauermann. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e87229f814..0516761090a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1421,6 +1421,8 @@ let inherit (xorg) libXpm; }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; From af15b26ee806c9058a6b6312203f1630e39ff731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 00:35:24 +0100 Subject: [PATCH 214/223] libxcomp: switch to release 3.5.0.30 instead of git --- pkgs/development/libraries/libxcomp/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 989373315d0..09888035b81 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "libxcomp-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression library"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; From 3a73e3bf92bd8e7765b6c5e2079090e0ad0c8bd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 00:36:02 +0100 Subject: [PATCH 215/223] nxproxy: switch to release 3.5.0.30 instead of git --- pkgs/tools/admin/nxproxy/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 67d07d6eb3b..098dd82eec7 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libxcomp }: +{ stdenv, fetchurl, autoconf, libxcomp }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "nxproxy-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression proxy"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; @@ -25,5 +24,5 @@ stdenv.mkDerivation { autoconf ''; - installTargets = [ "install.bin" ]; + makeFlags = [ "exec_prefix=$(out)" ]; } From ca6cf1a79d6627c2a4d5e150eea813949cca5fc6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2015 01:05:04 +0100 Subject: [PATCH 216/223] cassandra 2.0.12 -> 2.0.13 --- pkgs/servers/nosql/cassandra/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index 96724ec52f5..a67afd45f39 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -10,8 +10,8 @@ let - version = "2.0.12"; - sha256 = "125yga0h155fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + version = "2.0.13"; + sha256 = "125yga0h055fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; in From 92501d62f4218da6ea9a215e8b8cb02f9f2926a5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 16 Mar 2015 03:49:00 +0100 Subject: [PATCH 217/223] zfs_git: Update to 2015-03-12 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 1318722d395..680ac295cff 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-10"; + version = "2015-03-12"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "7f3e4662832269b687ff20dafc6a33f8e1d28912"; - sha256 = "1z0aizn212m6vygp4iqd3dv2xpqb883bvz12sw6hg7w8isq83ila"; + rev = "4c7b7eedcde7fababf457ca04445e6d9d1617e29"; + sha256 = "1v0rb4rfs48c66wihfmigc6cmqk6j5r5xlkv5d03shb9h5ypff84"; }; patches = [ From 614751bb168328f516a5c1d47b0b2ae5bd46b04b Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Fri, 13 Mar 2015 23:46:17 -0700 Subject: [PATCH 218/223] Package ario --- pkgs/applications/audio/ario/default.nix | 29 ++++++++++++++ .../audio/ario/glib-single-include.patch | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/applications/audio/ario/default.nix create mode 100644 pkgs/applications/audio/ario/glib-single-include.patch diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix new file mode 100644 index 00000000000..3840d06dd46 --- /dev/null +++ b/pkgs/applications/audio/ario/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libsoup, avahi, taglib + }: + +stdenv.mkDerivation rec { + version = "1.5.1"; + name = "ario-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + }; + + patches = [ ./glib-single-include.patch ]; + + buildInputs = [ + pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + ]; + + meta = { + description = "GTK2 client for MPD (Music player daemon)"; + homepage = "http://ario-player.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch new file mode 100644 index 00000000000..45e0a1738f8 --- /dev/null +++ b/pkgs/applications/audio/ario/glib-single-include.patch @@ -0,0 +1,40 @@ +From: Michael Biebl +Origin: vendor +Bug-Debian: http://bugs.debian.org/665506 +Subject: Including individual glib headers no longer supported + +--- a/src/ario-profiles.h ++++ b/src/ario-profiles.h +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include ++#include + #include "servers/ario-server.h" + + G_BEGIN_DECLS +--- a/src/plugins/ario-plugin-info.c ++++ b/src/plugins/ario-plugin-info.c +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "plugins/ario-plugin-info-priv.h" + #include "ario-debug.h" +--- a/src/ario-util.h ++++ b/src/ario-util.h +@@ -18,8 +18,8 @@ + */ + + #include "servers/ario-server.h" +-#include "glib/gslist.h" +-#include "gdk/gdkpixbuf.h" ++#include ++#include + + /* Number of covers used to generate the drag & drop image */ + #define MAX_COVERS_IN_DRAG 3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783f5ea6ad7..92e676a0b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9770,6 +9770,8 @@ let inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ario = callPackage ../applications/audio/ario { }; + arora = callPackage ../applications/networking/browsers/arora { }; atom = callPackage ../applications/editors/atom { From 1e4ba025c260fa6852765e9f5c59e985f10c6a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Mar 2015 08:53:33 +0100 Subject: [PATCH 219/223] Reverts a bunch of commits as a try to fix GC errors. Commits - 694f01db2d2e1cde06ee243a5909d196e84f0a18 - 829479d1dda5dbb579885e16dc655716127457ed - bd81885f706dae5cdeb8c03845fa43d8b74fa57c - b2fdcf801ce08bf0c44e63bafe8ae2c720704da7 --- lib/lists.nix | 6 +- .../web/nodejs/build-node-package.nix | 170 ++++++------------ 2 files changed, 62 insertions(+), 114 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index fa8cbddfd94..2dda700bef3 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -234,8 +234,8 @@ rec { in [x] ++ remove x xs; # Intersects list 'e' and another list - intersectLists = e: filter (x: elem x e); + intersect = e: filter (x: elem x e); - # Subtracts list 'e' from another list - subtractLists = e: filter (x: !(elem x e)); + # Substracts list 'e' from another list + substract = e: filter (x: !(elem x e)); } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 042e29f2970..cda1162c947 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,33 +1,25 @@ { stdenv, runCommand, nodejs, neededNatives}: { - name, version ? "", src, + name, src, # by default name of nodejs interpreter e.g. "nodejs-${name}" namePrefix ? nodejs.interpreterName + "-", # Node package name - pkgName ? - if version != "" then stdenv.lib.removeSuffix "-${version}" name else - (builtins.parseDrvName name).name, + pkgName ? (builtins.parseDrvName name).name, # List or attribute set of dependencies deps ? {}, # List or attribute set of peer depencies - peerDependencies ? {}, - - # List or attribute set of optional dependencies - optionalDependencies ? {}, - - # List of optional dependencies to skip - skipOptionalDependencies ? [], + peerDependencies ? [], # Whether package is binary or library - bin ? false, + bin ? null, - # Additional flags passed to npm install - flags ? "", + # Flags passed to npm install + flags ? [], # Command to be run before shell hook preShellHook ? "", @@ -35,12 +27,6 @@ # Command to be run after shell hook postShellHook ? "", - # Same as https://docs.npmjs.com/files/package.json#os - os ? [], - - # Same as https://docs.npmjs.com/files/package.json#cpu - cpu ? [], - # Attribute set of already resolved deps (internal), # for avoiding infinite recursion resolvedDeps ? {}, @@ -51,72 +37,42 @@ with stdenv.lib; let + npmFlags = concatStringsSep " " (map (v: "--${v}") flags); + + sources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv $(find . -type d -mindepth 1 -maxdepth 1) $out + ''; + + # Convert deps to attribute set + attrDeps = if isAttrs deps then deps else + (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); + + # All required node modules, without already resolved dependencies + requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps); + + # Recursive dependencies that we want to avoid with shim creation + recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps); + + peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies; + self = let - sources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv $(find . -type d -mindepth 1 -maxdepth 1) $out - ''; - - platforms = if os == [] then nodejs.meta.platforms else - fold (entry: platforms: - let - filterPlatforms = - stdenv.lib.platforms.${removePrefix "!" entry} or []; - in - # Ignore unknown platforms - if filterPlatforms == [] then platforms - else - if hasPrefix "!" entry then - subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms - else - platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) - ) [] os; - - mapDependencies = deps: f: rec { - # Convert deps to attribute set - attrDeps = if isAttrs deps then deps else - (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); - - # All required node modules, without already resolved dependencies - # Also override with already resolved dependencies - requiredDeps = mapAttrs (name: dep: - dep.override { - resolvedDeps = resolvedDeps // { "${name}" = self; }; - } - ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps))); - - # Recursive dependencies that we want to avoid with shim creation - recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps)); - }; - - _dependencies = mapDependencies deps (name: dep: - dep.pkgName != pkgName); - _optionalDependencies = mapDependencies optionalDependencies (name: dep: - (builtins.tryEval dep).success && - !(elem dep.pkgName skipOptionalDependencies) - ); - _peerDependencies = mapDependencies peerDependencies (name: dep: - dep.pkgName != pkgName); - - requiredDependencies = - _dependencies.requiredDeps // - _optionalDependencies.requiredDeps // - _peerDependencies.requiredDeps; - - recursiveDependencies = - _dependencies.recursiveDeps // - _optionalDependencies.recursiveDeps // - _peerDependencies.recursiveDeps; + # Pass resolved dependencies to dependencies of this package + deps = map ( + dep: dep.override { + resolvedDeps = resolvedDeps // { "${name}" = self; }; + } + ) (attrValues requiredDeps); patchShebangs = dir: '' - node=`type -p node` - coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ - xargs sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' || true + node=`type -p node` + coffee=`type -p coffee || true` + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' || true ''; in stdenv.mkDerivation ({ @@ -194,9 +150,9 @@ let # We do not handle shrinkwraps yet rm npm-shrinkwrap.json 2>/dev/null || true - mkdir ../build-dir + mkdir build-dir ( - cd ../build-dir + cd build-dir mkdir node_modules # Symlink or copy dependencies for node modules @@ -208,7 +164,12 @@ let '' else '' cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/ '' - ) (attrValues requiredDependencies)} + ) deps} + + # Symlink peer dependencies + ${concatMapStrings (dep: '' + ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ + '') peerDeps} # Create shims for recursive dependenceies ${concatMapStrings (dep: '' @@ -219,10 +180,10 @@ let "version": "${getVersion dep}" } EOF - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} ) - export HOME=$PWD/../build-dir + export HOME=$PWD/build-dir runHook postConfigure ''; @@ -231,14 +192,14 @@ let # If source was a file, repackage it, so npm pre/post publish hooks are not triggered, if [[ -f $src ]]; then - GZIP=-1 tar -czf ../build-dir/package.tgz ./ + tar --exclude='build-dir' -czf build-dir/package.tgz ./ export src=$HOME/package.tgz else export src=$PWD fi # Install package - (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags}) + (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}) runHook postBuild ''; @@ -253,7 +214,7 @@ let ${concatMapStrings (dep: '' rm node_modules/${dep.pkgName}/package.json rmdir node_modules/${dep.pkgName} - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} mkdir -p $out/lib/node_modules @@ -272,10 +233,10 @@ let done fi - # Move peer dependencies to node_modules + # Symlink dependencies ${concatMapStrings (dep: '' mv node_modules/${dep.pkgName} $out/lib/node_modules - '') (attrValues _peerDependencies.requiredDeps)} + '') peerDeps} # Install binaries and patch shebangs mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true @@ -298,36 +259,23 @@ let mkdir -p node_modules ${concatMapStrings (dep: '' ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') (attrValues requiredDependencies)} + '') deps} ${postShellHook} ''; - # Stipping does not make a lot of sense in node packages - dontStrip = true; - - meta = { - inherit platforms; - maintainers = [ stdenv.lib.maintainers.offline ]; - }; - passthru.pkgName = pkgName; - } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // { + } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { name = namePrefix + name; # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; - nativeBuildInputs = - (args.nativeBuildInputs or []) ++ neededNatives ++ - (attrValues requiredDependencies); + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; # Expose list of recursive dependencies upstream, up to the package that # caused recursive dependency - recursiveDeps = - (flatten ( - map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies) - )) ++ - (attrNames recursiveDependencies); + recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); }); in self From 7e285b8b872e7de3b7e312fd1f2aa77fa989e62c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 17 Mar 2015 11:02:44 +0300 Subject: [PATCH 220/223] Update Botan unstable and fix source link --- pkgs/development/libraries/botan/generic.nix | 5 ++++- pkgs/development/libraries/botan/unstable.nix | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index b01ea401b38..c843a00b836 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { src = fetchurl { name = "Botan-${version}.tgz"; - url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"; + urls = [ + "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" + "http://botan.randombit.net/releases/Botan-${version}.tgz" + ]; inherit sha256; }; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 87a3e49b89b..f586d6fd622 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "14"; - sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb"; + revision = "15"; + sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0"; openssl = null; }) From c1e1092b8b601b2cac96213a482c5b71476ff7d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Mar 2015 17:32:41 +0100 Subject: [PATCH 221/223] rsyslog: Move systemd check --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e253a4ef00e..2f62ce31949 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 systemd jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ]; + ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783f5ea6ad7..f88a6000d82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,7 +787,6 @@ let libgcrypt = libgcrypt_1_6; czmq = null; # Currently Broken hadoop = null; # Currently Broken - systemd = if stdenv.isLinux then systemd else null; }; rsyslog-light = callPackage ../tools/system/rsyslog { From eb7b6e2137fb4abc1807f22aaccb43e88deeafd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 18:41:51 +0100 Subject: [PATCH 222/223] haskell-exceptions: upstream has fixed the test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 466af76185f..1f634f3f55f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -504,9 +504,6 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/42 - exceptions = dontCheck super.exceptions; - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); From 04611ab692911089b5b2839a36b6b32d5eb38f2a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Mar 2015 14:48:11 +0100 Subject: [PATCH 223/223] ghc: update 7.10.1 to rc3 --- pkgs/development/compilers/ghc/7.10.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 47888679f24..7938e45605b 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150123"; + version = "7.10.0.20150315"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz"; - sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn"; + url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; + sha256 = "0drj8llsf17iqlr04dp0xd5ypfsv5cgcm7ncvh675sas2rw5qhjx"; }; buildInputs = [ ghc perl ];