From cbf1c3ca22cd719c4462d138297edfdc168fbad4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:18:05 +0200 Subject: [PATCH 001/135] kubernetes: update to 0.15 --- .../networking/cluster/kubernetes/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c89ad0a5168..4eb4d8cc1ea 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,25 +2,27 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; + sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; }; buildInputs = [ makeWrapper which go iptables rsync ]; - preBuild = "patchShebangs ./hack"; - - postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + buildPhase = '' + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + GOPATH=$(pwd) + patchShebangs ./hack + hack/build-go.sh --use_go_build + ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" - cp pause $out/bin/kube-pause ''; preFixup = '' From 6cb195a83d43531c465b6678ca6bd94ef205fea3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:18:25 +0200 Subject: [PATCH 002/135] nixos/kubernetes: fix module --- nixos/modules/services/cluster/kubernetes.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index d9ae0454ba5..6a775bb159f 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -224,7 +224,7 @@ in { machines = mkOption { description = "Kubernetes controller list of machines to schedule to schedule onto"; - default = []; + default = [config.networking.hostName]; type = types.listOf types.str; }; @@ -310,6 +310,12 @@ in { type = types.str; }; + master = mkOption { + description = "Kubernetes apiserver address"; + default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + extraOpts = mkOption { description = "Kubernetes proxy extra command line options."; default = ""; @@ -355,6 +361,7 @@ in { --secure_port=${toString cfg.apiserver.securePort} \ --portal_net=${cfg.apiserver.portalNet} \ --logtostderr=true \ + --runtime_config=api/v1beta3 \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; @@ -416,7 +423,6 @@ in { script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" exec ${cfg.package}/bin/kubelet \ - --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ @@ -443,7 +449,7 @@ in { after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ - --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \ + --master=${cfg.proxy.master} \ --bind_address=${cfg.proxy.address} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ From 5984c04f1fbb07692ae3981b3a12ab32297df2e9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 14:38:05 +0200 Subject: [PATCH 003/135] nixos/ripple-data-api: add import mode option --- .../modules/services/misc/ripple-data-api.nix | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index 6e5ac7ab00b..3b281449a25 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -43,6 +43,24 @@ in { type = types.int; }; + importMode = mkOption { + description = "Ripple data api import mode."; + default = "liveOnly"; + type = types.enum ["live" "liveOnly"]; + }; + + minLedger = mkOption { + description = "Ripple data api minimal ledger to fetch."; + default = null; + type = types.nullOr types.int; + }; + + maxLedger = mkOption { + description = "Ripple data api maximal ledger to fetch."; + default = null; + type = types.nullOr types.int; + }; + redis = { enable = mkOption { description = "Whether to enable caching of ripple data to redis."; @@ -129,6 +147,7 @@ in { serviceConfig = { ExecStart = "${pkgs.ripple-data-api}/bin/api"; + Restart = "always"; User = "ripple-data-api"; }; }; @@ -145,8 +164,15 @@ in { LOG_FILE = "/dev/null"; }; - serviceConfig = { - ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2"; + serviceConfig = let + importMode = + if cfg.minLedger != null && cfg.maxLedger != null then + "${toString cfg.minLedger} ${toString cfg.maxLedger}" + else + cfg.importMode; + in { + ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug"; + Restart = "always"; User = "ripple-data-api"; }; From 494d1820e3613f55c4f36304b9f2bf54975959ca Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 15:17:06 +0200 Subject: [PATCH 004/135] nixos/nginx: enable service/config reload --- nixos/modules/services/web-servers/nginx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0f21ef01263..fe50c182bfe 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,7 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; RestartSec = "10s"; StartLimitInterval = "1min"; From 6ca12344b39b0bd0274aca9f98a8790cab4e45d8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 25 Apr 2015 16:10:49 +0200 Subject: [PATCH 005/135] nixos: add confd module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/confd.nix | 89 +++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 nixos/modules/services/misc/confd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 17717c5988d..950bd59d988 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -184,6 +184,7 @@ ./services/misc/canto-daemon.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix + ./services/misc/confd.nix ./services/misc/dictd.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix new file mode 100644 index 00000000000..7094bb46089 --- /dev/null +++ b/nixos/modules/services/misc/confd.nix @@ -0,0 +1,89 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.confd; + + confdConfig = '' + backend = "${cfg.backend}" + confdir = "${cfg.confDir}" + interval = ${toString cfg.interval} + nodes = [ ${concatMapStringsSep "," (s: ''"${s}"'') cfg.nodes}, ] + prefix = "${cfg.prefix}" + log-level = "${cfg.logLevel}" + watch = ${if cfg.watch then "true" else "false"} + ''; + +in { + options.services.confd = { + enable = mkEnableOption "Whether to enable confd service."; + + backend = mkOption { + description = "Confd config storage backend to use."; + default = "etcd"; + type = types.enum ["etcd" "consul" "redis" "zookeeper"]; + }; + + interval = mkOption { + description = "Confd check interval."; + default = 10; + type = types.int; + }; + + nodes = mkOption { + description = "Confd list of nodes to connect to."; + default = [ "http://127.0.0.1:4001" ]; + type = types.listOf types.str; + }; + + watch = mkOption { + description = "Confd, whether to watch etcd config for changes."; + default = true; + type = types.bool; + }; + + prefix = mkOption { + description = "The string to prefix to keys."; + default = "/"; + type = types.path; + }; + + logLevel = mkOption { + description = "Confd log level."; + default = "info"; + type = types.enum ["info" "debug"]; + }; + + confDir = mkOption { + description = "The path to the confd configs."; + default = "/etc/confd"; + type = types.path; + }; + + package = mkOption { + description = "Confd package to use."; + default = pkgs.goPackages.confd; + type = types.package; + }; + }; + + config = mkIf cfg.enable { + systemd.services.confd = { + description = "Confd Service."; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/confd"; + }; + }; + + environment.etc = { + "confd/confd.toml".text = confdConfig; + }; + + environment.systemPackages = [ cfg.package ]; + + services.etcd.enable = mkIf (cfg.backend == "etcd") (mkDefault true); + }; +} From 00ab10de74bb8d67d426e6181cdad904e607c95a Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 27 Apr 2015 23:50:56 +0200 Subject: [PATCH 006/135] dvdisaster: Apply debian's patches to allow ROM type and encrypted DVDs --- pkgs/tools/cd-dvd/dvdisaster/default.nix | 22 ++++++++++++++----- pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch | 19 ++++++++++++++++ pkgs/tools/cd-dvd/dvdisaster/encryption.patch | 21 ++++++++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch create mode 100644 pkgs/tools/cd-dvd/dvdisaster/encryption.patch diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 1bdf363300b..472ef056f1f 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, which, gettext, intltool , glib, gtk2 +, enableSoftening ? true }: stdenv.mkDerivation rec { @@ -10,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b"; }; + patches = stdenv.lib.optional enableSoftening [ + ./encryption.patch + ./dvdrom.patch + ]; + postPatch = '' patchShebangs ./ ''; @@ -22,11 +28,17 @@ stdenv.mkDerivation rec { glib gtk2 ]; - meta = { + meta = with stdenv.lib; { homepage = http://dvdisaster.net/; - description = - "Stores data on CD/DVD/BD in a way that it is fully recoverable even " + - "after some read errors have developed"; - license = stdenv.lib.licenses.gpl2; + description = "data loss/scratch/aging protection for CD/DVD media"; + longDescription = '' + dvdisaster provides a margin of safety against data loss on CD and + DVD media caused by scratches or aging media. It creates error correction + data which is used to recover unreadable sectors if the disc becomes + damaged at a later time. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch new file mode 100644 index 00000000000..ce3f3de2bc0 --- /dev/null +++ b/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch @@ -0,0 +1,19 @@ +Author: Corey Wright +Description: Adds support for DVD-ROM medium-type. + +Index: dvdisaster/scsi-layer.c +=================================================================== +--- dvdisaster.orig/scsi-layer.c 2012-03-06 11:10:17.147044691 +0900 ++++ dvdisaster/scsi-layer.c 2012-03-06 11:10:30.927044292 +0900 +@@ -913,6 +913,11 @@ + break; + } + ++ if(layer_type & 0x01) ++ { dh->typeDescr = g_strdup("DVD-ROM"); ++ break; ++ } ++ + if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */ + { dh->typeDescr = g_strdup("DVD-ROM (fake)"); + dh->subType = DVD; diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch new file mode 100644 index 00000000000..a9383cb13cf --- /dev/null +++ b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch @@ -0,0 +1,21 @@ +Author: n/a +Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). + +Index: dvdisaster/scsi-layer.c +=================================================================== +--- dvdisaster.orig/scsi-layer.c 2012-04-08 21:51:10.995588783 +0900 ++++ dvdisaster/scsi-layer.c 2012-04-08 21:51:29.259678075 +0900 +@@ -2693,11 +2693,12 @@ + return NULL; + } + } +- ++/* + if(dh->mainType == DVD && query_copyright(dh)) + { CloseDevice(dh); + Stop(_("This software does not support encrypted media.\n")); + } ++*/ + + /* Create the bitmap of simulated defects */ + From 1b3fb2709ea7fa5d1f5eb3c8346b946120815411 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Mon, 27 Apr 2015 23:51:46 +0200 Subject: [PATCH 007/135] dvdisaster: Add icons and desktop file --- pkgs/tools/cd-dvd/dvdisaster/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 472ef056f1f..704c3643f3c 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./ + sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop ''; # Explicit --docdir= is required for on-line help to work: @@ -28,6 +29,16 @@ stdenv.mkDerivation rec { glib gtk2 ]; + postInstall = '' + mkdir -pv $out/share/applications + cp contrib/dvdisaster.desktop $out/share/applications/ + + for size in 16 24 32 48 64; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/ + cp contrib/dvdisaster"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png + done + ''; + meta = with stdenv.lib; { homepage = http://dvdisaster.net/; description = "data loss/scratch/aging protection for CD/DVD media"; From ce43dae0df758bfc762e9d2e89b0e0065f4c8c14 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Mon, 27 Apr 2015 21:38:42 -0400 Subject: [PATCH 008/135] Updated smartgithg to version `6.5.7`. --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 5bb201b60d0..1af0653fa81 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -7,7 +7,7 @@ }: let - the_version = "6_5_3"; + the_version = "6_5_7"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.syntevo.com/download/smartgit/" + "smartgit-generic-${the_version}.tar.gz"; - sha256 = "0hz1y29ipls58fizr27w6rbv7v7qbbc1h70xvjjd8c94k9ajmav9"; + sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l"; }; buildInputs = [ From c45bc8c2b4045be504a30cefd005ff638a360614 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Mon, 27 Apr 2015 22:38:24 -0400 Subject: [PATCH 009/135] Added innoextract package. Allows to extract inno installer packages. --- pkgs/tools/archivers/innoextract/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/tools/archivers/innoextract/default.nix diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix new file mode 100644 index 00000000000..d8c88b6ee65 --- /dev/null +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: +stdenv.mkDerivation rec { + name = "innoextract-1.4"; + src = fetchurl { + url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; + sha256 = "1j8wj0ijdnfh0r9qjr7ykp9v3n2yd4qisxln81bl6474w5d4njas"; + }; + buildInputs = [ python doxygen lzma boost ]; + nativeBuildInputs = [ cmake ]; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95bd693a9f8..6d16c81e980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1722,6 +1722,8 @@ let inetutils = callPackage ../tools/networking/inetutils { }; + innoextract = callPackage ../tools/archivers/innoextract {}; + ioping = callPackage ../tools/system/ioping {}; iodine = callPackage ../tools/networking/iodine { }; From 8388bd3280104c17e27693b75038e11f55941e85 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 07:38:16 +0000 Subject: [PATCH 010/135] wiki: do not rewrite served files --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index c0ed2041639..310083e7610 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -142,6 +142,7 @@ in RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs} + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedFiles} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" From bca76e46f0c4cc3907ee010589439f2edb3402d9 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 07:39:35 +0000 Subject: [PATCH 011/135] Apache servedFiles: fixed a typo in example --- .../services/web-servers/apache-httpd/per-server-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 0db27b0bcbe..5abcc5e7490 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -97,7 +97,7 @@ with lib; default = []; example = [ { urlPath = "/foo/bar.png"; - dir = "/home/eelco/some-file.png"; + files = "/home/eelco/some-file.png"; } ]; description = '' From 4855b0b3fb38d2f617cc50563ff23fac27e6f851 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 28 Apr 2015 08:04:10 +0000 Subject: [PATCH 012/135] Mediawiki 1.23.9 --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 310083e7610..52d8c89baff 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.3"; + name= "mediawiki-1.23.9"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf"; + sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql"; }; skins = config.skins; From f99d5cf2fc9c97df6853eab6187c79c299fb897f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 10:54:58 +0200 Subject: [PATCH 013/135] Fixed some descriptions --- pkgs/applications/altcoins/primecoin.nix | 2 +- .../audio/mopidy-mopify/default.nix | 2 +- .../editors/emacs-modes/icicles/default.nix | 2 +- pkgs/applications/editors/idea/default.nix | 2 +- pkgs/applications/editors/yi/wrapper.nix | 2 +- pkgs/applications/editors/yi/yi.nix | 2 +- pkgs/applications/misc/ctodo/default.nix | 2 +- .../networking/cluster/kubernetes/default.nix | 2 +- .../networking/cluster/marathon/default.nix | 2 +- .../networking/feedreaders/rawdog/default.nix | 2 +- .../programming/kframework/default.nix | 2 +- pkgs/data/fonts/dina/default.nix | 2 +- .../coq-modules/unimath/default.nix | 2 +- pkgs/development/libraries/geis/default.nix | 4 +-- .../libraries/libcouchbase/default.nix | 4 +-- .../libnetfilter_cthelper/default.nix | 2 +- .../libnetfilter_cttimeout/default.nix | 2 +- .../libraries/libosmpbf/default.nix | 2 +- .../development/libraries/luabind/default.nix | 2 +- .../libraries/science/math/arpack/default.nix | 2 +- pkgs/development/libraries/stxxl/default.nix | 2 +- pkgs/development/libraries/tevent/default.nix | 2 +- .../lisp-modules/lisp-packages.nix | 16 +++++----- pkgs/development/tools/chefdk/default.nix | 2 +- .../tools/database/sqldeveloper/default.nix | 2 +- .../tools/misc/autoconf-archive/default.nix | 2 +- .../tools/misc/checkbashisms/default.nix | 2 +- .../tools/parsing/jshon/default.nix | 2 +- pkgs/development/tools/rust/racer/default.nix | 2 +- .../tools/selenium/selendroid/default.nix | 2 +- pkgs/games/gnubg/default.nix | 2 +- pkgs/games/scrolls/default.nix | 2 +- pkgs/misc/emulators/cdemu/base.nix | 2 +- pkgs/servers/mail/exim/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/sensu/default.nix | 3 +- pkgs/servers/osrm-backend/default.nix | 2 +- pkgs/servers/sql/pgpool/default.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/compression/dtrx/default.nix | 2 +- pkgs/tools/filesystems/duff/default.nix | 2 +- pkgs/tools/misc/fluentd/default.nix | 2 +- pkgs/tools/misc/moreutils/default.nix | 2 +- pkgs/tools/misc/rmlint/default.nix | 2 +- pkgs/tools/misc/t/default.nix | 2 +- pkgs/tools/networking/wrk/default.nix | 2 +- pkgs/tools/system/augeas/default.nix | 2 +- pkgs/tools/system/honcho/default.nix | 2 +- pkgs/tools/text/grin/default.nix | 2 +- pkgs/tools/text/html2text/default.nix | 2 +- pkgs/top-level/go-packages.nix | 2 +- pkgs/top-level/lua-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 30 +++++++++---------- 54 files changed, 77 insertions(+), 78 deletions(-) diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 11ec35a71bd..61bba04cb6a 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec{ else "install -D bitcoind $out/bin/primecoind"; meta = { - description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers."; + description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; longDescription= '' Primecoin is an innovative cryptocurrency, a form of digital currency secured by cryptography and issued through a diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 2dd4c19f0e0..4616d3f7c64 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://github.com/dirkgroenen/mopidy-mopify; - description = "A mopidy webclient based on the Spotify webbased interface."; + description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; maintainers = [ maintainers.Gonzih ]; }; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 820e959a357..1a145e1b648 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.emacswiki.org/emacs/Icicles"; - description = "Enhance Emacs minibuffer input with cycling and powerful completion."; + description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ simons ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 0f9df276569..b99265cf0dd 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -227,7 +227,7 @@ in name = "clion-${version}"; version = "1.0"; build = "141.353"; - description = "C/C++ IDE. New. Intelligent. Cross-platform."; + description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 4887662bce5..a4dc3fe367a 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { env = yiEnv; meta = with stdenv.lib; { - description = "Allows Yi to find libraries and the compiler easily."; + description = "Allows Yi to find libraries and the compiler easily"; # This wrapper and wrapper only is under PD license = licenses.publicDomain; maintainers = with maintainers; [ fuuzetsu ]; diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index a63375adfd1..f9ef27d999d 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -30,7 +30,7 @@ cabal.mkDerivation (self: { configureFlags = "-fpango -fvty"; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8"; meta = { - homepage = "http://haskell.org/haskellwiki/Yi"; + homepage = http://haskell.org/haskellwiki/Yi; description = "The Haskell-Scriptable Editor"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 3978a369d06..7301ea704e8 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ctodo.apakoh.dk/"; - description = "A simple ncurses-based task list manager."; + description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c89ad0a5168..23ec975078b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Open source implementation of container cluster management."; + description = "Open source implementation of container cluster management"; license = licenses.asl20; homepage = https://github.com/GoogleCloudPlatform; maintainers = with maintainers; [offline]; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 36ce79aaf34..1714aa274f0 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://mesosphere.github.io/marathon; - description = "Cluster-wide init and control system for services in cgroups or Docker containers."; + description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index fc494c6aebc..231b3195b5f 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = "http://offog.org/code/rawdog/"; - description = "an RSS Aggregator Without Delusions Of Grandeur."; + description = "An RSS Aggregator Without Delusions Of Grandeur"; license = stdenv.lib.licenses.gpl2; platform = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix index 090dc5ac756..e8a4f2b3156 100644 --- a/pkgs/applications/science/programming/kframework/default.nix +++ b/pkgs/applications/science/programming/kframework/default.nix @@ -90,7 +90,7 @@ releaseTools.mvnBuild rec { ''; meta = { - description = "The K Framework is a rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined."; + description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined"; homepage = http://www.kframework.org; license = stdenv.lib.licenses.bsd3; # technically it is the UIUC/NCSA license # but LLVM uses that license as well and diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index da7a1bc5fb9..e79dcd014d3 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A monospace bitmap font aimed at programmers."; + description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is relatively compact to allow a lot of code on screen, while (hopefully) diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix index e16156dec53..e6f32d60c4f 100644 --- a/pkgs/development/coq-modules/unimath/default.nix +++ b/pkgs/development/coq-modules/unimath/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/UniMath/UniMath; - description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view."; + description = "A formalization of a substantial body of mathematics using the univalent point of view"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 15f42afd9a8..24c24fe5f12 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://launchpad.net/geis"; - description = "GEIS is a library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism."; + description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 841edd3dff6..bcc9e9f673f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl]; meta = { - description = "C client library for Couchbase."; + description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 197892897f3..97319840975 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; meta = { - description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure."; + description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure"; longDescription = '' libnetfilter_cthelper is the userspace library that provides the programming interface to the user-space helper infrastructure available since Linux kernel 3.6. With this diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 0626e91b8ba..2920cbd9785 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; meta = { - description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure."; + description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure"; longDescription = '' libnetfilter_cttimeout is the userspace library that provides the programming interface to the fine-grain connection tracking timeout infrastructure. diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 6ff5d816776..334748d668c 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/scrosby/OSM-binary; - description = "C library to read and write OpenStreetMap PBF files."; + description = "C library to read and write OpenStreetMap PBF files"; license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index edb914123e1..e03535ba979 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/luabind/luabind; - description = "Luabind is a library that helps you create bindings between C++ and Lua."; + description = "A library that helps you create bindings between C++ and Lua"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 296c5f6b920..01bb3371f5e 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue - problems. + problems ''; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index b387c59efa1..23590f17ca8 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/stxxl/stxxl; - description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations."; + description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; license = stdenv.lib.licenses.boost; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index db863d951a6..baa7e288178 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "an event system based on the talloc memory management library."; + description = "An event system based on the talloc memory management library"; homepage = http://tevent.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index ff95bb4a000..d7bd2348244 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -20,7 +20,7 @@ let lispPackages = rec { clx = buildLispPackage rec { baseName = "clx"; version = "git-20150117"; - description = "An implementation of the X Window System protocol in Lisp."; + description = "An implementation of the X Window System protocol in Lisp"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -98,7 +98,7 @@ let lispPackages = rec { clx-truetype = buildLispPackage rec { baseName = "clx-truetype"; version = "git-20141112"; - description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension"; deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; # Source type: git src = pkgs.fetchgit { @@ -178,7 +178,7 @@ let lispPackages = rec { trivial-features = buildLispPackage rec { baseName = "trivial-features"; version = "git-20141112"; - description = "Ensures consistent *FEATURES* across multiple CLs."; + description = "Ensures consistent *FEATURES* across multiple CLs"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -280,7 +280,7 @@ let lispPackages = rec { babel = buildLispPackage rec { baseName = "babel"; version = "git-20141113"; - description = "Babel, a charset conversion library."; + description = "A charset conversion library"; deps = [alexandria trivial-features]; # Source type: git src = pkgs.fetchgit { @@ -408,7 +408,7 @@ let lispPackages = rec { trivial-gray-streams = buildLispPackage rec { baseName = "trivial-gray-streams"; version = "git-20141113"; - description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -421,7 +421,7 @@ let lispPackages = rec { cl-ssl = buildLispPackage rec { baseName = "cl+ssl"; version = "git-20141113"; - description = "Common Lisp interface to OpenSSL."; + description = "Common Lisp interface to OpenSSL"; deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; # Source type: git src = pkgs.fetchgit { @@ -448,7 +448,7 @@ let lispPackages = rec { trivial-garbage = buildLispPackage rec { baseName = "trivial-garbage"; version = "git-20141113"; - description = "Portable finalizers, weak hash-tables and weak pointers."; + description = "Portable finalizers, weak hash-tables and weak pointers"; deps = []; # Source type: git src = pkgs.fetchgit { @@ -461,7 +461,7 @@ let lispPackages = rec { cl-base64 = buildLispPackage rec { baseName = "cl-base64"; version = "git-20141113"; - description = "Base64 encoding and decoding with URI support."; + description = "Base64 encoding and decoding with URI support"; deps = []; # Source type: git src = pkgs.fetchgit { diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 8352c71a686..f8e759b83ee 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -11,7 +11,7 @@ bundlerEnv { buildInputs = [ perl ]; meta = with lib; { - description = "A streamlined development and deployment workflow for Chef platform."; + description = "A streamlined development and deployment workflow for Chef platform"; homepage = https://downloads.chef.io/chef-dk/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9a0afdc8e1d..7c4aefee639 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Oracle's Oracle DB GUI client."; + description = "Oracle's Oracle DB GUI client"; longDescription = '' Oracle SQL Developer is a free integrated development environment that simplifies the development and management of Oracle Database in both diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 0e6ca01c625..c5c965ac58e 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; meta = with stdenv.lib; { - description = "Archive of autoconf m4 macros."; + description = "Archive of autoconf m4 macros"; homepage = http://www.gnu.org/software/autoconf-archive/; license = licenses.gpl3; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 259224aac5d..9c48227c9a8 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/checkbaskisms/; - description = "Performs basic checks on shell scripts for the presence of non portable syntax."; + description = "Performs basic checks on shell scripts for the presence of non portable syntax"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index fa11671db0b..4b35ba0cce2 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://kmkeen.com/jshon; - description = "JSON parser designed for maximum convenience within the shell."; + description = "JSON parser designed for maximum convenience within the shell"; license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ rushmorem ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 341088dc0f2..4ef9cc6d285 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A utility intended to provide Rust code completion for editors and IDEs."; + description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/phildawes/racer; license = stdenv.lib.licenses.mit; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index e34e479e938..6604bc5648d 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/selenium; - description = "Test automation for native or hybrid Android apps and the mobile web."; + description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 00ae4e28860..83560c21f5d 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gtk" "--with--board3d" ]; meta = with stdenv.lib; - { description = "World class backgammon application."; + { description = "World class backgammon application"; homepage = http://www.gnubg.org/; license = licenses.gpl3; maintainers = [ maintainers.emery ]; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 171a6d6fe83..376d1e33473 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "scrolls-2014-03-08"; meta = { - description = "Scrolls is a strategy collectible card game."; + description = "A strategy collectible card game"; homepage = "https://scrolls.com/"; # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index b2b641e3f7a..58727f10ef1 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation ({ cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON ''; meta = { - description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system."; + description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system"; longDescription = '' CDEmu consists of: diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index ae4e1d6f245..3dd0463b604 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://exim.org/"; - description = "Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems."; + description = "A mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 1e818a508d9..c0126fda572 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Analyzes resource usage and performance characteristics of running docker containers."; + description = "Analyzes resource usage and performance characteristics of running docker containers"; homepage = https://github.com/google/cadvisor; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 2785898bed5..38e59a39f38 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -9,8 +9,7 @@ gemset = ./gemset.nix; meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, -and scalable."; + description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; license = with licenses; mit; maintainers = with maintainers; [ theuni ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 37d3650f683..3e9e2158524 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/Project-OSRM/osrm-backend/wiki; - description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project."; + description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 137e536e5d8..775621e64b4 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://pgpool.net/mediawiki/index.php; - description = "a middleware that works between postgresql servers and postgresql clients."; + description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 57ca79a00a2..016e3c5d51e 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bareos.org/; - description = "a fork of the bacula project."; + description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 0d7a0e14e7d..343709dd957 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { }; meta = with stdenv.lib; { - description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives."; + description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; homepage = "http://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 0f9bff82967..409e7a8c36f 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Quickly find duplicate files."; + description = "Quickly find duplicate files"; homepage = http://duff.dreda.org/; license = with licenses; zlib; longDescription = '' diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index b659dafddeb..cfc1e9ab564 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -11,7 +11,7 @@ bundlerEnv { buildInputs = [ curl ]; meta = with lib; { - description = "Fluentd data collector."; + description = "A data collector"; homepage = http://www.fluentd.org/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 5a42a5d8515..843672fa26c 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; meta = { - description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young."; + description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = https://joeyh.name/code/moreutils/; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 21643a9d11a..aed93775ce9 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = "scons --prefix=$out install"; meta = { - description = "Extremely fast tool to remove duplicates and other lint from your filesystem."; + description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; homepage = http://rmlint.readthedocs.org; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index 10db8764f89..fd64f6694ee 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -9,7 +9,7 @@ bundlerEnv { gemset = ./gemset.nix; meta = with lib; { - description = "A command-line power tool for Twitter."; + description = "A command-line power tool for Twitter"; homepage = http://sferik.github.io/t/; license = with licenses; asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 9af28dbebd6..f4cdb7eaddb 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "HTTP benchmarking tool."; + description = "HTTP benchmarking tool"; homepage = http://github.com/wg/wrk; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index e6b09932f86..263690728d2 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig readline libxml2 ]; meta = with stdenv.lib; { - description = "Configuration editing tool."; + description = "Configuration editing tool"; license = licenses.lgpl2; homepage = http://augeas.net/; maintainers = with maintainers; [offline]; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 6bf2a995a24..b52c1c0f636 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -20,7 +20,7 @@ let honcho = buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "A Python clone of Foreman, a tool for managing Procfile-based applications."; + description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; homepage = https://github.com/nickstenning/honcho; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index da7799900a3..2ea4a950145 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = https://pypi.python.org/pypi/grin; - description = "A grep program configured the way I like it."; + description = "A grep program configured the way I like it"; platform = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sjagoe ]; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 27de591d889..8fd0bea2254 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text."; + description = "A command line utility, written in C++, that converts HTML documents into plain text"; homepage = http://www.mbayer.de/html2text/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 42b73fe612d..8c2f090e0c1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -448,7 +448,7 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = "https://github.com/jteeuwen/go-bindata"; - description = "A small utility which generates Go code from any file. Useful for embedding binary data in a Go program."; + description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0 ; platforms = platforms.all; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 766ff90d5b7..773ddd29521 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -74,7 +74,7 @@ let meta = with stdenv.lib; { homepage = http://luaforge.net/projects/luaevent/; - description = "Binding of libevent to Lua."; + description = "Binding of libevent to Lua"; license = licenses.mit; maintainers = [ maintainers.koral ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c86204cfd2..56bffa0bc51 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6727,7 +6727,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x"; }; meta = { - description = "Mozilla's ldap client library."; + description = "Mozilla's ldap client library"; license = "unknown"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0734c0d0727..0f224aae2f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -435,7 +435,7 @@ let meta = { homepage = http://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project."; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; }; @@ -668,7 +668,7 @@ let }; meta = { - description = "Utilities and Python modules for handling audio."; + description = "Utilities and Python modules for handling audio"; homepage = "http://audiotools.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; }; @@ -794,7 +794,7 @@ let meta = { homepage = http://pypi.python.org/pypi/babelfish; - description = "A module to work with countries and languages."; + description = "A module to work with countries and languages"; license = stdenv.lib.licenses.bsd3; }; }; @@ -1172,7 +1172,7 @@ let propagatedBuildInputs = with self; [ six html5lib ]; meta = with stdenv.lib; { - description = "An easy, HTML5, whitelisting HTML sanitizer."; + description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' Bleach is an HTML sanitizing library that escapes or strips markup and attributes based on a white list. Bleach can also linkify text safely, @@ -5784,7 +5784,7 @@ let meta = { homepage = http://pypi.python.org/pypi/guessit; license = stdenv.lib.licenses.lgpl3; - description = "A library for guessing information from video files."; + description = "A library for guessing information from video files"; }; }; @@ -6227,7 +6227,7 @@ let meta = with stdenv.lib; { homepage = http://maebert.github.io/jrnl/; - description = "A simple command line journal application that stores your journal in a plain text file."; + description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; }; }; @@ -6775,7 +6775,7 @@ let meta = with stdenv.lib; { description = '' - A content management platform built using the Django framework. + A content management platform built using the Django framework ''; longDescription = '' Mezzanine is a powerful, consistent, and flexible content management @@ -7713,8 +7713,8 @@ let }; meta = { - homepage = "http://code.google.com/p/oauth"; - description = "Library for OAuth version 1.0a."; + homepage = http://code.google.com/p/oauth; + description = "Library for OAuth version 1.0a"; license = licenses.mit; platforms = stdenv.lib.platforms.all; }; @@ -9490,7 +9490,7 @@ let meta = { homepage = http://pyparsing.wikispaces.com/; - description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; }; }; @@ -11636,7 +11636,7 @@ let propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer six ]; meta = with stdenv.lib; { - description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects."; + description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; license = licenses.bsd3; platforms = platforms.unix; @@ -13004,7 +13004,7 @@ let propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; meta = with stdenv.lib; { - description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python."; + description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; homepage = http://willie.dftba.net/; license = licenses.efl20; }; @@ -14796,8 +14796,8 @@ let propagatedBuildInputs = with self; [ nose ]; meta = { - homepage = "https://more-itertools.readthedocs.org"; - description = "Expansion of the itertools module."; + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; license = licenses.mit; }; }; @@ -14830,7 +14830,7 @@ let }; meta = with stdenv.lib; { - description = "Collection of fancy functional tools focused on practicality."; + description = "Collection of fancy functional tools focused on practicality"; homepage = "http://funcy.readthedocs.org/"; license = stdenv.lib.licenses.bsd3; From 69116f8fc93edf64c641c4f6dd74d65c86b9bd11 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 11:09:20 +0200 Subject: [PATCH 014/135] Fix evaluation after refactoring (a2a35082ccd64b4d00d88778d9633fe18c0bb215) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95bd693a9f8..b2ada831e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1995,7 +1995,6 @@ let minecraft = callPackage ../games/minecraft { pulseaudioSupport = config.pulseaudio or true; - pulseaudio = pulseaudio.override { ossWrapper = true; }; }; minecraft-server = callPackage ../games/minecraft-server { }; From ed46b22db0fbc2d51512f91f018711ed05ed7143 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 03:28:23 +0200 Subject: [PATCH 015/135] librep: git -> 0.92.5 This is the latest release and is more recent than the GIT revision pointed to previously. I have also taken the liberty of removing some irrelevant information from the package description. --- pkgs/development/libraries/librep/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 2abe01decb7..314508cc5c2 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -1,18 +1,17 @@ - - { stdenv, fetchgit +{ stdenv, fetchurl , pkgconfig, autoreconfHook , readline, texinfo , gdbm, gmp, libffi }: with stdenv.lib; + stdenv.mkDerivation rec { + name = "librep-${version}"; + version = "0.92.5"; - name = "librep-git-2015-02-15"; - - src = fetchgit { - url = "https://github.com/SawfishWM/librep.git"; - rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf"; - sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6"; + src = fetchurl { + url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz"; + sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76"; }; buildInputs = [ pkgconfig autoreconfHook readline texinfo ]; @@ -25,15 +24,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - description = "Lisp system for Sawfish"; + description = "Fast, lightweight, and versatile Lisp environment"; longDescription = '' - This is librep, a Lisp system for UNIX, needed by Sawfish window manager. - It contains a Lisp interpreter, byte-code compiler and virtual machine. - Applications may use the Lisp interpreter as an extension language, - or it may be used for stand-alone scripts. - - The Lisp dialect was originally inspired by Emacs Lisp, but with the worst - features removed. It also borrows many ideas from Scheme. + librep is a Lisp system for UNIX, comprising an + interpreter, a byte-code compiler, and a virtual + machine. It can serve as an application extension language + but is also suitable for standalone scripts. ''; homepage = http://sawfish.wikia.com; license = licenses.gpl2; From 0e7e91030f2833471d6ab50a5827c0c4b9600daa Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 11:05:58 +0200 Subject: [PATCH 016/135] rep-gtk: git -> 0.90.8.2 This is the most recent release which has a tarball. It is strictly older than the GIT revision previously pointed to, but the delta is insignificant (fixes to debian helper scripts, updating NEWS & fixing a typo in the changelog) --- pkgs/development/libraries/rep-gtk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 070baf7ae79..888a81a390e 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }: with stdenv.lib; stdenv.mkDerivation rec { - name = "rep-gtk-git-2015-02-15"; + name = "rep-gtk-${version}"; + version = "0.90.8.2"; - src = fetchgit { - url = "https://github.com/SawfishWM/rep-gtk.git"; - rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d"; - sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031"; + src = fetchurl { + url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz"; + sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r"; }; buildInputs = [ pkgconfig autoreconfHook ]; From db5623fd3edfa2ea3af0c534429b2d187e00d77b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Apr 2015 11:06:56 +0200 Subject: [PATCH 017/135] sawfish: git -> 1.11.90 This is the latest release (more recent than the GIT revision previously pointed to). There is no release tarball, however. --- .../window-managers/sawfish/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 4281eb99dd0..f3b19e84610 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango +, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo +, makeWrapper +}: with stdenv.lib; + stdenv.mkDerivation rec { - name = "sawfish-git-2015-02-15"; + name = "sawfish-${version}"; + version = "1.11.90"; src = fetchgit { url = "https://github.com/SawfishWM/sawfish.git"; - rev = "44729f44017e6779b4b66a7ecdbd63a98731f668"; - sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73"; + rev = "b121f832571c9aebd228691c32604146e49f5e55"; + sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc"; }; - buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ]; + buildInputs = + [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama + libXrandr libXtst imlib gettext texinfo makeWrapper + ]; patchPhase = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in @@ -25,7 +33,7 @@ stdenv.mkDerivation rec { --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; - + meta = { description = "An extensible, Lisp-based window manager"; longDescription = '' From 27ea35b4819cbcdfc9365f18504c5d1650b51f3a Mon Sep 17 00:00:00 2001 From: Hendrik Bunke Date: Tue, 28 Apr 2015 12:24:28 +0200 Subject: [PATCH 018/135] pythonPackages: fixed and updated goobook goobook didn't work because dependency package 'six' has been in buildInputs but should be in propagatedBuildInputs. Also: updated goobook to 1.6 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f224aae2f3..03e120dbea1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5638,7 +5638,7 @@ let }; goobook = buildPythonPackage rec { - name = "goobook-1.5"; + name = "goobook-1.6"; disabled = isPy3k; src = pkgs.fetchurl { @@ -5646,7 +5646,7 @@ let sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z"; }; - buildInputs = with self; [ six ]; + buildInputs = with self; [ ]; preConfigure = '' sed -i '/distribute/d' setup.py @@ -5656,11 +5656,11 @@ let description = "Search your google contacts from the command-line or mutt"; homepage = https://pypi.python.org/pypi/goobook; license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 hbunke ]; platforms = platforms.unix; }; - propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson ]; + propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson six]; }; google_api_python_client = buildPythonPackage rec { From 7b37a5f168706db5efa33599354f5c1967ac4c51 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Tue, 28 Apr 2015 12:16:37 +1000 Subject: [PATCH 019/135] nixos-install: Fix password prompt failing outside NixOS. When bootstrapping from other distributions, nixos-install is unable to find various tools in the chroot since their paths aren't aware of NixOS conventions. This makes a small change to existing code by specifying nixpkgs/nixos instead of just nixos when running nix-instantiate in the chroot. I haven't tested this outside of bootstrapping, but the same specification is used elsewhere in the code so I don't see why it wouldn't work. --- nixos/modules/installer/tools/nixos-install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 14ae3daace0..86e57f704c1 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -254,8 +254,14 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ chroot $mountPoint /nix/var/nix/profiles/system/activate +# Some systems may not be prepared to use NixOS' paths. +export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH +export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs +export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels + + # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi From 71910be9ea225895e36f60ed23a1bdce402b3088 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Tue, 28 Apr 2015 12:16:38 +1000 Subject: [PATCH 020/135] nixos-install: Fix chroot flag not defaulting to Bash outside NixOS. Passing the chroot flag to nixos-install without arguments should now give you a Bash shell as intended rather than try an empty path. This was masked by the user's shell (usually /bin/bash) being defaulted to by chroot, and being found since their paths used NixOS conventions. --- nixos/modules/installer/tools/nixos-install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 86e57f704c1..097631eda9c 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -45,7 +45,9 @@ while [ "$#" -gt 0 ]; do ;; --chroot) runChroot=1 - chrootCommand=("$@") + if [[ "$@" != "" ]]; then + chrootCommand=("$@") + fi break ;; --help) From c449a930aaf849416b39062d80b6e9eff24a9add Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Apr 2015 13:14:05 +0200 Subject: [PATCH 021/135] ghcWithPackages: add postBuild hook so that users can mess with the generated environment postBuild can be used to execute user-specific commands on the generated $out environment before finalizing the build. For example, this hook can be used to generate appropriate 'makeWrapper' script for binaries contained in the environment. --- .../haskell-modules/with-packages-wrapper.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 30035671a32..136566f65f0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, ghc, llvmPackages, packages, buildEnv -, makeWrapper -, ignoreCollisions ? false, withLLVM ? false }: +{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper +, ignoreCollisions ? false, withLLVM ? false +, postBuild ? "" +}: # This wrapper works only with GHC 6.12 or later. assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; @@ -89,7 +90,7 @@ buildEnv { ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} $out/bin/${ghcCommand}-pkg check - ''; + '' + postBuild; } // { preferLocalBuild = true; inherit (ghc) version meta; From 8233fd5c6a3690acaa2117c060544d63a3e58b32 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 20:49:19 +0200 Subject: [PATCH 022/135] i2p: add service to module-list --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 023d67a0142..61cc551f435 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -272,6 +272,7 @@ ./services/networking/haproxy.nix ./services/networking/hostapd.nix ./services/networking/i2pd.nix + ./services/networking/i2p.nix ./services/networking/ifplugd.nix ./services/networking/iodined.nix ./services/networking/ircd-hybrid/default.nix From c6562348b830c6cf8695c39f0eea33ecc2fd5381 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 21:13:44 +0200 Subject: [PATCH 023/135] i2p: update 0.9.18 -> 0.9.19 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 9a20e009e58..60dfd006776 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }: stdenv.mkDerivation rec { - name = "i2p-0.9.18"; + name = "i2p-0.9.19"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl"; + sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936"; }; buildInputs = [ openjdk8 ant gettext ]; buildPhase = '' From 9754783b06597fc133b955ab3c360660aa9fd4dc Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 15 Apr 2015 21:14:02 +0200 Subject: [PATCH 024/135] i2p: fix compilation - use system jdk instead of hardcoded openjdk - remove backgrounding of service launcher --- pkgs/tools/networking/i2p/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 60dfd006776..b5ef06c34ea 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, openjdk8, openjre, ant, gcj, gettext }: +{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { name = "i2p-0.9.19"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936"; }; - buildInputs = [ openjdk8 ant gettext ]; + buildInputs = [ jdk ant gettext which ]; buildPhase = '' export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" ant preppkg-linux-only @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e 's#%USER_HOME#$HOME#' \ -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \ - -e 's#JAVA=java#JAVA=${openjre}/bin/java#' + -e 's#JAVA=java#JAVA=${jre}/bin/java#' + sed -i $out/runplain.sh \ + -e "s#nohup \(.*Launch\) .*#\1#" \ + -e "s#echo \$\! .*##" mv $out/runplain.sh $out/bin/i2prouter-plain mv $out/man $out/share/ chmod +x $out/bin/* $out/i2psvc From f5e7190572dcc3f0f62918f1676439706623fe93 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Apr 2015 17:15:02 +0200 Subject: [PATCH 025/135] nixos.system_tarball_pc: Fix evaluation It was broken due to 57b05765c968c1ad5245c59513d11d679ed7130d. ZFS requires `networking.hostId` to be set. --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- nixos/modules/profiles/base.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index fde9989e1f9..446d79ce220 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -45,9 +45,6 @@ with lib; # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; - # Configure host id for ZFS to work - networking.hostId = "8425e349"; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 0d40b7112df..6c8e9994379 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -54,4 +54,6 @@ # Include support for various filesystems. boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ]; + # Configure host id for ZFS to work + networking.hostId = "8425e349"; } From f426922f4a7a32980a4dc9ab30189609bebaa55e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 17:40:03 +0200 Subject: [PATCH 026/135] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/44775051f9c0c34f42413a2af5d8c5ed4146cecf with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b --- .../haskell-modules/hackage-packages.nix | 325 ++++++++++-------- 1 file changed, 188 insertions(+), 137 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0148ca90664..8628d5a1698 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2886,19 +2886,20 @@ self: { "CouchDB" = callPackage ({ mkDerivation, base, bytestring, containers, HTTP, HUnit, json - , mtl, network, utf8-string + , mtl, network, network-uri, utf8-string }: mkDerivation { pname = "CouchDB"; - version = "1.2"; - sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; + version = "1.2.1"; + sha256 = "0hj1rml9pf9knwm3grwrkizjricc7bchsi6m7dgjlfh81q247jp4"; buildDepends = [ - base bytestring containers HTTP json mtl network utf8-string + base bytestring containers HTTP json mtl network network-uri + utf8-string ]; testDepends = [ - base bytestring containers HTTP HUnit json mtl network utf8-string + base bytestring containers HTTP HUnit json mtl network network-uri + utf8-string ]; - jailbreak = true; homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; license = stdenv.lib.licenses.bsd3; @@ -17526,8 +17527,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "agum"; - version = "2.5"; - sha256 = "0acirnqsm7mrz6pgy9nabn23bmljdcz08b3ahak4ma5lcm5bql9q"; + version = "2.6"; + sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; @@ -18033,8 +18034,8 @@ self: { }: mkDerivation { pname = "alms"; - version = "0.6.5"; - sha256 = "12hnhz1lz9wb4s95b9via1nkfgmgmr7p1wc9k4bcvsm778j920s8"; + version = "0.6.7"; + sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -18042,7 +18043,7 @@ self: { incremental-sat-solver mtl network parsec pretty QuickCheck random stm syb template-haskell transformers tuple ]; - homepage = "http://www.ccs.neu.edu/~tov/pubs/alms"; + homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/"; description = "a practical affine language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23041,8 +23042,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.3.12"; - sha256 = "1qmwxd8wfszawhfncqhcnbc2h1a47jcqa4zj4pfwybhy3xnn0yns"; + version = "0.3.13"; + sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l"; buildDepends = [ base bytestring containers hashable lifted-base ReadArgs safe system-filepath text transformers unordered-containers vector @@ -27876,8 +27877,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.2.0"; - sha256 = "06igjmr0n8418wid1pr74cgvlsmwni7ar72g9bddivlbxax1pfli"; + version = "0.3.2.1"; + sha256 = "0rhabhbcxl3gsq4wdkxd4mswrb8rqfmq6crcc70hm75fjxfmr3sz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28294,7 +28295,6 @@ self: { homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-uninstall" = callPackage @@ -30132,17 +30132,12 @@ self: { }) {}; "chart-histogram" = callPackage - ({ mkDerivation, base, Chart, colour, data-default-class, lens - , vector - }: + ({ mkDerivation, base, Chart }: mkDerivation { pname = "chart-histogram"; - version = "0.4.5"; - sha256 = "0c1y4jaslzxlcmqhj5bgdcx76jw49asmnfgdvfkprf2siq154zba"; - buildDepends = [ - base Chart colour data-default-class lens vector - ]; - jailbreak = true; + version = "1.0.0"; + sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5"; + buildDepends = [ base Chart ]; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32104,8 +32099,8 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "cmu"; - version = "1.9"; - sha256 = "1mn6l17x7zwhc8wlbfqiaxjsvmwh6j0sr4x3gss1z32n5g03syd0"; + version = "1.10"; + sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers ]; @@ -33506,8 +33501,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.4"; - sha256 = "1vqajj5mwnknqcjc5pj883jz4iwjj6is4jr701bzr0n6ngvn7qvh"; + version = "1.2.4.1"; + sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6"; buildDepends = [ base exceptions lifted-base mmorph mtl resourcet transformers transformers-base void @@ -33647,8 +33642,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.2"; - sha256 = "0nb7sd8a5lbl9frypz9clr808ircln356244nzm7kl5qd53752iw"; + version = "1.1.7.3"; + sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34673,17 +34668,17 @@ self: { }) {}; "cookie" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, data-default - , deepseq, HUnit, old-locale, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, time + ({ mkDerivation, base, blaze-builder, bytestring + , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, time }: mkDerivation { pname = "cookie"; - version = "0.4.1.4"; - sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d"; + version = "0.4.1.5"; + sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn"; buildDepends = [ - base blaze-builder bytestring data-default deepseq old-locale text - time + base blaze-builder bytestring data-default-class deepseq old-locale + text time ]; testDepends = [ base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit @@ -53032,10 +53027,9 @@ self: { ({ mkDerivation, array, base, containers }: mkDerivation { pname = "gll"; - version = "0.1.0.0"; - sha256 = "0z3v0bg8r1gmca5bgkrbc44j9ggxkrzlk6r1mqmpycjgv5zryw05"; + version = "0.1.0.1"; + sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv"; buildDepends = [ array base containers ]; - jailbreak = true; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66159,8 +66153,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.1.1"; - sha256 = "10a0rgz9ng84m30x2x9swpdr41yk6wkvhk9vlplbq254rfsg865b"; + version = "0.1.2"; + sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -68681,8 +68675,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.6"; - sha256 = "0ych09pli7v3mhfmvr6c0milvcmxf8bk1jf528z9r9halgjg18vh"; + version = "2.1.7"; + sha256 = "096rfq7ss5hvy1wcc9fdb4svnfiy96p79xh7vj3h7radh2wggfwv"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -68752,8 +68746,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.6"; - sha256 = "0ymgsvl9bq96b7ln4x3yqj5pkla7683xpgg1mp0z9nc70kdzq1w5"; + version = "2.1.7"; + sha256 = "1ifwsqa8ay8f8l96k37rawxjya0qs72bcifxfr5hlz3gagg4a02b"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -68772,8 +68766,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.6"; - sha256 = "0vjgnh4g4sg73n4rfgrlqn0xw2mhkpwrwkkccpwik5jfyks7l1jq"; + version = "2.1.7"; + sha256 = "0gh9kn9ds50xl0zin5vbablf4dpfiabi96sz2a4xsxlskfjflhl0"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -69819,14 +69813,14 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.0.0.3"; - sha256 = "15m48aniszfkbkd6h2ql3r88ldj6f3ph3dyv97nmi8xk1kliipn1"; + version = "1.0.1.0"; + sha256 = "0s44w6nhp6xlibh1740paa21rbjvbnkhjdf35d9yw5hycjwyjwqc"; buildDepends = [ attoparsec base-prelude text unordered-containers ]; testDepends = [ base base-prelude directory doctest filepath ]; homepage = "https://github.com/nikita-volkov/html-entities"; - description = "An \"attoparsec\" parser and a decoder of HTML entities"; + description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; }) {}; @@ -70249,8 +70243,8 @@ self: { }: mkDerivation { pname = "http-common"; - version = "0.7.2.0"; - sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960"; + version = "0.8.2.0"; + sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"; buildDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive directory mtl network text transformers unordered-containers @@ -70575,8 +70569,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.7.2.6"; - sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7"; + version = "0.8.3.1"; + sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -70591,6 +70585,7 @@ self: { snap-core snap-server system-fileio system-filepath text transformers unordered-containers ]; + jailbreak = true; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; @@ -78580,8 +78575,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.1.1"; - sha256 = "14bfzzf4lspkb1haf0bdq75zii50hzwzcl4q5rxysmxfhvmgldh4"; + version = "1.1.1.2"; + sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78594,7 +78589,7 @@ self: { time transformers unix unordered-containers vector yaml ]; testDepends = [ - ansi-wl-pprint base Glob hspec HUnit lens parsec parsers + ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; homepage = "http://lpuppet.banquise.net/"; @@ -89698,17 +89693,18 @@ self: { "nested-routes" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , containers, hspec, http-types, lucid, mtl, pred-trie, QuickCheck - , quickcheck-instances, semigroups, text, transformers, wai - , wai-extra + , constraints, containers, hspec, http-types, lucid, mtl + , poly-arity, pred-trie, QuickCheck, quickcheck-instances + , semigroups, text, transformers, wai, wai-extra }: mkDerivation { pname = "nested-routes"; - version = "0.2.2.2"; - sha256 = "0cnm6clz7y8kpnsi65i15a0vgv7i2q3150igvvmrs1jz15cxzi8z"; + version = "0.3"; + sha256 = "04cgy9hvriq4r8imi23s5lpvbvvdg8a3a51ypmwwgk6vss84jz1l"; buildDepends = [ - aeson attoparsec base blaze-html bytestring containers http-types - lucid mtl pred-trie semigroups text transformers wai wai-extra + aeson attoparsec base blaze-html bytestring constraints containers + http-types lucid mtl poly-arity pred-trie semigroups text + transformers wai wai-extra ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Declarative, compositional Wai responses"; @@ -92259,6 +92255,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "one-time-password" = callPackage + ({ mkDerivation, base, byteable, bytestring, cereal, cryptohash + , tasty, tasty-hunit, time + }: + mkDerivation { + pname = "one-time-password"; + version = "1.0.0.1"; + sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0"; + buildDepends = [ base byteable bytestring cereal cryptohash time ]; + testDepends = [ + base bytestring cryptohash tasty tasty-hunit time + ]; + homepage = "https://github.com/s9gf4ult/one-time-password"; + description = "HMAC-Based and Time-Based One-Time Passwords"; + license = stdenv.lib.licenses.mit; + }) {}; + "oneOfN" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96059,8 +96072,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.2.1"; - sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci"; + version = "0.1.2.2"; + sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -98012,8 +98025,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "1.1.0"; - sha256 = "116w1lac70fpqrcnx7xbr25jfl3nsqw1v35famnfxgf6mjirsbqg"; + version = "1.1.1"; + sha256 = "0c6ns1zwqanqxd45zly2ms6zg3wx0lzr690pvq1prmf676vw2fj1"; buildDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta @@ -98386,8 +98399,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.36.0.0"; - sha256 = "0kh7mf6g7qc2gp4xpvnnq3053i3wxabwiq827l14k8wv43bjsalj"; + version = "0.36.0.2"; + sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb"; buildDepends = [ base bytestring containers contravariant rainbow split text transformers @@ -99821,12 +99834,12 @@ self: { }) {}; "pseudomacros" = callPackage - ({ mkDerivation, base, old-locale, template-haskell, time }: + ({ mkDerivation, base, template-haskell, time }: mkDerivation { pname = "pseudomacros"; - version = "0.0.1"; - sha256 = "168vqim5m72yl51w6pi9vxzp324i1gnawrl2zlsayw81s7lf1jp4"; - buildDepends = [ base old-locale template-haskell time ]; + version = "0.0.2"; + sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9"; + buildDepends = [ base template-haskell time ]; description = "cpp-style built-in macros using Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101266,8 +101279,8 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.0"; - sha256 = "1criyy8iw1har4nd6rm32gwcrqq4f421935dnbyq4iwkd9xf9mqs"; + version = "0.26.0.2"; + sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; @@ -102663,6 +102676,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "refined" = callPackage + ({ mkDerivation, base, base-prelude, template-haskell }: + mkDerivation { + pname = "refined"; + version = "0.1.0.0"; + sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n"; + buildDepends = [ base base-prelude template-haskell ]; + homepage = "https://github.com/nikita-volkov/refined"; + description = "Refinement types with static and runtime checking"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -108208,8 +108233,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.3.2"; - sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5"; + version = "0.3.3"; + sha256 = "0jddjsvkc2fdnz9yny44ikrqwwx500rd0cgh8fz1894c6p6qfgkm"; buildDepends = [ base io-streams seqid ]; jailbreak = true; description = "Sequence ID IO-Streams"; @@ -109606,8 +109631,8 @@ self: { }: mkDerivation { pname = "shuffle"; - version = "0.1.3.1"; - sha256 = "120rc9gzdhad4nqich1mwixzax9bhsm3vv87qkvyarcz0qf80qcx"; + version = "0.1.3.2"; + sha256 = "07amjk5l9apxs90klq3ii8gxmywnxqhx4fk2yapmm8l75l8b6kfg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109617,7 +109642,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/shuffle"; description = "Shuffle tool for UHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -110935,6 +110959,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-series" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text + }: + mkDerivation { + pname = "smallcheck-series"; + version = "0.2"; + sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v"; + buildDepends = [ base bytestring smallcheck text ]; + testDepends = [ base doctest Glob ]; + homepage = "https://github.com/jdnavarro/smallcheck-series"; + description = "Extra SmallCheck series"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallpt-hs" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -111325,13 +111363,12 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.7"; - sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc"; + version = "1.2.8"; + sha256 = "1ycqfx4qv00cxjrddch1wxadrffq55zbv6bhcahan93wq3a5lb7w"; buildDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -113869,23 +113906,23 @@ self: { }) {}; "ssh" = callPackage - ({ mkDerivation, asn1-data, base, base64-string, binary, bytestring - , cereal, containers, crypto-api, crypto-pubkey-types - , cryptohash-cryptoapi, directory, filepath, HsOpenSSL, HUnit - , integer-gmp, libssh2, network, process, pseudomacros, QuickCheck - , random, RSA, SHA, SimpleAES, split, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, th-lift-instances - , transformers + ({ mkDerivation, asn1-encoding, asn1-types, base, base64-string + , binary, bytestring, cereal, containers, crypto-api + , crypto-pubkey-types, cryptohash-cryptoapi, directory, filepath + , HsOpenSSL, HUnit, integer-gmp, libssh2, network, process + , pseudomacros, QuickCheck, random, RSA, SHA, SimpleAES, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-lift-instances, transformers }: mkDerivation { pname = "ssh"; - version = "0.3.0.1"; - sha256 = "1325af0ij2ys1waghk3f4mr5ndcqbb1k6pjf5m71fk324hb2s9cx"; + version = "0.3.1"; + sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj"; buildDepends = [ - asn1-data base base64-string binary bytestring cereal containers - crypto-api crypto-pubkey-types cryptohash-cryptoapi HsOpenSSL - integer-gmp network process random RSA SHA SimpleAES split - transformers + asn1-encoding asn1-types base base64-string binary bytestring + cereal containers crypto-api crypto-pubkey-types + cryptohash-cryptoapi HsOpenSSL integer-gmp network process random + RSA SHA SimpleAES split transformers ]; testDepends = [ base bytestring containers directory filepath HUnit libssh2 @@ -114106,28 +114143,28 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, Cabal , classy-prelude-conduit, conduit, conduit-extra, containers , data-default-class, directory, filepath, hspec, http-client - , http-client-tls, http-conduit, mono-traversable, mtl, old-locale - , optparse-applicative, process, QuickCheck, semigroups - , stackage-types, stm, streaming-commons, system-fileio + , http-client-tls, http-conduit, monad-unlift, mono-traversable + , mtl, old-locale, optparse-applicative, optparse-simple, process + , QuickCheck, semigroups, stackage-cli, stackage-types + , stackage-update, stm, streaming-commons, system-fileio , system-filepath, tar, temporary, text, time, transformers , unix-compat, utf8-string, xml-conduit, yaml, zlib }: mkDerivation { pname = "stackage-curator"; - version = "0.7.4"; - revision = "1"; - sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk"; - editedCabalFile = "4e0d029d79d0224ebe84bcf2891b5fd37cdc3178d4acae146d1ba2148bee86b1"; + version = "0.8.0"; + sha256 = "1nzbx22y90llcbfv37v119s7psp70rh7gyszar6zfg7wr4plcimb"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async base bytestring Cabal classy-prelude-conduit conduit conduit-extra containers data-default-class directory filepath - http-client http-client-tls http-conduit mono-traversable mtl - old-locale optparse-applicative process semigroups stackage-types - stm streaming-commons system-fileio system-filepath tar temporary - text time transformers unix-compat utf8-string xml-conduit yaml - zlib + http-client http-client-tls http-conduit monad-unlift + mono-traversable mtl old-locale optparse-applicative + optparse-simple process semigroups stackage-cli stackage-types + stackage-update stm streaming-commons system-fileio system-filepath + tar temporary text time transformers unix-compat utf8-string + xml-conduit yaml zlib ]; testDepends = [ base Cabal classy-prelude-conduit containers hspec http-client @@ -114173,17 +114210,18 @@ self: { "stackage-upload" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-client, http-client-tls, http-types, optparse-applicative - , stackage-cli, text + , process, stackage-cli, temporary, text }: mkDerivation { pname = "stackage-upload"; - version = "0.1.0.1"; - sha256 = "1m2dhj2gsg3f1ykrabgvf61vmlv6dhc013nii4ymn6smacqzihhv"; + version = "0.1.0.3"; + sha256 = "0bg08nmcm9jg4pamsm41y1vw2fy2dy9pxxs36nmbrkn1622x7dkc"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring directory filepath http-client - http-client-tls http-types optparse-applicative stackage-cli text + http-client-tls http-types optparse-applicative process + stackage-cli temporary text ]; homepage = "https://github.com/fpco/stackage-upload"; description = "A more secure version of cabal upload which uses HTTPS"; @@ -118865,8 +118903,8 @@ self: { }: mkDerivation { pname = "test-framework-golden"; - version = "1.1.3.1"; - sha256 = "1vmkc16z3gzbq9aibfk3wv7ms7sq7yivaamld63qrzlqaffz1xrw"; + version = "1.1.3.3"; + sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36"; buildDepends = [ base bytestring filepath mtl process temporary test-framework ]; @@ -122712,8 +122750,8 @@ self: { ({ mkDerivation, base, eventloop }: mkDerivation { pname = "twentefp-eventloop-trees"; - version = "0.1.0.0"; - sha256 = "18cifjf8avblgf0v1nskxdfx08ph92d16n8c50l9ln99aj9pw724"; + version = "0.1.0.1"; + sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m"; buildDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; @@ -123055,8 +123093,8 @@ self: { }: mkDerivation { pname = "twitter-feed"; - version = "0.1.1.3"; - sha256 = "1c50rirj3wymbh1850c7dm79jyglcn34116vljh5f54f8sv17y96"; + version = "0.1.1.4"; + sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir"; buildDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; @@ -125228,20 +125266,21 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens + , QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "uri-bytestring"; - version = "0.0.1"; - sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5"; + version = "0.1"; + sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1"; buildDepends = [ attoparsec base bytestring ]; testDepends = [ - attoparsec base bytestring derive HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck + attoparsec base bytestring derive HUnit lens QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck ]; jailbreak = true; - homepage = "https://travis-ci.org/Soostone/uri-bytestring"; + homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127024,18 +127063,18 @@ self: { ({ mkDerivation, base, bytestring, c2hs, containers, data-default , deepseq, directory, filepath, hspec, hspec-expectations, libmpd , mtl, ncurses, old-locale, process, QuickCheck, template-haskell - , time, transformers, utf8-string, wcwidth + , time, time-locale-compat, transformers, utf8-string, wcwidth }: mkDerivation { pname = "vimus"; - version = "0.2.0"; - sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h"; + version = "0.2.1"; + sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring containers data-default deepseq directory filepath - libmpd mtl old-locale process template-haskell time utf8-string - wcwidth + libmpd mtl old-locale process template-haskell time + time-locale-compat utf8-string wcwidth ]; testDepends = [ base data-default hspec hspec-expectations mtl QuickCheck @@ -128985,8 +129024,8 @@ self: { }: mkDerivation { pname = "webcrank"; - version = "0.2"; - sha256 = "0ws66z1qrlx91arpj3i9nz6lqbz1iwcpbzxdnqrwc1bml7zs2ipj"; + version = "0.2.0.1"; + sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -133208,6 +133247,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-gitrev" = callPackage + ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core + }: + mkDerivation { + pname = "yesod-gitrev"; + version = "0.1.0.0"; + sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih"; + buildDepends = [ aeson base gitrev template-haskell yesod-core ]; + description = "A subsite for displaying git information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-goodies" = callPackage ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form @@ -133811,8 +133862,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.1.0.0"; - sha256 = "15c6z262fcbradphrv82fz5pc2il27vqnmkym1b61wvpsydy2681"; + version = "0.1.1.0"; + sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f"; buildDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers yesod yesod-core From a3beaca54f248471ba966dd50ac483712f890ddd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 19:44:38 +0200 Subject: [PATCH 027/135] haskell-cabal-test-quickcheck: fix build by providing a recent-enough version of QuickCheck --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 173ca92dd3e..fe74c9c5600 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -155,9 +155,8 @@ self: super: { patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal"; }); - # The test suite imposes too narrow restrictions on the version of - # Cabal that can be used to build this package. - cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck; + # Needs the latest version of QuickCheck to compile. + cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; From 6f7e793f0398466592de3133648e1055c44ebb59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 19:57:02 +0200 Subject: [PATCH 028/135] haskell-rainbox: the test suite does not compile --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fe74c9c5600..f6819a100fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -158,6 +158,9 @@ self: super: { # Needs the latest version of QuickCheck to compile. cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; }; + # https://github.com/massysett/rainbox/issues/1 + rainbox = dontCheck super.rainbox; + # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; From 90b84a60a63705ed9a11bbc5a1169476dfdf222d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2015 20:02:52 +0200 Subject: [PATCH 029/135] haskell-wreq: the library is broken with GHC 7.10.1 --- .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 9a05a251137..0e4fd3cc5d1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -329,4 +329,9 @@ self: super: { seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0; vector_0_10_9_3 = markBroken super.vector_0_10_9_3; + # https://github.com/bos/wreq/issues/61 + wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq); + wreq-sb = dontDistribute (dontCheck super.wreq-sb); + hipbot = dontDistribute super.hipbot; + } From ecd30ec9ca4fcbdee11bc17f5d029ea4bafcc477 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 28 Apr 2015 19:15:57 +0200 Subject: [PATCH 030/135] gcc-arm-embedded: Update to latest version. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdf26fea90..6035fef7edd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3707,9 +3707,9 @@ let sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; }; gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { - version = "4.9-2014q4-20141203"; - releaseType = "major"; - sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f"; + version = "4.9-2015q1-20150306"; + releaseType = "update"; + sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; }; gcc-arm-embedded = gcc-arm-embedded-4_9; From cdeb2e58860df70a50aaf73b61af2661c677e329 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 21:31:15 +0200 Subject: [PATCH 031/135] mcelog 115 -> 116 Added Knights Landing (Xeon Phi) support. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 55ab8eda9b5..342e29a6d2e 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "115"; in +let version = "116"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "13m9y4xfd3klzj2xrwwwwg31pnjfwd0rbrr2845sf557iyqrshki"; + sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From cb8f111a72a54888dea24b6ccbdb5a657577983f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 28 Apr 2015 22:21:57 +0200 Subject: [PATCH 032/135] Revert "pycairo: set user-agent to fix download of patches" This commit was should fix issue #7586, but it does not. This reverts commit e1c65ddfe11c8070dda00a66f2b4ae45bbddb0bc. --- pkgs/development/python-modules/pycairo/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 50e1435f3f4..0589bec36b9 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -15,13 +15,11 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} patches = [(fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; - curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; })]; patch_waf = fetchpatch { url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; - curlOpts = "--user-agent 'Mozilla/5.0'"; sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; From 4256ab778a0cc50c88cbd0366c2f126edb06fc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:35:39 +0200 Subject: [PATCH 033/135] fetchhg: pass proxyvars to hg --- pkgs/build-support/fetchhg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 4675cbe6ec8..26426ce7d83 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -6,13 +6,17 @@ stdenv.mkDerivation { builder = ./builder.sh; buildInputs = [mercurial]; + impureEnvVars = [ + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; + # Nix <= 0.7 compatibility. id = md5; outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive"; outputHash = if md5 != null then md5 else sha256; - + inherit url rev; preferLocalBuild = true; } From 63c00f27460ab465443c2a9d041b31ae0c03ba3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:36:56 +0200 Subject: [PATCH 034/135] fetchFrom{Savannah,RepoOrCz,GitLab}: added fetchgit migration helpers --- pkgs/top-level/all-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdf26fea90..cbf5a7aa4ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -375,12 +375,31 @@ let inherit sha256; }; + # gitorious example fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name; url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; }; + # cgit example, snapshot support is optional in cgit + fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; + }; + + # gitlab example + fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; + }; + + # gitweb example, snapshot support is optional in gitweb + fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name sha256; + url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; From b9b8e3acbae451f6a4d95b2faf2ddfd588f224b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Apr 2015 22:41:40 +0200 Subject: [PATCH 035/135] {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src: use mirrors, https and fetchFromSavannah to enable better availability for proxied users --- pkgs/development/libraries/libs3/default.nix | 9 +++++---- pkgs/development/libraries/nss_wrapper/default.nix | 9 ++++----- pkgs/development/libraries/socket_wrapper/default.nix | 9 ++++----- pkgs/tools/filesystems/ceph/0.94.nix | 2 +- pkgs/tools/misc/grub/2.0x.nix | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 551f65c2971..3d8699918e1 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, curl, libxml2 }: +{ stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { name = "libs3-2015-01-09"; - src = fetchgit { - url = "git://github.com/bji/libs3.git"; + src = fetchFromGitHub { + owner = "bji"; + repo = "libs3"; rev = "4d21fdc0857b88c964649b321057d7105d1e4da3"; - sha256 = "058sixppk078mdn9ii3swg87nbpgl86llz9mdhj5km5m53a7dnjw"; + sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3"; }; buildInputs = [ curl libxml2 ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index b0595e61e65..278834190bb 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "nss_wrapper-1.0.3"; - src = fetchgit { - url = "git://git.samba.org/nss_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18"; }; buildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 1344ad18d09..d682b10141e 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "socket_wrapper-1.1.3"; - src = fetchgit { - url = "git://git.samba.org/socket_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3"; }; buildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 0fc2b60748a..a14259184a5 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec { version = "0.94.1"; src = fetchgit { - url = "git://github.com/ceph/ceph.git"; + url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx"; }; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 47eb90eb11e..501c6820df2 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , zfs ? null , efiSupport ? false @@ -41,10 +41,10 @@ assert zfsSupport -> zfs != null; stdenv.mkDerivation rec { name = "grub-${version}"; - src = fetchgit { - url = "git://git.savannah.gnu.org/grub.git"; + src = fetchFromSavannah { + repo = "grub"; rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de"; - sha256 = "1170413b4d9kwqwgi1dcsnbwn8mb3snbid858wyfv84910kbrs2d"; + sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; From d941d4c26e8efb8f20207b97d33f707b694cfe5b Mon Sep 17 00:00:00 2001 From: Chris Double Date: Wed, 29 Apr 2015 11:58:52 +1200 Subject: [PATCH 036/135] Update tor-browser to 4.5 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index b605f3eb330..67d8b110568 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.8"; + version = "4.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "d8e1ff1865542eb358834bd6f095a2bfa2a991a30ca5188a5752883636a31a36" else - "152186ff31425660675c082af1759ef6cc65f618b6e49e25385c7ccacfe70061"; + "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else + "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49"; }; patchPhase = '' From afa51d31f5af60af61ec109f97be295b8828df39 Mon Sep 17 00:00:00 2001 From: dnhgff Date: Tue, 28 Apr 2015 17:37:27 -0700 Subject: [PATCH 037/135] ghcjs: bump ghcjs-boot commit see https://github.com/ghcjs/ghcjs-boot/pull/17 for justification (ghcjs-boot won't build anymore on the previous commit :() --- pkgs/development/compilers/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 4c75861cbec..8206bb19e4f 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -45,8 +45,8 @@ let libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8bf1a2c665d42a66354f17220c7dfb1c8b44c0ea"; # 7.10 branch - sha256 = "18bm6sfa9c9kwsmv3lz6j27ng6jl0ck3ifgqbwwa8myfy7fw4il7"; + rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch + sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343"; fetchSubmodules = true; }; shims = fetchgit { From 5f149c80f25d733bcefbabc85c1163a3492596c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 28 Apr 2015 21:18:06 -0700 Subject: [PATCH 038/135] gpgme: 1.5.3 -> 1.5.4 --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2e51f70e91d..d4913ef21f6 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.3"; + name = "gpgme-1.5.4"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d"; + sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; From 4d60f8f1bd196ed4aca83bdcec830d9bf004f6b0 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Tue, 28 Apr 2015 22:07:09 -0700 Subject: [PATCH 039/135] package Dirt Dirt is used with the Tidal audio programming library (already packaged). I tested by building and running locally. --- pkgs/applications/audio/dirt/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/dirt/default.nix diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix new file mode 100644 index 00000000000..b5436fde7e9 --- /dev/null +++ b/pkgs/applications/audio/dirt/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }: + +stdenv.mkDerivation rec { + name = "dirt-git"; + src = fetchFromGitHub { + repo = "Dirt"; + owner = "tidalcycles"; + rev = "cfc5e85318defda7462192b5159103c823ce61f7"; + sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; + }; + buildInputs = [ libsndfile libsamplerate liblo jack2 ]; + configurePhase = '' + export DESTDIR=$out + ''; + + meta = { + description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; + homepage = "https://github.com/tidalcycles/Dirt"; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c108c8915e..76c39a11261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10392,6 +10392,8 @@ let distrho = callPackage ../applications/audio/distrho {}; + dirt = callPackage ../applications/audio/dirt {}; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; From f64d767130152c7bc8136efcc589d7fc28a6d9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 29 Apr 2015 14:20:50 +0800 Subject: [PATCH 040/135] libxmp: Update to 4.3.8 --- pkgs/development/libraries/libxmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 7b4d3d6287a..4bc9e8ed1c4 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.2.7"; + name = "libxmp-4.3.8"; meta = with stdenv.lib; { description = "Extended module player library"; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; - sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536"; + sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny"; }; } From a5f2cbff0a161482830842a393c142ff7d24e8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 29 Apr 2015 14:22:28 +0800 Subject: [PATCH 041/135] xmp: Update to 4.0.10 --- pkgs/applications/audio/xmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 7f21d389cf5..6bec03bd71b 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.0.7"; + name = "xmp-4.0.10"; meta = with stdenv.lib; { description = "Extended module player"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; - sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw"; + sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; }; buildInputs = [ pkgconfig alsaLib libxmp ]; From 310da1b4dad2b9d4ae0b4411194dd1ce7c0a22df Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 29 Apr 2015 08:19:47 +0200 Subject: [PATCH 042/135] chromium/update: Remove reference to . We shouldn't make assumptions on what is set by NIX_PATH in order to make it easier to rename that Nix path reference. Signed-off-by: aszlig --- .../applications/networking/browsers/chromium/source/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index cfa5f1e009b..27af85de546 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -1,7 +1,7 @@ { system ? builtins.currentSystem }: let - inherit (import { + inherit (import ../../../../../../. { inherit system; }) lib writeText stdenv; From 543ec3cf469df5d551eb93e3cc0306581c580401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Wed, 29 Apr 2015 08:50:48 +0100 Subject: [PATCH 043/135] boot: bump from rc8 to rc14 --- pkgs/development/tools/build-managers/boot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index ccc7e326fd7..6ae4da408c0 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - version = "2.0.0-rc8"; + version = "2.0.0-rc14"; name = "boot-${version}"; src = fetchurl { url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh"; - sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j"; + sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0"; }; inherit jdk; From 2f2c50d9f4e11e99fca5b5300b68035fa7556345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 29 Apr 2015 10:10:28 +0200 Subject: [PATCH 044/135] uid_wrapper.src: use mirrors to enable better availability for proxied users --- pkgs/development/libraries/uid_wrapper/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index b19d404bee2..07fffeff20d 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pkgconfig }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "uid_wrapper-1.1.0"; - src = fetchgit { - url = "git://git.samba.org/uid_wrapper.git"; - rev = "refs/tags/${name}"; - sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj"; + src = fetchurl { + url = "mirror://samba/cwrap/${name}.tar.gz"; + sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn"; }; buildInputs = [ cmake pkgconfig ]; From eadb3a51ff475d741465921aca2ef5c2dbad604a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 29 Apr 2015 11:23:40 +0200 Subject: [PATCH 045/135] Fix sorting: dirt comes before distrho --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c39a11261..07a230a5fee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10390,10 +10390,10 @@ let diffuse = callPackage ../applications/version-management/diffuse { }; - distrho = callPackage ../applications/audio/distrho {}; - dirt = callPackage ../applications/audio/dirt {}; + distrho = callPackage ../applications/audio/distrho {}; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; From a38672dea22d424105a0e21ae4b71e051f657c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2015 11:27:30 +0200 Subject: [PATCH 046/135] release: fix eval by lib.tests -> lib-tests See discussion on commit https://github.com/NixOS/nixpkgs/commit/de0f122b016c88#commitcomment-10937080 --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cb469e61305..e156f336ffa 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -23,7 +23,7 @@ let { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; }; manual = import ../../doc; - lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; @@ -31,7 +31,7 @@ let constituents = [ jobs.tarball jobs.manual - jobs.lib.tests + jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin From 8978ff3840e8ceb52441ea50cb068adf8b6f63fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2015 11:47:18 +0200 Subject: [PATCH 047/135] unstable job: glib-tested seems ready (succeeding often) This reverts commit a35d4a9d4e2d4435e53fdfd1698f2118828c773f. --- pkgs/top-level/release.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e156f336ffa..361b9ab6cc3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -40,10 +40,8 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux - /* not ready yet jobs.glib-tested.x86_64-linux # standard glib doesn't do checks jobs.glib-tested.i686-linux - */ ]; }; From ad0bd73775954d4ecc7f83874ac813eff6d83866 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 29 Apr 2015 09:55:20 +0000 Subject: [PATCH 048/135] Work around infinite recursion issue in nixops. --- nixos/modules/virtualisation/google-compute-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index 9e6be93b6d9..f6bca1aa857 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -1,5 +1,5 @@ -{ config, pkgs, modulesPath, ... }: +{ config, pkgs, ... }: { - imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ]; + imports = [ ]; } From 9b27a88b66d318035943dbd70082ab4bd43412f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Apr 2015 18:38:18 +0200 Subject: [PATCH 049/135] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/5f6d964cbaae84478f73a185e89cafc169362cfd with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b --- .../haskell-modules/hackage-packages.nix | 289 ++++++++++++------ 1 file changed, 200 insertions(+), 89 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8628d5a1698..04293b81fe7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1007,6 +1007,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "BCMtools" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-lexing + , colour, conduit, conduit-extra, data-binary-ieee754 + , data-default-class, matrices, optparse-applicative, resourcet + , split, transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "BCMtools"; + version = "0.1.0"; + sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring bytestring-lexing colour conduit + conduit-extra data-binary-ieee754 data-default-class matrices + optparse-applicative resourcet split transformers + unordered-containers vector zlib + ]; + description = "Big Contact Map Tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "BNFC" = callPackage ({ mkDerivation, alex, array, base, containers, deepseq, directory , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process @@ -3910,12 +3932,12 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, containers, kan-extensions, ListLike }: + ({ mkDerivation, base, containers, ListLike }: mkDerivation { pname = "Earley"; - version = "0.6.0"; - sha256 = "0fqiiqrmrnb7zmk61bjnc98y30jvrd0yqflsk8mcnkfahbhhsc5w"; - buildDepends = [ base containers kan-extensions ListLike ]; + version = "0.7.0"; + sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72"; + buildDepends = [ base containers ListLike ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14679,8 +14701,8 @@ self: { }: mkDerivation { pname = "UISF"; - version = "0.3.0.1"; - sha256 = "0qfhcc0ii7nncfsyxvafwbrx8j6jjdc0jrj56g8jm8vmzsa082kp"; + version = "0.3.0.2"; + sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46"; buildDepends = [ arrows base containers deepseq GLFW OpenGL stm transformers ]; @@ -17376,21 +17398,20 @@ self: { }) {}; "aeson-t" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec2, text + ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec, text , unordered-containers, vector }: mkDerivation { pname = "aeson-t"; - version = "0.0.4"; - sha256 = "0y4mbn1xb288amgy8j6p5x9ih873qwiwrialfchc8ryg0n8syp8r"; + version = "0.0.5"; + sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd"; buildDepends = [ aeson base bytestring text unordered-containers vector ]; testDepends = [ - aeson aeson-qq base bytestring hspec2 text unordered-containers + aeson aeson-qq base bytestring hspec text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/begriffs/aeson-t"; description = "Transform JSON"; license = stdenv.lib.licenses.mit; @@ -21094,8 +21115,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.0.1"; - sha256 = "0x5q3aqsqi10plrwdpcprpvc9fd6vq0ar4f4am5kv5zs1h0yjvfd"; + version = "0.4.0.2"; + sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp"; buildDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -21778,8 +21799,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.4"; - sha256 = "0bd424ls3kfqx2y7fzcmhssss3r3bhra8bzmllx1slb1x04apgn6"; + version = "0.0.5"; + sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring containers cryptohash inflections influxdb MonadRandom mtl network @@ -22052,8 +22073,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.4.0.0"; - sha256 = "1jmm83pciv4mfknwj9z57kbq4siikfad21xhysnhwrpm2maqswa4"; + version = "0.4.0.1"; + sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22064,7 +22085,6 @@ self: { resourcet stm stm-chans stm-queue-extras text transformers unordered-containers ]; - jailbreak = true; description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; }) {}; @@ -22146,8 +22166,8 @@ self: { }: mkDerivation { pname = "aws-route53"; - version = "0.1.1"; - sha256 = "1nzxs6ff0nh6ncswfnx2gxxmx2by0xxzfpmlkk1cnd9xkz7c8n0k"; + version = "0.1.2"; + sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18"; buildDepends = [ aws base bytestring containers http-conduit http-types old-locale resourcet text time xml-conduit xml-hamlet @@ -25151,6 +25171,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitcoin-types" = callPackage + ({ mkDerivation, base, base58string, binary, bytestring, hexstring + , hspec, text + }: + mkDerivation { + pname = "bitcoin-types"; + version = "0.9.0"; + sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5"; + buildDepends = [ + base base58string binary bytestring hexstring text + ]; + testDepends = [ base base58string bytestring hexstring hspec ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Provides consistent low-level types used commonly among Bitcoin implementations"; + license = stdenv.lib.licenses.mit; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -27877,8 +27914,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.2.1"; - sha256 = "0rhabhbcxl3gsq4wdkxd4mswrb8rqfmq6crcc70hm75fjxfmr3sz"; + version = "0.3.3.0"; + sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -31949,12 +31986,12 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, HUnit, text }: + ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.1"; - sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb"; - buildDepends = [ base text ]; + version = "0.3.2"; + sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk"; + buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; @@ -32137,8 +32174,8 @@ self: { }: mkDerivation { pname = "cndict"; - version = "0.5.4"; - sha256 = "1jza2s9qmmzg4qgq8wpslj71ybbs3b8lk81jfqp70j3dq1zvzhba"; + version = "0.5.5"; + sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z"; buildDepends = [ base binary bytestring cassava containers file-embed text vector ]; @@ -41822,8 +41859,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.6.0.0"; - sha256 = "17dbhnwdn89wqm0s8j9zfydi7g6x1wlf1bnjv39qrp7qyr8mm2k5"; + version = "0.6.0.1"; + sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42379,6 +42416,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dove" = callPackage + ({ mkDerivation, acl2, base }: + mkDerivation { + pname = "dove"; + version = "0.0.0"; + sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd"; + buildDepends = [ acl2 base ]; + description = "The Dove verification language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dow" = callPackage ({ mkDerivation, array, base, directory, elerea, GLFW , mersenne-random, OpenGL @@ -43151,8 +43199,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.7"; - sha256 = "1jpl8prd18ka8ypkf2ni8i6arfmv9x3d75r7327aalayj3vzap3d"; + version = "0.1.0.8"; + sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k"; buildDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers @@ -46742,12 +46790,12 @@ self: { }) {}; "fasta" = callPackage - ({ mkDerivation, base, containers, parsec, split, text }: + ({ mkDerivation, base, containers, parsec, pipes, split, text }: mkDerivation { pname = "fasta"; - version = "0.5.3.0"; - sha256 = "060y8sqbklf7wr8kl2c935cxakykj705f1bbn72c4zcwfdrf5jz4"; - buildDepends = [ base containers parsec split text ]; + version = "0.5.4.0"; + sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg"; + buildDepends = [ base containers parsec pipes split text ]; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -47666,17 +47714,17 @@ self: { }) {}; "filediff" = callPackage - ({ mkDerivation, base, data-default, data-memocombinators - , directory, either, mtl, tasty, tasty-hunit, text, time - , transformers, Zora + ({ mkDerivation, base, bytestring, data-default + , data-memocombinators, directory, either, mtl, rainbow, tasty + , tasty-hunit, text, time, transformers, Zora }: mkDerivation { pname = "filediff"; - version = "0.1.0.7"; - sha256 = "1anjfh549ah2m8k5ibdgc578pi5phyycxj1avky38w499dadgwfi"; + version = "0.1.0.8"; + sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3"; buildDepends = [ - base data-default data-memocombinators directory either mtl tasty - tasty-hunit text time transformers Zora + base bytestring data-default data-memocombinators directory either + mtl rainbow tasty tasty-hunit text time transformers Zora ]; testDepends = [ base directory either mtl tasty tasty-hunit text time transformers @@ -70081,22 +70129,21 @@ self: { "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, clock, containers - , cookie, data-default-class, deepseq, directory, exceptions - , filepath, ghc-prim, hspec, http-types, mime-types, monad-control - , network, network-uri, publicsuffixlist, random, streaming-commons - , text, time, transformers, zlib + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib }: mkDerivation { pname = "http-client"; - version = "0.4.11.1"; - sha256 = "122h9g6nk17nwxrwqwni75gfbc221s1jvjjlmq6sh9ksgsyh09b4"; + version = "0.4.11.2"; + sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2"; buildDepends = [ array base base64-bytestring blaze-builder bytestring - case-insensitive clock containers cookie data-default-class deepseq + case-insensitive containers cookie data-default-class deepseq exceptions filepath ghc-prim http-types mime-types network - network-uri publicsuffixlist random streaming-commons text time - transformers + network-uri random streaming-commons text time transformers ]; testDepends = [ async base base64-bytestring blaze-builder bytestring @@ -79864,19 +79911,20 @@ self: { "libconfig" = callPackage ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text - , text-binary, transformers + , text-binary, transformers, transformers-compat }: mkDerivation { pname = "libconfig"; - version = "0.2.0.0"; - sha256 = "1z03vnqhm6iiz964rmhvzm15hdx7mmck06yawf0sy4h5ljwrq94a"; + version = "0.3.0.0"; + sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12"; buildDepends = [ base binary cereal cereal-text deepseq hashable profunctors text - text-binary transformers + text-binary transformers transformers-compat ]; testDepends = [ base doctest doctest-prop lens ]; buildTools = [ c2hs ]; extraLibraries = [ config ]; + homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; }) { config = null;}; @@ -81281,15 +81329,21 @@ self: { }) {}; "list-t-html-parser" = callPackage - ({ mkDerivation, base-prelude, either, html-tokenizer, list-t - , mtl-prelude, text + ({ mkDerivation, base-prelude, case-insensitive, conversion + , conversion-text, either, hspec, html-entities, html-tokenizer + , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text }: mkDerivation { pname = "list-t-html-parser"; - version = "0.2.1.0"; - sha256 = "0vf58ji73vc8hgbq2bd7p2ls7syk33qy5pp92kx5byr5j38zzar3"; + version = "0.2.2.0"; + sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0"; buildDepends = [ - base-prelude either html-tokenizer list-t mtl-prelude text + base-prelude case-insensitive either html-entities html-tokenizer + list-t mtl-prelude text + ]; + testDepends = [ + base-prelude conversion conversion-text hspec html-tokenizer + list-t-attoparsec list-t-text text ]; homepage = "https://github.com/nikita-volkov/list-t-html-parser"; description = "Streaming HTML parser"; @@ -81335,8 +81389,8 @@ self: { }: mkDerivation { pname = "list-t-text"; - version = "0.1.0.2"; - sha256 = "05vz6r9r5903wm9spmy6zsql8jzzqj1dv94yfnfhiwkkmgjsvv5z"; + version = "0.2.0.1"; + sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng"; buildDepends = [ base-prelude bytestring list-t mtl-prelude text ]; testDepends = [ base base-prelude bytestring hspec list-t QuickCheck @@ -84322,12 +84376,15 @@ self: { }) { eng = null; mat = null; mx = null;}; "matrices" = callPackage - ({ mkDerivation, base, binary, primitive, vector }: + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , tasty-quickcheck, vector + }: mkDerivation { pname = "matrices"; - version = "0.4.0"; - sha256 = "1whajm8cqr724dz6aqnjbki77c40xr1sy16pks15rq56j7f2av2v"; - buildDepends = [ base binary primitive vector ]; + version = "0.4.1"; + sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z"; + buildDepends = [ base primitive vector ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ]; description = "native matrix based on vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -91943,20 +92000,20 @@ self: { , base64-bytestring, bytestring, containers, cryptohash, dotenv , either, errors, ghc-prim, hspec, hspec-expectations, http-client , http-types, lens, mtl, optparse-applicative, text, time - , transformers, unordered-containers, utf8-string, wreq, xmlhtml + , transformers, unordered-containers, utf8-string, wreq-sb, xmlhtml , yaml }: mkDerivation { pname = "octohat"; - version = "0.1.4.1"; - sha256 = "1cc7np4kb03160fbn2bwkbl0xgcnizcgr3yvq8pp47p31k965x54"; + version = "0.1.4.2"; + sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base base-compat base16-bytestring base64-bytestring bytestring containers cryptohash dotenv either errors ghc-prim http-client http-types lens mtl optparse-applicative text time - transformers unordered-containers utf8-string wreq xmlhtml yaml + transformers unordered-containers utf8-string wreq-sb xmlhtml yaml ]; testDepends = [ base base-compat dotenv hspec hspec-expectations text transformers @@ -102413,15 +102470,15 @@ self: { "redis" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers - , MonadCatchIO-mtl, mtl, network, old-time, utf8-string + , exceptions, mtl, network, old-time, utf8-string }: mkDerivation { pname = "redis"; - version = "0.13.0.1"; - sha256 = "0djwih122pp7y0c1lx7ab7n80ra1488hrwgf0iq20gywk8an9wfq"; + version = "0.14"; + sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094"; buildDepends = [ - base bytestring concurrent-extra containers MonadCatchIO-mtl mtl - network old-time utf8-string + base bytestring concurrent-extra containers exceptions mtl network + old-time utf8-string ]; homepage = "http://hub.darcs.net/ganesh/redis"; description = "A driver for Redis key-value database"; @@ -104611,8 +104668,8 @@ self: { }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.16"; - sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1"; + version = "0.0.17"; + sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz"; buildDepends = [ aeson base binary bytestring hashable mtl network old-locale scientific template-haskell text time unordered-containers vector @@ -110508,8 +110565,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.1.0.0"; - sha256 = "183kqvkp0s55bqm5gr7kiq9lk9qpm3ijwnansl6lpdxclcg9gm8y"; + version = "0.1.1.0"; + sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s"; buildDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -113056,8 +113113,8 @@ self: { ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.2.0"; - sha256 = "1a3dmmq1dcz5sanj0cisddk313f89sil89xxbk2l9sjprc1fwrv7"; + version = "0.2.3.0"; + sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4"; buildDepends = [ base binary cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; @@ -114103,12 +114160,16 @@ self: { }) {}; "stackage" = callPackage - ({ mkDerivation, base, stackage-cli, stackage-update }: + ({ mkDerivation, base, stackage-cli, stackage-install + , stackage-update, stackage-upload + }: mkDerivation { pname = "stackage"; - version = "0.7.0.0"; - sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj"; - buildDepends = [ base stackage-cli stackage-update ]; + version = "0.7.1.0"; + sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7"; + buildDepends = [ + base stackage-cli stackage-install stackage-update stackage-upload + ]; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; @@ -114176,6 +114237,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-install" = callPackage + ({ mkDerivation, async, base, bytestring, directory, filepath + , http-client, http-client-tls, process, stm + }: + mkDerivation { + pname = "stackage-install"; + version = "0.1.0.1"; + sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring directory filepath http-client + http-client-tls process stm + ]; + homepage = "https://github.com/fpco/stackage-install"; + description = "Secure download of packages for cabal-install"; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions , hashable, semigroups, text, unordered-containers, vector @@ -118562,6 +118642,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "templater" = callPackage + ({ mkDerivation, attoparsec, base, hspec, hspec-attoparsec, HUnit + , QuickCheck, text + }: + mkDerivation { + pname = "templater"; + version = "0.0.2.0"; + sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb"; + buildDepends = [ attoparsec base text ]; + testDepends = [ + base hspec hspec-attoparsec HUnit QuickCheck text + ]; + homepage = "https://github.com/geraud/templater"; + description = "Simple string templater"; + license = stdenv.lib.licenses.mit; + }) {}; + "tempodb" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , HsOpenSSL, HTTP, http-streams, io-streams, mtl, old-locale, text @@ -119574,6 +119671,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-position" = callPackage + ({ mkDerivation, base, QuickCheck, regex-applicative }: + mkDerivation { + pname = "text-position"; + version = "0.1.0.0"; + sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8"; + buildDepends = [ base regex-applicative ]; + testDepends = [ base QuickCheck regex-applicative ]; + jailbreak = true; + homepage = "http://rel4tion.org/projects/text-position/"; + description = "Handling positions in text and position-tagging it"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -129675,8 +129786,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.2"; - sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; + version = "0.1.2.3"; + sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; From b88fc6c90e7f8d32fa24d8e51d099c16c36d59d7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 29 Apr 2015 13:15:17 +0200 Subject: [PATCH 050/135] update vagrant to 1.7.2 --- pkgs/development/tools/vagrant/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 44cb5fef90e..84bfcce541a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.6.5"; + version = "1.7.2"; rake = buildRubyGem { inherit ruby; name = "rake-10.3.2"; @@ -19,19 +19,19 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb"; - sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2"; + sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx"; } else fetchurl { url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb"; - sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq"; + sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz"; }; meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 globin ]; platforms = platforms.linux; }; @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { preFixup = '' # 'hide' the template file from shebang-patching - chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable - chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh + chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; postFixup = '' - chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable - chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh + chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable + chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh ''; } From 456da7fededf36efc592795b9106150f2033dd47 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Tue, 28 Apr 2015 18:56:29 +0200 Subject: [PATCH 051/135] apache pig: new package --- .../networking/cluster/pig/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/networking/cluster/pig/default.nix diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix new file mode 100644 index 00000000000..a5666fc8f32 --- /dev/null +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: + +stdenv.mkDerivation rec { + + name = "pig-0.14.0"; + + src = fetchurl { + url = "mirror://apache/pig/${name}/${name}.tar.gz"; + sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska"; + + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out + mv * $out + + # no need for the windows batch script + rm $out/bin/pig.cmd $out/bin/pig.py + + for n in $out/{bin,sbin}"/"*; do + wrapProgram $n \ + --prefix PATH : "${jre}/bin:${bash}/bin" \ + --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}" + done + ''; + + meta = with stdenv.lib; { + homepage = "http://pig.apache.org/"; + description = "High-level language for Apache Hadoop"; + license = licenses.asl20; + + longDescription = '' + Apache Pig is a platform for analyzing large data sets that consists of a + high-level language for expressing data analysis programs, coupled with + infrastructure for evaluating these programs. The salient property of Pig + programs is that their structure is amenable to substantial parallelization, + which in turns enables them to handle very large data sets. + ''; + + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdf26fea90..931155c4a15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11524,6 +11524,8 @@ let pcmanfm = callPackage ../applications/misc/pcmanfm { }; + pig = callPackage ../applications/networking/cluster/pig { }; + shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; smplayer = callPackage ../applications/video/smplayer { }; From 552ea209d0862e4fd5e28573cfa0e1512f78d747 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2015 16:07:36 +0200 Subject: [PATCH 052/135] php: Update to 5.4.40 --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 02137e5823e..c94199b7ab1 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./makePhpDerivation.nix { - phpVersion = "5.4.39"; - sha = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw"; + phpVersion = "5.4.40"; + sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; apacheHttpd = apacheHttpd; } From 182acabbae644182ee6dafc9779e63abd7991f8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2015 16:09:30 +0200 Subject: [PATCH 053/135] Don't use camelCase in file names --- pkgs/development/interpreters/php/5.4.nix | 2 +- pkgs/development/interpreters/php/5.5.nix | 2 +- pkgs/development/interpreters/php/5.6.nix | 2 +- .../interpreters/php/{makePhpDerivation.nix => generic.nix} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/php/{makePhpDerivation.nix => generic.nix} (100%) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c94199b7ab1..7133b1e0824 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.4.40"; sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 842f12a8910..fdc1ab79c76 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.5.21"; sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 2f4a3165f43..5f69e46189f 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,5 +1,5 @@ { callPackage, apacheHttpd }: -callPackage ./makePhpDerivation.nix { +callPackage ./generic.nix { phpVersion = "5.6.6"; sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9"; apacheHttpd = apacheHttpd; diff --git a/pkgs/development/interpreters/php/makePhpDerivation.nix b/pkgs/development/interpreters/php/generic.nix similarity index 100% rename from pkgs/development/interpreters/php/makePhpDerivation.nix rename to pkgs/development/interpreters/php/generic.nix From ff88f4bcda606d9a47f807b773749280998e64ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 29 Apr 2015 18:48:21 +0200 Subject: [PATCH 054/135] nixos-install: correctly detect stdin --- nixos/modules/installer/tools/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 097631eda9c..b1f4772d570 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -263,7 +263,7 @@ export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix # Ask the user to set a root password. -if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then +if [ "$(chroot $mountPoint nix-instantiate --eval '' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi From 9870ba196830ef03501c092f903919ea769b37ca Mon Sep 17 00:00:00 2001 From: William Giokas <1007380@gmail.com> Date: Wed, 29 Apr 2015 09:58:04 -0700 Subject: [PATCH 055/135] git-remote-hg: remove dbus, install built docs dbus is unused in this package, no reason to include it in the expression anywhere. --- .../git-and-tools/git-remote-hg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index a60d7d2a49b..588c7acff7c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, mercurial, makeWrapper, - asciidoc, xmlto, dbus, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 + asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ mercurial.python mercurial makeWrapper - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt libxml2 + asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2 ]; doCheck = false; - installFlags = "HOME=\${out}"; + installFlags = "HOME=\${out} install-doc"; postInstall = '' wrapProgram $out/bin/git-remote-hg \ From 9a535b90238938e38bdb0498e9f2558ace782a4f Mon Sep 17 00:00:00 2001 From: Bram Duvigneau Date: Wed, 29 Apr 2015 23:02:09 +0200 Subject: [PATCH 056/135] Added BRLTTY package --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/brltty.nix | 42 ++++++++++++++++++++++ pkgs/tools/misc/brltty/default.nix | 33 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 4 files changed, 79 insertions(+) create mode 100644 nixos/modules/services/hardware/brltty.nix create mode 100644 pkgs/tools/misc/brltty/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 61cc551f435..e1af98f0da6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -152,6 +152,7 @@ ./services/hardware/actkbd.nix ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix + ./services/hardware/brltty.nix ./services/hardware/freefall.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix new file mode 100644 index 00000000000..d6c05a3d620 --- /dev/null +++ b/nixos/modules/services/hardware/brltty.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.brltty; + + stateDir = "/run/brltty"; + + pidFile = "${stateDir}/brltty.pid"; + +in { + + options = { + + services.brltty.enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the BRLTTY daemon."; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.brltty = { + description = "Braille console driver"; + preStart = '' + mkdir -p ${stateDir} + ''; + serviceConfig = { + ExecStart = "${pkgs.brltty}/bin/brltty --pid-file=${pidFile}"; + Type = "forking"; + PIDFile = pidFile; + }; + before = [ "sysinit.target" ]; + wantedBy = [ "sysinit.target" ]; + }; + + }; + +} diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix new file mode 100644 index 00000000000..4201fb25f98 --- /dev/null +++ b/pkgs/tools/misc/brltty/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez }: + +assert alsaSupport -> alsaLib != null; + +stdenv.mkDerivation rec { + name = "brltty-5.2"; + + src = fetchurl { + url = "http://brltty.com/archive/${name}.tar.gz"; + sha256 = "1zaab5pxkqrv081n23p3am445d30gk0km4azqdirvcpw9z15q0cz"; + }; + + buildInputs = [ pkgconfig alsaLib bluez ] + ++ stdenv.lib.optional alsaSupport alsaLib; + + meta = { + description = "Access software for a blind person using a braille display"; + longDescription = '' + BRLTTY is a background process (daemon) which provides access to the Linux/Unix + console (when in text mode) for a blind person using a refreshable braille display. + It drives the braille display, and provides complete screen review functionality. + Some speech capability has also been incorporated. + ''; + homepage = http://www.brltty.com/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bramd ]; + platforms = stdenv.lib.platforms.all; + }; + + patchPhase = '' + substituteInPlace configure --replace /sbin/ldconfig ldconfig + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 332811bcafe..3855dc8b4a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -715,6 +715,9 @@ let brasero = callPackage ../tools/cd-dvd/brasero { }; + brltty = callPackage ../tools/misc/brltty { + alsaSupport = (!stdenv.isDarwin); + }; bro = callPackage ../applications/networking/ids/bro { }; bsod = callPackage ../misc/emulators/bsod { }; From 70241a53d011468a8aa75ea860aaf980901a2e55 Mon Sep 17 00:00:00 2001 From: Bram Duvigneau Date: Wed, 29 Apr 2015 23:30:18 +0200 Subject: [PATCH 057/135] Added Bram Duvigneau to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f0e87507ceb..8f148ba91c4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -41,6 +41,7 @@ bodil = "Bodil Stokke "; boothead = "Ben Ford "; bosu = "Boris Sukholitko "; + bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; calrama = "Moritz Maxeiner "; campadrenalin = "Philip Horger "; From 6a34c8fbac60f84621949d0194813b3d944077e0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 29 Apr 2015 14:31:33 -0700 Subject: [PATCH 058/135] kernel: 3.10.75 -> 3.10.76 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index ff9f2f38243..68e5c940ca9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.75"; + version = "3.10.76"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "00wqcmya2ky9f1djlq99mcq8fyvpabnjnp5cn61japlgk8p7r60q"; + sha256 = "0v4blm026fg4hk5ddh25b1fjhnk2yak2hpj4cz4wiq7yr84dr8p5"; }; features.iwlwifi = true; From 04144651373694bad842ce76f2d2a935409d2557 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 29 Apr 2015 14:31:44 -0700 Subject: [PATCH 059/135] kernel: 4.0 -> 4.0.1 --- pkgs/os-specific/linux/kernel/linux-4.0.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index b63aa7e9932..161861d6f06 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0"; - modDirVersion = "4.0.0"; + version = "4.0.1"; extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14argl6ywkggdvgiycfx4jl2d7290f631ly59wfggj4vjx27sbqg"; + sha256 = "1ggj26p1bm5v5kaviz6brfkjk32f8rib1mh61ns77gjlx5vsvc7z"; }; features.iwlwifi = true; From dfd7b26e3a18fdaef0b2326467465d28dccd3e66 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 29 Apr 2015 14:31:41 -0700 Subject: [PATCH 060/135] kernel: 3.19.5 -> 3.19.6 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 79302819d7c..293b0abf9f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.5"; + version = "3.19.6"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0s2yiyk1ks0z2fj8a8g56hkp6mfyvh9c34m1jpixhg9zck9xjdix"; + sha256 = "1kqn796vwkmhj2qkv56nj7anpmxx1hxv47cf44fcmx9n1afry8j4"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 998717b1f5d..73ae3a2c6eb 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.19.5"; - revision = "201504190814"; + { kversion = "3.19.6"; + revision = "201504290821"; branch = "test"; - sha256 = "0wj9bximhs41b11hh113mishmc1ya8bncc0v91cbrivx5y5hjpz0"; + sha256 = "0nya84cpj2cgncchywfysvmzx5m3wl034f6p7zfxj9l6jhjdcd6q"; }; grsec_fix_path = From 084d1143e63f86e585c1076538154f1335e06b2a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 29 Apr 2015 14:31:39 -0700 Subject: [PATCH 061/135] kernel: 3.14.39 -> 3.14.40 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 188eb6f699c..8b134e74006 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.39"; + version = "3.14.40"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0zgfiqlvmprbn55k9ijf6db027mxlcww76y47g4g7vcj5qrpq6rd"; + sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 73ae3a2c6eb..2bb8fb57000 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.39"; - revision = "201504190814"; + { kversion = "3.14.40"; + revision = "201504290821"; branch = "stable"; - sha256 = "0pjq0ggifh6hp5y62dl0ydskpmsmzj1cxxjaaqs6fpwn5ndsdji7"; + sha256 = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls"; }; grsecurity_unstable = grsecPatch From 50fb7b312ba24ebba6c03da3dda54cb23b56c7b8 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 29 Apr 2015 23:57:31 +0200 Subject: [PATCH 062/135] tig-2.1.1: version bump --- .../version-management/git-and-tools/tig/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index c8973e4a660..4c8430ed5c5 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tig-2.1"; + name = "tig-2.1.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"; + sha256 = "0bw5wivswwh7vx897q8xc2cqgkqhdzk8gh6fnav2kf34sngigiah"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ garbas bjornfor iElectric ]; + maintainers = with maintainers; [ garbas bjornfor iElectric qknight ]; license = licenses.gpl2; platforms = platforms.unix; }; From 4cae83bb70b45916063b280289b81a87d0387ba4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Apr 2015 20:54:01 +0200 Subject: [PATCH 063/135] gprof2dot: Add new package gprof2dot is a Python script to convert the output from many profilers into a dot graph. --- .../tools/profiling/gprof2dot/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/profiling/gprof2dot/default.nix diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix new file mode 100644 index 00000000000..38315116eeb --- /dev/null +++ b/pkgs/development/tools/profiling/gprof2dot/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonPackage { + name = "gprof2dot-2015-04-27"; + + src = fetchFromGitHub { + owner = "jrfonseca"; + repo = "gprof2dot"; + rev = "6fbb81559609c12e7c64ae5dce7d102a414a7514"; + sha256 = "1fff7w6dm6lld11hp2ij97f85ma1154h62dvchq19c5jja3zjw3c"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/jrfonseca/gprof2dot"; + description = "Python script to convert the output from many profilers into a dot graph"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 332811bcafe..166847e6b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1553,6 +1553,11 @@ let grails = callPackage ../development/web/grails { jdk = null; }; + gprof2dot = callPackage ../development/tools/profiling/gprof2dot { + # Using pypy provides significant performance improvements (~2x) + pythonPackages = pypyPackages; + }; + graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { From cc1b3a7d8a82a47cf644b59ccc552a9688ff46f9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 29 Apr 2015 19:09:56 -0400 Subject: [PATCH 064/135] Fixed issue with smartgithg download url prefix. Was using the `download` infix instead of `downloads`. --- pkgs/applications/version-management/smartgithg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 1af0653fa81..f2a2fadae8c 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "smartgithg-${the_version}"; src = fetchurl { - url = "http://www.syntevo.com/download/smartgit/" + + url = "http://www.syntevo.com/downloads/smartgit/" + "smartgit-generic-${the_version}.tar.gz"; sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l"; }; From 22faf646f1f71695557f74d8144a5743c484b3c9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Tue, 28 Apr 2015 00:18:00 -0400 Subject: [PATCH 065/135] Improvements to the clementine package. - Pass the gstreamer plugins as a list attribute instead of individual attributes. + This should allow for greater customization (e.g.: a user can add / remove plugins by overriding the plugin list attribute). This is the same technique as used for wrapping chrome with gstreamer plugins. - Moved integration of gstreamer plugins, spotify library and clementine into a wrapper derivation. + This should allow a user to change the gstreamer plugin set and activate / deactivate the spotify plugin without triggering a whole rebuild of the clementine sources (which is pretty long). --- .../applications/audio/clementine/default.nix | 110 +++++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 857aa2edaf5..f3d0eb3f834 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,60 +1,88 @@ { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base -, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig -, sparsehash, config, makeWrapper }: +, sparsehash, config, makeWrapper, gst_plugins }: -let withSpotify = config.clementine.spotify or false; -in -stdenv.mkDerivation { - name = "clementine-1.2.3"; +let + version = "1.2.3"; - src = fetchurl { - url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; - sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + withSpotify = config.clementine.spotify or false; + + wrappedExeName = "clementine"; + + wrapped = stdenv.mkDerivation { + name = "clementine-wrapped-${version}"; + + src = fetchurl { + url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; + sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + }; + + patches = [ ./clementine-1.2.1-include-paths.patch ]; + + buildInputs = [ + boost + cmake + fftw + gettext + glew + gst_plugins_base + gstreamer + gvfs + libcdio + libgpod + liblastfm + libmtp + libplist + pkgconfig + protobuf + qca2 + qjson + qt4 + sparsehash + sqlite + taglib + usbmuxd + ]; + + enableParallelBuilding = true; }; - patches = [ ./clementine-1.2.1-include-paths.patch ]; +in + +stdenv.mkDerivation { + name = "clementine-${version}"; + + src = ./.; + buildInputs = [ - boost - cmake - fftw - gettext - glew - gst_plugins_base - gst_plugins_good - gst_plugins_ugly - gst_ffmpeg - gstreamer - gvfs - libcdio - libgpod - liblastfm - libmtp - libplist + wrapped makeWrapper - pkgconfig - protobuf - qca2 - qjson - qt4 - sparsehash - sqlite - taglib - usbmuxd - ] ++ stdenv.lib.optional withSpotify libspotify; + ] ++ gst_plugins + ++ stdenv.lib.optional withSpotify libspotify; - enableParallelBuilding = true; + installPhase = '' + mkdir -p $out + cp -a ${wrapped}/* $out + chmod -R u+w-t $out - postInstall = '' - wrapProgram $out/bin/clementine \ - --set GST_PLUGIN_SYSTEM_PATH "$GST_PLUGIN_SYSTEM_PATH" + wrapProgram "$out/bin/${wrappedExeName}" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + preferLocalBuild = true; + dontPatchELF = true; + dontStrip = true; + meta = with stdenv.lib; { homepage = "http://www.clementine-player.org"; - description = "A multiplatform music player"; + description = "A multiplatform music player" + + " (" + + concatStrings (optionals (withSpotify) ["with spotify, "]) + + "with gstreamer plugins: " + + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) + + ")"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95bd693a9f8..91d5d332d45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -976,6 +976,7 @@ let clementine = callPackage ../applications/audio/clementine { boost = boost156; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; From 49fa00cded7bd3da0aa76cd2eb58e197084b820d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 30 Apr 2015 06:20:54 +0200 Subject: [PATCH 066/135] networkd: Fix disabled networkd units. In f8dbe5f, the default value for networking unit "enabled" option suddenly flipped to false. I have no idea of whether this happened by accident, but I'm setting it to true again, because it essentially breaks systemd networking support and we have systemd.network.enable to have a "turn the world off" switch. And of course, because the mentioned commit obviously wasn't done with even a run of the simplest run of one of the network VM tests, we now get an evaluation error if we switch useNetworkd to true. Fixes the core issue of #7505. Signed-off-by: aszlig --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 0221374ab83..e83aa6e2e2d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -132,7 +132,7 @@ let commonNetworkOptions = { enable = mkOption { - default = false; + default = true; type = types.bool; description = '' Whether to manage network configuration using systemd-network. From 4cdb4a4fef93b54dd41aab93d333c703df4d5803 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 30 Apr 2015 06:44:25 +0200 Subject: [PATCH 067/135] networkd: Fix evaluation of systemd.network units. During the refactor of the networkd stuff in f8dbe5f, a lot of the options are now needed by systemd.nix as well as networkd.nix but weren't moved by that commit as well. For now, this fixes all networkd VM tests except for the macvlan one and thus it should fix #7505 for at least DHCP-based configuration. Signed-off-by: aszlig --- nixos/modules/system/boot/networkd.nix | 5 ++ nixos/modules/system/boot/systemd-lib.nix | 63 +++++++++++++++++++ .../system/boot/systemd-unit-options.nix | 51 +-------------- nixos/modules/system/boot/systemd.nix | 18 ------ 4 files changed, 69 insertions(+), 68 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e83aa6e2e2d..b183c0f3236 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -482,6 +482,11 @@ let }; }; + commonMatchText = def: '' + [Match] + ${attrsToSection def.matchConfig} + ''; + linkToUnit = name: def: { inherit (def) enable; text = commonMatchText def + diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index e8cfd3395cb..873fff15d38 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -25,6 +25,69 @@ rec { ln -s /dev/null $out/${shellEscape name} ''; + boolValues = [true false "yes" "no"]; + + digits = map toString (range 0 9); + + isByteFormat = s: + let + l = reverseList (stringToCharacters s); + suffix = head l; + nums = tail l; + in elem suffix (["K" "M" "G" "T"] ++ digits) + && all (num: elem num digits) nums; + + assertByteFormat = name: group: attr: + optional (attr ? ${name} && ! isByteFormat attr.${name}) + "Systemd ${group} field `${name}' must be in byte format [0-9]+[KMGT]."; + + hexChars = stringToCharacters "0123456789abcdefABCDEF"; + + isMacAddress = s: stringLength s == 17 + && flip all (splitString ":" s) (bytes: + all (byte: elem byte hexChars) (stringToCharacters bytes) + ); + + assertMacAddress = name: group: attr: + optional (attr ? ${name} && ! isMacAddress attr.${name}) + "Systemd ${group} field `${name}' must be a valid mac address."; + + + assertValueOneOf = name: values: group: attr: + optional (attr ? ${name} && !elem attr.${name} values) + "Systemd ${group} field `${name}' cannot have value `${attr.${name}}'."; + + assertHasField = name: group: attr: + optional (!(attr ? ${name})) + "Systemd ${group} field `${name}' must exist."; + + assertRange = name: min: max: group: attr: + optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name})) + "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]"; + + assertOnlyFields = fields: group: attr: + let badFields = filter (name: ! elem name fields) (attrNames attr); in + optional (badFields != [ ]) + "Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; + + checkUnitConfig = group: checks: v: + let errors = concatMap (c: c group v) checks; in + if errors == [] then true + else builtins.trace (concatStringsSep "\n" errors) false; + + toOption = x: + if x == true then "true" + else if x == false then "false" + else toString x; + + attrsToSection = as: + concatStrings (concatLists (mapAttrsToList (name: value: + map (x: '' + ${name}=${toOption x} + '') + (if isList value then value else [value])) + as)); + generateUnits = type: units: upstreamUnits: upstreamWants: pkgs.runCommand "${type}-units" { preferLocalBuild = true; } '' mkdir -p $out diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 785634cbf66..57831a5e6ef 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -1,58 +1,9 @@ { config, lib }: with lib; +with import ./systemd-lib.nix { inherit config lib pkgs; }; let - - boolValues = [true false "yes" "no"]; - - assertValueOneOf = name: values: group: attr: - optional (attr ? ${name} && !elem attr.${name} values) - "Systemd ${group} field `${name}' cannot have value `${attr.${name}}'."; - - assertHasField = name: group: attr: - optional (!(attr ? ${name})) - "Systemd ${group} field `${name}' must exist."; - - assertOnlyFields = fields: group: attr: - let badFields = filter (name: ! elem name fields) (attrNames attr); in - optional (badFields != [ ]) - "Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; - - assertRange = name: min: max: group: attr: - optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name})) - "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]"; - - digits = map toString (range 0 9); - - isByteFormat = s: - let - l = reverseList (stringToCharacters s); - suffix = head l; - nums = tail l; - in elem suffix (["K" "M" "G" "T"] ++ digits) - && all (num: elem num digits) nums; - - assertByteFormat = name: group: attr: - optional (attr ? ${name} && ! isByteFormat attr.${name}) - "Systemd ${group} field `${name}' must be in byte format [0-9]+[KMGT]."; - - hexChars = stringToCharacters "0123456789abcdefABCDEF"; - - isMacAddress = s: stringLength s == 17 - && flip all (splitString ":" s) (bytes: - all (byte: elem byte hexChars) (stringToCharacters bytes) - ); - - assertMacAddress = name: group: attr: - optional (attr ? ${name} && ! isMacAddress attr.${name}) - "Systemd ${group} field `${name}' must be a valid mac address."; - - checkUnitConfig = group: checks: v: - let errors = concatMap (c: c group v) checks; in - if errors == [] then true - else builtins.trace (concatStringsSep "\n" errors) false; - checkService = checkUnitConfig "Service" [ (assertValueOneOf "Type" [ "simple" "forking" "oneshot" "dbus" "notify" "idle" diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 78aac7fe96f..0f210d50688 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -276,19 +276,6 @@ let }; }; - toOption = x: - if x == true then "true" - else if x == false then "false" - else toString x; - - attrsToSection = as: - concatStrings (concatLists (mapAttrsToList (name: value: - map (x: '' - ${name}=${toOption x} - '') - (if isList value then value else [value])) - as)); - commonUnitText = def: '' [Unit] ${attrsToSection def.unitConfig} @@ -369,11 +356,6 @@ let ''; }; - commonMatchText = def: '' - [Match] - ${attrsToSection def.matchConfig} - ''; - in { From 85c0aac675784298b55d2463870dd25d6b108ced Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Thu, 30 Apr 2015 09:49:45 +0200 Subject: [PATCH 068/135] New release of Blink --- .../instant-messengers/blink/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 00a881c0c67..c4cfc0b6776 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "blink-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c"; + sha256 = "388a0ca72ad99087cd87b78a4c449f9c079117920bfc50d7843853b8f942d045"; }; patches = [ ./pythonpath.patch ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03e120dbea1..c8ad9b0ba88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,11 +492,11 @@ let application = buildPythonPackage rec { name = "python-application-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; - sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275"; + sha256 = "9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc"; }; }; @@ -2919,11 +2919,11 @@ let eventlib = buildPythonPackage rec { name = "python-eventlib-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi"; + sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7"; }; propagatedBuildInputs = with self; [ greenlet ]; @@ -7058,11 +7058,11 @@ let msrplib = buildPythonPackage rec { name = "python-msrplib-${version}"; - version = "0.15.0"; + version = "0.17.0"; src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f"; + url = "http://download.ag-projects.com/MSRP/${name}.tar.gz"; + sha256 = "fe6ee541fbb4380a5708d08f378724dbc93438ff35c0cd0400e31b070fce73c4"; }; propagatedBuildInputs = with self; [ eventlib application gnutls ]; @@ -11450,14 +11450,14 @@ let sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "2.3.1"; + version = "2.4.0"; disabled = isPy3k; configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "1n3g1zg3zgdybikdla0qdqvpa06vn1ka2asr61lb8kk6xbvqkljv"; + sha256 = "f66543c680f22aa3cf86f55373a01a2bb699366a1be5e257c417d018696b6840"; }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; @@ -13059,11 +13059,11 @@ let xcaplib = buildPythonPackage rec { name = "python-xcaplib-${version}"; - version = "1.0.17"; + version = "1.1.0"; src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86"; + url = "http://download.ag-projects.com/XCAP/${name}.tar.gz"; + sha256 = "2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3"; }; propagatedBuildInputs = with self; [ eventlib application ]; From dd6ddfaf0c31812c344995de8afcd93b4e97f2f4 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 30 Apr 2015 12:08:54 +0200 Subject: [PATCH 069/135] dvdisaster: Fix description --- pkgs/tools/cd-dvd/dvdisaster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 704c3643f3c..101d69c0903 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://dvdisaster.net/; - description = "data loss/scratch/aging protection for CD/DVD media"; + description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' - dvdisaster provides a margin of safety against data loss on CD and + Dvdisaster provides a margin of safety against data loss on CD and DVD media caused by scratches or aging media. It creates error correction data which is used to recover unreadable sectors if the disc becomes damaged at a later time. From 5204bdfba6cbb559043e35d07872d48ad4a03018 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Apr 2015 22:00:56 +0200 Subject: [PATCH 070/135] geolite-legacy: support XZ-compressed databases --- pkgs/data/misc/geolite-legacy/builder.sh | 3 ++- pkgs/data/misc/geolite-legacy/default.nix | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh index 1886d144e48..bf8c9812e92 100644 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -16,4 +16,5 @@ for var in "${!src@}"; do cp "$src" "$dest" done -gunzip -v *.gz +gzip -dv *.gz +xz -dv *.xz diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index cf8e7ab47ae..ac8582e2018 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -3,7 +3,7 @@ let fetchDB = name: sha256: fetchurl { inherit sha256; - url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz"; + url = "https://geolite.maxmind.com/download/geoip/database/${name}"; }; # Annoyingly, these files are updated without a change in URL. This means that @@ -13,20 +13,21 @@ in stdenv.mkDerivation { name = "geolite-legacy-${version}"; - srcGeoIP = fetchDB "GeoLiteCountry/GeoIP" + srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k"; - srcGeoIPv6 = fetchDB "GeoIPv6" + srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i"; - srcGeoLiteCity = fetchDB "GeoLiteCity" - "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a"; - srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6" + srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" + "1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7"; + srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv"; - srcGeoIPASNum = fetchDB "asnum/GeoIPASNum" + srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms"; - srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6" + srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc"; meta = with stdenv.lib; { + inherit version; description = "GeoLite Legacy IP geolocation databases"; homepage = https://geolite.maxmind.com/download/geoip; license = with licenses; cc-by-sa-30; From 8ce7626dc728253d93759c2571d403380c0ed28b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Apr 2015 21:30:56 +0200 Subject: [PATCH 071/135] fatrace 0.9 -> 0.10 --- pkgs/os-specific/linux/fatrace/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index c6e52934a77..95c615111ff 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, python3}: +let version = "0.10"; in stdenv.mkDerivation rec { - version = "0.9"; name = "fatrace-${version}"; src = fetchurl { - url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd"; + url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + sha256 = "0q0cv2bsgf76wypz18v2acgj1crcdqhrhlsij3r53glsyv86xyra"; }; buildInputs = [ python3 ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { makeFlagsArray = "PREFIX=$(out)"; meta = with stdenv.lib; { + inherit version; description = "Report system-wide file access events"; homepage = https://launchpad.net/fatrace/; license = with licenses; gpl3Plus; From dbbc1b337982a5b0ee06ac61e7d642fa89115880 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Apr 2015 21:39:45 +0200 Subject: [PATCH 072/135] fatrace: fix power-usage-report --- pkgs/os-specific/linux/fatrace/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 95c615111ff..39c606f3fb5 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python3}: +{ stdenv, fetchurl, python3, which }: let version = "0.10"; in stdenv.mkDerivation rec { @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0q0cv2bsgf76wypz18v2acgj1crcdqhrhlsij3r53glsyv86xyra"; }; - buildInputs = [ python3 ]; + buildInputs = [ python3 which ]; + + postPatch = '' + substituteInPlace power-usage-report \ + --replace "'which'" "'${which}/bin/which'" + ''; makeFlagsArray = "PREFIX=$(out)"; From 2a29cf9eaae252a4e15057dc5813c4d8f1d8642f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Apr 2015 21:43:49 +0200 Subject: [PATCH 073/135] mcelog 116 -> 117 That was quick. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 342e29a6d2e..a5f6242f84f 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "116"; in +let version = "117"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf"; + sha256 = "0szc5s0bag16ypna336spwb5fagwbxaparn0h78w73wv05kcvwqw"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 3b611e3a0af0cf9abbc821c22fc450e04dc7a296 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Apr 2015 21:58:17 +0200 Subject: [PATCH 074/135] mksh: clarify that it's Free --- pkgs/shells/mksh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index ba510e8907a..e951c24e6a0 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = "custom"; + license = with stdenv.lib.licenses; free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; From dc5c8ce819313fc4112d0401002f4776cfbb5cc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Apr 2015 12:50:27 +0200 Subject: [PATCH 075/135] eduke32 20130303-3542 -> 20150420-5160 --- pkgs/games/eduke32/default.nix | 68 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index cc47f948240..e7a420b894a 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,68 +1,70 @@ -{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}: +{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm +, pkgconfig, SDL2, SDL2_mixer }: -stdenv.mkDerivation rec { - name = "eduke32-20130303-3542"; +let + date = "20150420"; + rev = "5160"; + version = "${date}-${rev}"; +in stdenv.mkDerivation rec { + name = "eduke32-${version}"; src = fetchurl { - url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; - sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz"; + sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ] + buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; - NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s"; + postPatch = '' + substituteInPlace build/src/glbuild.c \ + --replace libGL.so ${mesa}/lib/libGL.so \ + --replace libGLU.so ${mesa}/lib/libGLU.so + ''; + + NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL"; + NIX_LDFLAGS = "-L${SDL2}/lib"; + + makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}"; desktopItem = makeDesktopItem { name = "eduke32"; exec = "eduke32-wrapper"; comment = "Duke Nukem 3D port"; - desktopName = "EDuke32"; + desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; categories = "Application;Game;"; }; - preConfigure = '' - sed -i -e "s|/usr/bin/sdl-config|${SDL}/bin/sdl-config|" build/Makefile.shared - ''; - - buildPhase = '' - make OPTLEVEL=0 USE_LIBPNG=0 - ''; - installPhase = '' - # Install binaries - mkdir -p $out/bin - cp eduke32 mapster32 $out/bin - # Make wrapper script - cat > $out/bin/eduke32-wrapper < eduke32-wrapper < Date: Thu, 30 Apr 2015 10:48:09 -0400 Subject: [PATCH 076/135] Add isl-0.14.1 --- pkgs/development/libraries/isl/0.14.1.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/isl/0.14.1.nix diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix new file mode 100644 index 00000000000..dc13bbae989 --- /dev/null +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "isl-0.14.1"; + + src = fetchurl { + url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8"; + }; + + buildInputs = [ gmp ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.kotnet.org/~skimo/isl/; + license = stdenv.lib.licenses.lgpl21; + description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab48e4e367a..a2a12e51924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1771,6 +1771,7 @@ let isl = callPackage ../development/libraries/isl { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; + isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isync = callPackage ../tools/networking/isync { }; From 90ebf5b952d4cb7042eb827fb554d379b6427402 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 30 Apr 2015 10:48:35 -0400 Subject: [PATCH 077/135] Add gcc-5.1.0 --- pkgs/development/compilers/gcc/5.1/builder.sh | 255 +++++++++ .../development/compilers/gcc/5.1/default.nix | 526 ++++++++++++++++++ .../compilers/gcc/5.1/gfortran-driving.patch | 20 + .../compilers/gcc/5.1/gnat-cflags.patch | 33 ++ .../gcc/5.1/java-jvgenmain-link.patch | 17 + .../compilers/gcc/5.1/libstdc++-target.patch | 32 ++ .../compilers/gcc/5.1/no-sys-dirs.patch | 28 + pkgs/top-level/all-packages.nix | 19 + 8 files changed, 930 insertions(+) create mode 100644 pkgs/development/compilers/gcc/5.1/builder.sh create mode 100644 pkgs/development/compilers/gcc/5.1/default.nix create mode 100644 pkgs/development/compilers/gcc/5.1/gfortran-driving.patch create mode 100644 pkgs/development/compilers/gcc/5.1/gnat-cflags.patch create mode 100644 pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch create mode 100644 pkgs/development/compilers/gcc/5.1/libstdc++-target.patch create mode 100644 pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/5.1/builder.sh b/pkgs/development/compilers/gcc/5.1/builder.sh new file mode 100644 index 00000000000..dd77c67a023 --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/builder.sh @@ -0,0 +1,255 @@ +source $stdenv/setup + + +export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $NIX_FIXINC_DUMMY + + +if test "$staticCompiler" = "1"; then + EXTRA_LDFLAGS="-static" +else + EXTRA_LDFLAGS="" +fi + +# GCC interprets empty paths as ".", which we don't want. +if test -z "$CPATH"; then unset CPATH; fi +if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi +echo "\$CPATH is \`$CPATH'" +echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" + +if test "$noSysDirs" = "1"; then + + if test -e $NIX_CC/nix-support/orig-libc; then + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" + + else + # Hack: support impure environments. + extraFlags="-isystem /usr/include" + extraLDFlags="-L/usr/lib64 -L/usr/lib" + glibc_libdir="/usr/lib" + export NIX_FIXINC_DUMMY=/usr/include + fi + + extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, + # make sure to explictly add them so that files compiled with the + # bootstrap compiler are optimized and (optionally) contain + # debugging information (info "(gccinstall) Building"). + if test -n "$dontStrip"; then + extraFlags="-O2 -g $extraFlags" + else + # Don't pass `-g' at all; this saves space while building. + extraFlags="-O2 $extraFlags" + fi + + EXTRA_FLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" + done + + if test -n "$targetConfig"; then + # Cross-compiling, we need gcc not to read ./specs in order to build + # the g++ compiler (after the specs for the cross-gcc are created). + # Having LIBRARY_PATH= makes gcc read the specs from ., and the build + # breaks. Having this variable comes from the default.nix code to bring + # gcj in. + unset LIBRARY_PATH + unset CPATH + if test -z "$crossStageStatic"; then + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" + fi + else + if test -z "$NIX_CC_CROSS"; then + EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + else + # This the case of cross-building the gcc. + # We need special flags for the target, different than those of the build + # Assertion: + test -e $NIX_CC_CROSS/nix-support/orig-libc + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" + glibc_libdir="$glibc_dir/lib" + configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" + + extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + EXTRA_TARGET_CFLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" + done + fi + fi + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray+=( \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + + if test -z "$targetConfig"; then + makeFlagsArray+=( \ + BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + fi + + if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + # We don't want the gcc build to assume there will be a libc providing + # limits.h in this stagae + makeFlagsArray+=( \ + LIMITS_H_TEST=false \ + ) + else + makeFlagsArray+=( \ + LIMITS_H_TEST=true \ + ) + fi +fi + +if test -n "$targetConfig"; then + # The host strip will destroy some important details of the objects + dontStrip=1 +fi + +providedPreConfigure="$preConfigure"; +preConfigure() { + if test -n "$newlibSrc"; then + tar xvf "$newlibSrc" -C .. + ln -s ../newlib-*/newlib newlib + # Patch to get armvt5el working: + sed -i -e 's/ arm)/ arm*)/' newlib/configure.host + fi + + # Bug - they packaged zlib + if test -d "zlib"; then + # This breaks the build without-headers, which should build only + # the target libgcc as target libraries. + # See 'configure:5370' + rm -Rf zlib + fi + + if test -f "$NIX_CC/nix-support/orig-libc"; then + # Patch the configure script so it finds glibc headers. It's + # important for example in order not to get libssp built, + # because its functionality is in glibc already. + glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" + sed -i \ + -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ + gcc/configure + fi + + if test -n "$crossMingw" -a -n "$crossStageStatic"; then + mkdir -p ../mingw + # --with-build-sysroot expects that: + cp -R $libcCross/include ../mingw + configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." + fi + + # Eval the preConfigure script from nix expression. + eval "$providedPreConfigure" + + # Perform the build in a different directory. + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure +} + + +postConfigure() { + # Don't store the configure flags in the resulting executables. + sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile +} + + +preInstall() { + # Make ‘lib64’ a symlink to ‘lib’. + if [ -n "$is64bit" -a -z "$enableMultilib" ]; then + mkdir -p $out/lib + ln -s lib $out/lib64 + fi +} + + +postInstall() { + # Remove precompiled headers for now. They are very big and + # probably not very useful yet. + find $out/include -name "*.gch" -exec rm -rf {} \; -prune + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out + for i in $out/libexec/gcc/*/*/*; do + if PREV_RPATH=`patchelf --print-rpath $i`; then + patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i + fi + done + + # Get rid of some "fixed" header files + rm -rf $out/lib/gcc/*/*/include/root + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Disable RANDMMAP on grsec, which causes segfaults when using + # precompiled headers. + # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 + paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} + + eval "$postInstallGhdl" +} + +genericBuild diff --git a/pkgs/development/compilers/gcc/5.1/default.nix b/pkgs/development/compilers/gcc/5.1/default.nix new file mode 100644 index 00000000000..1c61d57729d --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/default.nix @@ -0,0 +1,526 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.isDarwin +, langObjCpp ? stdenv.isDarwin +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, cross ? null +, binutilsCross ? null +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "5.1.0"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = cross != null && cross.config == "i586-pc-gnu"; + + enableParallelBuilding = true; + + patches = [ ] + ++ optional (cross != null) ./libstdc++-target.patch + ++ optional noSysDirs ./no-sys-dirs.patch + # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its + # target libraries and tools. + ++ optional langAda ./gnat-cflags.patch + ++ optional langFortran ./gfortran-driving.patch; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-4.4-complete.jar; + sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && x11Support; + + /* Platform flags */ + platformFlags = let + gccArch = stdenv.platform.gcc.arch or null; + gccCpu = stdenv.platform.gcc.cpu or null; + gccAbi = stdenv.platform.gcc.abi or null; + gccFpu = stdenv.platform.gcc.fpu or null; + gccFloat = stdenv.platform.gcc.float or null; + gccMode = stdenv.platform.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode; + + /* Cross-gcc settings */ + crossMingw = cross != null && cross.libc == "msvcrt"; + crossDarwin = cross != null && cross.libc == "libSystem"; + crossConfigureFlags = let + gccArch = stdenv.cross.gcc.arch or null; + gccCpu = stdenv.cross.gcc.cpu or null; + gccAbi = stdenv.cross.gcc.abi or null; + gccFpu = stdenv.cross.gcc.fpu or null; + gccFloat = stdenv.cross.gcc.float or null; + gccMode = stdenv.cross.gcc.mode or null; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; + withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; + in + "--target=${cross.config}" + + withArch + + withCpu + + withAbi + + withFpu + + withFloat + + withMode + + (if crossMingw && crossStageStatic then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libmudflap " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-libatomic " + # libatomic requires libc + " --disable-decimal-float" # libdecnumber requires libc + else + (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" + else " --with-headers=${libcCross}/include") + + # Ensure that -print-prog-name is able to find the correct programs. + (stdenv.lib.optionalString (crossMingw || crossDarwin) ( + " --with-as=${binutilsCross}/bin/${cross.config}-as" + + " --with-ld=${binutilsCross}/bin/${cross.config}-ld" + )) + + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else (if cross.libc == "uclibc" then + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; + + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + +in + +# We need all these X libraries when building AWT with GTK+. +assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ./builder.sh; + + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"; + }; + + inherit patches; + + postPatch = + if (stdenv.isGNU + || (libcCross != null # e.g., building `gcc.crossDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + '' + else if cross != null || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' + done + '' + else null; + + inherit noSysDirs staticCompiler langJava crossStageStatic + libcCross crossMingw; + + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr libmpc libelf ] + ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional stdenv.isDarwin gnused) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then + configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include) + makeFlagsArray+=( \ + CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \ + CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + ) + fi + ''; + + dontDisableStatic = true; + + configureFlags = " + ${if stdenv.isSunOS then + " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + + # On Illumos/Solaris GNU as is preferred + " --with-gnu-as --without-gnu-ld " + else ""} + --enable-lto + ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} + ${optionalString (isl != null) "--with-isl=${isl}"} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${libmpc} + ${if libelf != null then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-static + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + } + ${if (stdenv ? glibc && cross == null) + then " --with-native-system-header-dir=${stdenv.glibc}/include" + else ""} + ${if langAda then " --enable-libada" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + ${if !bootstrap then "--disable-bootstrap" else ""} + ${if cross == null then platformFlags else ""} + "; + + targetConfig = if cross != null then cross.config else null; + + buildFlags = if bootstrap then + (if profiledCompiler then "profiledbootstrap" else "bootstrap") + else ""; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = let + xgccArch = stdenv.cross.gcc.arch or null; + xgccCpu = stdenv.cross.gcc.cpu or null; + xgccAbi = stdenv.cross.gcc.abi or null; + xgccFpu = stdenv.cross.gcc.fpu or null; + xgccFloat = stdenv.cross.gcc.float or null; + xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else ""; + xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; + xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; + xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; + xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else ""; + in { + AR = "${stdenv.cross.config}-ar"; + LD = "${stdenv.cross.config}-ld"; + CC = "${stdenv.cross.config}-gcc"; + CXX = "${stdenv.cross.config}-gcc"; + AR_FOR_TARGET = "${stdenv.cross.config}-ar"; + LD_FOR_TARGET = "${stdenv.cross.config}-ld"; + CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; + NM_FOR_TARGET = "${stdenv.cross.config}-nm"; + CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + # If we are making a cross compiler, cross != null + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + --target=${stdenv.cross.config} + ${xwithArch} + ${xwithCpu} + ${xwithAbi} + ${xwithFpu} + ${xwithFloat} + ''; + buildFlags = ""; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = concatStrings + (intersperse ":" (map (x: x + "/include") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs))); + + LIBRARY_PATH = concatStrings + (intersperse ":" (map (x: x + "/lib") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread))); + + EXTRA_TARGET_CFLAGS = + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" + else null; + + EXTRA_TARGET_LDFLAGS = + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") + else null; + + passthru = + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = http://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ]; + + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence cross != null) +// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch b/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch new file mode 100644 index 00000000000..70708886b40 --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch @@ -0,0 +1,20 @@ +This patch fixes interaction with Libtool. +See , for details. + +--- a/gcc/fortran/gfortranspec.c ++++ b/gcc/fortran/gfortranspec.c +@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); + { + fprintf (stderr, _("Driving:")); + for (i = 0; i < g77_newargc; i++) ++ { ++ if (g77_new_decoded_options[i].opt_index == OPT_l) ++ /* Make sure no white space is inserted after `-l'. */ ++ fprintf (stderr, " -l%s", ++ g77_new_decoded_options[i].canonical_option[1]); ++ else + fprintf (stderr, " %s", + g77_new_decoded_options[i].orig_option_with_args_text); ++ } + fprintf (stderr, "\n"); + } diff --git a/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch b/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch new file mode 100644 index 00000000000..bf2acf065e9 --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch @@ -0,0 +1,33 @@ +diff --git a/libada/Makefile.in b/libada/Makefile.in +index f5057a0..337e0c6 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) + WARN_CFLAGS = @warn_cflags@ + + TARGET_LIBGCC2_CFLAGS= +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ + -DIN_RTS @have_getipinfo@ + +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata + SOME_ADAFLAGS =-gnata + FORCE_DEBUG_ADAFLAGS = -g + GNATLIBFLAGS = -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libgcc ++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + diff --git a/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch new file mode 100644 index 00000000000..2612e8bfbbb --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch @@ -0,0 +1,17 @@ +The `jvgenmain' executable must be linked against `vec.o', among others, +since it uses its vector API. + +--- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 ++++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 +@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) + +-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) ++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) + rm -f $@ +- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) + + # + # Build hooks: diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch new file mode 100644 index 00000000000..fb622b39580 --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch @@ -0,0 +1,32 @@ +Patch to make the target libraries 'configure' scripts find the proper CPP. +I noticed that building the mingw32 cross compiler. +Looking at the build script for mingw in archlinux, I think that only nixos +needs this patch. I don't know why. +diff --git a/Makefile.in b/Makefile.in +index 93f66b6..d691917 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ ++ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + # Where to find GMP + HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch new file mode 100644 index 00000000000..36df51904ac --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch @@ -0,0 +1,28 @@ +diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c +--- gcc-4.8.3-orig/gcc/cppdefault.c 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/cppdefault.c 2014-08-18 16:20:32.893944536 +0200 +@@ -35,6 +35,8 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c +--- gcc-4.8.3-orig/gcc/gcc.c 2014-03-23 12:30:57.000000000 +0100 ++++ gcc-4.8.3/gcc/gcc.c 2014-08-18 13:19:32.689201690 +0200 +@@ -1162,10 +1162,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a12e51924..43c99b4008c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3618,6 +3618,25 @@ let else null; })); + gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + + isl = isl_0_14; + })); + gfortran = gfortran48; gfortran48 = wrapCC (gcc48.cc.override { From c9c972b872288a204361ff2bc991618fab03b240 Mon Sep 17 00:00:00 2001 From: Hendrik Bunke Date: Thu, 30 Apr 2015 17:08:29 +0200 Subject: [PATCH 078/135] vimPlugins: vim-nerdtree-tabs, vim-buffergator --- pkgs/misc/vim-plugins/default.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 226f9375fd4..60d67b38a44 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -439,6 +439,21 @@ rec { }; }; + vim-buffergator = buildVimPlugin { + name = "vim-buffergator-2015-03-31"; + src = fetchFromGitHub { + owner = "jeetsukumaran"; + repo = "vim-buffergator"; + rev = "77cfdd127f"; + sha256 = "11r9845kplwahf2d41whs2lg3bzy0dahs0mvmdbckp7ckq3gd3y4"; + }; + meta = with stdenv.lib; { + description = "Vim plugin to list, select and switch between buffers"; + license = licenses.gpl3; + maintainers = with maintainers; [ hbunke ]; + }; + }; + vim-jinja = buildVimPlugin { name = "vim-jinja-git-2014-06-11"; src = fetchFromGitHub { @@ -453,6 +468,21 @@ rec { }; }; + vim-nerdtree-tabs = buildVimPlugin { + name = "vim-nerdtree-tabs-2014-09-25"; + src = fetchFromGitHub { + owner = "jistr"; + repo = "vim-nerdtree-tabs"; + rev = "0decec122e"; + sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l"; + }; + meta = with stdenv.lib; { + description = "NERDTree and tabs together in Vim, painlessly"; + license = licenses.asl20; + maintainers = with maintainers; [ hbunke ]; + }; + }; + vimproc = buildVimPlugin { name = "vimproc-git-2015-02-23"; src = fetchgit { From bf7ad2d84fc8244a61fd65b69a2dda0640c54df1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 30 Apr 2015 17:05:14 +0200 Subject: [PATCH 079/135] meta.description fixups Mostly scripted substitutions with a couple of subjective enhancements. --- .../editors/emacs-modes/rudel/default.nix | 2 +- pkgs/applications/editors/zed/default.nix | 2 +- pkgs/applications/misc/krename/default.nix | 2 +- pkgs/applications/misc/pwsafe/default.nix | 2 +- .../networking/browsers/netsurf/libCSS.nix | 2 +- .../browsers/netsurf/libParserUtils.nix | 2 +- .../networking/browsers/netsurf/libnsbmp.nix | 2 +- .../networking/browsers/netsurf/libnsgif.nix | 2 +- .../browsers/netsurf/libwapcaplet.nix | 2 +- pkgs/applications/office/calligra/default.nix | 11 +++++- .../science/logic/yices/default.nix | 2 +- .../git-and-tools/stgit/default.nix | 2 +- pkgs/applications/window-managers/i3/lock.nix | 2 +- .../window-managers/i3/status.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/data/fonts/powerline-fonts/default.nix | 2 +- pkgs/desktops/e19/econnman.nix | 2 +- pkgs/desktops/kde-4.14/kdeedu/artikulate.nix | 2 +- .../compilers/elm/elm-compiler.nix | 2 +- pkgs/development/compilers/ghcjs/default.nix | 2 +- pkgs/development/compilers/gwt/2.4.0.nix | 2 +- pkgs/development/compilers/scala/2.10.nix | 2 +- pkgs/development/compilers/scala/2.9.nix | 2 +- pkgs/development/compilers/yap/default.nix | 2 +- .../coq-modules/bedrock/default.nix | 2 +- pkgs/development/coq-modules/fiat/default.nix | 2 +- .../development/coq-modules/flocq/default.nix | 2 +- pkgs/development/coq-modules/paco/default.nix | 2 +- pkgs/development/coq-modules/tlc/default.nix | 2 +- pkgs/development/coq-modules/ynot/default.nix | 2 +- pkgs/development/libraries/assimp/default.nix | 2 +- pkgs/development/libraries/fcgi/default.nix | 2 +- pkgs/development/libraries/fox/fox-1.6.nix | 2 +- pkgs/development/libraries/giflib/5.0.nix | 2 +- pkgs/development/libraries/giflib/5.1.nix | 2 +- pkgs/development/libraries/lame/default.nix | 2 +- .../libraries/libtomcrypt/default.nix | 2 +- .../libraries/npapi-sdk/default.nix | 2 +- .../libraries/physics/geant4/default.nix | 4 +-- .../libraries/physics/geant4/g4py/default.nix | 2 +- .../libraries/qmltermwidget/default.nix | 2 +- pkgs/development/libraries/urt/default.nix | 2 +- .../lisp-modules/lisp-packages.nix | 2 +- .../ocaml-modules/gmetadom/default.nix | 2 +- .../ocaml-modules/ocaml-text/default.nix | 2 +- .../ocaml-modules/ulex/0.8/default.nix | 2 +- .../ocaml-modules/ulex/default.nix | 2 +- .../tools/misc/checkbashisms/default.nix | 2 +- .../tools/ocaml/camlidl/default.nix | 2 +- .../tools/parsing/hammer/default.nix | 16 +++++---- pkgs/games/super-tux-kart/default.nix | 2 +- pkgs/misc/emulators/cdemu/base.nix | 10 +++--- pkgs/os-specific/linux/fusionio/util.nix | 2 +- pkgs/os-specific/linux/hal-flash/default.nix | 2 +- pkgs/servers/mail/exim/default.nix | 4 +-- pkgs/servers/nosql/hyperdex/busybee.nix | 2 +- pkgs/servers/nosql/hyperdex/default.nix | 2 +- pkgs/servers/nosql/hyperdex/replicant.nix | 2 +- pkgs/servers/sql/monetdb/default.nix | 2 +- pkgs/tools/backup/store-backup/default.nix | 2 +- .../tools/filesystems/yandex-disk/default.nix | 2 +- pkgs/tools/networking/airfield/default.nix | 2 +- pkgs/tools/networking/bwm-ng/default.nix | 2 +- pkgs/tools/security/aide/default.nix | 2 +- pkgs/tools/text/html2text/default.nix | 2 +- pkgs/top-level/python-packages.nix | 36 +++++++++---------- 66 files changed, 106 insertions(+), 95 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index 787f5df6eb0..f830b16da98 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation meta = { homepage = "http://rudel.sourceforge.net/"; - description = "Rudel is a collaborative editing environment for GNU Emacs"; + description = "A collaborative editing environment for GNU Emacs"; license = "GPL"; }; } diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index e46cb66de56..0d4b9fd1dab 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "Zed is a fully offline-capable, open source, keyboard-focused, text and code editor for power users"; + description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users"; license = stdenv.lib.licenses.mit; homepage = http://zedapp.org/; maintainers = [ stdenv.lib.maintainers.matejc ]; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 75d8e5ecb89..ff98bb5186a 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.krename.net; - description = "KRename is a powerful batch renamer for KDE"; + description = "A powerful batch renamer for KDE"; inherit (kdelibs.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index a1538c69932..3faf127d88d 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Password Safe is a password database utility"; + description = "A password database utility"; longDescription = '' Password Safe is a password database utility. Like many other diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix index ede053aeca3..99192fda113 100644 --- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix +++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [pkgconfig libParserUtils libwapcaplet]; meta = { - description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf + description = "A CSS parser and selection engine, written in C"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libcss/; license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index 32bede76e43..3c2b7693be7 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [pkgconfig]; meta = { - description = "LibParserUtils is a library for building efficient parsers, written in C"; + description = "A library for building efficient parsers, written in C"; homepage = http://www.netsurf-browser.org/projects/libparserutils/; license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index d370002543c..083850bb545 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = []; meta = { - description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf + description = "A decoding library for BMP and ICO image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsbmp/; license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index a4502d2354d..5e2acb4f313 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = []; meta = { - description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf + description = "A decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 5aa15d7b80d..a4cd09d1d86 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = []; meta = { - description = "LibWapcaplet is a string internment library, written in C"; + description = "A string internment library, written in C"; homepage = http://www.netsurf-browser.org/projects/libwapcaplet/; license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 00f27bfc93c..0b28d13e4e5 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -32,7 +32,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; meta = { - description = "Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient and capable office components: Words for text processing, Sheets for computations, Stage for presentations, Plan for planning, Flow for flowcharts, Kexi for database creation, Krita for painting and raster drawing, and Karbon for vector graphics."; + description = "A suite of productivity applications"; + longDescription = '' + Calligra Suite is a set of applications written to help + you to accomplish your work. Calligra includes efficient + and capable office components: Words for text processing, + Sheets for computations, Stage for presentations, Plan for + planning, Flow for flowcharts, Kexi for database creation, + Krita for painting and raster drawing, and Karbon for + vector graphics. + ''; homepage = http://calligra.org; maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index e181ecfd0e1..4e3b9b2a76b 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Yices is a high-performance theorem prover and SMT solver"; + description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; license = stdenv.lib.licenses.unfreeRedistributable; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index d4b74390c4c..f6966f92eb2 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://procode.org/stgit/"; - description = "StGit is a patch manager implemented on top of Git"; + description = "A patch manager implemented on top of Git"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b9d5ac168b2..91fff3335ec 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "i3lock is a simple screen locker like slock"; + description = "A simple screen locker like slock"; homepage = http://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 99562ebd662..97b200e340e 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=\${out}"; meta = { - description = "i3 is a tiling window manager"; + description = "A tiling window manager"; homepage = http://i3wm.org; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 622171b33e3..c495ac0a929 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Zeal is a simple offline API documentation browser"; + description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (OS X app), available for Linux and Windows. diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 0d3d9c104d4..2f528a619e7 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; - description = "Patched fonts for Powerline users."; + description = "Patched fonts for Powerline users"; longDescription = '' Pre-patched and adjusted fonts for usage with the Powerline plugin. ''; diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 8eaebaf0af3..08d7a8c3e73 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Econnman is a user interface for the connman network connection manager"; + description = "A user interface for the connman network connection manager"; homepage = http://enlightenment.org/; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix index b1828766f22..8674a774443 100644 --- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix +++ b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix @@ -3,6 +3,6 @@ kde { buildInputs = [ kdelibs qt_gstreamer1 ]; meta = { - description = "Artikulate is a pronunciation learning program for KDE."; + description = "A pronunciation learning program for KDE"; }; } diff --git a/pkgs/development/compilers/elm/elm-compiler.nix b/pkgs/development/compilers/elm/elm-compiler.nix index 87a0b660d2a..9cf8eda2d9a 100644 --- a/pkgs/development/compilers/elm/elm-compiler.nix +++ b/pkgs/development/compilers/elm/elm-compiler.nix @@ -27,7 +27,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://elm-lang.org"; - description = "Values to help with elm-package, elm-make, and elm-lang.org."; + description = "Values to help with elm-package, elm-make, and elm-lang.org"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 8206bb19e4f..54604f548fa 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -122,7 +122,7 @@ in mkDerivation (rec { }; homepage = "https://github.com/ghcjs/ghcjs"; - description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; + description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index f0dc9378c4f..588861ee42d 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/webtoolkit/; - description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications"; + description = "A development toolkit for building and optimizing complex browser-based applications"; }; } diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index b518a9a0e0e..ab13e0ba7dc 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Scala is a general purpose programming language"; + description = "A general purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix index de5db1eff99..c98e2e75c17 100644 --- a/pkgs/development/compilers/scala/2.9.nix +++ b/pkgs/development/compilers/scala/2.9.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Scala is a general purpose programming language"; + description = "A general purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index f9b587c0504..2482f2ac131 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; - description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; + description = "A ISO-compatible high-performance Prolog compiler"; license = stdenv.lib.licenses.artistic2; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix index 478f74058bd..92a3d16963b 100644 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://plv.csail.mit.edu/bedrock/; - description = "Bedrock is a library that turns Coq into a tool much like classical verification systems"; + description = "A library that turns Coq into a tool much like classical verification systems"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix index 9f020de1534..92b69319e0b 100644 --- a/pkgs/development/coq-modules/fiat/default.nix +++ b/pkgs/development/coq-modules/fiat/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://plv.csail.mit.edu/fiat/; - description = "Fiat is a library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; + description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 89555c2e13d..05267d6bf6c 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://flocq.gforge.inria.fr/; - description = "Flocq (Floats for Coq) is a floating-point formalization for the Coq system"; + description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index c885d14aa3f..98d447d21d3 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://plv.mpi-sws.org/paco/; - description = "Paco is a Coq library implementing parameterized coinduction"; + description = "A Coq library implementing parameterized coinduction"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index e47ffbdd456..b98ff613f9d 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.chargueraud.org/softs/tlc/; - description = "TLC is a general purpose Coq library that provides an alternative to Coq's standard library"; + description = "A general purpose Coq library that provides an alternative to Coq's standard library"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix index 555945068b1..d83e2c5c790 100644 --- a/pkgs/development/coq-modules/ynot/default.nix +++ b/pkgs/development/coq-modules/ynot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://ynot.cs.harvard.edu/; - description = "Ynot is a library for writing and verifying imperative programs"; + description = "A library for writing and verifying imperative programs"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 229db910ffd..70447d9f885 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ unzip cmake boost ]; meta = with stdenv.lib; { - description = "Open Asset Import Library is a library to import various 3D model formats"; + description = "A library to import various 3D model formats"; homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ emery ]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index f75c2117084..6808ea52adf 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s . $out/include/fastcgi"; meta = with stdenv.lib; { - description = "FastCGI is a language independent, scalable, open extension to CG"; + description = "A language independent, scalable, open extension to CG"; homepage = http://www.fastcgi.com/; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 604fe3c2fdf..e966388b2ad 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.6"; - description = "FOX is a C++ based class library for building Graphical User Interfaces"; + description = "A C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. It is a C++ based class library for building Graphical User Interfaces. diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 49e3fc40ba6..95038284cd6 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { - description = "giflib is a library for reading and writing gif images"; + description = "A library for reading and writing gif images"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix index dcd52fc93f4..0bccb857d35 100644 --- a/pkgs/development/libraries/giflib/5.1.nix +++ b/pkgs/development/libraries/giflib/5.1.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { - description = "giflib is a library for reading and writing gif images"; + description = "A library for reading and writing gif images"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index abf05f4c138..562e292791a 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "LAME is a high quality MPEG Audio Layer III (MP3) encoder"; + description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; license = licenses.lgpl2; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 4a3196e44b8..e960f5ef57f 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt"; - description = "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit"; + description = "A fairly comprehensive, modular and portable cryptographic toolkit"; }; } diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 57b1b3af2d1..c2799d039cc 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "NPAPI-SDK is a bundle of NPAPI headers by Mozilla"; + description = "A bundle of NPAPI headers by Mozilla"; homepage = https://code.google.com/p/npapi-sdk/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 1e1fc7ea3b8..872576d9fb0 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -92,7 +92,7 @@ let ''; meta = { - description = "A toolkit for the simulation of the passage of particles through matter."; + description = "A toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. @@ -129,7 +129,7 @@ let ''; meta = { - description = "Data files for the Geant4 toolkit."; + description = "Data files for the Geant4 toolkit"; homepage = http://www.geant4.org; license = stdenv.lib.licenses.g4sl; maintainers = [ ]; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index f90b2e6c4ae..e023b122091 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -45,7 +45,7 @@ let ''; meta = { - description = "Python bindings and utilities for Geant4."; + description = "Python bindings and utilities for Geant4"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index d011114bfd2..9078796fee6 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "This project is a QML port of qtermwidget"; + description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix index 8570af2b283..090ca28d7c4 100644 --- a/pkgs/development/libraries/urt/default.nix +++ b/pkgs/development/libraries/urt/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cs.utah.edu/gdc/projects/urt/; - description = "The Utah Raster Toolkit is a library for dealing with raster images"; + description = "A library for dealing with raster images"; }; } \ No newline at end of file diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index d7bd2348244..7d4c88e5c9e 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -98,7 +98,7 @@ let lispPackages = rec { clx-truetype = buildLispPackage rec { baseName = "clx-truetype"; version = "git-20141112"; - description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension"; + description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension"; deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; # Source type: git src = pkgs.fetchgit { diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f1ec69143b0..f0a9387a537 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; - description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; + description = "A collection of librares, each library providing a DOM implementation"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 44b30b368b3..c82785e4aa9 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ocaml-text.forge.ocamlcore.org/"; - description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. "; + description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index 77ffa752898..eddc71aeace 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; - description = "ulex is a lexer generator for Unicode and OCaml"; + description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 123641ba1ac..28950078f39 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; - description = "ulex is a lexer generator for Unicode and OCaml"; + description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 9c48227c9a8..1585b126961 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/checkbaskisms/; - description = "Performs basic checks on shell scripts for the presence of non portable syntax"; + description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index dee605ced57..7a980c69c18 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = { - description = "CamlIDL is a stub code generator and COM binding for Objective Caml"; + description = "A stub code generator and COM binding for Objective Caml"; homepage = "${webpage}"; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index f04d773c374..5392f14926b 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -15,13 +15,15 @@ stdenv.mkDerivation rec { installPhase = "scons prefix=$out install"; meta = with stdenv.lib; { - description = "Hammer is a parsing library"; - longDescription = "Hammer is a parsing library. Like many modern parsing libraries, - it provides a parser combinator interface for writing grammars - as inline domain-specific languages, but Hammer also provides a - variety of parsing backends. It's also bit-oriented rather than - character-oriented, making it ideal for parsing binary data such - as images, network packets, audio, and executables."; + description = "A bit-oriented parser combinator library"; + longDescription = '' + Hammer is a parsing library. Like many modern parsing libraries, + it provides a parser combinator interface for writing grammars + as inline domain-specific languages, but Hammer also provides a + variety of parsing backends. It's also bit-oriented rather than + character-oriented, making it ideal for parsing binary data such + as images, network packets, audio, and executables. + ''; homepage = https://github.com/UpstandingHackers/hammer; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index db42572de5e..f3574d137d3 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SuperTuxKart is a Free 3D kart racing game"; + description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, characters and items for you to try, similar in spirit to Mario diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 58727f10ef1..d7c91169ed3 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -16,8 +16,8 @@ in stdenv.mkDerivation ({ configurePhase = '' cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON ''; - meta = { - description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system"; + meta = with stdenv.lib; { + description = "A suite of tools for emulating optical drives and discs"; longDescription = '' CDEmu consists of: @@ -29,9 +29,9 @@ in stdenv.mkDerivation ({ Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. ''; - homepage = "http://cdemu.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + homepage = http://cdemu.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ "Rok Mandeljc " ]; }; } // drvParams) diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix index 16f1ef73dba..e2f8d423a61 100644 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://fusionio.com; - description = "Fusionio command line utilities."; + description = "Fusionio command line utilities"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; broken = stdenv.system != "x86_64-linux"; diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index 1ac67f19917..f61318e1b6b 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/cshorler/hal-flash; - description = "libhal stub library to satisfy the Flash Player DRM requirements."; + description = "libhal stub library to satisfy the Flash Player DRM requirements"; longDescription = '' Stub library based loosely upon libhal.[ch] from the hal-0.5.14 diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 3dd0463b604..856d4f61c54 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://exim.org/"; - description = "A mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems"; + homepage = http://exim.org/; + description = "A mail transfer agent (MTA)"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix index 19482db6f5a..9fdbbf064b0 100644 --- a/pkgs/servers/nosql/hyperdex/busybee.nix +++ b/pkgs/servers/nosql/hyperdex/busybee.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i"; meta = with stdenv.lib; { - description = "BusyBee is a high-performance messaging layer."; + description = "A high-performance messaging layer"; homepage = https://github.com/rescrv/busybee; license = licenses.bsd3; }; diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix index 44cc0752088..7ed3661b87f 100644 --- a/pkgs/servers/nosql/hyperdex/default.nix +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -fi"; meta = with stdenv.lib; { - description = "HyperDex is a scalable, searchable key-value store"; + description = "A scalable, searchable key-value store"; homepage = http://hyperdex.org; license = licenses.bsd3; }; diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix index c064aa419cd..69146b58672 100644 --- a/pkgs/servers/nosql/hyperdex/replicant.nix +++ b/pkgs/servers/nosql/hyperdex/replicant.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -i"; meta = with stdenv.lib; { - description = "A system for maintaining replicated state machines."; + description = "A system for maintaining replicated state machines"; homepage = https://github.com/rescrv/Replicant; license = licenses.bsd3; }; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 2293e2ab316..ebc0cffb3aa 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -34,7 +34,7 @@ composableDerivation.composableDerivation {} { ''; meta = { - description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; + description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; homepage = http://monetdb.cwi.nl/; license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html }; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index c986adeafdc..84351e19210 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Storebackup is a backup suite that stores files on other disks"; + description = "A backup suite that stores files on other disks"; homepage = http://savannah.nongnu.org/projects/storebackup; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index eb308f9de4f..a64b7f55003 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://help.yandex.com/disk/cli-clients.xml; - description = "Yandex.Disk is a free cloud file storage service"; + description = "A free cloud file storage service"; maintainers = with stdenv.lib.maintainers; [smironov]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 38c802f3c08..aad3b769fe2 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -29,7 +29,7 @@ in nodePackages.buildNodePackage rec { passthru.names = ["Airfield"]; meta = { - description = "Airfield is a web-interface for hipache-proxy"; + description = "A web-interface for hipache-proxy"; license = licenses.mit; homepage = https://github.com/emblica/airfield; maintainers = with maintainers; [offline]; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index c7376ad47b4..62dea1e6cd4 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor"; + description = "A small and simple console-based live network and disk io bandwidth monitor"; homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index c1b6fe197a1..d190dff842b 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://aide.sourceforge.net/"; - description = "Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker"; + description = "A file and directory integrity checker"; license = licenses.free; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 8fd0bea2254..4f2eeb4be20 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A command line utility, written in C++, that converts HTML documents into plain text"; + description = "Convert HTML to plain text"; homepage = http://www.mbayer.de/html2text/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03e120dbea1..9a490b4a56a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -533,7 +533,7 @@ let }; meta = with pkgs.stdenv.lib; { - description = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed"; + description = "A Python library that lets you schedule your Python code to be executed"; homepage = http://pypi.python.org/pypi/APScheduler/; license = licenses.mit; }; @@ -776,7 +776,7 @@ let buildInputs = [ pkgs.lzma ]; meta = { - describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files."; + describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; homepage = https://github.com/peterjc/backports.lzma; license = stdenv.lib.licenses.bsd3; }; @@ -914,7 +914,7 @@ let }; meta = { - description = "CalDAVCLientLibrary is a Python library and tool for CalDAV"; + description = "A Python library and tool for CalDAV"; longDescription = '' CalDAVCLientLibrary is a Python library and tool for CalDAV. @@ -1687,7 +1687,7 @@ let }; meta = with stdenv.lib; { - description = "This module implements a very fast JSON encoder/decoder for Python."; + description = "A very fast JSON encoder/decoder for Python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; platforms = platforms.all; @@ -2929,7 +2929,7 @@ let propagatedBuildInputs = with self; [ greenlet ]; meta = with stdenv.lib; { - description = "Eventlib bindings for python."; + description = "Eventlib bindings for python"; homepage = "http://ag-projects.com/"; license = licenses.lgpl2; platforms = platforms.all; @@ -4684,7 +4684,7 @@ let buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ]; meta = with stdenv.lib; { - description = "Simple Python implementation of the Git file formats and protocols."; + description = "Simple Python implementation of the Git file formats and protocols"; homepage = http://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; maintainers = [ maintainers.koral ]; @@ -4704,7 +4704,7 @@ let propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ]; meta = with stdenv.lib; { - description = "Push and pull from a Git server using Mercurial."; + description = "Push and pull from a Git server using Mercurial"; homepage = http://hg-git.github.com/; maintainers = [ maintainers.koral ]; }; @@ -6526,7 +6526,7 @@ let #''; meta = { - description = "python-magic is a python interface to the libmagic file type identification library"; + description = "A python interface to the libmagic file type identification library"; homepage = https://github.com/ahupp/python-magic; }; }; @@ -9265,7 +9265,7 @@ let meta = { homepage = "https://launchpad.net/pygpgme"; - description = "A Python wrapper for the GPGME library."; + description = "A Python wrapper for the GPGME library"; license = licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; }; @@ -9417,7 +9417,7 @@ let meta = with stdenv.lib; { description = "JSON Web Token implementation in Python"; - longDescription = "A Python implementation of JSON Web Token draft 01."; + longDescription = "A Python implementation of JSON Web Token draft 01"; homepage = https://github.com/progrium/pyjwt; downloadPage = https://github.com/progrium/pyjwt/releases; license = licenses.mit; @@ -9505,7 +9505,7 @@ let meta = { homepage = http://pyparsing.wikispaces.com/; - description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions."; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; }; }; @@ -11079,7 +11079,7 @@ let }; meta = { - description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; + description = "A simple, fast, extensible JSON encoder/decoder for Python"; longDescription = '' simplejson is compatible with Python 2.4 and later with no @@ -14350,7 +14350,7 @@ let LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API."; + description = "Graphite-web, without the interface. Just the rendering HTTP API"; homepage = https://github.com/brutasse/graphite-api; license = licenses.asl20; }; @@ -14603,7 +14603,7 @@ let buildInputs = with self; [ requests gevent ]; meta = { - description = "GRequests allows you to use Requests with Gevent to make asynchronous HTTP Requests easily."; + description = "Asynchronous HTTP requests"; homepage = https://github.com/kennethreitz/grequests; license = "bsd"; maintainers = [ stdenv.lib.maintainers.matejc ]; @@ -14714,7 +14714,7 @@ let ''; buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; meta = { - description = "Python bindings for EFL and Elementary."; + description = "Python bindings for EFL and Elementary"; homepage = http://enlightenment.org/; maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ]; platforms = stdenv.lib.platforms.linux; @@ -14995,7 +14995,7 @@ let }; meta = { - description = "Thumbor is a smart imaging service. It enables on-demand crop, resizing and flipping of images."; + description = "A smart imaging service"; homepage = https://github.com/globocom/thumbor/wiki; license = licenses.mit; }; @@ -15144,7 +15144,7 @@ let meta = { homepage = "https://github.com/erikrose/parsimonious"; - description = "Fast arbitrary-lookahead packrat parser written in pure Python."; + description = "Fast arbitrary-lookahead packrat parser written in pure Python"; license = licenses.mit; }; }; @@ -15162,7 +15162,7 @@ let meta = { homepage = "https://networkx.github.io/"; - description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks."; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = licenses.bsd3; }; }; From 33984cfeeea43a738ea0a09924d246edffdd8047 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 Apr 2015 16:44:45 +0000 Subject: [PATCH 080/135] Add logentries agent 1.4.13 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a490b4a56a..59196a23a16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6336,6 +6336,26 @@ let }; + le = buildPythonPackage rec { + name = "le-${version}"; + version = "1.4.13"; + + src = pkgs.fetchFromGitHub { + owner = "logentries"; + repo = "le"; + rev = "v${version}"; + sha256 = "12l6fqavykjinq286i9pgbbbrv5lq2mmiji91g0m05lfdx9pg4y1"; + }; + + propagatedBuildInputs = with self; [ simplejson ]; + + meta = { + homepage = "https://github.com/logentries/le"; + description = "Logentries agent"; + }; + }; + + libcloud = buildPythonPackage (rec { name = "libcloud-0.14.1"; From e37dbea9423cc65f6edae362fb7043f50cf27373 Mon Sep 17 00:00:00 2001 From: Bram Duvigneau Date: Fri, 1 May 2015 00:08:32 +0200 Subject: [PATCH 081/135] Document the brltty servicve in release notes --- nixos/doc/manual/release-notes/rl-unstable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index cdbd074e782..6b2cf55bb8d 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -15,9 +15,9 @@ Following new services were added since the last release: - + +brltty + When upgrading from a previous release, please be aware of the From a704233a87d22121d6ad38bd1e4a61d9e9cc7c25 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 30 Apr 2015 18:54:40 -0400 Subject: [PATCH 082/135] Add ats-extsolve (formerly patsolve) --- .../compilers/ats-extsolve/default.nix | 35 +++++ .../compilers/ats-extsolve/misc-fixes.patch | 136 ++++++++++++++++++ pkgs/development/compilers/ats2/default.nix | 2 + pkgs/development/compilers/ats2/setup-hook.sh | 1 + pkgs/top-level/all-packages.nix | 1 + 5 files changed, 175 insertions(+) create mode 100644 pkgs/development/compilers/ats-extsolve/default.nix create mode 100644 pkgs/development/compilers/ats-extsolve/misc-fixes.patch create mode 100644 pkgs/development/compilers/ats2/setup-hook.sh diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix new file mode 100644 index 00000000000..9cd6d3adb32 --- /dev/null +++ b/pkgs/development/compilers/ats-extsolve/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }: + +stdenv.mkDerivation { + name = "ats-extsolve-0pre6a9b752"; + + buildInputs = [ python z3 ats2 pkgconfig json_c ]; + + src = fetchurl { + url = "https://github.com/githwxi/ATS-Postiats-contrib/archive/6a9b752efb8af1e4f77213f9e81fc2b7fa050877.tar.gz"; + sha256 = "1zz4fqjm1rdvpm0m0sdck6vx55iiqlk2p8z078fca2q9xyxqjkqd"; + }; + + postUnpack = '' + export PATSHOMERELOC="$PWD/$sourceRoot"; + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC" + ''; + + patches = [ ./misc-fixes.patch ]; + + preBuild = "cd projects/MEDIUM/ATS-extsolve"; + + buildFlags = [ "setup" "patsolve" ]; + + installPhase = '' + install -d -m755 $out/bin + install -m755 patsolve $out/bin + ''; + + meta = { + platforms = ats2.meta.platforms; + homepage = http://www.illtyped.com/projects/patsolve; + description = "External Constraint-Solving for ATS2"; + maintainer = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/compilers/ats-extsolve/misc-fixes.patch b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch new file mode 100644 index 00000000000..8775bb83ba4 --- /dev/null +++ b/pkgs/development/compilers/ats-extsolve/misc-fixes.patch @@ -0,0 +1,136 @@ +From bfc7216250e666a59e304f3b7518f8b0bccccbae Mon Sep 17 00:00:00 2001 +From: Shea Levy +Date: Thu, 30 Apr 2015 16:50:47 -0400 +Subject: [PATCH] Add missing case in fprint_s2rt + +--- + projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats +index a841b5f..5bc28d7 100644 +--- a/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats ++++ b/projects/MEDIUM/ATS-extsolve/constraint/constraint_s2rt.dats +@@ -113,6 +113,7 @@ case+ s2t0 of + | S2RTfun (args, ret) => fprint (out, "S2RTfun()") + | S2RTtup () => fprint (out, "S2RTtup()") + | S2RTerr () => fprint (out, "S2RTerr()") ++| S2RTuninterp (str) => fprint! (out, "S2RTuninterp(", str, ")") + // + | S2RTignored () => fprint (out, "S2RTignored()") + // +From 9d4c7669d0d3bc8725648684391a2962ed5a922e Mon Sep 17 00:00:00 2001 +From: Shea Levy +Date: Thu, 30 Apr 2015 17:13:35 -0400 +Subject: [PATCH] ATS-extsolve: Get rid of verbose . overload + +--- + projects/MEDIUM/ATS-extsolve/solving/solver.dats | 2 +- + projects/MEDIUM/ATS-extsolve/solving/solver.sats | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.dats b/projects/MEDIUM/ATS-extsolve/solving/solver.dats +index 8446cd5..f2f77b4 100644 +--- a/projects/MEDIUM/ATS-extsolve/solving/solver.dats ++++ b/projects/MEDIUM/ATS-extsolve/solving/solver.dats +@@ -250,7 +250,7 @@ end // end of [c3nstr_solve_main] + implement c3nstr_solve (c3t, scripts, verbose) = let + var env : smtenv + val _ = smtenv_nil (env) +- val () = env.verbose (verbose) ++ val () = smtenv_set_verbose(env, verbose) + val () = + case+ scripts of + | list_nil () => () +diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver.sats b/projects/MEDIUM/ATS-extsolve/solving/solver.sats +index e43a028..dae452c 100644 +--- a/projects/MEDIUM/ATS-extsolve/solving/solver.sats ++++ b/projects/MEDIUM/ATS-extsolve/solving/solver.sats +@@ -39,14 +39,8 @@ fun smtenv_load_scripts (env: &smtenv, scripts: List0(string)): void + + fun smtenv_get_solver (env: &smtenv): solver + +-fun smtenv_get_verbose (env: &smtenv): bool +- +-overload .verbose with smtenv_get_verbose +- + fun smtenv_set_verbose (env: &smtenv, verbose: bool): void + +-overload .verbose with smtenv_set_verbose +- + fun formula_cst (s2c: s2cst): formula + + (* ****** ****** *) +From e3473a8d9dc7c56cda1111a439db7123254d00b4 Mon Sep 17 00:00:00 2001 +From: Shea Levy +Date: Thu, 30 Apr 2015 18:09:33 -0400 +Subject: [PATCH 1/2] solver_smt.dats: Don't use mapfree on linear list of + non-linear values + +--- + projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats +index 04055b9..b49602d 100644 +--- a/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats ++++ b/projects/MEDIUM/ATS-extsolve/solving/solver_smt.dats +@@ -348,7 +348,7 @@ in + // + val () = assertloc (length(pairs) > 0) + // +- implement list_vt_mapfree$fopr<@(s2exp,s2exp)>(x) = let ++ implement list_vt_map$fopr<@(s2exp,s2exp)>(x) = let + val (pf, fpf | Env) = $UN.ptr1_vtake{smtenv}(addr@ env) + val met = formula_make (!Env, x.0) + val bound = formula_make (!Env, x.1) +@@ -362,7 +362,8 @@ in + end + // + val assertions = +- list_vt_mapfree<(s2exp,s2exp)> (pairs) ++ list_vt_map<(s2exp,s2exp)> (pairs) ++ val () = list_vt_free(pairs) + // + implement + list_vt_fold$init (x) = x + +From 50de956561e6bf43190d7efb385bb6da658f1637 Mon Sep 17 00:00:00 2001 +From: Shea Levy +Date: Thu, 30 Apr 2015 18:18:56 -0400 +Subject: [PATCH 2/2] ats-extsolve/main.dats: Don't use mapfree on linear list + of non-linear values + +--- + projects/MEDIUM/ATS-extsolve/main.dats | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/projects/MEDIUM/ATS-extsolve/main.dats b/projects/MEDIUM/ATS-extsolve/main.dats +index ac30ca0..930697d 100644 +--- a/projects/MEDIUM/ATS-extsolve/main.dats ++++ b/projects/MEDIUM/ATS-extsolve/main.dats +@@ -34,7 +34,7 @@ dynload "commarg.dats" + + (* ****** ****** *) + +-overload mapfree with list_vt_mapfree ++overload map with list_vt_map + overload filter with list_vt_filter + + (* ****** ****** *) +@@ -56,12 +56,13 @@ implement main0 (argc, argv) = let + | Script (s) => true + | _ =>> false + implement +- list_vt_mapfree$fopr (x) = ++ list_vt_map$fopr (x) = + case- x of + | Script (s) => s + // + val scriptargs = filter (list_vt_copy (args)) +- val scripts = mapfree (scriptargs) ++ val scripts = map (scriptargs) ++ val () = list_vt_free (scriptargs) + // + implement + list_find$pred (x) = diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 304d5c284ae..8345a353f3f 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + setupHook = ./setup-hook.sh; + meta = { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/development/compilers/ats2/setup-hook.sh new file mode 100644 index 00000000000..67647b1edf6 --- /dev/null +++ b/pkgs/development/compilers/ats2/setup-hook.sh @@ -0,0 +1 @@ +export PATSHOME=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3f0d172705..356ef9bb690 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3375,6 +3375,7 @@ let ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; + ats-extsolve = callPackage ../development/compilers/ats-extsolve { }; avra = callPackage ../development/compilers/avra { }; From 53ab1f7d3ca355a16569bb77bb950b89e8fcf01b Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 30 Apr 2015 21:14:16 -0400 Subject: [PATCH 083/135] mbpfan: new package Daemon that uses input from coretemp module and sets the fan speed using the applesmc module --- pkgs/os-specific/linux/mbpfan/default.nix | 30 +++++++++++++++++++++++ pkgs/os-specific/linux/mbpfan/fixes.patch | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 61 insertions(+) create mode 100644 pkgs/os-specific/linux/mbpfan/default.nix create mode 100644 pkgs/os-specific/linux/mbpfan/fixes.patch diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix new file mode 100644 index 00000000000..75099e95f90 --- /dev/null +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, gnugrep, kmod }: + +stdenv.mkDerivation rec { + name = "mbpfan-${version}"; + version = "1.9.0"; + src = fetchFromGitHub { + owner = "dgraziotin"; + repo = "mbpfan"; + rev = "v${version}"; + sha256 = "15nm1d0a0c0lzxqngrpn2qpsydsmglnn6d20djl7brpsq26j24h9"; + }; + patches = [ ./fixes.patch ]; + postPatch = '' + substituteInPlace src/main.c \ + --replace '@GREP@' '${gnugrep}/bin/grep' \ + --replace '@LSMOD@' '${kmod}/bin/lsmod' + ''; + installPhase = '' + mkdir -p $out/bin $out/etc + cp bin/mbpfan $out/bin + cp mbpfan.conf $out/etc + ''; + meta = with lib; { + description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module"; + homepage = "https://github.com/dgraziotin/mbpfan"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch new file mode 100644 index 00000000000..548cce05c35 --- /dev/null +++ b/pkgs/os-specific/linux/mbpfan/fixes.patch @@ -0,0 +1,29 @@ +diff --git a/src/main.c b/src/main.c +index e8af708..6cfee17 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -71,7 +71,7 @@ void check_requirements() + * Check for coretemp and applesmc modules + * Credits: -http://stackoverflow.com/questions/12978794 + */ +- FILE *fd = popen("lsmod | grep coretemp", "r"); ++ FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r"); + char buf[16]; + + if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { +@@ -87,7 +87,7 @@ void check_requirements() + + pclose(fd); + +- fd = popen("lsmod | grep applesmc", "r"); ++ fd = popen("@LSMOD@ | @GREP@ applesmc", "r"); + + if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { + DIR* dir = opendir(APPLESMC_PATH); +@@ -145,4 +145,4 @@ int main(int argc, char *argv[]) + void (*fan_control)() = mbpfan; + go_daemon(fan_control); + exit(EXIT_SUCCESS); +-} +\ No newline at end of file ++} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 356ef9bb690..9936330936c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9512,6 +9512,8 @@ let lvm2 = callPackage ../os-specific/linux/lvm2 { }; + mbpfan = callPackage ../os-specific/linux/mbpfan { }; + mdadm = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; From d83399dcd906d93edbbca9bd4e0ae46227cb8473 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 30 Apr 2015 21:15:19 -0400 Subject: [PATCH 084/135] mgpfan: new service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/mbpfan.nix | 106 +++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 nixos/modules/services/misc/mbpfan.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e1af98f0da6..d182359b5cf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -196,6 +196,7 @@ ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/ihaskell.nix + ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/mesos-master.nix ./services/misc/mesos-slave.nix diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix new file mode 100644 index 00000000000..2767520d78f --- /dev/null +++ b/nixos/modules/services/misc/mbpfan.nix @@ -0,0 +1,106 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mbpfan; + +in { + options.services.mbpfan = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the mbpfan daemon. + ''; + }; + + package = mkOption { + default = pkgs.mbpfan; + description = '' + The package used for the mbpfan daemon. + ''; + }; + + minFanSpeed = mkOption { + type = types.int; + default = 2000; + description = '' + The minimum fan speed. + ''; + }; + + maxFanSpeed = mkOption { + type = types.int; + default = 6200; + description = '' + The maximum fan speed. + ''; + }; + + lowTemp = mkOption { + type = types.int; + default = 63; + description = '' + The low temperature. + ''; + }; + + highTemp = mkOption { + type = types.int; + default = 66; + description = '' + The high temperature. + ''; + }; + + maxTemp = mkOption { + type = types.int; + default = 86; + description = '' + The maximum temperature. + ''; + }; + + pollingInterval = mkOption { + type = types.int; + default = 7; + description = '' + The polling interval. + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "coretemp" "applesmc" ]; + + security.setuidPrograms = [ "mbpfan" ]; + + environment = { + etc."mbpfan.conf".text = '' + [general] + min_fan_speed = ${toString cfg.minFanSpeed} + max_fan_speed = ${toString cfg.maxFanSpeed} + low_temp = ${toString cfg.lowTemp} + high_temp = ${toString cfg.highTemp} + max_temp = ${toString cfg.maxTemp} + polling_interval = ${toString cfg.pollingInterval} + ''; + systemPackages = [ cfg.package ]; + }; + + systemd.services.mbpfan = { + description = "A fan manager daemon for MacBook Pro"; + wantedBy = [ "sysinit.target" ]; + after = [ "syslog.target" "sysinit.target" ]; + restartTriggers = [ config.environment.etc."mbpfan.conf".source ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/mbpfan -fv"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PIDFile = "/var/run/mbpfan.pid"; + Restart = "always"; + }; + }; + }; +} From bc4347bfd78944eacbf5e3abb44ad11b86e412cc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 30 Apr 2015 18:50:26 -0700 Subject: [PATCH 085/135] iproute: 3.19.0 -> 4.0.0 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index a5bf8ccc162..53812a71286 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.19.0"; + name = "iproute2-4.0.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "1c6pgysxfqs5qkd4kpwkbdhw3xydhjnskrz1q2k2nvqndv1ziyg2"; + sha256 = "0616cg6liyysfddf6d8i4vyndd9b0hjmfw35icq8p18b0nqnxl2w"; }; patch = [ ./vpnc.patch ]; From 4c01e6d91993b6de128795f4fbdd25f6227fb870 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 May 2015 09:14:35 +0200 Subject: [PATCH 086/135] calibre: update from 2.26.0 to 2.27.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 991cc65c94d..13738cdafe5 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.26.0"; + name = "calibre-2.27.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0340cdxbdwvckmz3zygwx1wbn62wxap0545nsimpfq4ln7dcxrfw"; + sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5"; }; inherit python; From 78a877bef1e7914b8a5506a5cb33cd70b9c5f3f5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 1 May 2015 20:10:20 +0200 Subject: [PATCH 087/135] Delete redundant docutils expression `development/tools/documentation/docutils` is also provided by `pythonPackages`; use that instead. --- .../tools/documentation/docutils/default.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/tools/documentation/docutils/default.nix diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix deleted file mode 100644 index cd01cf059d6..00000000000 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.11" a; - buildInputs = with a; [ - python pil makeWrapper - ]; -in -rec { - src = fetchurl { - url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["installPythonPackage" "wrapBinContentsPython"]; - - name = "python-docutils-" + version; - meta = { - description = "Processor of ReStructured Text"; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c..ce16006fa83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5150,9 +5150,7 @@ let binutils = binutils; }; - docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { - inherit python pil makeWrapper; - }; + docutils = pythonPackages.docutils; doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; From ba50d4840063bcc8cd662c48262c90102ec7132a Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 1 May 2015 17:11:00 -0400 Subject: [PATCH 088/135] mbpfan: service improvements * add verbosity setting * don't set mbpfan as a setuid program --- nixos/modules/services/misc/mbpfan.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 2767520d78f..3fb5f684b76 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.mbpfan; + verbose = if cfg.verbose then "v" else ""; in { options.services.mbpfan = { @@ -69,13 +70,19 @@ in { The polling interval. ''; }; + + verbose = mkOption { + type = types.bool; + default = false; + description = '' + If true, sets the log level to verbose. + ''; + }; }; config = mkIf cfg.enable { boot.kernelModules = [ "coretemp" "applesmc" ]; - security.setuidPrograms = [ "mbpfan" ]; - environment = { etc."mbpfan.conf".text = '' [general] @@ -96,7 +103,7 @@ in { restartTriggers = [ config.environment.etc."mbpfan.conf".source ]; serviceConfig = { Type = "simple"; - ExecStart = "${cfg.package}/bin/mbpfan -fv"; + ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; PIDFile = "/var/run/mbpfan.pid"; Restart = "always"; From c5081bd6032feeacc82cdcab32f93cd0685d7e20 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 11:16:58 -0700 Subject: [PATCH 089/135] btrfsprogs: 3.19.1 -> 4.0 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index d1e0e8e430b..9286d58482f 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.19.1"; in +let version = "4.0"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1nw8rsc0dc5k6hrg03m1c65n4d0f7rfs1fjv96xqhqg0wykn5214"; + sha256 = "07ss0spfkb6dkvcwmkljy6bbyf437abwzngip141a1mhq6ng370p"; }; buildInputs = [ From 9d4e9aa79e220a3810de6d4c9547f1b53fc1bf6e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 11:19:59 -0700 Subject: [PATCH 090/135] apr: 1.5.1 -> 1.5.2 --- pkgs/development/libraries/apr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 3810a47fac3..08fd1fe4d5f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.5.1"; + name = "apr-1.5.2"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9"; + sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; From 9d5a3e62cf1b5baa91ba2c1958a2118211af06ac Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 11:24:07 -0700 Subject: [PATCH 091/135] curl: 7.42.0 -> 7.42.1 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 8e4bbad7f4b..3bb1c20ae88 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -12,11 +12,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.42.0"; + name = "curl-7.42.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "13yhcqfksy2vwc4sjv97nv3cbd2pb2a8lnvv8g46qp1gail7sm9j"; + sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From 1d150637683b7cfcfcc3bfe8d4b4dda2afadb735 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 14:37:10 -0700 Subject: [PATCH 092/135] rtmpdump: Use openssl by default --- pkgs/tools/video/rtmpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 55240be19a4..552023278b6 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, zlib -, gnutlsSupport ? true, gnutls ? null -, opensslSupport ? false, openssl ? null +, gnutlsSupport ? false, gnutls ? null +, opensslSupport ? true, openssl ? null }: # Must have an ssl library enabled From 21fea99191905bb7ccb2412b41061e23dae62a38 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 14:36:51 -0700 Subject: [PATCH 093/135] Fix some meta --- pkgs/development/libraries/c-ares/default.nix | 10 ++++------ pkgs/development/libraries/jansson/default.nix | 6 ++++-- pkgs/development/libraries/zlib/default.nix | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 58e7c17f249..678c7e15112 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -8,13 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; }; - meta = { + meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; - homepage = http://c-ares.haxx.se; - - license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ shlevy ]; }; } diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 7b78c39924f..f0f9cc65cb2 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1mvq9p85khsl818i4vbszyfab0fd45mdrwrxjkzw05mk1xcyc1br"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 8a79806bf93..162bae54d37 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Lossless data-compression library"; license = licenses.zlib; + platforms = platforms.all; }; } // (if stdenv.isDarwin then { postInstall = '' From cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 1 May 2015 14:35:56 -0700 Subject: [PATCH 094/135] nghttp2: Add derivation --- .../development/libraries/nghttp2/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 2 files changed, 78 insertions(+) create mode 100644 pkgs/development/libraries/nghttp2/default.nix diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix new file mode 100644 index 00000000000..b72abb57e8f --- /dev/null +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, pkgconfig + +# Optinal Dependencies +, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null +, libxml2 ? null, jemalloc ? null + +# Extra argument +, prefix ? "" +}: + +let + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + isLib = prefix == "lib"; + + optOpenssl = if isLib then null else shouldUsePkg openssl; + optLibev = if isLib then null else shouldUsePkg libev; + optZlib = if isLib then null else shouldUsePkg zlib; + + hasApp = optOpenssl != null && optLibev != null && optZlib != null; + + optJansson = if isLib then null else shouldUsePkg jansson; + #optBoost = if isLib then null else shouldUsePkg boost; + optBoost = null; # Currently detection is broken + optLibxml2 = if !hasApp then null else shouldUsePkg libxml2; + optJemalloc = if !hasApp then null else shouldUsePkg jemalloc; +in +stdenv.mkDerivation rec { + name = "${prefix}nghttp2-${version}"; + version = "0.7.13"; + + # Don't use fetchFromGitHub since this needs a bootstrap curl + src = fetchurl { + url = "http://pub.wak.io/nixos/tarballs/nghttp2-0.7.13.tar.xz"; + sha256 = "1nz14hmfhsxljmf7f3763q9kpn9prfdivrvdr7c74x72s75bzwli"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] + ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; + + configureFlags = [ + (mkEnable false "werror" null) + (mkEnable false "debug" null) + (mkEnable true "threads" null) + (mkEnable hasApp "app" null) + (mkEnable (optJansson != null) "hpack-tools" null) + (mkEnable (optBoost != null) "asio-lib" null) + (mkEnable false "examples" null) + (mkEnable false "python-bindings" null) + (mkEnable false "failmalloc" null) + (mkWith (optLibxml2 != null) "libxml2" null) + (mkWith (optJemalloc != null) "jemalloc" null) + (mkWith false "spdylay" null) + (mkWith false "cython" null) + ]; + + meta = with stdenv.lib; { + homepage = http://nghttp2.org/; + description = "an implementation of HTTP/2 in C"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c..7a1116126a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7218,6 +7218,12 @@ let newt = callPackage ../development/libraries/newt { }; + nghttp2 = callPackage ../development/libraries/nghttp2 { }; + libnghttp2 = nghttp2.override { + prefix = "lib"; + fetchurl = fetchurlBoot; + }; + nix-plugins = callPackage ../development/libraries/nix-plugins { nix = pkgs.nixUnstable; }; From b95fa1c852ff60e9b866c2e4518bd37feeb7eee6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 00:59:57 +0200 Subject: [PATCH 095/135] grsecurity: Update stable and test patches stable: 3.1-3.14.40-201504290821 -> 3.1-3.14.40-201504302118 test: 3.1-3.19.6-201504290821 -> 3.1-3.19.6-201504302119 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2bb8fb57000..9ed7633e7a3 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.40"; - revision = "201504290821"; + revision = "201504302118"; branch = "stable"; - sha256 = "0382ydr1dshjmwggx5a6ywrdr7qv52w178ify60qw59lrphbdkls"; + sha256 = "154ivf42ib93f8shh2b2qcqhppd1c6vbjfiazgigr006q638429i"; }; grsecurity_unstable = grsecPatch { kversion = "3.19.6"; - revision = "201504290821"; + revision = "201504302119"; branch = "test"; - sha256 = "0nya84cpj2cgncchywfysvmzx5m3wl034f6p7zfxj9l6jhjdcd6q"; + sha256 = "03yj8011i6mkf33npa7all0c33r95mgiic6zjg494x56279s701s"; }; grsec_fix_path = From a46066219c3954c280fe24c93e29d9010f7bb6fc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 01:00:56 +0200 Subject: [PATCH 096/135] spl: Update from 0.6.4 -> 0.6.4.1 --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 1367be74c63..b3332d88512 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.4"; + version = "0.6.4.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "1jja3aqkm2whb4rcw5k5dr9c4gx6hax1w3f82fb9ks2sy731as6r"; + sha256 = "1rlflraj66ag2gcvzsyfl4zwhq4846ifyzdmnnmscwmdf2qxc1l8"; }; patches = [ ./const.patch ./install_prefix.patch ]; From 8119b8a0e414a2541d4e6838d9ddf07306b3854a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 01:01:14 +0200 Subject: [PATCH 097/135] zfs: Update from 0.6.4 -> 0.6.4.1 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 06aca23369e..bd4b0c23c8b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.6.4"; + version = "0.6.4.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "0xlj2w6gadip3rr3f1lri1n93lkjpzyksnk01sbl5wsrbkry3xjq"; + sha256 = "15fh1b2rvzvx4j3vgkwrgy2sd553bzwcvk1zai6phjhb6i2rw8v4"; }; patches = [ ./nix-build.patch ]; From 2bc69990ccfe2b02163ed9a745e6d3d1f131cf67 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Sat, 2 May 2015 11:05:43 +0200 Subject: [PATCH 098/135] dmd: Tweaks so that it compiles on darwin - Patching the makefile so use "clang++" as compiler. This was commented out inside of the makefile. - Fix the path to copy libphobos from. --- pkgs/development/compilers/dmd/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 068b29d47ce..c57cf2551aa 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation { buildInputs = [ unzip curl ]; + # Allow to use "clang++", commented in Makefile + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/dmd/posix.mak --replace g++ clang++ + ''; + buildPhase = '' cd src/dmd make -f posix.mak INSTALL_DIR=$out @@ -34,8 +39,9 @@ stdenv.mkDerivation { cd ../phobos mkdir $out/lib - ${let bits = if stdenv.is64bit then "64" else "32"; in - "cp generated/linux/release/${bits}/libphobos2.a $out/lib" + ${let bits = if stdenv.is64bit then "64" else "32"; + osname = if stdenv.isDarwin then "osx" else "linux"; in + "cp generated/${osname}/release/${bits}/libphobos2.a $out/lib" } cp -r std $out/include/d2 @@ -55,4 +61,3 @@ stdenv.mkDerivation { platforms = platforms.unix; }; } - From 2e658c1c6357443ab778653dfc62753677bafe4f Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Sat, 2 May 2015 11:20:45 +0200 Subject: [PATCH 099/135] dmd: Update version to 2.067.1 --- pkgs/development/compilers/dmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index c57cf2551aa..fb4666de4c2 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, curl }: stdenv.mkDerivation { - name = "dmd-2.067.0"; + name = "dmd-2.067.1"; src = fetchurl { - url = http://downloads.dlang.org/releases/2015/dmd.2.067.0.zip; - sha256 = "0b1b65694846ef3430de1de341c8cf353151a1a39656e6a1065fe56bc90fb60b"; + url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; + sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; }; buildInputs = [ unzip curl ]; From c6d17dfa24243c144d68da31722bee0b739600c0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 2 May 2015 12:36:04 +0200 Subject: [PATCH 100/135] fix up cudatoolkit 6.5 so that nvprof can run --- pkgs/development/compilers/cudatoolkit/6.5.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix index 17156cd0664..268e8e7aeae 100644 --- a/pkgs/development/compilers/cudatoolkit/6.5.nix +++ b/pkgs/development/compilers/cudatoolkit/6.5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: let version = "6.5.19"; in @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; runtimeDependencies = [ + glibc ncurses expat python zlib xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext gtk2 glib fontconfig freetype unixODBC alsaLib @@ -54,6 +55,9 @@ stdenv.mkDerivation rec { rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" mv $out/include $out/usr_include + + # let's remove the 32-bit libraries, they confuse the lib64->lib mover + rm -rf $out/lib ''; setupHook = ./setup-hook.sh; From d1df0cd87370ce9d96fcff5c1a86dbe1e1882227 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 2 May 2015 12:26:50 +0200 Subject: [PATCH 101/135] chipmunk: 6.1.5 -> 7.0.0 --- .../libraries/chipmunk/default.nix | 52 ++++++++----------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 63c5959960a..52990097a23 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,39 +1,29 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - fullDepEntry = args.fullDepEntry; +{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto +, inputproto, libXi, libXmu +}: + +stdenv.mkDerivation rec { + name = "chipmunk-${version}"; + majorVersion = "7"; + version = "${majorVersion}.0.0"; - version = lib.attrByPath ["version"] "6.1.5" args; - majorVersion = lib.attrByPath ["majorVersion"] "6" args; - buildInputs = with args; [ - cmake freeglut mesa - libX11 xproto inputproto libXi libXmu - ]; -in -rec { src = fetchurl { - url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7"; + url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; + sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql"; }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"]; + buildInputs = + [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; - genMakefile = fullDepEntry '' - cmake -D CMAKE_INSTALL_PREFIX=$out . - '' ["minInit" "addInputs" "doUnpack"]; - - demoInstall = fullDepEntry('' + postInstall = '' mkdir -p $out/bin - cp Demo/chipmunk_demos $out/bin - '') ["doMakeInstall" "defEnsureDir"]; - - name = "chipmunk-" + version; - meta = { - description = "2D physics engine"; + cp demo/chipmunk_demos $out/bin + ''; + + meta = with stdenv.lib; { + description = "A fast and lightweight 2D game physics library"; + homepage = http://chipmunk2d.net/; + license = licenses.mit; + platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e86ed832d9..85bbae43123 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,8 +5521,7 @@ let check = callPackage ../development/libraries/check { }; - chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { - inherit cmake freeglut mesa; + chipmunk = callPackage ../development/libraries/chipmunk { inherit (xlibs) libX11 xproto inputproto libXi libXmu; }; From 03c749e896c975fb0be25c039323e56bb1e8ebb4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 01:01:27 +0200 Subject: [PATCH 102/135] icedtea7_web: Update from 1.5.2 -> 1.6 --- pkgs/development/compilers/icedtea-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index ffff81b686a..f1a7b907815 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.5.2"; + version = "1.6"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1wrvl66qj0yhaqqhcq24005ci5sc3w005809cld55iiwagr8z7mj"; + sha256 = "0z8iirvpciai55s4vhpfkhyx4h4hm6dqy4pg4c61pia3innqd4qn"; }; buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ]; From b526c0fbb2e99a9f6d6c7f4f79a4e316aa980e77 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 13:37:31 +0200 Subject: [PATCH 103/135] attic: Update hash It seems to have happened the same thing as in 2c89d0b82dfcd399750ae685d91b63cc6b906ef9: the hash changed but apparently no new commit was added... --- pkgs/tools/backup/attic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index b7bcadd73c5..fba7a28eded 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec { src = fetchzip { name = "${name}-src"; url = "https://github.com/jborg/attic/archive/0.15.tar.gz"; - sha256 = "0bing5zg82mwvdi27jl77ardw65zaq4996k4677gz2lq7p7b4gd7"; + sha256 = "0c5rsxxcg897a619cbv75hzi1ahpkym8dccf6y3jlcs98z11vm5d"; }; propagatedBuildInputs = with python3Packages; From bb9ee2ab55f3d4a3ca03379ade14e2055ac1966c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 2 May 2015 14:44:34 +0200 Subject: [PATCH 104/135] Add vala 0.28 --- pkgs/development/compilers/vala/0.28.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/compilers/vala/0.28.nix diff --git a/pkgs/development/compilers/vala/0.28.nix b/pkgs/development/compilers/vala/0.28.nix new file mode 100644 index 00000000000..caec4fda887 --- /dev/null +++ b/pkgs/development/compilers/vala/0.28.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt +, glib, libiconv, libintlOrEmpty +}: + +let + major = "0.28"; + minor = "0"; + sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; +in +stdenv.mkDerivation rec { + name = "vala-${major}.${minor}"; + + meta = { + description = "Compiler for GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; + }; + + src = fetchurl { + url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + + buildInputs = [ glib libiconv ] + ++ libintlOrEmpty; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a1116126a9..d285b8f5adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4477,6 +4477,8 @@ let vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; + vala_0_28 = callPackage ../development/compilers/vala/0.28.nix { }; + visualcpp = callPackage ../development/compilers/visual-c++ { }; vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; From dd89ec5785dc173d9fad3a89df4b3d980cc00047 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 2 May 2015 22:15:29 +0900 Subject: [PATCH 105/135] Bump Android packages to newest versions, add androidsdk_5_1_1 and androidsdk_5_1_1_extras to env Detailed changes: - android-sdk: update 24.0.1 -> 24.1.2 - android-platforms: add 5.1.1 - android-platform-tools: update 21 -> 22 - android-build-tools: update 21.1.2 -> 22.0.1 - android-support: update 21 -> 22.1.1 - android-support-repository: update 9 -> 14 --- pkgs/development/mobile/androidenv/addon.xml | 154 +++-- pkgs/development/mobile/androidenv/addons.nix | 89 +-- .../mobile/androidenv/androidsdk.nix | 6 +- .../mobile/androidenv/build-tools.nix | 13 +- .../development/mobile/androidenv/default.nix | 14 + .../mobile/androidenv/generate-addons.xsl | 36 +- .../mobile/androidenv/generate-platforms.xsl | 26 +- .../mobile/androidenv/generate-sysimages.sh | 2 + .../mobile/androidenv/generate-sysimages.xsl | 2 +- .../mobile/androidenv/platform-tools.nix | 6 +- .../mobile/androidenv/platforms-linux.nix | 101 ++-- .../mobile/androidenv/platforms-macosx.nix | 102 ++-- .../mobile/androidenv/repository-10.xml | 534 ++++++++++++++---- .../mobile/androidenv/support-repository.nix | 9 +- .../development/mobile/androidenv/support.nix | 9 +- .../development/mobile/androidenv/sys-img.xml | 119 +++- .../mobile/androidenv/sysimages.nix | 90 ++- 17 files changed, 967 insertions(+), 345 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 274ae734b6e..334626b93ac 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -440,6 +440,7 @@ August 15, 2011 Android + Google APIs http://developer.android.com/ + 34908058 @@ -467,6 +468,7 @@ August 15, 2011 Android + Google APIs, revision 2 http://developer.android.com/ + 42435735 @@ -550,6 +552,7 @@ August 15, 2011 Android + Google APIs, revision 1 http://developer.android.com/ + 53691339 @@ -659,6 +662,7 @@ August 15, 2011 Android + Google APIs, API 11, revision 1 http://developer.android.com/ + 83477179 @@ -686,6 +690,7 @@ August 15, 2011 Android + Google APIs, API 12, revision 1 http://developer.android.com/ + 86099835 @@ -713,6 +718,7 @@ August 15, 2011 Android + Google APIs, API 13, revision 1 http://developer.android.com/ + 88615525 @@ -738,6 +744,7 @@ August 15, 2011 14 2 + com.google.android.maps @@ -876,14 +883,14 @@ August 15, 2011 - + google Google Inc. google_apis Google APIs (ARM System Image) Android + Google APIs 19 - 7 + 13 com.google.android.maps @@ -897,9 +904,49 @@ August 15, 2011 - 160661775 - 150f5a3fec4f03313ca770b90126605619bd713c - google_apis-19_r07.zip + 181034400 + 75c8af27f1fdf83dc28057537b5bd62b794365cc + google_apis-19_r13.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 21 + 1 + + + + 179499 + 66a754efb24e9bb07cc51648426443c7586c9d4a + google_apis-21_r01.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 22 + 1 + + + + 179259 + 5def0f42160cba8acff51b9c0c7e8be313de84f5 + google_apis-22_r01.zip @@ -917,6 +964,7 @@ August 15, 2011 Android + Google TV, API 12, preview release http://developer.android.com/ + 78266751 @@ -938,6 +986,7 @@ August 15, 2011 Android + Google TV, API 13 http://developer.android.com/ + 87721879 @@ -951,11 +1000,11 @@ August 15, 2011 - + - 20 - 0 - 0 + 22 + 1 + 1 Android android @@ -964,18 +1013,18 @@ August 15, 2011 compatibility - 5508097 - 719c260dc3eb950712988f987daaf91afa9e36af - support_r20.zip + 8475991 + 88bdc7b4074065ed28681f39e6b32c4f7ab45d94 + support_r22.1.1.zip - + - 6 + 14 Android android @@ -984,12 +1033,12 @@ August 15, 2011 m2repository - 22271942 - d4874fd330f41a7c16de392ce917c2a3562dd620 - android_m2repository_r06.zip + 68533453 + 0011dfe1473ccdfb1a533a19cad152c59dcd6b45 + android_m2repository_r14.zip - + @@ -1000,15 +1049,15 @@ August 15, 2011 Google Repository m2repository - 11 + 17 Local Maven repository for Google Libraries - 18832133 - 08b5114037d187cf3d4b44a25570149ef4f8ab3d - google_m2repository_r11.zip + 43508126 + a91a809149b69fab1efb4652c21b439e8b9e7150 + google_m2repository_r17.zip @@ -1066,6 +1115,7 @@ August 15, 2011 Google Play services client library and sample code https://developers.google.com/android/google-play-services/index + 5265389 @@ -1081,57 +1131,37 @@ August 15, 2011 Google Play services google_play_services - 19 + 24 Google Play services client library and sample code https://developers.google.com/android/google-play-services/index - 13982276 - 847a8806dd3c43effc2afdd7b49fc6ba27f72d5d - google_play_services_5089000_r19.zip + 17636517 + 9dc5092c1043d6d9c162d481e668b95fc2f36782 + google_play_services_7327000_r24.zip - google - Google Inc. - Google Play services for Fit Preview - google_play_services_fit_preview - - 1 - - Google Play services client library and sample code - https://developers.google.com/android/google-play-services/index - - - - 15224769 - 34369ca796268ec7274bc49d659d9e8f042b55ae - google_play_services_fit_preview_5208000_r01.zip - - - - - - + google http://developer.android.com/ usb_driver - USB Driver for Windows, revision 10 + USB Driver for Windows, revision 11 Google USB Driver Google Inc. - 10 + 11 - usb_driver_r10-windows.zip - a5f8280829f07bb3144a8d657ec7aa0128443a2c - 8682752 + usb_driver_r11-windows.zip + dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc + 8682859 windows @@ -1240,4 +1270,24 @@ August 15, 2011 + + + google + Google Inc. + Android Auto API Simulators + simulators + + 1 + + Android Auto API testing simulators + http://developer.android.com/auto + + + 2167286 + 4fb5344e34e8faab4db18af07dace44c50db26a7 + simulator_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 241aaeb0e81..ca4870cf4c8 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-addons.sh. DO NOT EDIT. +# Execute generate-addons.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -13,7 +15,7 @@ let }); in { - + google_apis_3 = buildGoogleApis { name = "google_apis-3"; src = fetchurl { @@ -25,7 +27,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_4 = buildGoogleApis { name = "google_apis-4"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_5 = buildGoogleApis { name = "google_apis-5"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_6 = buildGoogleApis { name = "google_apis-6"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_7 = buildGoogleApis { name = "google_apis-7"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_8 = buildGoogleApis { name = "google_apis-8"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_9 = buildGoogleApis { name = "google_apis-9"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_10 = buildGoogleApis { name = "google_apis-10"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_11 = buildGoogleApis { name = "google_apis-11"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_12 = buildGoogleApis { name = "google_apis-12"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_13 = buildGoogleApis { name = "google_apis-13"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/; }; }; - + google_apis_14 = buildGoogleApis { name = "google_apis-14"; src = fetchurl { @@ -154,10 +156,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_15 = buildGoogleApis { name = "google_apis-15"; src = fetchurl { @@ -166,10 +168,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_16 = buildGoogleApis { name = "google_apis-16"; src = fetchurl { @@ -178,10 +180,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { @@ -190,10 +192,10 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_18 = buildGoogleApis { name = "google_apis-18"; src = fetchurl { @@ -202,38 +204,63 @@ in }; meta = { description = "Android + Google APIs"; - + }; }; - + google_apis_19 = buildGoogleApis { name = "google_apis-19"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-19_r07.zip; - sha1 = "150f5a3fec4f03313ca770b90126605619bd713c"; + url = https://dl-ssl.google.com/android/repository/google_apis-19_r13.zip; + sha1 = "75c8af27f1fdf83dc28057537b5bd62b794365cc"; }; meta = { description = "Android + Google APIs"; - + }; }; - + + google_apis_21 = buildGoogleApis { + name = "google_apis-21"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-21_r01.zip; + sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_22 = buildGoogleApis { + name = "google_apis-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-22_r01.zip; + sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r20.zip; - sha1 = "719c260dc3eb950712988f987daaf91afa9e36af"; + url = https://dl-ssl.google.com/android/repository/support_r22.1.1.zip; + sha1 = "88bdc7b4074065ed28681f39e6b32c4f7ab45d94"; }; meta = { description = "Android Support Library"; url = http://developer.android.com/; }; }; + google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_play_services_3265130_r12.zip; - sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; + url = https://dl-ssl.google.com/android/repository/google_play_services_7327000_r24.zip; + sha1 = "9dc5092c1043d6d9c162d481e668b95fc2f36782"; }; meta = { description = "Google Play services client library and sample code"; @@ -241,6 +268,4 @@ in }; }; - } - diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index f4c3448c921..ed7bd051a7a 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.0.1"; + version = "24.1.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - sha1 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523"; + sha1 = "a46298bjpgzsnchhpcm1i86c4r50x638"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54"; + sha1 = "as109624lgrn8krylmyvm33yapqkzr00"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 158d886a5e7..3a7df3ce1af 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: -stdenv.mkDerivation { - name = "android-build-tools-r21.1.2"; +stdenv.mkDerivation rec { + version="22.0.1"; + name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip; - sha1 = "5e35259843bf2926113a38368b08458735479658"; + url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-linux.zip"; + sha1 = "8sb05s9f1h03qa7hdj72jffy7rf9r2ys"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; - sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; + url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-macosx.zip"; + sha1 = "pxdwrz6bb8b13fknf6qm67g013vdgnjk"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index e99ab93b7ae..5df4213d233 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -142,6 +142,20 @@ rec { useGooglePlayServices = true; }; + androidsdk_5_1_1 = androidsdk { + platformVersions = [ "22" ]; + abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; + useGoogleAPIs = true; + }; + + androidsdk_5_1_1_extras = androidsdk { + platformVersions = [ "22" ]; + abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; + useGoogleAPIs = true; + useExtraSupportLibs = true; + useGooglePlayServices = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl index 51d0c07c934..a43731fdd08 100644 --- a/pkgs/development/mobile/androidenv/generate-addons.xsl +++ b/pkgs/development/mobile/androidenv/generate-addons.xsl @@ -5,6 +5,8 @@ +# This file is generated from generate-addons.sh. DO NOT EDIT. +# Execute generate-addons.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -19,7 +21,7 @@ let }); in { - + google_apis_ = buildGoogleApis { name = "-"; src = fetchurl { @@ -28,11 +30,37 @@ in }; meta = { description = ""; - url = ; + url = ; }; }; - + + + + android_support_extra = buildGoogleApis { + name = "android_support_extra"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = "Android Support Library"; + url = http://developer.android.com/; + }; + }; + + google_play_services = buildGoogleApis { + name = "google_play_services"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = "Google Play services client library and sample code"; + url = http://developer.android.com/; + }; + }; + } - + diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index ba556f2baac..7851f4899bf 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -5,7 +5,23 @@ + + + + + + + + + https://dl-ssl.google.com/android/repository/ + + + + + +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -20,19 +36,19 @@ let }); in { - + platform_ = buildPlatform { name = "android-platform-"; src = fetchurl { - url = ; + url = ; sha1 = ""; }; meta = { description = ""; - url = ; + url = ; }; }; - + } - + diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index ef2f825642b..586381e8ba6 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,6 +1,8 @@ #!/bin/sh -e cat > sysimages.nix << "EOF" +# This file is generated from generate-sysimages.sh. DO NOT EDIT. +# Execute generate-sysimages.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 6de690622b5..aa1e05e85a0 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -15,6 +15,6 @@ sha1 = ""; }; }; - + diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 76e160fb0da..1be54adaaed 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,7 +1,7 @@ {stdenv, stdenv_32bit, fetchurl, unzip}: let - version = "21"; + version = "22"; in @@ -10,11 +10,11 @@ stdenv.mkDerivation { src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad"; + sha256 = "1kbp5fzfdas6c431n53a9w0z0182ihhadd1h8a64m1alkw0swr41"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb"; + sha256 = "0r359xxicn7zw9z0jbrmsppx1372fijg09ck907gg8x1cvzj2ry0"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 4ce1e421478..cf509cdff97 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -25,7 +27,7 @@ in url = http://developer.android.com/sdk/android-1.1.html; }; }; - + platform_3 = buildPlatform { name = "android-platform-1.5"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/sdk/android-1.5.html; }; }; - + platform_4 = buildPlatform { name = "android-platform-1.6"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/sdk/android-1.6.html; }; }; - + platform_5 = buildPlatform { name = "android-platform-2.0"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/sdk/android-2.0.html; }; }; - + platform_6 = buildPlatform { name = "android-platform-2.0.1"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/sdk/android-2.0.1.html; }; }; - + platform_7 = buildPlatform { name = "android-platform-2.1"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_8 = buildPlatform { name = "android-platform-2.2"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_9 = buildPlatform { name = "android-platform-2.3.1"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_10 = buildPlatform { name = "android-platform-2.3.3"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_11 = buildPlatform { name = "android-platform-3.0"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_12 = buildPlatform { name = "android-platform-3.1"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_13 = buildPlatform { name = "android-platform-3.2"; src = fetchurl { @@ -157,76 +159,88 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { description = "Android SDK Platform 4.0"; - + }; }; - + platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { description = "Android SDK Platform 4.0.3"; - + }; }; - + platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; - sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; + url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { description = "Android SDK Platform 4.1.2"; - + }; }; - + platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; - sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; + url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { description = "Android SDK Platform 4.2.2"; - + }; }; - + platform_18 = buildPlatform { - name = "android-platform-4.3"; + name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; - sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; + url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { - description = "Android SDK Platform 4.3"; - + description = "Android SDK Platform 4.3.1"; + }; }; - + platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r03.zip; - sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95"; + url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { description = "Android SDK Platform 4.4.2"; - + + }; + }; + + platform_20 = buildPlatform { + name = "android-platform-4.4W.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + meta = { + description = "Android SDK Platform 4.4W.2"; + }; }; @@ -238,6 +252,19 @@ in }; meta = { description = "Android SDK Platform 5.0.1"; + + }; + }; + + platform_22 = buildPlatform { + name = "android-platform-5.1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + meta = { + description = "Android SDK Platform 5.1.1"; + }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 1f41d8dda9e..c9ec3dd6e84 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -1,4 +1,6 @@ +# This file is generated from generate-platforms.sh. DO NOT EDIT. +# Execute generate-platforms.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -25,7 +27,7 @@ in url = http://developer.android.com/sdk/android-1.1.html; }; }; - + platform_3 = buildPlatform { name = "android-platform-1.5"; src = fetchurl { @@ -37,7 +39,7 @@ in url = http://developer.android.com/sdk/android-1.5.html; }; }; - + platform_4 = buildPlatform { name = "android-platform-1.6"; src = fetchurl { @@ -49,7 +51,7 @@ in url = http://developer.android.com/sdk/android-1.6.html; }; }; - + platform_5 = buildPlatform { name = "android-platform-2.0"; src = fetchurl { @@ -61,7 +63,7 @@ in url = http://developer.android.com/sdk/android-2.0.html; }; }; - + platform_6 = buildPlatform { name = "android-platform-2.0.1"; src = fetchurl { @@ -73,7 +75,7 @@ in url = http://developer.android.com/sdk/android-2.0.1.html; }; }; - + platform_7 = buildPlatform { name = "android-platform-2.1"; src = fetchurl { @@ -85,7 +87,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_8 = buildPlatform { name = "android-platform-2.2"; src = fetchurl { @@ -97,7 +99,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_9 = buildPlatform { name = "android-platform-2.3.1"; src = fetchurl { @@ -109,7 +111,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_10 = buildPlatform { name = "android-platform-2.3.3"; src = fetchurl { @@ -121,7 +123,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_11 = buildPlatform { name = "android-platform-3.0"; src = fetchurl { @@ -133,7 +135,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_12 = buildPlatform { name = "android-platform-3.1"; src = fetchurl { @@ -145,7 +147,7 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_13 = buildPlatform { name = "android-platform-3.2"; src = fetchurl { @@ -157,76 +159,88 @@ in url = http://developer.android.com/sdk/; }; }; - + platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { description = "Android SDK Platform 4.0"; - + }; }; - + platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { description = "Android SDK Platform 4.0.3"; - + }; }; - + platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; - sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; + url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { description = "Android SDK Platform 4.1.2"; - + }; }; - + platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; - sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; + url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { description = "Android SDK Platform 4.2.2"; - + }; }; - + platform_18 = buildPlatform { - name = "android-platform-4.3"; + name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; - sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; + url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { - description = "Android SDK Platform 4.3"; - + description = "Android SDK Platform 4.3.1"; + }; }; - + platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r03.zip; - sha1 = "5f33d8fd36a384fe2b170035e04a29c274a9ef95"; + url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { description = "Android SDK Platform 4.4.2"; - + + }; + }; + + platform_20 = buildPlatform { + name = "android-platform-4.4W.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + meta = { + description = "Android SDK Platform 4.4W.2"; + }; }; @@ -238,8 +252,20 @@ in }; meta = { description = "Android SDK Platform 5.0.1"; + + }; + }; + + platform_22 = buildPlatform { + name = "android-platform-5.1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + meta = { + description = "Android SDK Platform 5.1.1"; + }; }; - } diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-10.xml index 81023cae2ee..fa07307e01e 100644 --- a/pkgs/development/mobile/androidenv/repository-10.xml +++ b/pkgs/development/mobile/androidenv/repository-10.xml @@ -329,6 +329,7 @@ June 2014. Android SDK Platform 1.5_r3 http://developer.android.com/sdk/android-1.5.html + 54624370 @@ -365,6 +366,7 @@ June 2014. Android SDK Platform 1.6_r2 http://developer.android.com/sdk/android-1.6.html + 63454485 @@ -481,6 +483,7 @@ June 2014. Android SDK Platform 2.1_r3 http://developer.android.com/sdk/ + 70142829 @@ -582,6 +585,7 @@ June 2014. Android SDK Platform 3.0, revision 2 http://developer.android.com/sdk/ + 104513908 @@ -609,6 +613,7 @@ June 2014. Android SDK Platform 3.1, revision 3 http://developer.android.com/sdk/ + 106472351 @@ -634,6 +639,7 @@ June 2014. Android SDK Platform 3.2, revision 1 http://developer.android.com/sdk/ + 108426536 @@ -648,51 +654,52 @@ June 2014. - - 3 + + 4 Android SDK Platform 4.0 4.0 14 - 7 + 12 1 + - 45919570 - 41ba83b51e886461628c41b1b4d47762e0688ed5 - https://dl-ssl.google.com/android/repository/android-14_r03.zip + 46038082 + d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c + android-14_r04.zip - - 3 + + 5 Android SDK Platform 4.0.3 4.0.3 15 - 15 + 21 - 7 + 12 1 - 44414679 - 23da24610a8da51054c5391001c51ce43a778b97 - https://dl-ssl.google.com/android/repository/android-15_r03.zip + 44533475 + 69ab4c443b37184b2883af1fd38cc20cbeffd0f3 + android-15_r05.zip - - 4 + + 5 Android SDK Platform 4.1.2 4.1.2 16 @@ -700,22 +707,22 @@ June 2014. 21 - 9 + 12 1 - 48005140 - 90b9157b8b45f966be97e11a22fba4591b96c2ee - https://dl-ssl.google.com/android/repository/android-16_r04.zip + 48128695 + 12a5ce6235a76bc30f62c26bda1b680e336abd07 + android-16_r05.zip - - 2 + + 3 Android SDK Platform 4.2.2 4.2.2 17 @@ -723,45 +730,45 @@ June 2014. 21 - 9 + 12 1 - 48057484 - c442c32c1b702173ab0929a74486e4f86fe528ec - https://dl-ssl.google.com/android/repository/android-17_r02.zip + 57030216 + dbe14101c06e6cdb34e300393e64e64f8c92168a + android-17_r03.zip - - 2 - Android SDK Platform 4.3 - 4.3 + + 3 + Android SDK Platform 4.3.1 + 4.3.1 18 21 - 10 + 12 1 - 57319855 - 62a9438d4cf6692f4d6510c27a380be195db9534 - https://dl-ssl.google.com/android/repository/android-18_r02.zip + 57771739 + e6b09b3505754cbbeb4a5622008b907262ee91cb + android-18_r03.zip - - 3 + + 4 Android SDK Platform 4.4.2 4.4.2 19 @@ -769,64 +776,86 @@ June 2014. 22 - 10 + 12 1 - 63798840 - 5f33d8fd36a384fe2b170035e04a29c274a9ef95 - https://dl-ssl.google.com/android/repository/android-19_r03.zip + 63871092 + 2ff20d89e68f2f5390981342e009db5a2d456aaa + android-19_r04.zip - - 1 - Android SDK Platform 4.4W - 4.4W + + 2 + Android SDK Platform 4.4W.2 + 4.4W.2 20 22 - 10 + 12 1 - 63548914 - 928b1d181101a5bc06f739eb40501e1249dd4895 - android-20_r01.zip + 63567784 + a9251f8a3f313ab05834a07a963000927637e01d + android-20_r02.zip - - 3 - Android SDK Platform L - L - 20 - L + + 2 + Android SDK Platform 5.0.1 + 5.0.1 + 21 22 - 11 - 1 + 12 + 2 - 69421660 - 76b6da426db06b2e2901dbc5e02d210ba83753c4 - android-L_r03.zip + 65897960 + 53536556059bb29ae82f414fd2e14bc335a4eb4c + android-21_r02.zip - + + + + + + 2 + Android SDK Platform 5.1.1 + 5.1.1 + 22 + + 22 + + + 14 + 2 + + + + 66852371 + 5d1bd10fea962b216a0dece1247070164760a9fc + android-22_r02.zip + + + @@ -839,6 +868,7 @@ June 2014. 01 Android SDK Samples for Android API 7, revision 1 http://developer.android.com/sdk/ + 7677831 @@ -912,6 +942,7 @@ June 2014. 01 Android SDK Samples for Android API 11, revision 1 http://developer.android.com/sdk/ + 11976920 @@ -930,6 +961,7 @@ June 2014. 01 Android SDK Samples for Android API 12, revision 1 http://developer.android.com/sdk/ + 12150514 @@ -948,6 +980,7 @@ June 2014. 01 Android SDK Samples for Android API 13, revision 1 http://developer.android.com/sdk/ + 12193502 @@ -962,6 +995,7 @@ June 2014. 2 14 + 16253619 @@ -1043,60 +1077,73 @@ June 2014. - - 2 + + 3 20 - 49718791 - 4b906c46057ee8f502b4f27c23670fd87a49d6ff - samples-20_r02.zip + 50796850 + 8b1290b0b707827808392e8178094a68dfb51a14 + samples-20_r03.zip - - 2 - 20 - L + + 4 + 21 - 41182182 - 4afc36cf3f53051881729f733fe9bb571104c48f - samples-L_r02.zip + 95971939 + 3a08d37e97f567f5f629a06a9012f89b05c5ad8a + samples-21_r04.zip - + + + + + + 5 + 22 + + + 107981157 + dbc5cc27b5d15acc25cd6b94b8c2971806b70bb0 + samples-22_r05.zip + + + - + - 20 + 22 0 0 - 1741113 - 72c34cc6a991f53e2588f9d5487559f013bc30f9 - platform-tools_r20-windows.zip + 1848028 + 720214bd29d08eb82673cd81a8159b083eef19d7 + platform-tools_r22-windows.zip windows - 1753061 - fb120ce85b6698b801cb4788b204693c1d682b87 - platform-tools_r20-linux.zip + 1751911 + b78be9cc31cf9f9fe0609e29a6a133beacf03b52 + platform-tools_r22-linux.zip linux - 1666257 - f2c65c58caf76169d9bebf25eef5c69ff99670b5 - platform-tools_r20-macosx.zip + 1743025 + ddc96385bccf8a15d4f8a11eb1cb9d2a08a531c8 + platform-tools_r22-macosx.zip macosx @@ -1112,6 +1159,7 @@ June 2014. 0 0 + 11004914 @@ -1144,6 +1192,7 @@ June 2014. 0 1 + 15413527 @@ -1174,6 +1223,7 @@ June 2014. 1 0 + 19659547 @@ -1204,6 +1254,7 @@ June 2014. 1 1 + 19660000 @@ -1234,6 +1285,7 @@ June 2014. 0 0 + 20611447 @@ -1264,6 +1316,7 @@ June 2014. 0 1 + 20500648 @@ -1294,6 +1347,7 @@ June 2014. 0 2 + 20621117 @@ -1324,6 +1378,7 @@ June 2014. 0 3 + 20730715 @@ -1407,13 +1462,259 @@ June 2014. + + + + 21 + 0 + 0 + + + + + 22306371 + 5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32 + build-tools_r21-windows.zip + windows + + + 22153145 + 4933328fdeecbd554a29528f254f4993468e1cf4 + build-tools_r21-linux.zip + linux + + + 22668456 + 9bef7989b51436bd4e5114d8a0330359f077cbfa + build-tools_r21-macosx.zip + macosx + + + + + + + + + 21 + 0 + 1 + + + + + 22306243 + d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df + build-tools_r21.0.1-windows.zip + windows + + + 22153013 + e573069eea3e5255e7a65bedeb767f4fd0a5f49a + build-tools_r21.0.1-linux.zip + linux + + + 22668616 + b60c8f9b810c980abafa04896706f3911be1ade7 + build-tools_r21.0.1-macosx.zip + macosx + + + + + + + + + 21 + 0 + 2 + + + + + 22306371 + 37496141b23cbe633167927b7abe6e22d9f1a1c1 + build-tools_r21.0.2-windows.zip + windows + + + 22153122 + e1236ab8897b62b57414adcf04c132567b2612a5 + build-tools_r21.0.2-linux.zip + linux + + + 22668597 + f17471c154058f3734729ef3cc363399b1cd3de1 + build-tools_r21.0.2-macosx.zip + macosx + + + + + + + + + 21 + 1 + 0 + + + + + 32797810 + c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 + build-tools_r21.1-windows.zip + windows + + + 32642820 + b7455e543784d52a8925f960bc880493ed1478cb + build-tools_r21.1-linux.zip + linux + + + 33158159 + df619356c2359aa5eacdd48699d15b335d9bd246 + build-tools_r21.1-macosx.zip + macosx + + + + + + + + + 21 + 1 + 1 + + + + + 32797356 + 53fc4201237f899d5cd92f0b76ad41fb89da188b + build-tools_r21.1.1-windows.zip + windows + + + 32642454 + 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d + build-tools_r21.1.1-linux.zip + linux + + + 33157676 + 836a146eab0504aa9387a5132e986fe7c7381571 + build-tools_r21.1.1-macosx.zip + macosx + + + + + + + + + 21 + 1 + 2 + + + + 32792587 + 1d944759c47f60e634d2b8a1f3a4259be2f8d652 + build-tools_r21.1.2-windows.zip + windows + + + 32637678 + 5e35259843bf2926113a38368b08458735479658 + build-tools_r21.1.2-linux.zip + linux + + + 33152878 + e7c906b4ba0eea93b32ba36c610dbd6b204bff48 + build-tools_r21.1.2-macosx.zip + macosx + + + + + + + + + 22 + 0 + 0 + + + + + 33254114 + 08fcca41e81b172bd9f570963b90d3a84929e043 + build-tools_r22-windows.zip + windows + + + 33104280 + a8a1619dd090e44fac957bce6842e62abf87965b + build-tools_r22-linux.zip + linux + + + 33646090 + af95429b24088d704bc5db9bd606e34ac1b82c0d + build-tools_r22-macosx.zip + macosx + + + + + + + + + 22 + 0 + 1 + + + + 33254137 + 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf + build-tools_r22.0.1-windows.zip + windows + + + 33104577 + da8b9c5c3ede39298e6cf0283c000c2ee9029646 + build-tools_r22.0.1-linux.zip + linux + + + 33646102 + 53dad7f608e01d53b17176ba11165acbfccc5bbf + build-tools_r22.0.1-macosx.zip + macosx + + + + + - + - 23 - 0 + 24 + 1 2 @@ -1421,21 +1722,21 @@ June 2014. - 141154615 - 0a64ec9b7777bb00ff299c94c359163ef5e443ae - tools_r23.0.2-windows.zip + 159505060 + c20ffa023618c5cb6953131d6dbb0c628a3a1a14 + tools_r24.1.2-windows.zip windows - 141930870 - e8a2d55d750adeaded60a3daad48e62b09aa472a - tools_r23.0.2-linux.zip + 169061591 + c7c30f6da6eff6323260f0353ccaacc984ea6b3e + tools_r24.1.2-linux.zip linux - 90920343 - c46b1e173188ba82a56d6b9e349fdae4e8922bab - tools_r23.0.2-macosx.zip + 89081357 + e32ba2fb21cc92ec4f1f01b5cb9a06f666eee460 + tools_r24.1.2-macosx.zip macosx @@ -1445,18 +1746,17 @@ June 2014. - + 1 - 20 - L + 22 - 207889084 - 58a94248c7c960829db3d779c84534e5e783210f - docs-L_r01.zip + 296467484 + 419791c49fa0a305a06966fd1734cf5b0498ea1a + docs-22_r01.zip - + @@ -1465,6 +1765,7 @@ June 2014. 1 14 + 16152383 @@ -1558,5 +1859,34 @@ June 2014. + + + + 1 + 21 + + + 28274751 + 137a5044915d32bea297a8c1552684802bbc2e25 + sources-21_r01.zip + + + + + + + + 1 + 22 + + + 28861236 + 98320e13976d11597a4a730a8d203ac9a03ed5a6 + sources-22_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 6905cb24993..c0c2fb47fcd 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "android-support-repository-r9"; +stdenv.mkDerivation rec { + version = "14"; + name = "android-support-repository-r${version}"; src = fetchurl { - url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip; - sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c"; + url = "http://dl-ssl.google.com/android/repository/android_m2repository_r${version}.zip"; + sha256 = "027mmfzvs07nbp28vn6c6cgszqdrmmgwdfzda87936lpi5dwg34p"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index d9d24f9bf9f..772ecad8f8a 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "android-support-r21"; +stdenv.mkDerivation rec { + version = "22.1.1"; + name = "android-support-r${version}"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r21.zip; - sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be"; + url = "https://dl-ssl.google.com/android/repository/support_r${version}.zip"; + sha1 = "jifv8yjg5jrycf8zd0lfsra00yscggc8"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 5d2b0f7a883..ef6507035f3 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -423,6 +423,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS Android SDK Platform 4.0 14 armeabi-v7a + 99621822 @@ -520,40 +521,22 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 1 - Android SDK Platform L - 20 - L + + 3 + Android SDK Platform 5.0.2 + 21 armeabi-v7a default - 227716008 - 1d5d81a7078b5b2a685620d93e1e04a51d2e786a - sysimg_armv7a-L_r01.zip + 186521381 + 0b2e21421d29f48211b5289ca4addfa7f4c7ae5a + sysimg_arm-21_r03.zip - + - - - 1 - Android SDK Platform L - 20 - L - x86 - default - - - 245850484 - c2d32d6244821ff59f370469778525f6a5345010 - sysimg_x86-L_r01.zip - - - - @@ -653,6 +636,90 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default + + + 3 + Android SDK Platform 5.0.2 + 21 + x86 + default + + + 201601288 + a0b510c66769e84fa5e40515531be2d266a4247f + sysimg_x86-21_r03.zip + + + + + + + + 3 + Android SDK Platform 5.0.2 + 21 + x86_64 + default + + + 285253158 + 2f205b728695d84488156f4846beb83a353ea64b + sysimg_x86_64-21_r03.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + x86 + default + + + 207436768 + 6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15 + sysimg_x86-22_r01.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + x86_64 + default + + + 292511941 + 05752813603f9fa03a58dcf7f8f5e779be722aae + sysimg_x86_64-22_r01.zip + + + + + + + + 1 + Android SDK Platform 5.1 + 22 + armeabi-v7a + default + + + 193687339 + 2aa6a887ee75dcf3ac34627853d561997792fcb8 + sysimg_arm-22_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index ddc6dd99d39..83ca0d49830 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -1,3 +1,5 @@ +# This file is generated from generate-sysimages.sh. DO NOT EDIT. +# Execute generate-sysimages.sh or fetch.sh to update the file. {stdenv, fetchurl, unzip}: let @@ -20,7 +22,7 @@ in sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; }; }; - + sysimg_armeabi-v7a_15 = buildSystemImage { name = "sysimg-armeabi-v7a-15"; src = fetchurl { @@ -28,7 +30,7 @@ in sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e"; }; }; - + sysimg_armeabi-v7a_16 = buildSystemImage { name = "sysimg-armeabi-v7a-16"; src = fetchurl { @@ -36,7 +38,7 @@ in sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7"; }; }; - + sysimg_armeabi-v7a_17 = buildSystemImage { name = "sysimg-armeabi-v7a-17"; src = fetchurl { @@ -44,7 +46,7 @@ in sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; }; }; - + sysimg_armeabi-v7a_18 = buildSystemImage { name = "sysimg-armeabi-v7a-18"; src = fetchurl { @@ -52,7 +54,7 @@ in sha1 = "4a1a93200210d8c42793324362868846f67401ab"; }; }; - + sysimg_armeabi-v7a_19 = buildSystemImage { name = "sysimg-armeabi-v7a-19"; src = fetchurl { @@ -60,23 +62,15 @@ in sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5"; }; }; - - sysimg_armeabi-v7a_20 = buildSystemImage { - name = "sysimg-armeabi-v7a-20"; + + sysimg_armeabi-v7a_21 = buildSystemImage { + name = "sysimg-armeabi-v7a-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-L_r01.zip; - sha1 = "1d5d81a7078b5b2a685620d93e1e04a51d2e786a"; + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; + sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a"; }; }; - - sysimg_x86_20 = buildSystemImage { - name = "sysimg-x86-20"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-L_r01.zip; - sha1 = "c2d32d6244821ff59f370469778525f6a5345010"; - }; - }; - + sysimg_x86_10 = buildSystemImage { name = "sysimg-x86-10"; src = fetchurl { @@ -84,7 +78,7 @@ in sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; }; }; - + sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { @@ -92,7 +86,7 @@ in sha1 = "d540325952e0f097509622b9e685737584b83e40"; }; }; - + sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { @@ -100,7 +94,7 @@ in sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; }; }; - + sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { @@ -108,7 +102,7 @@ in sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; }; }; - + sysimg_x86_18 = buildSystemImage { name = "sysimg-x86-18"; src = fetchurl { @@ -116,7 +110,7 @@ in sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; }; }; - + sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { @@ -124,7 +118,47 @@ in sha1 = "8889cb418984a2a7916a359da7c429d2431ed060"; }; }; - + + sysimg_x86_21 = buildSystemImage { + name = "sysimg-x86-21"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip; + sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f"; + }; + }; + + sysimg_x86_64_21 = buildSystemImage { + name = "sysimg-x86_64-21"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip; + sha1 = "2f205b728695d84488156f4846beb83a353ea64b"; + }; + }; + + sysimg_x86_22 = buildSystemImage { + name = "sysimg-x86-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip; + sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15"; + }; + }; + + sysimg_x86_64_22 = buildSystemImage { + name = "sysimg-x86_64-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip; + sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae"; + }; + }; + + sysimg_armeabi-v7a_22 = buildSystemImage { + name = "sysimg-armeabi-v7a-22"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; + sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; + }; + }; + sysimg_mips_15 = buildSystemImage { name = "sysimg-mips-15"; src = fetchurl { @@ -132,7 +166,7 @@ in sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; }; }; - + sysimg_mips_16 = buildSystemImage { name = "sysimg-mips-16"; src = fetchurl { @@ -140,7 +174,7 @@ in sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; }; }; - + sysimg_mips_17 = buildSystemImage { name = "sysimg-mips-17"; src = fetchurl { @@ -148,4 +182,4 @@ in sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; }; }; - } +} From 1a6cddff0ed9688d32c0a31eba8b7a918554f08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 2 May 2015 22:03:30 +0200 Subject: [PATCH 106/135] pythonPackages.httpretty: add certifi dependency --- 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 e8aafa0e2f8..782acbdf3c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5994,7 +5994,7 @@ let md5 = "50b02560a49fe928c90c53a49791f621"; }; - buildInputs = with self; [ tornado requests httplib2 sure nose coverage ]; + buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ]; propagatedBuildInputs = with self; [ urllib3 ]; From c9f7c574eca907070066b75a459688433b587fb1 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 2 May 2015 22:04:26 +0200 Subject: [PATCH 107/135] pythonPackages.pyzmq: 13.0.0 -> 14.5.0 --- 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 782acbdf3c4..d409993a45d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13979,10 +13979,10 @@ let }; pyzmq = buildPythonPackage rec { - name = "pyzmq-13.0.0"; + name = "pyzmq-14.5.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/p/pyzmq/pyzmq-13.0.0.zip"; - md5 = "fa2199022e54a393052d380c6e1a0934"; + url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz"; + sha256 = "1gbpgz4ngfw5x6zlsa1k0jwy5vd5wg9iz1shdx4zav256ib08vjx"; }; buildInputs = with self; [ pkgs.zeromq3 ]; doCheck = false; From a5b17ecc945eda6e7248ff7cf2bd17430f003e9a Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 2 May 2015 22:04:26 +0200 Subject: [PATCH 108/135] pythonPackages.tornado: 3.2 -> 4.1 --- 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 d409993a45d..816b49afe36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13850,13 +13850,13 @@ let tornado = buildPythonPackage rec { - name = "tornado-3.2"; + name = "tornado-4.1"; propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz"; - md5 = "bd83cee5f1a5c5e139e87996d00b251b"; + sha256 = "0a12f00h277zbifibnj46wf14801f573irvf6hwkgja5vspd7awr"; }; doCheck = false; From ebe3802a8f117989251f1af32ad0397e9c236c60 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 2 May 2015 22:04:26 +0200 Subject: [PATCH 109/135] pythonPackages.ipython: 2.3.1 -> 3.1.0 --- pkgs/shells/ipython/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 09b2d30ea7c..47705a05cc8 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { - name = "ipython-2.3.1"; + name = "ipython-3.1.0"; namePrefix = ""; src = fetchurl { - url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1764gi5m3ff481rjk336cw6i2h4zlc0nxam9rc5m8m7yl9m4d61y"; + url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; + sha256 = "092nilrkr76l1mklnslgbw1cz7z1xabp1hz5s7cb30kgy39r482k"; }; propagatedBuildInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { pythonPackages.tornado pythonPackages.pyzmq pythonPackages.jinja2 + pythonPackages.jsonschema ] ++ stdenv.lib.optionals qtconsoleSupport [ pythonPackages.pygments pythonPackages.pyzmq From ca03cf5c70797d7a4b78bd012e4e1193b85f13b8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 2 May 2015 23:13:26 +0200 Subject: [PATCH 110/135] xmoto: refactor, remove patches and add myself to maintainers --- pkgs/games/xmoto/default.nix | 44 ++++++++++------------- pkgs/games/xmoto/src-for-default.nix | 9 ----- pkgs/games/xmoto/src-info-for-default.nix | 7 ---- pkgs/top-level/all-packages.nix | 6 +--- 4 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 pkgs/games/xmoto/src-for-default.nix delete mode 100644 pkgs/games/xmoto/src-info-for-default.nix diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 5695bb5b429..7d4f2e53a94 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,32 +1,26 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ +{ stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg +, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net +, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: + +stdenv.mkDerivation rec { + name = "xmoto-${version}"; + version = "0.5.11"; + + src = fetchurl { + url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; + sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; + }; + + buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; - inherit (s) name; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"]; - patchIncludes = a.fullDepEntry '' - sed -e '1i#include ' -i src/helpers//System.cpp - sed -e '1i#include ' -i src/helpers//System.cpp - '' ["doUnpack" "minInit"]; - - meta = { - description = "X-Moto - obstacled race game"; - maintainers = [ - a.lib.maintainers.raskin - a.lib.maintainers.viric - ]; - platforms = a.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Obstacled race game"; + homepage = http://xmoto.tuxfamily.org; + maintainers = with maintainers; [ raskin viric pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix deleted file mode 100644 index beb3f6af164..00000000000 --- a/pkgs/games/xmoto/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.5.11"; - name="xmoto-0.5.11"; - hash="1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; - url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz"; - - -} diff --git a/pkgs/games/xmoto/src-info-for-default.nix b/pkgs/games/xmoto/src-info-for-default.nix deleted file mode 100644 index 8d5d3f49822..00000000000 --- a/pkgs/games/xmoto/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://xmoto.tuxfamily.org/"; - baseName = "xmoto"; - sourceRegexp = "xmoto-.*-src[.]tar[.].*"; - versionExtractorSedScript = ''$dashDelimitedVersion''; - versionReferenceCreator=''$(replaceAllVersionOccurences)''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96f04b61151..1afde965760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9851,11 +9851,7 @@ let xf86_video_nouveau = xorg.xf86videonouveau; - xmoto = builderDefsPackage (import ../games/xmoto) { - inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir libxml2; - }; + xmoto = callPackage ../games/xmoto { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; From 2514f80bdf326d349ce85991ec5a36645e7feaf3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 2 May 2015 23:16:21 +0200 Subject: [PATCH 111/135] removed phpPackages.apc We no longer build packages for php-5.4 and apc is obsolete and will not build for later versions of php. See #7615 and #7518. --- pkgs/top-level/php-packages.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6f99cd76cfa..9187d560602 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -33,12 +33,6 @@ let self = with self; { sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; }; - apc = buildPecl { - name = "apc-3.1.13"; - - sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; - }; - zendopcache = buildPecl { name = "zendopcache-7.0.3"; From 9dcac56f34f905a656db546ff06d9cdd5bbb41d5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 3 May 2015 00:02:04 +0200 Subject: [PATCH 112/135] bzrTools: update from 2.5 to 2.6 and refactor --- .../version-management/bazaar/tools.nix | 20 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index f10fb5e65ce..4e03371ff19 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,20 +1,22 @@ -args : with args; +{ stdenv, fetchurl, makeWrapper, python2, bazaar }: -rec { - version = "2.5"; +stdenv.mkDerivation rec { + name = "bzr-tools-${version}"; + version = "2.6.0"; + src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; + sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; }; - buildInputs = []; - configureFlags = []; + buildInputs = [ makeWrapper python2 ]; - /* doConfigure should be specified separately */ - phaseNames = [(simplyShare "bzrtools")]; + installPhase = '' + ${python2}/bin/python ./setup.py install --prefix=$out + ''; - name = "bzr-tools-${version}"; meta = { description = "Bazaar plugins"; + homepage = http://wiki.bazaar.canonical.com/BzrTools; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1afde965760..05894be7f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10243,9 +10243,7 @@ let bazaar = callPackage ../applications/version-management/bazaar { }; - bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { - inherit bazaar; - }; + bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; beast = callPackage ../applications/audio/beast { inherit (gnome) libgnomecanvas libart_lgpl; From 127050d851126bebbbd253ed2bebcd6f267754ac Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 3 May 2015 00:22:23 +0200 Subject: [PATCH 113/135] cppcheck: 1.68 -> 1.69 Also update meta and install man page. --- .../tools/analysis/cppcheck/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index d94d4483682..53397786dc4 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,29 +1,35 @@ -{ stdenv, fetchurl }: - -# TODO: add support for "make man" +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }: let name = "cppcheck"; - version = "1.68"; + version = "1.69"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1ca9fdhrrxfyzd6kn67gxbfszp70191cf3ndasrh5jh55ghybmmd"; + sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab"; }; - configurePhase = '' - makeFlags="PREFIX=$out CFGDIR=$out/cfg" + buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; + + makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; + + postInstall = '' + make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man + mkdir -p $out/share/man/man1 + cp cppcheck.1 $out/share/man/man1/cppcheck.1 ''; - postInstall = "cp -r cfg $out/cfg"; - meta = { - description = "Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun and more"; - homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/"; - license = "GPL"; + description = "A static analysis tool for C/C++ code"; + longDescription = '' + Check C/C++ code for memory leaks, mismatching + allocation-deallocation, buffer overruns and more. + ''; + homepage = http://cppcheck.sourceforge.net/; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; From 36f6601e121c7565fe7c0004cb9ff3307bae5f11 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 29 Apr 2015 21:29:26 -0700 Subject: [PATCH 114/135] gnuk: Add derivation for fst-01 --- pkgs/misc/gnuk/default.nix | 11 +++++++ pkgs/misc/gnuk/generic.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/misc/gnuk/git.nix | 11 +++++++ pkgs/misc/gnuk/unstable.nix | 11 +++++++ pkgs/top-level/all-packages.nix | 4 +++ 5 files changed, 89 insertions(+) create mode 100644 pkgs/misc/gnuk/default.nix create mode 100644 pkgs/misc/gnuk/generic.nix create mode 100644 pkgs/misc/gnuk/git.nix create mode 100644 pkgs/misc/gnuk/unstable.nix diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix new file mode 100644 index 00000000000..fb845d9c476 --- /dev/null +++ b/pkgs/misc/gnuk/default.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.0.4"; + + src = fetchgit { + url = "git://git.gniibe.org/gnuk/gnuk.git"; + rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca"; + sha256 = "176vx81m6wnfvamxpp7hfbs1pm692zr0my0z2gid65b6rgffdycd"; + }; +}) diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix new file mode 100644 index 00000000000..52e970b5b82 --- /dev/null +++ b/pkgs/misc/gnuk/generic.nix @@ -0,0 +1,52 @@ +{ stdenv, gcc-arm-embedded, makeWrapper +, python, pythonPackages + +# Extra options +, device ? "fsij", vid ? "234b", pid ? "0000" + +# Version specific options +, version, src +, ... +}: + +stdenv.mkDerivation { + name = "gnuk-${version}-${device}"; + + inherit src; + + nativeBuildInputs = [ gcc-arm-embedded makeWrapper ]; + buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]); + + configurePhase = '' + cd src + patchShebangs configure + ./configure --vidpid=${vid}:${pid} + ''; + + installPhase = '' + mkdir -p $out/bin + + find . -name gnuk.bin -exec cp {} $out \; + + #sed -i 's,Exception as e,IOError as e,' ../tool/stlinkv2.py + sed -i ../tool/stlinkv2.py \ + -e "1a import array" \ + -e "s,\(data_received =\) (),\1 array.array('B'),g" \ + -e "s,\(data_received\) = data_received + \(.*\),\1.extend(\2),g" + cp ../tool/stlinkv2.py $out/bin/stlinkv2 + wrapProgram $out/bin/stlinkv2 --prefix PYTHONPATH : "$PYTHONPATH" + + # Some useful helpers + echo "#! ${stdenv.shell} -e" | tee $out/bin/{unlock,flash} + echo "$out/bin/stlinkv2 -u \$@" >> $out/bin/unlock + echo "$out/bin/stlinkv2 -b \$@ $out/gnuk.bin" >> $out/bin/flash + chmod +x $out/bin/{unlock,flash} + ''; + + meta = with stdenv.lib; { + homepage = http://www.fsij.org/pages/gnuk; + description = "an implementation of USB cryptographic token for gpg"; + license = licenses.gpl3; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix new file mode 100644 index 00000000000..8c03a1eee53 --- /dev/null +++ b/pkgs/misc/gnuk/git.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2015-04-22"; + + src = fetchgit { + url = "git://git.gniibe.org/gnuk/gnuk.git"; + rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700"; + sha256 = "1pkdca331wrf1lsnlxxwbbnfcr7vj9xsac92dhj06fhpq4mb8kgb"; + }; +}) diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix new file mode 100644 index 00000000000..0bfcbc023bf --- /dev/null +++ b/pkgs/misc/gnuk/unstable.nix @@ -0,0 +1,11 @@ +{ callPackage, fetchgit, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.1.4"; + + src = fetchgit { + url = "git://git.gniibe.org/gnuk/gnuk.git"; + rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103"; + sha256 = "0zjpgvmnvgvfqp9cd9g8ns9z05alimwcdqx16l22604ywnhdy99l"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05894be7f6c..9a5f0f7e823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13992,6 +13992,10 @@ let x11Support = true; }); + gnuk = callPackage ../misc/gnuk { }; + gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { }; + gnuk-git = callPackage ../misc/gnuk/git.nix { }; + guix = callPackage ../tools/package-management/guix { }; gxemul = callPackage ../misc/emulators/gxemul { }; From ab50b069e1a3a88028b5bf0fb2e6a6f37a04e686 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 May 2015 15:50:31 -0700 Subject: [PATCH 115/135] pulseaudio: Refactor a little --- pkgs/servers/pulseaudio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b031b0b4508..a4d35124abb 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -151,8 +151,9 @@ stdenv.mkDerivation rec { (mkWith true "system-user" "pulseaudio") (mkWith true "system-group" "pulseaudio") (mkWith true "access-group" "audio") - "--with-systemduserunitdir=\${out}/lib/systemd/user" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; + (mkWith true "systemduserunitdir" "\${out}/lib/systemd/user") + (mkWith stdenv.isDarwin "mac-sysroot" "/") + ]; enableParallelBuilding = true; From 8de4be096ff276eff71347e548d736e589df5f11 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 2 May 2015 15:54:30 -0700 Subject: [PATCH 116/135] ffado: Refactor and cleanup --- pkgs/os-specific/linux/ffado/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index dcbf0e567ad..b0f545b2171 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -3,10 +3,7 @@ # Optional dependencies , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null -, pyqt4 ? null, xdg_utils ? null - -, glibmm -, pythonDBus, qt4 +, pyqt4 ? null, pythonDBus ? null, xdg_utils ? null # Other Flags , prefix ? "" @@ -23,6 +20,7 @@ let optDbus_cplusplus = shouldUsePkg dbus_cplusplus; optAlsaLib = shouldUsePkg alsaLib; optPyqt4 = shouldUsePkg pyqt4; + optPythonDBus = shouldUsePkg pythonDBus; optXdg_utils = shouldUsePkg xdg_utils; in stdenv.mkDerivation rec { @@ -41,9 +39,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (!libOnly) [ optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4 optXdg_utils - # dbus dbus_cplusplus glibmm - # pyqt4 - # python pythonDBus qt4 ]; patches = [ ./build-fix.patch ]; @@ -76,11 +71,12 @@ stdenv.mkDerivation rec { LIBDIR=$out/lib INCLUDEDIR=$out/include install '' else '' scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install - + '' + stdenv.lib.optionalString (optPyqt4 != null && optPythonDBus != null) '' wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ - $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + $PYTHONPATH:$PYDIR:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX: + wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \ - $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + $PYTHONPATH:$PYDIR:$out/share/libffado/python:${optPyqt4}/$LIBSUFFIX:${optPythonDBus}/$LIBSUFFIX: ''; meta = with stdenv.lib; { From 372f7e0a13cb2850c420d59a0917c34bef5271c2 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 May 2015 13:50:01 +0200 Subject: [PATCH 117/135] pypy: Update from 2.5.0 -> 2.5.1 --- pkgs/development/interpreters/pypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index f67c48c62d8..a705deddeb6 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -7,7 +7,7 @@ assert zlibSupport -> zlib != null; let majorVersion = "2.5"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "126zrsx6663n9w60018mii1z7cqb87iq9irnhp8z630mldallr4d"; + sha256 = "0gzhgc0rh5ywpkvzishpvkninl41r5k207y8afa8vxwpfx03vcrj"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] From 2a8577d7feb36372d0195eb6d13bc9b0a853eb1c Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Sun, 3 May 2015 19:15:03 +1000 Subject: [PATCH 118/135] Correct spelling --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index eadaae6715b..ec3137ede4f 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -352,7 +352,7 @@ EOF if ($fsType eq "btrfs") { my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint"); if ($status != 0 || join("", @msg) =~ /ERROR:/) { - die "Failed to retreive subvolume info for $mountPoint\n"; + die "Failed to retrieve subvolume info for $mountPoint\n"; } my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/; if ($#ids > 0) { From 123ca02fe3a420cf7ddafed588977f82b5d3d033 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 3 May 2015 06:10:26 -0400 Subject: [PATCH 119/135] gcc51: rename gcc5 in light of new versioning scheme --- pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh | 0 pkgs/development/compilers/gcc/{5.1 => 5}/default.nix | 0 .../development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch | 0 pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch | 0 .../compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch | 0 .../development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch | 0 pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/default.nix (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch (100%) rename pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch (100%) diff --git a/pkgs/development/compilers/gcc/5.1/builder.sh b/pkgs/development/compilers/gcc/5/builder.sh similarity index 100% rename from pkgs/development/compilers/gcc/5.1/builder.sh rename to pkgs/development/compilers/gcc/5/builder.sh diff --git a/pkgs/development/compilers/gcc/5.1/default.nix b/pkgs/development/compilers/gcc/5/default.nix similarity index 100% rename from pkgs/development/compilers/gcc/5.1/default.nix rename to pkgs/development/compilers/gcc/5/default.nix diff --git a/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch b/pkgs/development/compilers/gcc/5/gfortran-driving.patch similarity index 100% rename from pkgs/development/compilers/gcc/5.1/gfortran-driving.patch rename to pkgs/development/compilers/gcc/5/gfortran-driving.patch diff --git a/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch b/pkgs/development/compilers/gcc/5/gnat-cflags.patch similarity index 100% rename from pkgs/development/compilers/gcc/5.1/gnat-cflags.patch rename to pkgs/development/compilers/gcc/5/gnat-cflags.patch diff --git a/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch similarity index 100% rename from pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch rename to pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5/libstdc++-target.patch similarity index 100% rename from pkgs/development/compilers/gcc/5.1/libstdc++-target.patch rename to pkgs/development/compilers/gcc/5/libstdc++-target.patch diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5/no-sys-dirs.patch similarity index 100% rename from pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch rename to pkgs/development/compilers/gcc/5/no-sys-dirs.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16e31c62035..1d20f1ff232 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3622,7 +3622,7 @@ let else null; })); - gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 { + gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 { inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion From de0aa2d099367a0b89feec21fcb051fbe8eb1ada Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 3 May 2015 12:24:52 +0200 Subject: [PATCH 120/135] add Ardour4 --- pkgs/applications/audio/ardour3/default.nix | 88 +++++++++++++++++++++ pkgs/applications/audio/ardour4/default.nix | 88 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++- 3 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/ardour3/default.nix create mode 100644 pkgs/applications/audio/ardour4/default.nix diff --git a/pkgs/applications/audio/ardour3/default.nix b/pkgs/applications/audio/ardour3/default.nix new file mode 100644 index 00000000000..3142b2c52fc --- /dev/null +++ b/pkgs/applications/audio/ardour3/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 +, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf +, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python, serd, sord, sratom, suil }: + +let + + # Ardour git repo uses a mix of annotated and lightweight tags. Annotated + # tags are used for MAJOR.MINOR versioning, and lightweight tags are used + # in-between; MAJOR.MINOR.REV where REV is the number of commits since the + # last annotated tag. A slightly different version string format is needed + # for the 'revision' info that is built into the binary; it is the format of + # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. + + # Version to build. + tag = "3.5.403"; + + # Version info that is built into the binary. Keep in sync with 'tag'. The + # last 8 digits is a (fake) commit id. + revision = "3.5-403-00000000"; + +in + +stdenv.mkDerivation rec { + name = "ardour-${tag}"; + + src = fetchgit { + url = git://git.ardour.org/ardour/ardour.git; + rev = "refs/tags/${tag}"; + sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x"; + }; + + buildInputs = + [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc + glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python serd sord sratom suil + ]; + + patchPhase = '' + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc + sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript + sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings + sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl + ''; + + configurePhase = "python waf configure --optimize --prefix=$out"; + + buildPhase = "python waf"; + + # For the custom ardour clearlooks gtk-engine to work, it must be + # moved to a directory called "engines" and added to GTK_PATH + installPhase = '' + python waf install + mkdir -pv $out/gtk2/engines + cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ + wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 + + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 3 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour3 + Icon=$out/share/ardour3/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF + ''; + + meta = with stdenv.lib; { + description = "Multi-track hard disk recording software"; + longDescription = '' + Also read "The importance of Paying Something" on their homepage, please! + ''; + homepage = http://ardour.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/audio/ardour4/default.nix b/pkgs/applications/audio/ardour4/default.nix new file mode 100644 index 00000000000..b0a095fa75a --- /dev/null +++ b/pkgs/applications/audio/ardour4/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 +, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf +, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: + +let + + # Ardour git repo uses a mix of annotated and lightweight tags. Annotated + # tags are used for MAJOR.MINOR versioning, and lightweight tags are used + # in-between; MAJOR.MINOR.REV where REV is the number of commits since the + # last annotated tag. A slightly different version string format is needed + # for the 'revision' info that is built into the binary; it is the format of + # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. + + # Version to build. + tag = "4.0"; + + # Version info that is built into the binary. Keep in sync with 'tag'. The + # last 8 digits is a (fake) commit id. + revision = "4.0-e1aa66cb3f"; + +in + +stdenv.mkDerivation rec { + name = "ardour-${tag}"; + + src = fetchgit { + url = git://git.ardour.org/ardour/ardour.git; + rev = "e1aa66cb3f"; + sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; + }; + + buildInputs = + [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc + glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK + ]; + + patchPhase = '' + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc + sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript + sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings + sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl + ''; + + configurePhase = "python waf configure --optimize --prefix=$out"; + + buildPhase = "python waf"; + + # For the custom ardour clearlooks gtk-engine to work, it must be + # moved to a directory called "engines" and added to GTK_PATH + installPhase = '' + python waf install + mkdir -pv $out/gtk2/engines + cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ + wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2 + + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 3 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour4 + Icon=$out/share/ardour4/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF + ''; + + meta = with stdenv.lib; { + description = "Multi-track hard disk recording software"; + longDescription = '' + Also read "The importance of Paying Something" on their homepage, please! + ''; + homepage = http://ardour.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d20f1ff232..3b2fbc26b6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10158,12 +10158,18 @@ let antiword = callPackage ../applications/office/antiword {}; - ardour = ardour3; - ardour3 = lowPrio (callPackage ../applications/audio/ardour { + ardour = ardour4; + + ardour3 = lowPrio (callPackage ../applications/audio/ardour3 { inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ardour4 = lowPrio (callPackage ../applications/audio/ardour4 { + inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (vamp) vampSDK; + }); + ario = callPackage ../applications/audio/ario { }; arora = callPackage ../applications/networking/browsers/arora { }; From 797c6d3fab5c427d20e96674b78919ff991aab76 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 3 May 2015 13:03:41 +0200 Subject: [PATCH 121/135] cleanup Ardour 3 and Ardour 4 --- .../default.nix => ardour/ardour3.nix} | 0 pkgs/applications/audio/ardour/default.nix | 20 ++--- pkgs/applications/audio/ardour4/default.nix | 88 ------------------- pkgs/top-level/all-packages.nix | 9 +- 4 files changed, 14 insertions(+), 103 deletions(-) rename pkgs/applications/audio/{ardour3/default.nix => ardour/ardour3.nix} (100%) delete mode 100644 pkgs/applications/audio/ardour4/default.nix diff --git a/pkgs/applications/audio/ardour3/default.nix b/pkgs/applications/audio/ardour/ardour3.nix similarity index 100% rename from pkgs/applications/audio/ardour3/default.nix rename to pkgs/applications/audio/ardour/ardour3.nix diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 3142b2c52fc..ea81d6c14c2 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -3,7 +3,7 @@ , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python, serd, sord, sratom, suil }: +, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: let @@ -15,11 +15,11 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "3.5.403"; + tag = "4.0"; # Version info that is built into the binary. Keep in sync with 'tag'. The # last 8 digits is a (fake) commit id. - revision = "3.5-403-00000000"; + revision = "4.0-e1aa66cb3f"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; - rev = "refs/tags/${tag}"; - sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x"; + rev = "e1aa66cb3f"; + sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; }; buildInputs = @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python serd sord sratom suil + makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK ]; patchPhase = '' @@ -57,17 +57,17 @@ stdenv.mkDerivation rec { python waf install mkdir -pv $out/gtk2/engines cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ - wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 + wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2 # Install desktop file mkdir -p "$out/share/applications" cat > "$out/share/applications/ardour.desktop" << EOF [Desktop Entry] - Name=Ardour 3 + Name=Ardour 4 GenericName=Digital Audio Workstation Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour3 - Icon=$out/share/ardour3/icons/ardour_icon_256px.png + Exec=$out/bin/ardour4 + Icon=$out/share/ardour4/icons/ardour_icon_256px.png Terminal=false Type=Application X-MultipleArgs=false diff --git a/pkgs/applications/audio/ardour4/default.nix b/pkgs/applications/audio/ardour4/default.nix deleted file mode 100644 index b0a095fa75a..00000000000 --- a/pkgs/applications/audio/ardour4/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: - -let - - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - tag = "4.0"; - - # Version info that is built into the binary. Keep in sync with 'tag'. The - # last 8 digits is a (fake) commit id. - revision = "4.0-e1aa66cb3f"; - -in - -stdenv.mkDerivation rec { - name = "ardour-${tag}"; - - src = fetchgit { - url = git://git.ardour.org/ardour/ardour.git; - rev = "e1aa66cb3f"; - sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK - ]; - - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript - sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings - sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl - ''; - - configurePhase = "python waf configure --optimize --prefix=$out"; - - buildPhase = "python waf"; - - # For the custom ardour clearlooks gtk-engine to work, it must be - # moved to a directory called "engines" and added to GTK_PATH - installPhase = '' - python waf install - mkdir -pv $out/gtk2/engines - cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ - wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2 - - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 3 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour4 - Icon=$out/share/ardour4/icons/ardour_icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Also read "The importance of Paying Something" on their homepage, please! - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b2fbc26b6b..a10162fbdcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10158,17 +10158,16 @@ let antiword = callPackage ../applications/office/antiword {}; - ardour = ardour4; - ardour3 = lowPrio (callPackage ../applications/audio/ardour3 { + ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; - }); + }; - ardour4 = lowPrio (callPackage ../applications/audio/ardour4 { + ardour4 = callPackage ../applications/audio/ardour { inherit (gnome) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; - }); + }; ario = callPackage ../applications/audio/ario { }; From 365fd9efeb8e5d0918e641fc24922bd9e48041a6 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 3 May 2015 11:47:07 +0000 Subject: [PATCH 122/135] use gnutls rtmpdump for ffmpeg, as it doesnot build otherwise --- pkgs/development/libraries/ffmpeg/generic.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d3a68508246..c33fabeb416 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -109,7 +109,7 @@ , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , pulseaudio ? null # Pulseaudio input support -, rtmpdump ? null # RTMP[E] support +, rtmpdump_gnutls ? null # RTMP[E] support #, libquvi ? null # Quvi input support , sambaExtlib ? false, samba ? null # Samba protocol #, schroedinger ? null # Dirac de/encoder @@ -410,7 +410,7 @@ stdenv.mkDerivation rec { (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") #(mkFlag quvi "2.0" "libquvi") - (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp") + (mkFlag (disDarwinFix (rtmpdump_gnutls != null)) "0.6" "librtmp") #(mkFlag (schroedinger != null) "0.5" "libschroedinger") #(mkFlag (shine != null) "2.0" "libshine") (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") @@ -457,7 +457,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] ++ optionals (!isDarwin) [ frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ - openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */ + openjpeg_1 pulseaudio rtmpdump_gnutls vid-stab wavpack x265 /* xavs */ ] ++ optional (!isDarwin && !isCygwin) libva ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d20f1ff232..c75a8730a14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2592,6 +2592,7 @@ let redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; + rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; From c7bb01cfa24ecc1c8d8f63f2c0d4f886bf0a32d2 Mon Sep 17 00:00:00 2001 From: Andreas Baldeau Date: Sun, 26 Apr 2015 11:44:43 +0200 Subject: [PATCH 123/135] Added Font Awesome TTF font. --- pkgs/data/fonts/font-awesome-ttf/default.nix | 31 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/data/fonts/font-awesome-ttf/default.nix diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix new file mode 100644 index 00000000000..7e07ec8a37c --- /dev/null +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "font-awesome-4.3.0"; + + src = fetchurl { + url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip"; + sha256 = "018syfvkj01jym60mpys93xv84ky9l2x90gprnm9npzwkw5169jc"; + }; + + buildCommand = '' + ${unzip}/bin/unzip $src + mkdir -p $out/share/fonts/truetype + cp */fonts/*.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "Font Awesome - TTF font"; + + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the TTF font. For full CSS etc. see the project website. + ''; + + homepage = "http://fortawesome.github.io/Font-Awesome/"; + license = stdenv.lib.licenses.ofl; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.abaldeau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c75a8730a14..920bbc00621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9946,6 +9946,8 @@ let fira-mono = callPackage ../data/fonts/fira-mono { }; + font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; From 25baba283f8d4902de704055074c9f4326e73461 Mon Sep 17 00:00:00 2001 From: Andreas Baldeau Date: Sun, 3 May 2015 15:03:40 +0200 Subject: [PATCH 124/135] Webstorm update => 10.0.2 --- 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 b99265cf0dd..d1bd3d95b5c 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -309,13 +309,13 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "9.0.3"; - build = "139.1112"; + version = "10.0.2"; + build = "141.728"; description = "Professional IDE for Web and JavaScript devlopment"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "e4cfe7b5f1220b68d880c4f236df9c9df2b1efcc04775afad6149d949f45f0aa"; + sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx"; }; }; From 6d219ff22236be585a2cac1db67003811e1d659e Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Fri, 1 May 2015 15:54:40 +0100 Subject: [PATCH 125/135] Add shairport sync binary. This binary allows to run a local airtunes server. --- pkgs/servers/shairport-sync/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/shairport-sync/default.nix diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix new file mode 100644 index 00000000000..16705433084 --- /dev/null +++ b/pkgs/servers/shairport-sync/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }: + +stdenv.mkDerivation rec { + version = "2.3.0"; + name = "shairport-sync-${version}"; + + src = fetchurl { + url = "https://github.com/mikebrady/shairport-sync/archive/${version}.zip"; + sha256 = "1kslif2ifrn0frvi39d44wpn53sjahwq0xjc0hd98ycf3xbcgndg"; + }; + + buildInputs = [ + openssl + avahi + alsaLib + libdaemon + autoconf + automake + pkgconfig + libtool + popt + unzip + libconfig + pulseaudio + ]; + + enableParallelBuilding = true; + + preConfigure = "autoreconf -vfi"; + configureFlags = "--with-alsa --with-avahi --with-ssl=openssl --without-initscript --with-pulseaudio"; + + meta = with stdenv.lib; { + homepage = https://github.com/mikebrady/shairport-sync; + description = "Airtunes server and emulator with multi-room capabilities"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c..c4ae56d62e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8775,6 +8775,8 @@ let samba_light = samba4_light; + shairport-sync = callPackage ../servers/shairport-sync { }; + serfdom = callPackage ../servers/serfdom { }; seyren = callPackage ../servers/monitoring/seyren { }; From d88736df6c9cdd6c593646118683fe8e5baadd70 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 3 May 2015 23:03:36 +0900 Subject: [PATCH 126/135] androidsdk: Make monitor and other commands to work --- pkgs/development/mobile/androidenv/androidsdk.nix | 13 +++++++++---- pkgs/development/mobile/androidenv/default.nix | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index ed7bd051a7a..52b146b87f4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -3,7 +3,7 @@ , zlib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk +, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils }: {platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}: @@ -27,7 +27,12 @@ stdenv.mkDerivation rec { cd $out/libexec unpackFile $src cd android-sdk-*/tools - + + for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint + do + sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" + done + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ @@ -84,7 +89,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib:${libXtst}/lib cd ../.. '' @@ -97,7 +102,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib::${libXtst}/lib cd ../.. '' diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 5df4213d233..693a53cf428 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -40,7 +40,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk; + inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst; inherit platformTools buildTools support supportRepository platforms sysimages addons; From 2352fce77694ac1413404b58d06210de1c5c1765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 3 May 2015 17:01:14 +0200 Subject: [PATCH 127/135] idea.android-studio: 1.2.0.8 -> 1.2.0.12 --- 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 d1bd3d95b5c..8d150ded4ab 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -212,14 +212,14 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.2.0.8"; - build = "141.1845774"; + version = "1.2.0.12"; + build = "141.1890965"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "1l201qv1aya1l9jrybgqclv2v2fgzdpcb6qsnxszcq3npplisw9h"; + sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n"; }; }; From 9be8b790f822b88dac5b625f92bf8cb0fd1be46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 3 May 2015 18:02:55 +0200 Subject: [PATCH 128/135] Choosing a different nodejs for armv5tel. nodejs 0.12 doesn't build in armv5 or without fpu, it seems. I tested this change on armv5tel, branch staging. --- pkgs/development/web/nodejs/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index ee121d6788a..56b8e952e80 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -2,6 +2,10 @@ , pkgconfig, runCommand, which, unstableVersion ? false }: +# nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think. +# Related post: http://zo0ok.com/techfindings/archives/1820 +assert stdenv.system != "armv5tel-linux"; + let dtrace = runCommand "dtrace-native" {} '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 920bbc00621..64614db1444 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1866,15 +1866,23 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; + nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { }; - nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; }; + nodejs = if stdenv.system == "armv5tel-linux" then + nodejs-0_10 + else + nodejs-0_12; + + nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_10; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; - nodePackages = nodePackages_0_12; + nodePackages = if stdenv.system == "armv5tel-linux" then + nodePackages-0_10 + else + nodePackages-0_12; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; From 919de285ebb3dd43b152a598cc8d221f80c61265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 3 May 2015 18:18:43 +0200 Subject: [PATCH 129/135] Fix nodePackages naming (evaluation error) --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64614db1444..47db19f158e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1880,9 +1880,9 @@ let nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages = if stdenv.system == "armv5tel-linux" then - nodePackages-0_10 + nodePackages_0_10 else - nodePackages-0_12; + nodePackages_0_12; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; From 3bac56f1abc2c02b15633d3591ac302a4df78de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 3 May 2015 18:19:42 +0200 Subject: [PATCH 130/135] nodePackages_0_12: use nodejs 0.12. Bad copypaste. --- 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 47db19f158e..3d3f2b12d37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1875,7 +1875,7 @@ let else nodejs-0_12; - nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_10; }; + nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; From d4bd57555157d1788cd7dceedb57b120005e945b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 May 2015 20:08:27 +0200 Subject: [PATCH 131/135] Ardour 4: enable dbus and alsa support --- pkgs/applications/audio/ardour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index ea81d6c14c2..3610aa5fe47 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, dbus, fftw , fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc + [ alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac glibc glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl ''; - configurePhase = "python waf configure --optimize --prefix=$out"; + configurePhase = "python waf configure --with-backend=alsa,jack --optimize --prefix=$out"; buildPhase = "python waf"; From 22167289794c080c50f092274de808543c7978c4 Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Sun, 3 May 2015 15:29:42 +0100 Subject: [PATCH 132/135] add support for pam_u2f to nixos pam module This adds support for authenticating using a U2F device such as a yubikey neo. --- lib/maintainers.nix | 1 + nixos/modules/security/pam.nix | 20 +++++++++++++++++ .../libraries/libu2f-host/default.nix | 2 +- .../libraries/libu2f-server/default.nix | 20 +++++++++++++++++ pkgs/os-specific/linux/pam_u2f/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 6 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libu2f-server/default.nix create mode 100644 pkgs/os-specific/linux/pam_u2f/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8f148ba91c4..6f4a7be21f6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -153,6 +153,7 @@ pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; phausmann = "Philipp Hausmann "; + philandstuff = "Philip Potter "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 631e8317cb4..35622b12ea3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -36,6 +36,16 @@ let ''; }; + u2fAuth = mkOption { + default = config.security.pam.enableU2F; + type = types.bool; + description = '' + If set, users listed in + ~/.yubico/u2f_keys are able to log in + with the associated U2F key. + ''; + }; + usbAuth = mkOption { default = config.security.pam.usb.enable; type = types.bool; @@ -209,6 +219,8 @@ let "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"} ${optionalString cfg.fprintAuth "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} + ${optionalString cfg.u2fAuth + "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} ${optionalString cfg.unixAuth @@ -364,6 +376,13 @@ in ''; }; + security.pam.enableU2F = mkOption { + default = false; + description = '' + Enable the U2F PAM module. + ''; + }; + security.pam.enableEcryptfs = mkOption { default = false; description = '' @@ -392,6 +411,7 @@ in ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ] + ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ] ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ]; security.setuidPrograms = diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index f996216826a..cda18e4e9bd 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-host; - description = "a C library and command-line tool thati mplements the host-side of the U2F protocol"; + description = "A C library and command-line tool thati mplements the host-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix new file mode 100644 index 00000000000..6ac4eb29d13 --- /dev/null +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, json_c, hidapi, openssl, check }: + +stdenv.mkDerivation rec { + name = "libu2f-server-0.0.0"; + + src = fetchurl { + url = "https://developers.yubico.com/libu2f-server/Releases/libu2f-server-0.0.0.tar.xz"; + sha256 = "1vdl3qavzfpi6p6h48zw17md9wykfzpay5c4l1c08id46m560wp0"; + }; + + buildInputs = [ pkgconfig json_c hidapi openssl check ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/libu2f-server/; + description = "A C library that implements the server-side of the U2F protocol"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ philandstuff ]; + }; +} diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix new file mode 100644 index 00000000000..458d171ec68 --- /dev/null +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -0,0 +1,22 @@ +{ pkgs, fetchurl, stdenv }: +stdenv.mkDerivation rec { + name = "pam_u2f-${version}"; + version = "0.0.1"; + src = fetchurl { + url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; + sha256 = "0p1wia4nfw5h0pmy1lcgwsbrlm7z39v1n37692lgqfzyg1kmpv7l"; + }; + buildInputs = with pkgs; [ asciidoc autoconf automake docbook_xml_dtd_45 libtool libu2f-host libu2f-server libxml2 libxslt pkgconfig pam ]; + + installFlags = [ + "PAMDIR=$(out)/lib/security" + ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/pam-u2f/; + description = "A PAM module for allowing authentication with a U2F device"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ philandstuff ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 920bbc00621..0eab47c68d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6920,6 +6920,8 @@ let libu2f-host = callPackage ../development/libraries/libu2f-host { }; + libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; @@ -9573,6 +9575,8 @@ let pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; + pam_u2f = callPackage ../os-specific/linux/pam_u2f { }; + pam_usb = callPackage ../os-specific/linux/pam_usb { }; paxctl = callPackage ../os-specific/linux/paxctl { }; From d66b8344ce03b2f197f79e6a0f0249c77677caea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 May 2015 20:25:57 +0200 Subject: [PATCH 133/135] Ardour: tidy up expression and improve the longDescription --- pkgs/applications/audio/ardour/ardour3.nix | 8 ++++++- pkgs/applications/audio/ardour/default.nix | 27 ++++++++++++++-------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 3142b2c52fc..b6d1ce5bd5b 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -78,7 +78,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-track hard disk recording software"; longDescription = '' - Also read "The importance of Paying Something" on their homepage, please! + Ardour is a digital audio workstation (DAW), You can use it to + record, edit and mix multi-track audio and midi. Produce your + own CDs. Mix video soundtracks. Experiment with new ideas about + music and sound. + + Please consider supporting the ardour project financially: + https://community.ardour.org/node/8288 ''; homepage = http://ardour.org/; license = licenses.gpl2; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 3610aa5fe47..21dc1d70407 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -3,7 +3,9 @@ , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: +, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib +, vampSDK +}: let @@ -32,13 +34,14 @@ stdenv.mkDerivation rec { sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c"; }; - buildInputs = - [ alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python rubberband serd sord sratom suil taglib vampSDK - ]; + buildInputs = [ + alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac + glibc glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python rubberband serd sord + sratom suil taglib vampSDK + ]; patchPhase = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc @@ -78,7 +81,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-track hard disk recording software"; longDescription = '' - Also read "The importance of Paying Something" on their homepage, please! + Ardour is a digital audio workstation (DAW), You can use it to + record, edit and mix multi-track audio and midi. Produce your + own CDs. Mix video soundtracks. Experiment with new ideas about + music and sound. + + Please consider supporting the ardour project financially: + https://community.ardour.org/node/8288 ''; homepage = http://ardour.org/; license = licenses.gpl2; From aaef57d4c2718a2884b325d1951deae494111513 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 May 2015 22:08:50 +0200 Subject: [PATCH 134/135] netsniff-ng -> v0.5.9-rc5-22-gdafb89c - Show the packet number as part of the dissector output - Reorder packet number output - Print 'IE:' prefix before each mgmt IE parameter - Print probe request IEs info - Alias lb to rr as well --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 0830871c0cd..8e3f5d34f1e 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "v0.5.9-rc5"; in +let version = "v0.5.9-rc5-22-gdafb89c"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "76f4acca4bef1658543a97475f1c1d83accc395c"; - sha256 = "11k88lsdqy41j4xwyx3vq85zjj4n39hj828f1b6naq1ywyfcvmr5"; + rev = "dafb89c7a307272189b29a5c74bd6e33068ac831"; + sha256 = "0j6gii9jw93pdnbdk8yxddcc67g30623r2xvgdvrbhg3v2q6k1qm"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 65775f9a0e2064c1eabd94e0c69694533fbab80b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 May 2015 22:08:50 +0200 Subject: [PATCH 135/135] vim-plugins: wakatime 3.0.9 -> 4.0.0 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 60d67b38a44..8155d4942fd 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -527,11 +527,11 @@ rec { }; wakatime = buildVimPlugin { - name = "wakatime-3.0.9"; + name = "wakatime-4.0.0"; src = fetchFromGitHub { - sha256 = "0qq2h5ysbixypz1ga5j3yrh8sd5h1npqkd59dpl5c1mvjlc30fpk"; - rev = "f5848439ffdf63db3859f692df1d8fa64b1b3edf"; + sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25"; + rev = "a7d48d3507499b8667bfca0b12f8865c01b26678"; repo = "vim-wakatime"; owner = "wakatime"; };