From 00cbf82c01da23780ef75a9d34dd89f57c4ace91 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 3 May 2015 02:28:13 +0200 Subject: [PATCH 001/208] clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222 CVE-2015-2305 CVE-2015-2668 --- pkgs/tools/security/clamav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 350a6f369f0..9a0b947e99b 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.98.6"; + version = "0.98.7"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5"; + sha256 = "0wp2ad8km4cqmlndni5ljv7q3lfxm6y4r3giv0yf23bl0yvif918"; }; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.robberer ]; + maintainers = with maintainers; [ phreedom robberer qknight ]; platforms = platforms.linux; }; } From b2dc40401b06c6089f31b748aa94caed26702848 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Sun, 17 May 2015 18:06:49 +0000 Subject: [PATCH 002/208] updated digikam to version 4.10.0 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 70966196b07..47528ecad62 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "digikam-4.6.0"; + name = "digikam-4.10.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh"; + sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; From 86cfcabfbb8df17515fba2713565415a4740ce13 Mon Sep 17 00:00:00 2001 From: Fabian Schmitthenner Date: Mon, 18 May 2015 09:56:06 +0000 Subject: [PATCH 003/208] digikam: enable face recognition --- pkgs/applications/graphics/digikam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 47528ecad62..f86d3056db9 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { KDEDIRS="${marble}:${qjson}"; # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; enableParallelBuilding = true; From 2f4dc083d5d294392b9aaef59808466b4dad55c2 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 20 Apr 2015 13:55:04 +0200 Subject: [PATCH 004/208] added hwinfo --- .../libraries/libx86emu/default.nix | 33 +++++++++++++++++ pkgs/tools/system/hwinfo/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/development/libraries/libx86emu/default.nix create mode 100644 pkgs/tools/system/hwinfo/default.nix diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix new file mode 100644 index 00000000000..a1471766516 --- /dev/null +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "libx86emu-${version}"; + version = "1.5"; + + src = fetchurl { + url = "https://github.com/wfeldt/libx86emu/archive/${version}.tar.gz"; + sha256 = "1im6w6m0bl6ajynx4hc028lad8v10whv4y7w9zxndzh3j4mi3aa8"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + # VERSION is usually generated using Git + echo "${version}" > VERSION + sed -i 's|/usr/|/|g' Makefile + ''; + + makeFlags = "shared"; + + installPhase = '' + make install DESTDIR=$out/ LIBDIR=lib + ''; + + meta = with stdenv.lib; { + description = "x86 emulation library"; + license = licenses.bsd2; + homepage = https://github.com/wfeldt/libx86emu; + maintainers = with maintainers; [ bobvanderlinden ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix new file mode 100644 index 00000000000..6ecbbb98a54 --- /dev/null +++ b/pkgs/tools/system/hwinfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, libx86emu, flex, perl }: + +stdenv.mkDerivation rec { + name = "hwinfo-${version}"; + version = "21.12"; + + src = fetchurl { + url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz"; + sha256 = "01y5jk2jns0a3mgsgmvmpvi5yyc0df7b3yqsg32hn5r2nv17i47p"; + }; + + patchPhase = '' + # VERSION and changelog is usually generated using Git + echo "${version}" > VERSION + sed -i 's|^\(TARGETS\s*=.*\)\\(.*\)$|\1\2|g' Makefile + + sed -i 's|lex isdn_cdb.lex|${flex}/bin/flex isdn_cdb.lex|g' src/isdn/cdb/Makefile + sed -i 's|/sbin|/bin|g' Makefile + sed -i 's|/usr/|/|g' Makefile + ''; + + installPhase = '' + make install DESTDIR=$out + ''; + + buildInputs = [ libx86emu flex perl ]; + + meta = with stdenv.lib; { + description = "Hardware detection tool from openSUSE"; + license = licenses.gpl2; + homepage = https://github.com/openSUSE/hwinfo; + maintainers = with maintainers; [ bobvanderlinden ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ee71adff23..f6dd5891baa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1670,6 +1670,8 @@ let httptunnel = callPackage ../tools/networking/httptunnel { }; + hwinfo = callPackage ../tools/system/hwinfo { }; + i2p = callPackage ../tools/networking/i2p {}; i2pd = callPackage ../tools/networking/i2pd {}; @@ -1869,6 +1871,8 @@ let libxcomp = callPackage ../development/libraries/libxcomp { }; + libx86emu = callPackage ../development/libraries/libx86emu { }; + librdmacm = callPackage ../development/libraries/librdmacm { }; limesurvey = callPackage ../servers/limesurvey { }; From da516baceaee5525b283e28b91c3702f723c0c3b Mon Sep 17 00:00:00 2001 From: dnhgff Date: Tue, 26 May 2015 08:02:41 -0700 Subject: [PATCH 005/208] zeal: add xcb-util-keysyms to buildInputs --- pkgs/data/documentation/zeal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7bc1b9fa1fd..5c1711edd28 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }: +{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii"; }; - buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; + buildInputs = [ + xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive + ]; configurePhase = '' qmake PREFIX=/ From 9c7fae83eefd7693770d7ecf5a09ea68af3b3b31 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Mon, 25 May 2015 11:31:57 +0200 Subject: [PATCH 006/208] Make it easy to override the marathon framework user Currently the module hardcodes the systemd service user to "marathon". With this change one would not need to create an extra systemd config to override the user. So why would one need to override the Marathon user? Some apps require root access to run. You can't run those with Marathon unless you override the default user to root. Marathon also provides a `--mesos_user` command line flag which allows you to run apps using arbitrary users. You need to run the framework as root to enable this functionality. --- .../modules/services/scheduling/marathon.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index ab93334f5fc..b9f4a808b0c 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -19,14 +19,6 @@ in { ''; }; - httpPort = mkOption { - type = types.int; - default = 8080; - description = '' - Marathon listening port for HTTP connections. - ''; - }; - master = mkOption { type = types.str; default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos"; @@ -45,6 +37,25 @@ in { ''; }; + user = mkOption { + type = types.str; + default = "marathon"; + example = "root"; + description = '' + The user that the Marathon framework will be launched as. If the user doesn't exist it will be created. + If you want to run apps that require root access or you want to launch apps using arbitrary users, that + is using the `--mesos_user` flag then you need to change this to `root`. + ''; + }; + + httpPort = mkOption { + type = types.int; + default = 8080; + description = '' + Marathon listening port for HTTP connections. + ''; + }; + extraCmdLineOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -76,14 +87,12 @@ in { serviceConfig = { ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; - User = "marathon"; + User = cfg.user; Restart = "always"; RestartSec = "2"; }; }; - users.extraUsers.marathon = { - description = "Marathon mesos framework user"; - }; + users.extraUsers.${cfg.user} = { }; }; } From 1badfabc4ddb6b487005cf4a8447b5d1111cd72c Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 9 Mar 2015 18:28:34 +0000 Subject: [PATCH 007/208] Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server. --- .../virtualisation/google-compute-image.nix | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eea6c646d48..25bdd9569de 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -143,34 +143,41 @@ in umask 077 # Don't download the SSH key if it has already been downloaded if ! [ -e /root/.ssh/authorized_keys ]; then - echo "obtaining SSH key..." - mkdir -m 0700 -p /root/.ssh - ${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys - if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then - cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub - if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then - cat /root/key.pub >> /root/.ssh/authorized_keys - echo "new key added to authorized_keys" - fi - chmod 600 /root/.ssh/authorized_keys + echo "obtaining SSH key..." + mkdir -m 0700 -p /root/.ssh + AUTH_KEYS=$(mktemp) && { + ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys + if [ $? -eq 0 -a -e $AUTH_KEYS ]; then + KEY_PUB=$(mktemp) && { + cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB + if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then + cat $KEY_PUB >> /root/.ssh/authorized_keys + echo "new key added to authorized_keys" + fi + chmod 600 /root/.ssh/authorized_keys + rm -f $KEY_PUB + } fi - rm -f /root/key.pub /root/authorized-keys-metadata + rm -f $AUTH_KEYS + } fi countKeys=0 ${flip concatMapStrings config.services.openssh.hostKeys (k : let kName = baseNameOf k.path; in '' - echo "trying to obtain SSH private host key ${kName}" - ${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : - if [ $? -eq 0 -a -e /root/${kName} ]; then - countKeys=$((countKeys+1)) - mv -f /root/${kName} ${k.path} - echo "downloaded ${k.path}" - chmod 600 ${k.path} - ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub - chmod 644 ${k.path}.pub - fi - rm -f /root/${kName} + PRIV_KEY=$(mktemp) && { + echo "trying to obtain SSH private host key ${kName}" + ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : + if [ $? -eq 0 -a -e $PRIV_KEY ]; then + countKeys=$((countKeys+1)) + mv -f $PRIV_KEY ${k.path} + echo "downloaded ${k.path}" + chmod 600 ${k.path} + ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub + chmod 644 ${k.path}.pub + fi + rm -f $PRIV_KEY + } '' )} From 4744e3541ad2308625afd1d0ac53329efd947e6a Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 23 Mar 2015 21:45:40 +0000 Subject: [PATCH 008/208] [GCE] Put temp files for fetch-ssh-keys service in /run --- nixos/modules/virtualisation/google-compute-image.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 25bdd9569de..cdcd7e5a126 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -137,7 +137,8 @@ in after = [ "network-online.target" "ip-up.target" ]; wants = [ "network-online.target" "ip-up.target" ]; - script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in + script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; + mktemp = "mktemp --tmpdir=/run"; in '' # When dealing with cryptographic keys, we want to keep things private. umask 077 @@ -145,10 +146,10 @@ in if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -m 0700 -p /root/.ssh - AUTH_KEYS=$(mktemp) && { + AUTH_KEYS=$(${mktemp}) && { ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e $AUTH_KEYS ]; then - KEY_PUB=$(mktemp) && { + KEY_PUB=$(${mktemp}) && { cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then cat $KEY_PUB >> /root/.ssh/authorized_keys @@ -165,7 +166,7 @@ in countKeys=0 ${flip concatMapStrings config.services.openssh.hostKeys (k : let kName = baseNameOf k.path; in '' - PRIV_KEY=$(mktemp) && { + PRIV_KEY=$(${mktemp}) && { echo "trying to obtain SSH private host key ${kName}" ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : if [ $? -eq 0 -a -e $PRIV_KEY ]; then From 29b7d76ec81b1ba6536d72415a853ff596d7b6b2 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 28 Apr 2015 21:28:16 +0000 Subject: [PATCH 009/208] Remove use of && in fetch-ssh-keys service. Scripts are run with -e so will abort when a command fails. --- .../virtualisation/google-compute-image.nix | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index cdcd7e5a126..fcc71773dea 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -143,42 +143,44 @@ in # When dealing with cryptographic keys, we want to keep things private. umask 077 # Don't download the SSH key if it has already been downloaded - if ! [ -e /root/.ssh/authorized_keys ]; then + if ! [ -s /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -m 0700 -p /root/.ssh - AUTH_KEYS=$(${mktemp}) && { - ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys - if [ $? -eq 0 -a -e $AUTH_KEYS ]; then - KEY_PUB=$(${mktemp}) && { - cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB - if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then - cat $KEY_PUB >> /root/.ssh/authorized_keys - echo "new key added to authorized_keys" - fi - chmod 600 /root/.ssh/authorized_keys - rm -f $KEY_PUB - } - fi - rm -f $AUTH_KEYS - } + AUTH_KEYS=$(${mktemp}) + ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys + if [ -s $AUTH_KEYS ]; then + KEY_PUB=$(${mktemp}) + cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB + if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then + cat $KEY_PUB >> /root/.ssh/authorized_keys + echo "New key added to authorized_keys." + fi + chmod 600 /root/.ssh/authorized_keys + rm -f $KEY_PUB + else + echo "Downloading http://metadata.google.internal/0.1/meta-data/authorized-keys failed." + false + fi + rm -f $AUTH_KEYS fi countKeys=0 ${flip concatMapStrings config.services.openssh.hostKeys (k : let kName = baseNameOf k.path; in '' - PRIV_KEY=$(${mktemp}) && { - echo "trying to obtain SSH private host key ${kName}" - ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : - if [ $? -eq 0 -a -e $PRIV_KEY ]; then - countKeys=$((countKeys+1)) - mv -f $PRIV_KEY ${k.path} - echo "downloaded ${k.path}" - chmod 600 ${k.path} - ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub - chmod 644 ${k.path}.pub - fi - rm -f $PRIV_KEY - } + PRIV_KEY=$(${mktemp}) + echo "trying to obtain SSH private host key ${kName}" + ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : + if [ $? -eq 0 -a -s $PRIV_KEY ]; then + countKeys=$((countKeys+1)) + mv -f $PRIV_KEY ${k.path} + echo "Downloaded ${k.path}" + chmod 600 ${k.path} + ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub + chmod 644 ${k.path}.pub + else + echo "Downloading http://metadata.google.internal/0.1/meta-data/attributes/${kName} failed." + fi + rm -f $PRIV_KEY '' )} From 1ed1c3ec929fc9160e20e78e5ad32cdb2cadfa9c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 28 May 2015 03:02:01 +0200 Subject: [PATCH 010/208] ardour: give it all the libs it asks for. ardour3: bugfix The latest ardour3 release loses audio and midi files under some conditions. https://github.com/Ardour/ardour/commit/7024232855d268633760674d34c096ce447b7240 fixes that. --- pkgs/applications/audio/ardour/ardour3.nix | 42 +++++++++++----------- pkgs/applications/audio/ardour/default.nix | 35 +++++++----------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index b6d1ce5bd5b..aca04f299c2 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw +, fftwSinglePrec, flac, glibc, glibmm, graphviz, 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 }: +, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango +, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: let @@ -15,49 +15,49 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "3.5.403"; + #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"; + revision = "3.5-4539-g7024232"; + # temporarily use a non tagged version, because 3.5.403 has a bug that + # causes loss of audio-files, and it was decided that there won't be a + # hotfix release, and we should use 4.0 when it comes out. + # more info: http://comments.gmane.org/gmane.comp.audio.ardour.user/13665 + + version = "2015-02-20"; in stdenv.mkDerivation rec { - name = "ardour-${tag}"; + name = "ardour3-git-${version}"; src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; - rev = "refs/tags/${tag}"; - sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x"; + rev = "7024232855d268633760674d34c096ce447b7240"; + sha256 = "ede3730455c3c91b2fd612871fa7262bdacd3dff4ba77c5dfbc3c1f0de9b8a36"; }; buildInputs = - [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc + glibmm graphviz 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 + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 + makeWrapper pango perl pkgconfig python rubberband serd sord-svn 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 + patchShebangs ./tools/ ''; - configurePhase = "python waf configure --optimize --prefix=$out"; + configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --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" diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 21dc1d70407..280cf6e8042 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw +, fftwSinglePrec, flac, glibc, glibmm, graphviz, 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 -}: +, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango +, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: let @@ -34,33 +32,26 @@ 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 doxygen dbus fftw fftwSinglePrec flac glibc + glibmm graphviz gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 + makeWrapper pango perl pkgconfig python rubberband serd sord-svn 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 + patchShebangs ./tools/ ''; - configurePhase = "python waf configure --with-backend=alsa,jack --optimize --prefix=$out"; + configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c675ec1523..60e609ad8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10443,6 +10443,7 @@ let ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (vamp) vampSDK; }; ardour4 = callPackage ../applications/audio/ardour { From 2ba1ab3ad16c4a2b4672ddd4ea014f79bd896bca Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Sat, 30 May 2015 16:37:18 -0500 Subject: [PATCH 011/208] supporting pandas on osx, added test suite --- pkgs/top-level/python-packages.nix | 58 +++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c284839fb37..234c628ef6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8100,21 +8100,69 @@ let sha256 = "1w3wjnn3v37hf3hrd24lfgk6vpykarv9mihhpcfq6y7rg586bgjk"; }; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ dateutil numpy pytz modules.sqlite3 ]; + buildInputs = [ self.nose ]; + propagatedBuildInputs = with self; [ + dateutil + numpy + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy9 + lxml + modules.sqlite3 + ]; - # Tests require networking to pass - doCheck = false; + preCheck = '' + # Need to do this patch or tests will fail (swaps 1st and 2nd lines). + # See: https://github.com/pydata/pandas/commit/c4bcc2054bfd2f89b640bea0c9a109b0184d6710 + first=$(sed -n '1p' < pandas/tests/test_format.py) + second=$(sed -n '2p' < pandas/tests/test_format.py) + rest=$(tail -n +3 pandas/tests/test_format.py) + echo $second > pandas/tests/test_format.py + echo $first >> pandas/tests/test_format.py + echo "$rest" >> pandas/tests/test_format.py + ''; + + checkPhase = '' + runHook preCheck + + # The flag `-A 'not network'` will disable tests that use internet. + # The `-e` flag disables a few problematic tests. + python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3 + + runHook postCheck + ''; meta = { homepage = "http://pandas.pydata.org/"; description = "Python Data Analysis Library"; license = licenses.bsd3; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }; + xlrd = buildPythonPackage rec { + name = "xlrd-${version}"; + version = "0.9.3"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz"; + md5 = "6f3325132f246594988171bc72e1a385"; + }; + }; + + bottleneck = buildPythonPackage rec { + name = "Bottleneck-${version}"; + version = "1.0.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz"; + md5 = "380fa6f275bd24f27e7cf0e0d752f5d2"; + }; + propagatedBuildInputs = [self.numpy]; + }; + parsedatetime = buildPythonPackage rec { name = "parsedatetime-${version}"; version = "1.4"; From 77fc22e6799585260427400f00aa20ef2a13d91d Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 31 May 2015 13:50:02 +0200 Subject: [PATCH 012/208] jaaa: refactor needed by libclthreads refactor --- pkgs/applications/audio/jaaa/default.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0f29ce34cac..0b8f8863d6c 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -13,18 +13,6 @@ stdenv.mkDerivation rec { alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi ]; - NIX_CFLAGS_COMPILE = [ - "-I${xlibs.xproto}/include" - "-I${libX11}/include" - "-I${libXft}/include" - "-I${freetype}/include" - "-I${fontconfig}/include" - "-I${libXrender}/include" - "-I${xlibs.renderproto}/include" - "-I${alsaLib}/include" - "-I${zita-alsa-pcmi}/include" - ]; - makeFlags = [ "PREFIX=$(out)" "SUFFIX=''" @@ -38,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; - maintainers = with maintainers; [ magnetophon ]; + maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; } From 2d1ac6669281b071674739adf4bc124dfaf30a3e Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:04:31 -0400 Subject: [PATCH 013/208] mopidy: 1.0.0 -> 1.0.5 --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 08ccfc13302..7c236944892 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,11 +5,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "1.0.0"; + version = "1.0.5"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "15cz6mqw8ihqxhlssnbbssl3bi1xxbmq7krf3hv0zmmdj73ilsd6"; + sha256 = "0lhmm2w2djf6mb3acw1yq1k4j74v1lf4kgx24dsdnpkgsycrv5q6"; }; propagatedBuildInputs = with pythonPackages; [ From 42be3c60975f890276875c802b96c0faeafbccff Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:06:18 -0400 Subject: [PATCH 014/208] mopidy-moped: 0.5.0 -> 0.6.0 --- pkgs/applications/audio/mopidy-moped/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix index a96a5c9d898..6bf73c02185 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-moped-${version}"; - - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; - sha256 = "1bkx0c4yi48nxm1vzacdil9scn0ilwkbd1rgiga34p77lcg16qb2"; + sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr"; }; propagatedBuildInputs = [ mopidy ]; From 846fa0b7e45991513da4ff037006b1ec46a72eec Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:08:38 -0400 Subject: [PATCH 015/208] mopidy-mopify: 1.4.1 -> 1.5.1 --- pkgs/applications/audio/mopidy-mopify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix index 4616d3f7c64..770a1a79556 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy-mopify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-mopify-${version}"; - version = "1.4.1"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz"; - sha256 = "1i752vnkgqfps5vym63rbsh1xm141z8r68d80bi076zr6zbzdjj9"; + sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as"; }; propagatedBuildInputs = [ mopidy ]; From 5de70f7badd9c5728e3c0e611852861b4018fb39 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 20:10:37 -0400 Subject: [PATCH 016/208] mopidy-spotify: 1.3.0 -> 1.4.0 --- pkgs/applications/audio/mopidy-spotify/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 14818e60cca..8b67f38390e 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "0pwgg9xw86sjhv6w735fm0k81v0lv3gqlidgw90hr47hc4wajnzx"; + sha256 = "0cf97z9vnnp5l77xhwvmkbkqgpj5gwnm1pipiy66lbk4gn6va4z4"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; From b4a99530d1d9028f7b174bea3570885730dfd0ff Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:39:02 -0400 Subject: [PATCH 017/208] cookies: add python package --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab452a562d9..db4c2e70c92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2008,6 +2008,23 @@ let }; }; + cookies = buildPythonPackage rec { + name = "cookies-2.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz"; + sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + }; + + doCheck = false; + + meta = { + description = "Friendlier RFC 6265-compliant cookie parser/renderer"; + homepage = https://github.com/sashahart/cookies; + license = licenses.mit; + }; + }; + coverage = buildPythonPackage rec { name = "coverage-3.7.1"; From f70582e3341d84d3715d09d6d1a277be7d652c1c Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:42:53 -0400 Subject: [PATCH 018/208] responses: 0.2.2 -> 0.4.0 --- pkgs/top-level/python-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4c2e70c92..8805c49ead3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1057,17 +1057,17 @@ let }; responses = self.buildPythonPackage rec { - name = "responses-0.2.2"; - - propagatedBuildInputs = with self; [ requests mock six pytest flake8 ]; - - doCheck = false; + name = "responses-0.4.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; - md5 = "5d79fd425cf8d858dfc8afa6475395d3"; + url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz"; + sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; }; + propagatedBuildInputs = with self; [ cookies mock requests2 six ]; + + doCheck = false; + }; rarfile = self.buildPythonPackage rec { From cdf49bb47af6809ed3c51fa991c63233a0a602f5 Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 22:47:31 -0400 Subject: [PATCH 019/208] requests2: 2.6.0 -> 2.7.0 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8805c49ead3..3327ed44a9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10584,16 +10584,17 @@ let requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw"; + sha256 = "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir"; }; meta = { description = "An Apache2 licensed HTTP library, written in Python, for human beings"; homepage = http://docs.python-requests.org/en/latest/; + license = licenses.asl20; }; }; From b49026ee98a7def8bb731c72b36ef33187648d78 Mon Sep 17 00:00:00 2001 From: "Ryan Scheel (Havvy)" Date: Mon, 1 Jun 2015 05:17:59 +0200 Subject: [PATCH 020/208] Added: Havvy as maintainer for iojs/nodejs. --- lib/maintainers.nix | 1 + pkgs/development/web/iojs/default.nix | 1 + pkgs/development/web/nodejs/default.nix | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 059bfaecbb4..ee7f3eb873e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -93,6 +93,7 @@ goibhniu = "Cillian de RĂ³iste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; henrytill = "Henry Till "; hinton = "Tom Hinton "; diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index b3b9881559d..2fa2c0ddac5 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -31,5 +31,6 @@ in stdenv.mkDerivation { homepage = https://iojs.org/; license = licenses.mit; platforms = platforms.linux; + maintainers = [ maintainers.havvy ]; }; } diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 56b8e952e80..f91a7c3b41d 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.shlevy ]; + maintainers = [ maintainers.goibhniu maintainers.shlevy maintainers.havvy ]; platforms = platforms.linux ++ platforms.darwin; }; } From dd6946dcbba7e5501c2d7ac4f89641520c137d1e Mon Sep 17 00:00:00 2001 From: codyopel Date: Sun, 31 May 2015 23:51:04 -0400 Subject: [PATCH 021/208] beets: 1.3.11 -> 1.3.13 --- pkgs/tools/audio/beets/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index dc859b49736..0af0b427bf2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonPackage, pythonPackages, python +, buildPythonPackage, pythonPackages, python, imagemagick , enableAcoustid ? true , enableDiscogs ? true @@ -45,8 +45,9 @@ let "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" - "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random" - "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" + "mbcollection" "mbsync" "metasync" "missing" "permissions" "play" + "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" + "types" "zero" ]; enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); @@ -59,18 +60,19 @@ let in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.11"; + version = "1.3.13"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m"; + sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl"; }; propagatedBuildInputs = [ pythonPackages.enum34 + pythonPackages.jellyfish pythonPackages.munkres pythonPackages.musicbrainzngs pythonPackages.mutagen @@ -91,13 +93,10 @@ in buildPythonPackage rec { buildInputs = with pythonPackages; [ beautifulsoup4 - flask + imagemagick mock nose - pyechonest - pylast rarfile - requests2 responses ]; @@ -165,9 +164,9 @@ in buildPythonPackage rec { ''; meta = { - homepage = http://beets.radbox.org; description = "Music tagger and library organizer"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ]; + homepage = http://beets.radbox.org; + license = licenses.mit; + maintainers = with maintainers; [ aszlig iElectric pjones ]; }; } From 28bfbb55626085717f258f2abcffba51f921a1ac Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 May 2015 08:42:20 +0200 Subject: [PATCH 022/208] why3: update from 0.85 to 0.86.1 --- pkgs/applications/science/logic/why3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 228d1a7c4d4..d1fb853ee9e 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.85"; + version = "0.86.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/34074/why3-0.85.tar.gz"; - sha256 = "0sj1pd50lqvnvyss1f8ysgigdi64s91rrpdrmp7crmcy1npa8apf"; + url = https://gforge.inria.fr/frs/download.php/file/34797/why3-0.86.1.tar.gz; + sha256 = "129kzq79n8h480zrlphgh1ixvwp3wm18nbcky9bp4wdnr6zaibd7"; }; buildInputs = with ocamlPackages; - [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith ]; + [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ]; meta = with stdenv.lib; { description = "A platform for deductive program verification"; From a53ca334d67cf62e01ece7431215f41a3ddbca41 Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 1 Jun 2015 01:27:46 -0400 Subject: [PATCH 023/208] libsass: 3.2.2 -> 3.2.4 --- pkgs/development/libraries/libsass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 69bae8abfeb..356891e7351 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax"; + sha256 = "1v804r7k0iv97ihlr46hwfw88v874kfklsm616b85yzdz0105i8h"; }; patchPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A C/C++ implementation of a Sass compiler"; homepage = https://github.com/sass/libsass; license = licenses.mit; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ codyopel offline ]; platforms = platforms.unix; }; } From fcf850c99e2b0b2cc65980e8e13aa5226f55ba70 Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 1 Jun 2015 01:28:18 -0400 Subject: [PATCH 024/208] sassc: 3.2.1 -> 3.2.4 --- pkgs/development/tools/sassc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 451ee3a719c..256bd93f1ab 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.2.1"; + version = "3.2.4"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw"; + sha256 = "0ksdfv9ff5smba4vbwr1wqf3bp908rnprkp6lfssj85h9ciqq896"; }; patchPhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A front-end for libsass"; homepage = https://github.com/sass/sassc/; license = licenses.mit; - maintainers = with maintainers; [ pjones ]; + maintainers = with maintainers; [ codyopel pjones ]; platforms = platforms.unix; }; } From 98e698fad2b7bc992d1320bcaf29d1a98ee0cd8b Mon Sep 17 00:00:00 2001 From: _1126 Date: Mon, 1 Jun 2015 10:58:01 +0200 Subject: [PATCH 025/208] maintainers: change of nickname. --- lib/maintainers.nix | 2 +- pkgs/applications/audio/caudec/default.nix | 2 +- pkgs/applications/audio/ncmpc/default.nix | 2 +- pkgs/applications/audio/pamixer/default.nix | 2 +- pkgs/applications/misc/rofi/pass.nix | 2 +- pkgs/applications/window-managers/stumpwm/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 059bfaecbb4..fb39e174b0b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -4,7 +4,6 @@ /* Add your name and email address here. Keep the list alphabetically sorted. */ - _1126 = "Christian Lask "; abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; aforemny = "Alexander Foremny "; @@ -95,6 +94,7 @@ guibert = "David Guibert "; hbunke = "Hendrik Bunke "; henrytill = "Henry Till "; + hiberno = "Christian Lask "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 24613d4dd96..978dd27facd 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ _1126 ]; + maintainers = with maintainers; [ hiberno ]; }; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index b5f84f536d0..6c53d1fe755 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ _1126 ]; + maintainers = with maintainers; [ hiberno ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 31353cec6a9..c2d32ea3dad 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cdemoulins/pamixer; license = licenses.gpl3; - maintainers = with maintainers; [ _1126 ]; + maintainers = with maintainers; [ hiberno ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index e20c511be91..c6b5666921c 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = [stdenv.lib.maintainers._1126]; + maintainers = [stdenv.lib.maintainers.hiberno]; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index fe62b8250ae..d44ac128d80 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager for X11"; homepage = https://github.com/stumpwm/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ _1126 the-kenny ]; + maintainers = with maintainers; [ hiberno the-kenny ]; platforms = platforms.linux; }; } From 4d70496ebb38796fea4f5c81079e031efb3fd959 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 1 Jun 2015 12:07:46 +0200 Subject: [PATCH 026/208] sails: don't treat warnings as errors to fix the build Reported upstream as kragniz/sails/issues/18 --- pkgs/misc/sails/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix index f6ccbf9ec76..ed965f73b92 100644 --- a/pkgs/misc/sails/default.nix +++ b/pkgs/misc/sails/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig gtk3 librsvg ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = with stdenv.lib; { description = "Simulator for autonomous sailing boats"; homepage = https://github.com/kragniz/sails; From d866d4616dc41dac93f3c6c90383c205dae7e10a Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 1 Jun 2015 06:56:42 -0400 Subject: [PATCH 027/208] musescore: 2.0.0 -> 2.0.1 --- pkgs/applications/audio/musescore/default.nix | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9dbebe31a38..bfbfa577531 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,27 +1,47 @@ -{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2 -, lame, libsndfile, libvorbis }: +{ stdenv, fetchurl, cmake, pkgconfig +, alsaLib, freetype, jack2, lame, libogg, libpulseaudio, libsndfile, libvorbis +, portaudio, qt5 #, tesseract +}: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w"; + sha256 = "0n4xk35jggdq2dcizqjq1kdpclih4scpl93ymmxahvfa1vvwn5iw"; }; - buildInputs = [ - makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis + makeFlags = [ + "PREFIX=$(out)" ]; - patchPhase = '' - sed s,"/usr/local",$out, -i Makefile + cmakeFlags = [ + "-DAEOLUS=OFF" + "-DZERBERUS=ON" + "-DOSC=ON=ON" + "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error + "-DOCR=OFF" # Not necessary without OMR + "-DSOUNDFONT3=ON" + "-DHAS_AUDIOFILE=ON" + "-DBUILD_JACK=ON" + ]; + + preBuild = '' + make lupdate + make lrelease ''; - preBuild = "make lrelease"; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + alsaLib jack2 freetype lame libogg libpulseaudio libsndfile libvorbis + portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools + qt5.webkit qt5.xmlpatterns #tesseract + ]; meta = with stdenv.lib; { - description = "Qt-based score editor"; + description = "Music notation and composition software"; homepage = http://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; From 3400fa038f8ef79690100d10eb9110e2fe264cee Mon Sep 17 00:00:00 2001 From: codyopel Date: Mon, 1 Jun 2015 07:08:21 -0400 Subject: [PATCH 028/208] rtmpdump_gnutls: add missing lib nettle & use git date format Close #8112. --- pkgs/tools/video/rtmpdump/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 29f2a1c448d..9987d697cf0 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchgit, zlib -, gnutlsSupport ? false, gnutls ? null +, gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: # Must have an ssl library enabled assert (gnutlsSupport || opensslSupport); -assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport)); -assert opensslSupport -> ((openssl != null) && (!gnutlsSupport)); +assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport; +assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; stdenv.mkDerivation rec { name = "rtmpdump-${version}"; - version = "2.4"; + version = "2015-01-15"; src = fetchgit { url = git://git.ffmpeg.org/rtmpdump; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.cc.isClang "CC=clang"; propagatedBuildInputs = [ zlib ] - ++ optional gnutlsSupport gnutls + ++ optionals gnutlsSupport [ gnutls nettle ] ++ optional opensslSupport openssl; meta = { From 4f0d8460c0fa2328763c847a44ed1deb8dc047e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jun 2015 14:43:40 +0200 Subject: [PATCH 029/208] nixos release notes: add an item about Haskell NG --- nixos/doc/manual/release-notes/rl-unstable.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 755b4bf4154..837fdf07cec 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -8,9 +8,21 @@ In addition to numerous new and upgraded packages, this release has the following highlights: - Following new services were added since the last release: From d4412bf6c45ee5d4f9b00fed58c2ce15b783ce62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jun 2015 15:19:53 +0200 Subject: [PATCH 030/208] nixos release notes: document incompatible changes due to Haskell NG --- .../doc/manual/release-notes/rl-unstable.xml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 837fdf07cec..a7ba1cb1ff5 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -83,6 +83,64 @@ was accordingly renamed to bomi + + + Haskell packages can no longer be found by name, i.e. the commands + nix-env -qa cabal-install and nix-env -i + ghc will fail, even though we do ship + both cabal-install and ghc. + The reason for this inconvenience is the sheer size of the Haskell + package set: name-based lookups such as these would become much + slower than they are today if we'd add the entire Hackage database + into the top level attribute set. Instead, the list of Haskell + packages can be displayed by + + +nix-env -f "<nixpkgs>" -qaP -A haskellPackages + + + and packages can be installed with: + + +nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + + + + + Previous versions of NixOS come with a feature called + ghc-wrapper, a small wrapper script that allows + GHC to transparently pick up on libraries installed in the user's + profile. This feature has been deprecated; + ghc-wrapper was removed from the distribution. + The proper way to register Haskell libraries with the compiler now + is the haskellPackages.ghcWithPackages + function. + https://nixos.org/wiki/Haskell + provides much information about this subject. + + + + + + All Haskell builds that have been generated with version 1.x of + the cabal2nix utility are now invalid and need + to be re-generated with a current version of + cabal2nix to function. The most recent version + of this tool can be installed by running + nix-env -i cabal2nix. + + + + + + The haskellPackages set in Nixpkgs used to have a + function attribute called extension that users + could override in their ~/.nixpkgs/config.nix + files to configure additional attributes, etc. That function still + exists, but it's now called overrides. + + From 789f20eba860b769d7153afab42a70fe50688185 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jun 2015 15:20:18 +0200 Subject: [PATCH 031/208] nixos release notes: document new services.openssh.moduliFile option --- nixos/doc/manual/release-notes/rl-unstable.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index a7ba1cb1ff5..cf67014a69d 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -21,6 +21,17 @@ below, in the list of backwards-incompatible changes. + + + + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the vulnerabilities + discovered in the Diffie-Hellman key exchange can now replace OpenSSH's + default version with one they generated themselves using the new + services.openssh.moduliFile option. + + From 9cb7239f1283c5a8d2498bef4e2ff1d6009946b2 Mon Sep 17 00:00:00 2001 From: "Ryan Scheel (Havvy)" Date: Mon, 1 Jun 2015 15:34:31 +0200 Subject: [PATCH 032/208] Update iojs to v.2.2.1 --- pkgs/development/web/iojs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 2fa2c0ddac5..2ed6e1adade 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "2.1.0"; + version = "2.2.1"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i"; + sha256 = "1ylmj69nwhqqwn1grphlrzny9dp4bspx4172q41izr6dyk29rrsm"; }; prePatch = '' From 0645f5eab7b98e57cbbf51cab7fc77b4762b44b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 15:28:05 +0200 Subject: [PATCH 033/208] samba: Revert style changes and get rid of some dependencies Packages like glusterfs are now optional dependencies. A bunch of dependencies like subunit are gone: as far as I can tell, these are only used by Samba's test suite, which we're not even running, so they're pointless. Fixes #8067. --- pkgs/os-specific/gnu/default.nix | 3 +- pkgs/servers/samba/4.x.nix | 166 +++++++++---------------------- pkgs/top-level/all-packages.nix | 52 +++------- 3 files changed, 61 insertions(+), 160 deletions(-) diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 94bfec0a18e..457b670319e 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -1,7 +1,7 @@ # Packages that make up the GNU/Hurd operating system (aka. GNU). args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool -, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light +, texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gccCrossStageFinal , forceNativeDrv, forceSystem, newScope, platform, config, crossSystem , overrides ? {} }: @@ -91,7 +91,6 @@ let mig_raw = callPackage ./mig {}; smbfs = callPackage ./smbfs { - samba = samba_light; hurd = gnu.hurdCross; }; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 877850f532b..6a6e2469e78 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,48 +1,23 @@ -{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl +{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent -, ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper -, uid_wrapper, libarchive +, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext +, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs +, gnutls, libgcrypt, libgpgerror +, ncurses, libunwind, libibverbs, librdmacm, systemd -# source3/wscript optionals -, kerberos ? null -, zlib ? null -, openldap ? null -, cups ? null -, pam ? null -, avahi ? null -, acl ? null -, libaio ? null -, fam ? null -, libceph ? null -, glusterfs ? null - -# buildtools/wafsamba/wscript optionals -, libiconv ? null -, gettext ? null - -# source4/lib/tls/wscript optionals -, gnutls ? null -, libgcrypt ? null -, libgpgerror ? null - -# other optionals -, ncurses ? null -, libunwind ? null -, dbus ? null -, libibverbs ? null -, librdmacm ? null -, systemd ? null +, enableKerberos ? false +, enableInfiniband ? false +, enableLDAP ? false +, enablePrinting ? false +, enableMDNS ? false +, enableDomainController ? false +, enableRegedit ? true +, enableCephFS ? false +, enableGlusterFS ? false }: -assert kerberos != null -> zlib != null; +with lib; -let - bundledLibs = if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"; - hasGnutls = gnutls != null && libgcrypt != null && libgpgerror != null; - isKrb5OrNull = if kerberos != null && kerberos.implementation == "krb5" then true else null; - hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null; -in -with stdenv.lib; stdenv.mkDerivation rec { name = "samba-4.2.1"; @@ -51,25 +26,26 @@ stdenv.mkDerivation rec { sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip"; }; - patches = [ - ./4.x-no-persistent-install.patch - ./4.x-fix-ctdb-deps.patch - ] ++ optional (kerberos != null) ./4.x-heimdal-compat.patch; + patches = + [ ./4.x-no-persistent-install.patch + ./4.x-fix-ctdb-deps.patch + ] ++ stdenv.lib.optional enableKerberos ./4.x-heimdal-compat.patch; - buildInputs = [ - python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 - docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser - subunit libbsd nss_wrapper socket_wrapper uid_wrapper - libarchive - - kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs - - libiconv gettext - - gnutls libgcrypt libgpgerror - - ncurses libunwind dbus libibverbs librdmacm systemd - ]; + buildInputs = + [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* + docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser + libbsd libarchive zlib acl fam libiconv gettext libunwind + ] + ++ optionals stdenv.isLinux [ libaio pam systemd ] + ++ optional enableKerberos kerberos + ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ] + ++ optional enableLDAP openldap + ++ optional (enablePrinting && stdenv.isLinux) cups + ++ optional enableMDNS avahi + ++ optional enableDomainController gnutls + ++ optional enableRegedit ncurses + ++ optional (enableCephFS && stdenv.isLinux) libceph + ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs; postPatch = '' # Removes absolute paths in scripts @@ -79,70 +55,24 @@ stdenv.mkDerivation rec { sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py ''; + configureFlags = + [ "--with-static-modules=NONE" + "--with-shared-modules=ALL" + "--enable-fhs" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--bundled-libraries=${if enableKerberos && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" + "--private-libraries=NONE" + "--builtin-libraries=replace" + ] + ++ optional (enableKerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" + ++ optional (!enableDomainController) "--without-ad-dc" + ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; + enableParallelBuilding = true; - configureFlags = [ - # source3/wscript options - (mkWith true "static-modules" "NONE") - (mkWith true "shared-modules" "ALL") - (mkWith true "winbind" null) - (mkWith (openldap != null) "ads" null) - (mkWith (openldap != null) "ldap" null) - (mkEnable (cups != null) "cups" null) - (mkEnable (cups != null) "iprint" null) - (mkWith (pam != null) "pam" null) - (mkWith (pam != null) "pam_smbpass" null) - (mkWith true "quotas" null) - (mkWith true "sendfile-support" null) - (mkWith true "utmp" null) - (mkWith true "utmp" null) - (mkEnable true "pthreadpool" null) - (mkEnable (avahi != null) "avahi" null) - (mkWith true "iconv" null) - (mkWith (acl != null) "acl-support" null) - (mkWith true "dnsupdate" null) - (mkWith true "syslog" null) - (mkWith true "automount" null) - (mkWith (libaio != null) "aio-support" null) - (mkWith (fam != null) "fam" null) - (mkWith (libarchive != null) "libarchive" null) - (mkWith true "cluster-support" null) - (mkWith (ncurses != null) "regedit" null) - (mkWith libceph "libcephfs" libceph) - (mkEnable (glusterfs != null) "glusterfs" null) - - # dynconfig/wscript options - (mkEnable true "fhs" null) - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - - # buildtools/wafsamba/wscript options - (mkOther "bundled-libraries" bundledLibs) - (mkOther "private-libraries" "NONE") - (mkOther "builtin-libraries" "replace") - (mkWith libiconv "libiconv" libiconv) - (mkWith (gettext != null) "gettext" gettext) - - # source4/lib/tls/wscript options - (mkEnable hasGnutls "gnutls" null) - - # wscript options - (mkWith isKrb5OrNull "system-mitkrb5" null) - (if hasGnutls then null else "--without-ad-dc") - - # ctdb/wscript - (mkEnable hasInfinibandOrNull "infiniband" null) - (mkEnable null "pmda" null) - ]; - stripAllList = [ "bin" "sbin" ]; - postInstall = '' - # Remove unecessary components - rm -r $out/{lib,share}/ctdb-tests - rm $out/bin/ctdb_run{_cluster,}_tests - ''; - postFixup = '' export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" read -r -d "" SCRIPT << EOF diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18a1a43c99c..d642c4188c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8986,15 +8986,7 @@ let python = python2; kerberos = heimdal; gnutls = gnutls33; - cups = if stdenv.isDarwin then null else cups; - pam = if stdenv.isDarwin then null else pam; - libaio = if stdenv.isDarwin then null else libaio; - libceph = if stdenv.isDarwin then null else libceph; - glusterfs = if stdenv.isDarwin then null else glusterfs; - dbus = if stdenv.isLinux then dbus else null; - libibverbs = if stdenv.isLinux then libibverbs else null; - librdmacm = if stdenv.isLinux then librdmacm else null; - systemd = if stdenv.isLinux then systemd else null; + # enableLDAP }; samba = samba4; @@ -9012,39 +9004,19 @@ let libunwind = null; }); - samba4_light = lowPrio (samba4.override { - # source3/wscript optionals - kerberos = null; - zlib = null; - openldap = null; - cups = null; - pam = null; - avahi = null; - acl = null; - libaio = null; - fam = null; - libceph = null; - glusterfs = null; - - # buildtools/wafsamba/wscript optionals - libiconv = null; - gettext = null; - - # source4/lib/tls/wscript optionals - gnutls = null; - libgcrypt = null; - libgpgerror = null; - - # other optionals - ncurses = null; - libunwind = null; - dbus = null; - libibverbs = null; - librdmacm = null; - systemd = null; + samba4Full = lowPrio (samba4.override { + enableKerberos = true; + enableInfiniband = true; + enableLDAP = true; + enablePrinting = true; + enableMDNS = true; + enableDomainController = true; + enableRegedit = true; + enableCephFS = true; + enableGlusterFS = true; }); - samba_light = samba4_light; + sambaFull = samba4Full; shairport-sync = callPackage ../servers/shairport-sync { }; From 23b19506037abacccfe18f668b0bf8e11290160f Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Mon, 1 Jun 2015 08:43:53 -0500 Subject: [PATCH 034/208] switch to sha256 hashes --- pkgs/top-level/python-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 234c628ef6f..332e32a0ddf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8101,8 +8101,8 @@ let }; buildInputs = [ self.nose ]; - propagatedBuildInputs = with self; [ - dateutil + propagatedBuildInputs = with self; [ + dateutil numpy scipy numexpr @@ -8111,7 +8111,7 @@ let bottleneck sqlalchemy9 lxml - modules.sqlite3 + modules.sqlite3 ]; preCheck = '' @@ -8127,7 +8127,7 @@ let checkPhase = '' runHook preCheck - + # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3 @@ -8149,7 +8149,7 @@ let version = "0.9.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz"; - md5 = "6f3325132f246594988171bc72e1a385"; + sha256 = "174ks80h0g9p67ahnakf0y7di3gvbhxvb1jlk097gvd7gpi3aflk"; }; }; @@ -8158,7 +8158,7 @@ let version = "1.0.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz"; - md5 = "380fa6f275bd24f27e7cf0e0d752f5d2"; + sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd"; }; propagatedBuildInputs = [self.numpy]; }; @@ -9204,12 +9204,12 @@ let version = "1.5.3"; # FAIL:test_generate_entry and test_time # both tests fail due to time issue that doesn't seem to matter in practice - doCheck = false; + doCheck = false; src = pkgs.fetchurl { url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz"; sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885"; }; - + propagatedBuildInputs = with self; [ pygments markdown ]; meta = { From 51bb5e85dcca35ba503aa5ad9891f09059a15663 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 1 Jun 2015 15:58:07 +0200 Subject: [PATCH 035/208] hashcat: fix build and update to 0.49 --- pkgs/tools/security/hashcat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 806fcb613ca..3a4a6edef03 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, p7zip, patchelf }: +{ stdenv, fetchurl, p7zip, patchelf, gmp }: assert stdenv.isLinux; let bits = if stdenv.system == "x86_64-linux" then "64" else "32"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc gmp ]; fixBin = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "0.47"; + version = "0.49"; src = fetchurl { url = "http://hashcat.net/files/${name}.7z"; - sha256 = "0mc4lv4qfxabp794xfzgr63fhwk7lvbg12pry8a96lldp0jwp6i3"; + sha256 = "0va07flncihgmnri5wj0jn636w86x5qwm4jmj2halcyg7qwqijh2"; }; buildInputs = [ p7zip patchelf ]; From 10acbd67164672d4334b7d5cb162157e9e9468bf Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 1 Jun 2015 16:15:19 +0200 Subject: [PATCH 036/208] new package: crackxls --- pkgs/tools/security/crackxls/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/crackxls/default.nix diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix new file mode 100644 index 00000000000..ba2bee2ffc2 --- /dev/null +++ b/pkgs/tools/security/crackxls/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, autoconf, automake, openssl, libgsf }: + +stdenv.mkDerivation rec { + + name = "crackxls-${version}"; + version = "v0.4"; + + src = fetchgit { + url = https://github.com/GavinSmith0123/crackxls2003.git; + rev = "refs/tags/${version}"; + sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; + }; + + buildInputs = [ openssl libgsf automake autoconf ]; + + installPhase = + '' + mkdir $out/bin + cp crackxls2003 $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/GavinSmith0123/crackxls2003/; + description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; + platforms = platforms.none; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d642c4188c7..73f2c3100e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1125,6 +1125,8 @@ let cpio = callPackage ../tools/archivers/cpio { }; + crackxls = callPackage ../tools/security/crackxls { }; + cromfs = callPackage ../tools/archivers/cromfs { }; cron = callPackage ../tools/system/cron { }; From ee8ac51986949522a51418b5ce650aaf2fe82da0 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 1 Jun 2015 16:59:09 +0200 Subject: [PATCH 037/208] add linux to platforms --- pkgs/tools/security/crackxls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index ba2bee2ffc2..c593650dbd4 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/GavinSmith0123/crackxls2003/; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; - platforms = platforms.none; + platforms = platforms.linux; license = licenses.gpl3; }; } From 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 10:49:37 +0200 Subject: [PATCH 038/208] Use nixUnstable by default --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 6d25fef4576..42a9d46f1d6 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -63,7 +63,7 @@ in package = mkOption { type = types.package; - default = pkgs.nix; + default = pkgs.nixUnstable; description = '' This option specifies the Nix package instance to use throughout the system. ''; From 314c6847aa8d3b2335889c7ef3b26adb6c933375 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 1 Jun 2015 20:28:11 +0200 Subject: [PATCH 039/208] cpuminer: update from 2.4.1 to 2.4.2 --- pkgs/tools/misc/cpuminer/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 0ca95127f11..713c0a92329 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "0grj0swh1q3c3bj3yxji80yhxb09yz62x1n5h8z7c3azq4rrv2w1"; + sha256 = "1ds5yfxf25pd8y5z5gh689qb80m4dqw2dy3yx87hibnprlaiym0n"; }; buildInputs = [ curl jansson ]; configureFlags = [ "CFLAGS=-O3" ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/pooler/cpuminer; description = "CPU miner for Litecoin and Bitcoin"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; }; } From 727565279f94a77306f2a06040b82fd1f06c8097 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Mon, 1 Jun 2015 13:53:12 -0500 Subject: [PATCH 040/208] Fix dd-agent buildInputs to include pythonPackages.psutil When deploying current master version journalctl showed ImportErrors in the logs with message: 'No module named psutil' and systemctl dd-agent service failed to start. To fix I added pythonPackages.psutil as a buildInputs entry and this fixed the issue. See this Gist for journalctl errors for reference: https://gist.github.com/mbbx6spp/59eefabbe708c335a31f --- pkgs/tools/networking/dd-agent/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 911bb7197eb..8c340460b75 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -12,7 +12,17 @@ stdenv.mkDerivation rec { sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan"; }; - buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests ]; + buildInputs = [ + python + unzip + makeWrapper + pythonPackages.psycopg2 + pythonPackages.psutil + pythonPackages.ntplib + pythonPackages.simplejson + pythonPackages.pyyaml + pythonPackages.requests + ]; propagatedBuildInputs = [ python tornado ]; buildCommand = '' From 217566ede466f8189f4c0f91784ac3143f9990c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2015 21:13:34 +0200 Subject: [PATCH 041/208] mcelog 117 -> 118 Changet to mcelog(8) to support new architectural extentions in Intel CPUs. --- 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 16f1331d320..0a4d3797ce2 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 = "117"; in +let version = "118"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "0szc5s0bag16ypna336spwb5fagwbxaparn0h78w73wv05kcvwqw"; + sha256 = "04hzadxyqlnhjn328bv711lpkipfn5k3gszswydmvvjpis2vhbrr"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 70cb6e67c0a976f3e170e38b6b33777685f7c680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 1 Mar 2015 21:29:40 +0100 Subject: [PATCH 042/208] nixos/apcupsd: don't evaluate event hooks at build time Better replace the double quotes in 'echo "${commands}"' with single quotes, to prevent the shell from doing command substitution etc. at configuration build time. --- nixos/modules/services/monitoring/apcupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index ffa7be7dd30..6cd0254dbe3 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -39,7 +39,7 @@ let shellCmdsForEventScript = eventname: commands: '' echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}" - echo "${commands}" >> "$out/${eventname}" + echo '${commands}' >> "$out/${eventname}" chmod a+x "$out/${eventname}" ''; From 9835f18fbdc06fbaa7abf02726b2adb97a93143a Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 1 Jun 2015 15:16:51 -0500 Subject: [PATCH 043/208] Add myself as maintainer for skarnet software --- pkgs/development/libraries/skalibs/default.nix | 1 + pkgs/os-specific/linux/s6-linux-utils/default.nix | 1 + pkgs/servers/s6/default.nix | 1 + pkgs/tools/misc/execline/default.nix | 1 + pkgs/tools/misc/s6-portable-utils/default.nix | 1 + pkgs/tools/networking/s6-dns/default.nix | 1 + pkgs/tools/networking/s6-networking/default.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index fa1d4f4f984..32739b45576 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -30,6 +30,7 @@ in stdenv.mkDerivation rec { description = "A set of general-purpose C programming libraries"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 9bccedb0120..faf5106c67e 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 73843b8c114..10d4520d912 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { description = "skarnet.org's small & secure supervision software suite"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index a2edb1f842e..a7c555ee72b 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -32,6 +32,7 @@ in stdenv.mkDerivation rec { description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 9aaf928b7b0..4d8094d3a3b 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -27,6 +27,7 @@ in stdenv.mkDerivation rec { description = "A set of tiny general Unix utilities optimized for simplicity and small size"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 89c7642d0a5..d44f4554043 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -32,6 +32,7 @@ in stdenv.mkDerivation rec { description = "A suite of DNS client programs and libraries for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index d2c7ebd0345..acc620b6cc0 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { description = "A suite of small networking utilities for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; } From 74964c255e4153b9b4170914cdd19f8abc3e9786 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 1 Jun 2015 15:19:11 -0500 Subject: [PATCH 044/208] Update skarnet.org software execline 2.1.2.0 s6-dns 2.0.0.3 s6-networking 2.1.0.1 s6-portable-utils 2.0.5.0 skalibs 2.3.4.0 --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 32739b45576..cc49466d020 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.2.0"; + version = "2.3.4.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a"; + sha256 = "03kqcinb5sn1pk297nqg7w5hzgmkkhhcs3l9x99w1x9kgmw6wisp"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index a7c555ee72b..162cc9a48ff 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.1.0"; + version = "2.1.2.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "0yhxyih8p6p9135nifi655qk4gnhdarjzfp1lb4pxx9ar9ay5q7w"; + sha256 = "0p9wp1rq8010k5yxlvamajhi6m24r9v7ikb7scvznf6zb2b0d9hf"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 4d8094d3a3b..2f0a647f343 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.4.0"; + version = "2.0.5.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0gl4v6hslqkxdfxj3qzi1xpiiw52ic8y8l9nkl2z5gp893qb6yvx"; + sha256 = "099c7isi5vynis4iaiz362rvr73w4rvjhv3c2f7ddxgfyvd2331l"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index d44f4554043..e8ed6e68e41 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.2"; + version = "2.0.0.3"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0rsw19r9hwxb0xj9xs1rwb7fa21wwbsnfq3p2nfg4lf6cc64b39r"; + sha256 = "0kabv1k5xn2vhwlq42913d22kd1f79nssmi7jkncgvsgv1zs0sym"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index acc620b6cc0..5f24592f030 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.0.0"; + version = "2.1.0.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c"; + sha256 = "0jdjxwqrp7lzdb85sp1gdkm7s478wyl7wqxb3jfxflgh2bgdgvy2"; }; dontDisableStatic = true; From 2c9f03ff8188a418bb9329b5dbc4b75d168efd5a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 1 Jun 2015 22:36:00 +0200 Subject: [PATCH 045/208] ocaml-async: set attribute to null for unsupported OCaml versions --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c28a6c98c7..2a7c9a087c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4104,7 +4104,10 @@ let async_unix = callPackage ../development/ocaml-modules/async_unix { }; - async = callPackage ../development/ocaml-modules/async { }; + async = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/async { } + else null; atd = callPackage ../development/ocaml-modules/atd { }; From e361e700e160679579053574fd6cd9e15878b809 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 1 Jun 2015 22:35:34 +0200 Subject: [PATCH 046/208] ocaml-cstruct: assert minimal OCaml version (4.01) --- pkgs/development/ocaml-modules/cstruct/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index d62b9397a73..5b2eebed9e0 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,9 +1,7 @@ {stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, async ? null, lwt ? null, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; stdenv.mkDerivation { name = "ocaml-cstruct-1.6.0"; From b351009cca23584c6c8e17a334f252d96663b596 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 1 Jun 2015 20:41:50 +0200 Subject: [PATCH 047/208] ocaml-hex: update from 0.1.0 to 0.2.0 --- pkgs/development/ocaml-modules/hex/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 1be3b4cbfb7..7a060bd795a 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, cstruct }: -let version = "0.1.0"; in +let version = "0.2.0"; in stdenv.mkDerivation { name = "ocaml-hex-${version}"; src = fetchzip { url = "https://github.com/mirage/ocaml-hex/archive/${version}.tar.gz"; - sha256 = "1nna0v5wi1g8l9ywl43xda2lqbz3sa3ncpyg84bl9baxyfmw4p9n"; + sha256 = "13vmpxwg5vb2qvkdqz37rx1ya19r9cp4dwylx8jj15mn77hpy7xg"; }; buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ cstruct ]; createFindlibDestdir = true; meta = { From 9cd797ff269efc749563547b24e68a241f11932c Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 1 Jun 2015 13:14:47 +0300 Subject: [PATCH 048/208] vim plugins: refactor and regenerate --- pkgs/misc/vim-plugins/default.nix | 1499 ++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 137 ++- pkgs/misc/vim-plugins/vim-utils.nix | 4 +- 3 files changed, 814 insertions(+), 826 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a1a78e9fb64..49935487afe 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -10,6 +10,12 @@ inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin buildVimPluginFrom2Nix vimHelpTags; in +# TL;DR +# Add your plugin to ./vim-plugin-names +# Generate via `vim-plugin-names-to-nix` +# If plugin is complicated then create a PR to +# https://github.com/jagajaga/vim-addon-vim2nix/tree/master/additional-nix-code + # This attrs contains two sections: # The first contains plugins added manually, the second contains plugins # generated by call nix#ExportPluginsForNix. @@ -17,587 +23,662 @@ in # attribute names should be the same as used by vim-pi to make dependency # resolution work rec { + # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations + # which recreates this the following derivations based on ./vim-plugin-names + pluginnames2nix = vimUtils.pluginnames2Nix { + name = "vim-plugin-names-to-nix"; + namefiles = [./vim-plugin-names]; }; - ### section I: manually mantained plugins - airline = vim-airline; - alternative = a; # backwards compat, added 2014-10-21 - command_T = command-t; # backwards compat, added 2014-10-18 - gitgutter = vim-gitgutter; - haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 - necoGhc = neco-ghc; # backwards compat, added 2014-10-18 - nerdcommenter = The_NERD_Commenter; - stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 - youcompleteme = YouCompleteMe; + # Section I - a = buildVimPlugin { - name = "a-git-2010-11-06"; + # Section II + # Update with vimUtils.vimPlugins.pluginnames2Nix command + + # aliasess + airline = vim-airline; + alternative = a-vim; # backwards compat, added 2014-10-21 + coffee-script = vim-coffee-script; + coffeeScript = coffee-script; # backwards compat, added 2014-10-18 + colors-solarized = Solarized; + colorsamplerpack = Colour_Sampler_Pack; + Colour_Sampler_Pack = Colour-Sampler-Pack; + command_T = command-t; # backwards compat, added 2014-10-18 + easy-align = vim-easy-align; + easymotion = vim-easymotion; + eighties = vim-eighties; + ghc-mod-vim = ghcmod; + gist-vim = Gist; + gitgutter = vim-gitgutter; + gundo = Gundo; + haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 + haskellconceal = vim-haskellconceal; + hoogle = Hoogle; + hier = vim-hier; + ipython = vim-ipython; + latex-live-preview = vim-latex-live-preview; + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + nerdcommenter = The_NERD_Commenter; + nerdtree = The_NERD_tree; + quickrun = vim-quickrun; + signature = vim-signature; + "sourcemap.vim" = sourcemap; + stylish-haskell = vim-stylish-haskell; + stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 + supertab = Supertab; + syntastic = Syntastic; + tabular = Tabular; + tagbar = Tagbar; + tmux-navigator = vim-tmux-navigator; + tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 + watchdogs = vim-watchdogs; + webapi-vim = WebAPI; + yankring = YankRing; + YouCompleteMe = youcompleteme; + + + Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Gist-2015-05-29"; src = fetchgit { - url = "https://github.com/vim-scripts/a.vim.git"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240"; - }; + url = "git://github.com/mattn/gist-vim"; + rev = "235955468c2d85e5d0ece46d84948acf2bedeb20"; + sha256 = "50ac95e145d00631acb3ae53261c880920b40b208fed1aaae71ed31d070e381e"; + }; + dependencies = []; + + }; + + Gundo = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Gundo"; + src = fetchhg { + url = "https://bitbucket.org/sjl/gundo.vim"; + rev = "eb9fc8676b89"; + sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp"; + }; + dependencies = []; + + }; + + Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Hoogle-2013-11-26"; + src = fetchgit { + url = "git://github.com/Twinside/vim-hoogle"; + rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + }; + dependencies = []; + + }; + + Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Solarized-2011-05-09"; + src = fetchgit { + url = "git://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + }; + dependencies = []; + + }; + + Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Supertab-2015-02-15"; + src = fetchgit { + url = "git://github.com/ervandew/supertab"; + rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; + sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; + }; + dependencies = []; + + }; + + Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Syntastic-2015-05-29"; + src = fetchgit { + url = "git://github.com/scrooloose/syntastic"; + rev = "5c6e78a2711aa5d04d116123d78684b620033c3d"; + sha256 = "fa8781df0c37b5d120ab4b287a911a1545cd4342edf08f85d644097c50ff59b0"; + }; + dependencies = []; + + }; + + Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Tabular-2013-05-16"; + src = fetchgit { + url = "git://github.com/godlygeek/tabular"; + rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + }; + dependencies = []; + + }; + + Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Tagbar-2015-05-10"; + src = fetchgit { + url = "git://github.com/majutsushi/tagbar"; + rev = "399b75256ac7333d7119d11047f6b3aff8fa2828"; + sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c"; + }; + dependencies = []; + + }; + + The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "The_NERD_Commenter-2014-07-08"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdcommenter"; + rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + }; + dependencies = []; + + }; + + The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "The_NERD_tree-2015-05-13"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdtree"; + rev = "af85499edace2acca27ce41790ac333f62b689bb"; + sha256 = "12f68eb374ccc8cbfcf88b85cf44a4a18856be4e30a50850b8f3d0b186207f0c"; + }; + dependencies = []; + + }; + + UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "UltiSnips-2015-05-11"; + src = fetchgit { + url = "git://github.com/sirver/ultisnips"; + rev = "188e00f7b87297ea7737f9494d531c7073637332"; + sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c"; + }; + dependencies = []; + + }; + + VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "VimOutliner-2015-01-09"; + src = fetchgit { + url = "git://github.com/vimoutliner/vimoutliner"; + rev = "7c995f973c54b0d026137615af28059890edb197"; + sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5"; + }; + dependencies = []; + + }; + + WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "WebAPI-2015-05-14"; + src = fetchgit { + url = "git://github.com/mattn/webapi-vim"; + rev = "6d577e49aeb81b4ede280161ca1e550c9328d098"; + sha256 = "cb57200ada38ff5388e043075e900d3794020bb6f063a2845c71993e5543862a"; + }; + dependencies = []; + + }; + + YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YankRing"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + buildInputs = [ unzip ]; + dependencies = []; meta = { - homepage = https://github.com/vim-scripts/a.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "http://www.vim.org/scripts/script.php?script_id=1234"; }; + + }; - align = buildVimPlugin { - name = "align-git-2012-08-07"; + commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "commentary-2014-11-10"; src = fetchgit { - url = "https://github.com/vim-scripts/align.git"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; - }; - meta = { - homepage = https://github.com/vim-scripts/align; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/tpope/vim-commentary"; + rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; + sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d"; }; + dependencies = []; + }; - calendar = buildVimPlugin { - name = "calendar-git-2015-04-24"; + ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-2013-07-29"; src = fetchgit { - url = "https://github.com/itchyny/calendar.vim.git"; - rev = "4149b7bdbe159d9a7670fea9238fe3acac618d67"; - sha256 = "4a04a03343f94fcbdb0eca44ba1eef8e1669f31e7aa5bf411e6fca4e5b8cdb30"; - }; - meta = { - homepage = https://github.com/itchyny/calendar.vim.git; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/kien/ctrlp.vim"; + rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; + sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; }; + dependencies = []; + }; - - command-t = buildVimPlugin { - name = "command-t-git-2015-04-29"; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "extradite-2015-01-26"; src = fetchgit { - url = "https://github.com/wincent/Command-T"; - rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b"; - sha256 = "0l0ajdi3dj2w0zfvgy5fkyl8wln6r8x6ikqvr31rxxzkpwmyxmr1"; + url = "git://github.com/int3/vim-extradite"; + rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; + sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714"; }; - buildInputs = [ perl ruby ]; - buildPhase = '' - pushd ruby/command-t - ruby extconf.rb - make - popd - ''; + dependencies = []; + }; - easymotion = buildVimPlugin { - name = "easymotion-git-2015-04-21"; + fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fugitive-2015-05-31"; src = fetchgit { - url = "https://github.com/lokaltog/vim-easymotion"; - rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f"; - sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54"; - }; - meta = { - homepage = https://github.com/lokaltog/vim-easymotion; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/tpope/vim-fugitive"; + rev = "e065e4f841f4a033ac9a6156573a446007617b1d"; + sha256 = "339e2418da5f7e04490e6732010abd2f287c935e7a20df5832611f94ed42013f"; }; + dependencies = []; + }; - - eighties = buildVimPlugin { - name = "eighties-git-2015-04-16"; + ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ghcmod-2015-03-17"; src = fetchgit { - url = "https://github.com/justincampbell/vim-eighties"; - rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24"; - sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c"; - }; - buildPhase = ":"; - meta = with stdenv.lib; { - description = "Automatically resizes your windows to 80 characters"; - homepage = https://github.com/justincampbell/vim-eighties; - license = licenses.publicDomain; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + url = "git://github.com/eagletmt/ghcmod-vim"; + rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb"; + sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899"; }; + dependencies = []; + }; - - - golang = buildVimPlugin { - name = "golang-git-2014-08-06"; + vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-vim2nix-2015-06-01"; src = fetchgit { - url = "https://github.com/jnwhiteh/vim-golang.git"; - rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; - sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; - }; - meta = { - homepage = https://github.com/jnwhiteh/vim-golang; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/JagaJaga/vim-addon-vim2nix"; + rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d"; + sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e"; }; + dependencies = ["vim-addon-manager"]; + }; - hardtime = buildVimPlugin { - name = "hardtime-git-2014-10-21"; + lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "lushtags-2013-12-27"; src = fetchgit { - url = "https://github.com/takac/vim-hardtime.git"; - rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf"; - sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd"; - }; - meta = { - homepage = https://github.com/takac/vim-hardtime; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - haskellconceal = buildVimPlugin { - name = "haskellconceal-git-2014-08-07"; - src = fetchgit { - url = "https://github.com/twinside/vim-haskellconceal.git"; - rev = "1d85e8f10b675d38ec117368ec8032f486c27f98"; - sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633"; - }; - meta = { - homepage = https://github.com/twinside/vim-haskellconceal; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - - hasksyn = buildVimPlugin { - name = "hasksyn-git-2014-09-03"; - src = fetchgit { - url = "https://github.com/travitch/hasksyn.git"; - rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; - sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931"; - }; - meta = { - homepage = https://github.com/travitch/hasksyn; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - hdevtools = buildVimPlugin { - name = "hdevtools-git-2012-12-29"; - src = fetchgit { - url = "https://github.com/bitc/vim-hdevtools.git"; - rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; - sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; - }; - meta = { - homepage = https://github.com/bitc/vim-hdevtools; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - hier = buildVimPlugin { - name = "hier-git-2011-08-27"; - src = fetchgit { - url = "https://github.com/jceb/vim-hier.git"; - rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; - sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785"; - }; - buildInputs = [ vim ]; - meta = { - homepage = https://github.com/jceb/vim-hier; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - idris-vim = buildVimPlugin { - name = "idris-vim-git-2014-12-29"; - src = fetchgit { - url = "https://github.com/idris-hackers/idris-vim.git"; - rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1"; - sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff"; - }; - meta = { - homepage = https://github.com/idris-hackers/idris-vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - ipython = buildVimPlugin { - name = "ipython-git-2015-01-12"; - src = fetchgit { - url = "https://github.com/ivanov/vim-ipython.git"; - rev = "a47d92b371588a81f8501c66604d79e2827c60a8"; - sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53"; - }; - meta = { - homepage = https://github.com/ivanov/vim-ipython; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - latex-box = buildVimPlugin { - name = "latex-box-git-2015-05-11"; - src = fetchgit { - url = "https://github.com/latex-box-team/latex-box"; - rev = "ede8371663e89c6e033f8ae387590422b8ea6dd0"; - sha256 = "1d0f5244e681cc5c972ad043ebc2b8b5f751ba216ca44d4c07821dcb641c5f3d"; - }; - meta = { - homepage = https://github.com/latex-box-team/latex-box; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - lushtags = buildVimPlugin { - name = "lushtags-git-2013-12-27"; - src = fetchgit { - url = "https://github.com/bitc/lushtags.git"; + url = "git://github.com/bitc/lushtags"; rev = "429fab3b748ae04ee5de0cbf75d947f15441e798"; sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7"; - }; - meta = { - homepage = https://github.com/bitc/lushtags; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; + dependencies = []; + }; - neco-ghc = buildVimPlugin { - name = "neco-ghc-git-2015-04-07"; + vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hdevtools-2012-12-29"; src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc"; + url = "git://github.com/bitc/vim-hdevtools"; + rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; + sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; + }; + dependencies = []; + + }; + + vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tmux-navigator-2015-05-29"; + src = fetchgit { + url = "git://github.com/christoomey/vim-tmux-navigator"; + rev = "176452ead44118174ddad3502709a247d9c24bb4"; + sha256 = "789c8b24b971a3b307ac296234230f1048ff2928c89302700bd4e5fc2edd2d8a"; + }; + dependencies = []; + + }; + + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-ghc-2015-04-07"; + src = fetchgit { + url = "git://github.com/eagletmt/neco-ghc"; rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda"; sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59"; }; - meta = { - homepage = https://github.com/eagletmt/neco-ghc; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; + dependencies = []; + }; - neocomplete = buildVimPlugin { - name = "neocomplete-git-2015-05-11"; + YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YUNOcommit-vim-2014-11-26"; src = fetchgit { - url = "https://github.com/Shougo/neocomplete.vim"; - rev = "425eaacdaa126db647c1fc24c3357e6326c48bdc"; - sha256 = "bb7dac68562fa5456aad0f993ee2caf962d53425e29659b7c5ae3d33d815a3ed"; - }; - meta = { - homepage = https://github.com/Shougo/neocomplete.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/esneider/YUNOcommit.vim"; + rev = "981082055a73ef076d7e27477874d2303153a448"; + sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56"; }; + dependencies = []; + }; - - neosnippet = buildVimPlugin { - name = "neosnippet-git-2015-05-04"; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "idris-vim-2014-12-29"; src = fetchgit { - url = "https://github.com/Shougo/neosnippet.vim"; - rev = "48689a972d41256b423aa635dff689868a48e5bd"; - sha256 = "a46be238526e0e39b4561c9a53351bbb43a5fec3a912bdf0b86ab2f031ccc383"; - }; - meta = { - homepage = https://github.com/Shougo/neosnippet.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/idris-hackers/idris-vim"; + rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1"; + sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff"; }; + dependencies = []; + }; - - neosnippet-snippets = buildVimPlugin { - name = "neosnippet-snippets-git-2015-05-10"; + calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "calendar-vim-2015-05-21"; src = fetchgit { - url = "https://github.com/Shougo/neosnippet-snippets"; - rev = "c35446a74d3a5c11838a96b9f2e3673e56ced384"; - sha256 = "92be7af28c0a64e8e3f0c5c7973fee36f7401d943ff97bd5deffe3f0e2760e5d"; - }; - meta = { - homepage = https://github.com/Shougo/neosnippet-snippets; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/itchyny/calendar.vim"; + rev = "394c789d2235a7a056ba527daf722e9119cac1c8"; + sha256 = "dfefb8d479096baa755185546624fffdd9c843da9c4fdbf17f213cdba599c08e"; }; + dependencies = []; + }; - - quickrun = buildVimPlugin { - name = "quickrun-git-2015-05-02"; + thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "thumbnail-vim-2015-03-15"; src = fetchgit { - url = "https://github.com/thinca/vim-quickrun"; - rev = "b40cdc36c3600fd096323d3e08c3bbd5d55ec8a8"; - sha256 = "32e5870ff9bb7ae3fdd2c279c6580935c0f3cd9b306ce34a9e14b227d59e193b"; - }; - meta = { - homepage = https://github.com/thinca/vim-quickrun; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/itchyny/thumbnail.vim"; + rev = "19bd717307a8d0986a4a77116f47168fbe11e178"; + sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882"; }; + dependencies = []; + }; - - racer = buildVimPlugin { - name = "racer-git-2015-05-04"; + vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ipython-2015-05-30"; src = fetchgit { - url = "https://github.com/phildawes/racer"; - rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c"; - sha256 = "938516aef0674053886fcf032faa5ae87d14e4412c77aadd981dbe145a01ae51"; + url = "git://github.com/ivanov/vim-ipython"; + rev = "5876b483902313143adc2dcdfd8de94036e191a6"; + sha256 = "6c0f3011dca269d8c862abb5477bcdbe3ec2fbe4fc6cebeb38e7f0816cedaae5"; }; + dependencies = []; + + }; + + vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hier-2011-08-27"; + src = fetchgit { + url = "git://github.com/jceb/vim-hier"; + rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; + sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785"; + }; + dependencies = []; + buildInputs = [ vim ]; + }; + + vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-buffergator-2015-03-31"; + src = fetchgit { + url = "git://github.com/jeetsukumaran/vim-buffergator"; + rev = "77cfdd127fcf026ea2d5e8f5aaf85502286b16b7"; + sha256 = "2d3ce83b5ea7d0502cea3e91bf1e2a0b27a046879c1b5ff1854df47028dd4d48"; + }; + dependencies = []; + + }; + + tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tslime-vim-2015-02-10"; + src = fetchgit { + url = "git://github.com/jgdavey/tslime.vim"; + rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; + sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; + }; + dependencies = []; + + }; + + vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-nerdtree-tabs-2014-09-25"; + src = fetchgit { + url = "git://github.com/jistr/vim-nerdtree-tabs"; + rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7"; + sha256 = "ac4bfc3ae18e8a62ef8e20d0dd0a0f7c172d0ebd5fed58c533ccccec3ae7bdc2"; + }; + dependencies = []; + + }; + + vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-golang-2014-08-06"; + src = fetchgit { + url = "git://github.com/jnwhiteh/vim-golang"; + rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; + sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; + }; + dependencies = []; + + }; + + vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-xdebug-2012-08-15"; + src = fetchgit { + url = "git://github.com/joonty/vim-xdebug"; + rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; + sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2"; + }; + dependencies = []; + postInstall = false; + }; + + vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-eighties-2015-04-16"; + src = fetchgit { + url = "git://github.com/justincampbell/vim-eighties"; + rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24"; + sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c"; + }; + dependencies = []; + + }; + + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "latex-box-2015-05-16"; + src = fetchgit { + url = "git://github.com/latex-box-team/latex-box"; + rev = "55a88ed55a7631b91321916cf80c47077d478c9c"; + sha256 = "96203a95d919db65574e187b793a7d846463d91fe641349732cc5d9aeb8242ac"; + }; + dependencies = []; + + }; + + vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jinja-2014-06-11"; + src = fetchgit { + url = "git://github.com/lepture/vim-jinja"; + rev = "4412484b410b15caecd71f2e52758b2a90ea124d"; + sha256 = "650c7f23688e8982f30be3f7d45b73d9c1d283f10a6829e518e2583b4a52befc"; + }; + dependencies = []; + + }; + + vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easymotion-2015-04-21"; + src = fetchgit { + url = "git://github.com/lokaltog/vim-easymotion"; + rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f"; + sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54"; + }; + dependencies = []; + + }; + + vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-xkbswitch-2015-05-19"; + src = fetchgit { + url = "git://github.com/lyokha/vim-xkbswitch"; + rev = "0854ac6a810daae4a5c99bcae61613266ce75c26"; + sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655"; + }; + dependencies = []; + buildInputs = [ xkb_switch ]; + }; + + vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-stylish-haskell-2015-05-10"; + src = fetchgit { + url = "git://github.com/nbouscal/vim-stylish-haskell"; + rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; + sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6"; + }; + dependencies = []; + + }; + + shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "shabadou-vim-2014-07-27"; + src = fetchgit { + url = "git://github.com/osyo-manga/shabadou.vim"; + rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; + sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6"; + }; + dependencies = []; + + }; + + vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-watchdogs-2015-04-16"; + src = fetchgit { + url = "git://github.com/osyo-manga/vim-watchdogs"; + rev = "5e3d1db592297f7d4c563900a6d224ff559f533e"; + sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a"; + }; + dependencies = []; + + }; + + racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "racer-2015-06-01"; + src = fetchgit { + url = "git://github.com/phildawes/racer"; + rev = "7425ae5299ed3f89817945fd867403e825070df6"; + sha256 = "0721528de38e179ab887ccb06339dabcc5aa43c564f47fa06a372ace6e9ba457"; + }; + dependencies = []; buildPhase = '' find . -type f -not -name 'racer.vim' -exec rm -rf {} \; rm -rf editors images src ''; - meta = { - homepage = https://github.com/phildawes/racer; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; }; - shabadou = buildVimPlugin { - name = "shabadou-git-2014-07-27"; + neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neocomplete-vim-2015-05-26"; src = fetchgit { - url = "https://github.com/osyo-manga/shabadou.vim.git"; - rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; - sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6"; - }; - meta = { - homepage = https://github.com/osyo-manga/shabadou.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/shougo/neocomplete.vim"; + rev = "0a8a7e8a72a23459c2eda5116fe9b22b0dad7a3e"; + sha256 = "fe75653939e1299b71708a26a9af2ca1e4ac0f1daed8aa98ce46b8bb26c9bd71"; }; + dependencies = []; + }; - stylish-haskell = buildVimPlugin { - name = "stylish-haskell-git-2015-05-10"; + neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neosnippet-snippets-2015-05-28"; src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell"; - rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; - sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6"; - }; - meta = { - homepage = https://github.com/nbouscal/vim-stylish-haskell; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/shougo/neosnippet-snippets"; + rev = "842622af4ce0e559ba64f4b991d0de8b9cade6af"; + sha256 = "5d9a3c2d06edb3146e0dbdbba7d8c411197914bea8192844a3c849987e23a72a"; }; + dependencies = []; + }; - - tabmerge = buildVimPlugin { - name = "tabmerge-git-2010-10-17"; + neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neosnippet-vim-2015-05-12"; src = fetchgit { - url = "https://github.com/vim-scripts/tabmerge.git"; - rev = "074e5f06f26e7108a0570071a0f938a821768c06"; - sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f"; - }; - meta = { - homepage = https://github.com/vim-scripts/tabmerge; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/shougo/neosnippet.vim"; + rev = "e2c830db87e50e8cdb1128f3096664f68cb05cad"; + sha256 = "bc950c1756d3c276dc231563749a9fbe7de0d5595e30428e1408bb530bc61e6f"; }; + dependencies = []; + }; - taglist = buildVimPlugin { - name = "taglist-4.6"; - meta = with stdenv.lib; { - description = "Source code browser plugin"; - homepage = "http://www.vim.org/scripts/script.php?script_id=273"; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; - name = "taglist_46.zip"; - sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; - }; - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; - buildInputs = [ unzip ]; - }; - - thumbnail = buildVimPlugin { - name = "thumbnail-git-2015-03-15"; + vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimproc-vim-2015-05-14"; src = fetchgit { - url = "https://github.com/itchyny/thumbnail.vim.git"; - rev = "19bd717307a8d0986a4a77116f47168fbe11e178"; - sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882"; - }; - meta = { - homepage = https://github.com/itchyny/thumbnail.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - tmux-navigator = buildVimPlugin { - name = "tmux-navigator-git-2015-03-16"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator.git"; - rev = "928a52fbda90ec70b2eb6edaf570654df4521af0"; - sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c"; - }; - meta = { - homepage = https://github.com/christoomey/vim-tmux-navigator; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - - tslime = buildVimPlugin { - name = "tslime-git-2015-02-10"; - src = fetchgit { - url = "https://github.com/jgdavey/tslime.vim.git"; - rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; - sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; - }; - meta = { - homepage = https://github.com/jgdavey/tslime.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - - 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 { - owner = "lepture"; - repo = "vim-jinja"; - rev = "4412484b41"; - sha256="1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335"; - }; - meta = { - homepage = "https://github.com/lepture/vim-jinja"; - maintainers = [ stdenv.lib.maintainers.hbunke ]; - }; - }; - - 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-05-10"; - src = fetchgit { - url = "https://github.com/shougo/vimproc.vim"; - rev = "421827f0971a62ba3d67e2ed158a7d282c5d05bb"; - sha256 = "158d6d3990528730dbf699326cfb402c33ab3322e5d7ab6c95d84b0bd6292aee"; + url = "git://github.com/shougo/vimproc.vim"; + rev = "c286dcbdfca9e0ee1a4cb90f09c3f03638112f5a"; + sha256 = "884753f4f188cee5fb11e4dfb5aaf8b80d4809e637ab91068af1a5787acdcb19"; }; + dependencies = []; buildInputs = [ which ]; buildPhase = '' sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim make -f make_unix.mak ''; - - meta = { - homepage = https://github.com/shougo/vimproc.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; }; - vimshell = buildVimPlugin { - name = "vimshell-git-2015-05-01"; + vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimshell-vim-2015-05-01"; src = fetchgit { - url = "https://github.com/Shougo/vimshell.vim"; + url = "git://github.com/shougo/vimshell.vim"; rev = "4939e10609c434becf6423b2f3876bb9c2be3464"; sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca"; }; - meta = with stdenv.lib; { - description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script"; - homepage = https://github.com/Shougo/vimshell.vim; - repositories.git = https://github.com/Shougo/vimshell.vim.git; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - buildInputs = [ vimproc ]; - preBuild = '' - sed -ie '1 i\ - set runtimepath+=${vimproc}/${rtpPath}/vimproc\ - ' autoload/vimshell.vim - ''; + dependencies = [ "vimproc-vim" ]; }; - vim-wakatime = buildVimPlugin { - name = "vim-wakatime-4.0.1"; - - src = fetchFromGitHub { - sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10"; - rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d"; - repo = "vim-wakatime"; - owner = "wakatime"; - }; - - meta = with stdenv.lib; { - description = "Analytics about your programming"; - homepage = https://wakatime.com; - license = licenses.bsd3; - platforms = with platforms; linux; - maintainers = with maintainers; [ nckx ]; - }; - - buildInputs = [ python ]; - }; - - watchdogs = buildVimPlugin { - name = "watchdogs-git-2015-04-16"; + vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hardtime-2014-10-21"; src = fetchgit { - url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "5e3d1db592297f7d4c563900a6d224ff559f533e"; - sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a"; - }; - meta = { - homepage = https://github.com/osyo-manga/vim-watchdogs; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/takac/vim-hardtime"; + rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf"; + sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd"; }; + dependencies = []; + }; - xdebug = buildVimPlugin { - name = "xdebug-git-2012-08-15"; + vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-quickrun-2015-05-15"; src = fetchgit { - url = "https://github.com/joonty/vim-xdebug.git"; - rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; - sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2"; - }; - postInstall = false; - meta = { - homepage = https://github.com/joonty/vim-xdebug; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/thinca/vim-quickrun"; + rev = "c7800ea3d01209da678708e4d3b5175009551807"; + sha256 = "375668b6fd7cf64a26f752afcdd976f79a9dc12b045eed8afafce6486740f143"; }; + dependencies = []; + }; - xkbswitch = buildVimPlugin { - name = "xkbswitch-git-2015-01-18"; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "hasksyn-2014-09-03"; src = fetchgit { - url = "https://github.com/lyokha/vim-xkbswitch.git"; - rev = "932765d8a45b0c8b994b920505b8f10cc7e8cad0"; - sha256 = "20e1f7196b65d98687a27c8a3f2d0847701890a0818dfcfec13f24a3151b0e73"; - }; - buildInputs = [ xkb_switch ]; - meta = { - homepage = https://github.com/lyokha/vim-xkbswitch; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + url = "git://github.com/travitch/hasksyn"; + rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; + sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931"; }; + dependencies = []; + }; - - YouCompleteMe = buildVimPlugin { - name = "YouCompleteMe-git-2015-05-07"; + vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-haskellconceal-2014-10-28"; src = fetchgit { - url = "https://github.com/Valloric/YouCompleteMe"; - rev = "295769ccfd304246c1fae847416a2a15771f7d98"; - sha256 = "04qcbbxm3qhb2f3awhrwprffm3jh54z4ag6r49aa8xk0l9k8i8sp"; + url = "git://github.com/twinside/vim-haskellconceal"; + rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9"; + sha256 = "1ebf98b170642d342207eb8c16551f9969f884b3be975b8755f1018947053ba8"; }; + dependencies = []; + }; + + youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "youcompleteme-2015-05-29"; + src = fetchgit { + url = "git://github.com/valloric/youcompleteme"; + rev = "c2d962dddb4cc86f771722e9775d2345d31fe8bb"; + sha256 = "2543d42662e99401ac8b4ff938fe5452b6d0215befc155e9b24590533a4bfe06"; + }; + dependencies = []; buildInputs = [ python cmake llvmPackages.clang-unwrapped llvmPackages.llvm @@ -635,275 +716,80 @@ rec { }; }; - - YUNOcommit = buildVimPlugin { - name = "YUNOcommit"; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Colour-Sampler-Pack-2012-11-29"; src = fetchgit { - url = "https://github.com/esneider/YUNOcommit.vim"; - rev = "981082055a73ef076d7e27477874d2303153a448"; - sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56"; - + url = "git://github.com/vim-scripts/Colour-Sampler-Pack"; + rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; + sha256 = "e3dd18f9fd36543e0c87257b7eaa999a82d75cbfa6dce4dfea403fa751c8620f"; }; dependencies = []; - }; - - - ### section II: automatically generated plugin derivations - # Update with vimUtils.vimPlugins.pluginnames2Nix command - - # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations - # which recreates this the following derivations based on ./vim-plugin-names - pluginnames2nix = vimUtils.pluginnames2Nix { - name = "vim-plugin-names-to-nix"; - namefiles = [./vim-plugin-names]; - }; - - # aliasess - tabular = Tabular; - tagbar = Tagbar; - coffee-script = vim-coffee-script; - coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - colors-solarized = Solarized; - colorsamplerpack = Colour_Sampler_Pack; - easy-align = vim-easy-align; - ghc-mod-vim = ghcmod; - gist-vim = Gist; - gundo = Gundo; - hoogle = Hoogle; - latex-live-preview = vim-latex-live-preview; - nerdtree = The_NERD_tree; - signature = vim-signature; - supertab = Supertab; - syntastic = Syntastic; - webapi-vim = WebAPI; - yankring = YankRing; - "sourcemap.vim" = sourcemap; - - - ### The following derivations are generated by nix#ExportPluginsForNix - - "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Colour_Sampler_Pack"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; - name = "ColorSamplerPack.zip"; - sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=625"; - }; - }; - "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-05-06"; + + a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "a-vim-git-2010-11-06"; src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "6130b8ee438ad55572c5de1cb974ef824163a1f4"; - sha256 = "5142abefc6f5eaf5f2cce4f5222782b7d9e1033a3e54db7bca0dcf2bd7575853"; + url = "git://github.com/vim-scripts/a.vim"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240"; }; dependencies = []; }; - "Gundo" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gundo"; - src = fetchhg { - url = "https://bitbucket.org/sjl/gundo.vim"; - rev = "eb9fc8676b89"; - sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp"; - }; - dependencies = []; - }; - "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2013-11-26"; + align = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "align-git-2012-08-07"; src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + url = "git://github.com/vim-scripts/align"; + rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; }; dependencies = []; }; - "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized-2011-05-09"; + + tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabmerge-2010-10-17"; src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + url = "git://github.com/vim-scripts/tabmerge"; + rev = "074e5f06f26e7108a0570071a0f938a821768c06"; + sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f"; }; dependencies = []; }; - "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-02-15"; + + vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-wakatime-2015-05-31"; src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; - sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; + url = "git://github.com/wakatime/vim-wakatime"; + rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d"; + sha256 = "ebd5a651554742727944f4a705ccbe990875d4ed656fc535183474091bcf1f1c"; }; dependencies = []; - + buildInputs = [ python ]; }; - "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-05-09"; + + command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "command-t-2015-04-29"; src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "5dba05af4fb9e69472a994bb1228c6b86a47911a"; - sha256 = "a6f2a77dec55d2bb2abe742e24865d2311c12f030290f31ad9219e4d787a6d3c"; + url = "git://github.com/wincent/command-t"; + rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b"; + sha256 = "21d7ee2bbff3f79ec3c81bcf683acac6528ea89faef8b7dd075cc83662930a50"; }; dependencies = []; - + buildInputs = [ perl ruby ]; + buildPhase = '' + pushd ruby/command-t + ruby extconf.rb + make + popd + ''; }; - "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2013-05-16"; - src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; - }; - dependencies = []; - }; - "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2015-05-10"; - src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "399b75256ac7333d7119d11047f6b3aff8fa2828"; - sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c"; - }; - dependencies = []; - - }; - "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2014-07-08"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; - sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; - }; - dependencies = []; - - }; - "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-05-06"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "a87b1bf3c566c3f80090996a2a2a1201318478a8"; - sha256 = "4422563a44f14aa008b5e7ef8b7df1f7fc1ffdca1323a3cb1c115409e325a87e"; - }; - dependencies = []; - - }; - "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-05-11"; - src = fetchgit { - url = "git://github.com/sirver/ultisnips"; - rev = "188e00f7b87297ea7737f9494d531c7073637332"; - sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c"; - }; - dependencies = []; - - }; - "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2015-01-09"; - src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "7c995f973c54b0d026137615af28059890edb197"; - sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5"; - }; - dependencies = []; - - }; - "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2014-10-27"; - src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "a7789abffe936db56e3152e23733847f94755753"; - sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; - }; - dependencies = []; - - }; - "YankRing" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; - name = "yankring_180.zip"; - sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=1234"; - }; - - - }; - "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2014-11-10"; - src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; - sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d"; - }; - dependencies = []; - - }; - "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-2013-07-29"; - src = fetchgit { - url = "git://github.com/kien/ctrlp.vim"; - rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; - sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; - }; - dependencies = []; - - }; - "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite-2015-01-26"; - src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; - sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714"; - }; - dependencies = []; - - }; - "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-03-31"; - src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c"; - sha256 = "f7e79b5e823639d0b9e2c46c29cdae621b22b3bb0c601dce058083877dad2e13"; - }; - dependencies = []; - - }; - "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-03-17"; - src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb"; - sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899"; - }; - dependencies = []; - - }; - "github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06"; - src = fetchgit { - url = "git://github.com/JagaJaga/vim-addon-vim2nix"; - rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5"; - sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564"; - }; - dependencies = ["vim-addon-manager"]; - - }; - "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit.zip"; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "matchit-zip"; src = fetchurl { url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; name = "matchit.zip"; @@ -915,15 +801,16 @@ rec { url = "http://www.vim.org/scripts/script.php?script_id=39"; }; - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; + unpackPhase = '' + ( + sourceRoot=d + mkdir $sourceRoot; cd $sourceRoot; + unzip $src + ) + ''; }; - "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "pathogen-2014-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; @@ -933,7 +820,8 @@ rec { dependencies = []; }; - "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "quickfixstatus-2011-09-02"; src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; @@ -943,7 +831,8 @@ rec { dependencies = []; }; - "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rainbow_parentheses-2013-03-04"; src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; @@ -953,7 +842,8 @@ rec { dependencies = []; }; - "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rust-2015-01-29"; src = fetchgit { url = "git://github.com/wting/rust.vim"; @@ -963,7 +853,8 @@ rec { dependencies = []; }; - "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sensible-2015-04-04"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; @@ -973,7 +864,8 @@ rec { dependencies = []; }; - "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "snipmate-2015-04-04"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; @@ -983,7 +875,8 @@ rec { dependencies = ["vim-addon-mw-utils" "tlib"]; }; - "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sourcemap-2012-09-19"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; @@ -993,7 +886,8 @@ rec { dependencies = []; }; - "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "surround-2015-03-15"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; @@ -1003,7 +897,8 @@ rec { dependencies = []; }; - "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "table-mode-2015-04-21"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; @@ -1013,17 +908,40 @@ rec { dependencies = []; }; - "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-05-04"; + + taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "taglist"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; + name = "taglist_46.zip"; + sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=273"; + }; + + setSourceRoot = '' + export sourceRoot=taglist + mkdir taglist + mv doc taglist + mv plugin taglist + ''; + }; + + tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tlib-2015-05-20"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652"; - sha256 = "5d3d5f066b23be90c3c4de54967056378fff931594154c4e5541a3bcd424b795"; + rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7"; + sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971"; }; dependencies = []; }; - "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "undotree-2015-03-01"; src = fetchgit { url = "git://github.com/mbbill/undotree"; @@ -1033,7 +951,8 @@ rec { dependencies = []; }; - "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-actions-2014-09-22"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; @@ -1043,7 +962,8 @@ rec { dependencies = ["vim-addon-mw-utils" "tlib"]; }; - "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-async-2013-10-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; @@ -1053,7 +973,8 @@ rec { dependencies = ["vim-addon-signs"]; }; - "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-background-cmd-2015-01-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; @@ -1063,7 +984,8 @@ rec { dependencies = ["vim-addon-mw-utils"]; }; - "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-commenting-2013-06-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; @@ -1073,7 +995,8 @@ rec { dependencies = []; }; - "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-completion-2015-02-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; @@ -1083,7 +1006,8 @@ rec { dependencies = ["tlib"]; }; - "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; @@ -1093,7 +1017,8 @@ rec { dependencies = []; }; - "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; @@ -1103,7 +1028,8 @@ rec { dependencies = ["tlib"]; }; - "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; @@ -1113,7 +1039,8 @@ rec { dependencies = []; }; - "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-manager-2014-12-03"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; @@ -1123,7 +1050,8 @@ rec { dependencies = []; }; - "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-mru-2013-08-08"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; @@ -1133,7 +1061,8 @@ rec { dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; }; - "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-mw-utils-2012-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; @@ -1143,7 +1072,8 @@ rec { dependencies = []; }; - "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-nix-2015-03-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; @@ -1153,7 +1083,8 @@ rec { dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; - "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-other-2014-07-15"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; @@ -1163,7 +1094,8 @@ rec { dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; - "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; @@ -1173,7 +1105,8 @@ rec { dependencies = []; }; - "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-signs-2013-04-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; @@ -1183,7 +1116,8 @@ rec { dependencies = []; }; - "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-sql-2014-01-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; @@ -1193,7 +1127,8 @@ rec { dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; - "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-syntax-checker-2013-07-12"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; @@ -1203,7 +1138,8 @@ rec { dependencies = ["vim-addon-mw-utils" "tlib"]; }; - "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; @@ -1213,7 +1149,8 @@ rec { dependencies = ["vim-addon-mw-utils" "tlib"]; }; - "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; @@ -1223,17 +1160,19 @@ rec { dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; - "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2015-03-24"; + + vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline-2015-05-25"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3"; - sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012"; + rev = "67de5f2257f8d5def7a31e3009d4298ce977cb80"; + sha256 = "0ca13f68b22ce3112117d7194f3d6b4e1280f032bc7bbca6fba4df185ff1da2a"; }; dependencies = []; }; - "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-coffee-script-2015-04-20"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; @@ -1243,7 +1182,8 @@ rec { dependencies = []; }; - "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-easy-align-2014-12-14"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; @@ -1253,7 +1193,8 @@ rec { dependencies = []; }; - "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gista-2015-01-29"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; @@ -1263,7 +1204,8 @@ rec { dependencies = []; }; - "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gitgutter-2015-05-08"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; @@ -1273,7 +1215,8 @@ rec { dependencies = []; }; - "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; @@ -1283,37 +1226,41 @@ rec { dependencies = []; }; - "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2013-11-25"; + + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-latex-live-preview-2015-05-11"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; - sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + rev = "7695dd4ebddb735bec632d468e2202d070029cb8"; + sha256 = "3551e2a84a98b07f5edce6e35bad5cd2a78da1ef60dd94202c623e238b05bfc8"; }; dependencies = []; }; - "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2015-04-24"; + + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signature-2015-05-19"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "7586613e5dcfd2f09d32197aa5a10ed025da21f4"; - sha256 = "0bce1c37adc06a386438e13c6e3e0af5829a13e4e65fbd703234680bc3d769fc"; + rev = "7ab61e2a5101ec139a54735b432a6e95a22770d8"; + sha256 = "041b906cd27bcb922732e324b671adbf6ea0106105230ea43111ca9f844b64c3"; }; dependencies = []; }; - "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-05-05"; + + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snippets-2015-05-31"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03"; - sha256 = "fb6a7a2fa0939a64f8bac4411dfa36dc5a6e1385e5016978045614039ab89720"; + rev = "0e9eff1bf36728b6423171f962a8d6e5de7a4621"; + sha256 = "0d2342a184806ba9357871ef77229a29854a665fd4e75674638136d2054c0551"; }; dependencies = []; }; - "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim2hs-2014-04-16"; src = fetchgit { url = "git://github.com/dag/vim2hs"; @@ -1323,7 +1270,8 @@ rec { dependencies = []; }; - "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vundle-2015-03-21"; src = fetchgit { url = "git://github.com/gmarik/vundle"; @@ -1333,7 +1281,8 @@ rec { dependencies = []; }; - "wombat256" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + + wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "wombat256"; src = fetchurl { url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; @@ -1348,6 +1297,4 @@ rec { }; - - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 39f6aa18904..c095237bc9a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,57 +1,98 @@ -"vim-addon-syntax-checker" -"vim-addon-other" -"vim-addon-local-vimrc" -"snipmate" -"vim-snippets" -"vim-addon-mru" -"vim-addon-commenting" -"vim-addon-sql" -"vim-addon-async" -"vim-addon-toggle-buffer" -"vim-addon-mw-utils" -"matchit.zip" -"vim-addon-xdebug" -"vim-addon-php-manual" -"sourcemap" -"vim-iced-coffee-script" -"ctrlp" -"commentary" -"Colour_Sampler_Pack" +"Gist" +"Gundo" +"Hoogle" "Solarized" -"vim-coffee-script" -"vim-easy-align" -"Tagbar" -"Tabular" -"table-mode" -"Syntastic" -"vim-signature" -"surround" "Supertab" -"rust" -"rainbow_parentheses" -"pathogen" -"quickfixstatus" +"Syntastic" +"Tabular" +"Tagbar" "The_NERD_Commenter" "The_NERD_tree" -"vim-latex-live-preview" -"Hoogle" -"Gundo" -"vim-gitgutter" -"Gist" -"ghcmod" -"fugitive" -"extradite" -"vim-airline" -"VimOutliner" -"vim2hs" -"undotree" "UltiSnips" -"wombat256" -"vundle" +"VimOutliner" "WebAPI" "YankRing" -"vim-addon-manager" -"vim-addon-nix" -"vim-gista" +"commentary" +"ctrlp" +"extradite" +"fugitive" +"ghcmod" "github:JagaJaga/vim-addon-vim2nix" +"github:bitc/lushtags" +"github:bitc/vim-hdevtools" +"github:christoomey/vim-tmux-navigator" +"github:eagletmt/neco-ghc" +"github:esneider/YUNOcommit.vim" +"github:idris-hackers/idris-vim" +"github:itchyny/calendar.vim" +"github:itchyny/thumbnail.vim" +"github:ivanov/vim-ipython" +"github:jceb/vim-hier" +"github:jeetsukumaran/vim-buffergator" +"github:jgdavey/tslime.vim" +"github:jistr/vim-nerdtree-tabs" +"github:jnwhiteh/vim-golang" +"github:joonty/vim-xdebug" +"github:justincampbell/vim-eighties" +"github:latex-box-team/latex-box" +"github:lepture/vim-jinja" +"github:lokaltog/vim-easymotion" +"github:lyokha/vim-xkbswitch" +"github:nbouscal/vim-stylish-haskell" +"github:osyo-manga/shabadou.vim" +"github:osyo-manga/vim-watchdogs" +"github:phildawes/racer" +"github:shougo/neocomplete.vim" +"github:shougo/neosnippet-snippets" +"github:shougo/neosnippet.vim" +"github:shougo/vimproc.vim" +"github:shougo/vimshell.vim" +"github:takac/vim-hardtime" +"github:thinca/vim-quickrun" +"github:travitch/hasksyn" +"github:twinside/vim-haskellconceal" +"github:valloric/youcompleteme" +"github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/a.vim" +"github:vim-scripts/align" +"github:vim-scripts/tabmerge" +"github:wakatime/vim-wakatime" +"github:wincent/command-t" +"matchit.zip" +"pathogen" +"quickfixstatus" +"rainbow_parentheses" +"rust" "sensible" +"snipmate" +"sourcemap" +"surround" +"table-mode" +"taglist" +"undotree" +"vim-addon-async" +"vim-addon-commenting" +"vim-addon-completion" +"vim-addon-local-vimrc" +"vim-addon-manager" +"vim-addon-mru" +"vim-addon-mw-utils" +"vim-addon-nix" +"vim-addon-other" +"vim-addon-php-manual" +"vim-addon-sql" +"vim-addon-syntax-checker" +"vim-addon-toggle-buffer" +"vim-addon-xdebug" +"vim-airline" +"vim-coffee-script" +"vim-easy-align" +"vim-gista" +"vim-gitgutter" +"vim-iced-coffee-script" +"vim-latex-live-preview" +"vim-signature" +"vim-snippets" +"vim2hs" +"vundle" +"wombat256" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 9140acffe0d..ec1724a9f9a 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -102,7 +102,7 @@ Then create a temp vim file and insert: Then ":source %" it. -nix#ExportPluginsForNix is provided by github.com/MarcWeber/vim-addon-vim2nix +nix#ExportPluginsForNix is provided by github.com/JagaJaga/vim-addon-vim2nix A buffer will open containing the plugin derivation lines as well list fitting the vimrcConfig.vam.pluginDictionaries option. @@ -296,7 +296,7 @@ rec { pluginnames2Nix = {name, namefiles} : vim_configurable.customize { inherit name; vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["github:JagaJaga/vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream + vimrcConfig.vam.pluginDictionaries = ["vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream vimrcConfig.customRC = '' " Yes - this is impure and will create the cache file and checkout vim-pi " into ~/.vim/vim-addons From 23bc70208c840a93f1bb67502f5e1f9910c8d7ae Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 29 May 2015 18:56:17 -0700 Subject: [PATCH 049/208] Prometheus: update to 0.14.0 --- .../servers/monitoring/prometheus/default.nix | 97 +++++++++---------- pkgs/top-level/go-packages.nix | 36 ++++++- 2 files changed, 78 insertions(+), 55 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 8180d24aa9e..4b8d1cdbe56 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,58 +1,55 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: +{ stdenv, lib, goPackages, fetchFromGitHub, vim }: goPackages.buildGoPackage rec { - name = "prometheus-${version}"; - version = "0.13.4"; - goPackagePath = "github.com/prometheus/prometheus"; - rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0"; + name = "prometheus-${version}"; + version = "0.14.0"; + goPackagePath = "github.com/prometheus/prometheus"; + rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430"; - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "prometheus"; - sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j"; - }; + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9"; + }; - buildInputs = [ - goPackages.dns - goPackages.glog - goPackages.protobuf - goPackages.goleveldb - goPackages.net - goPackages.prometheus.client_golang - protobuf # the non-golang package, for protoc - vim # for xxd, used in embed-static.sh - ]; + buildInputs = [ + goPackages.consul + goPackages.dns + goPackages.fsnotify.v1 + goPackages.goleveldb + goPackages.logrus + goPackages.net + goPackages.prometheus.client_golang + goPackages.prometheus.log + goPackages.yaml-v2 + vim # for xxd, used in embed-static.sh + ]; - # Metadata that gets embedded into the binary - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${version} - -X main.buildRevision ${builtins.substring 0 6 rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; + # Metadata that gets embedded into the binary + buildFlagsArray = '' + -ldflags= + -X main.buildVersion ${version} + -X main.buildRevision ${builtins.substring 0 6 rev} + -X main.buildBranch master + -X main.buildUser nix@nixpkgs + -X main.buildDate 20150101-00:00:00 + -X main.goVersion ${lib.getVersion goPackages.go} + ''; - preBuild = '' - ( - cd "go/src/$goPackagePath" - protoc --proto_path=./config \ - --go_out=./config/generated/ \ - ./config/config.proto + preBuild = '' + ( + cd "go/src/$goPackagePath/web" + ${stdenv.shell} ../utility/embed-static.sh static templates \ + | gofmt > blob/files.go + ) + ''; - cd web - ${stdenv.shell} ../utility/embed-static.sh static templates \ - | gofmt > blob/files.go - ) - ''; - - meta = with lib; { - description = "Service monitoring system and time series database"; - homepage = http://prometheus.github.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = http://prometheus.io; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 9af04081000..1181d8e2b60 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1991,6 +1991,19 @@ let buildInputs = [ protobuf ]; }; + prometheus.log = buildGoPackage rec { + name = "prometheus-log-${version}"; + version = "git-2015-05-29"; + goPackagePath = "github.com/prometheus/log"; + src = fetchFromGitHub { + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + owner = "prometheus"; + repo = "log"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + propagatedBuildInputs = [ logrus ]; + }; + prometheus.procfs = buildGoPackage rec { rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2413,16 +2426,29 @@ let }; yaml-v1 = buildGoPackage rec { - rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; - name = "yaml-v1-${stdenv.lib.strings.substring 0 7 rev}"; + name = "yaml-v1-${version}"; + version = "git-2015-05-01"; goPackagePath = "gopkg.in/yaml.v1"; - src = fetchgit { - inherit rev; - url = "https://github.com/go-yaml/yaml.git"; + src = fetchFromGitHub { + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + owner = "go-yaml"; + repo = "yaml"; sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; }; }; + yaml-v2 = buildGoPackage rec { + name = "yaml-v2-${version}"; + version = "git-2015-05-19"; + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchFromGitHub { + rev = "c1cd2254a6dd314c9d73c338c12688c9325d85c6"; + owner = "go-yaml"; + repo = "yaml"; + sha256 = "0xhv0i700hh8lczrwxhn3c99npqma7k4337qrh6k36falm0jpp4s"; + }; + }; + yamux = buildGoPackage rec { rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d"; name = "yamux-${stdenv.lib.strings.substring 0 7 rev}"; From 3309a15be9d28a546184f1ffdc81bde2b6e2d8fd Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 1 Jun 2015 12:28:21 -0700 Subject: [PATCH 050/208] New package: prometheus-nginx-exporter Adding to the growing collection of prometheus tools... --- .../prometheus/nginx_exporter/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 13 +++++++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix new file mode 100644 index 00000000000..b45b2784042 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix @@ -0,0 +1,27 @@ +{ lib, goPackages, fetchFromGitHub }: + +goPackages.buildGoPackage rec { + name = "prometheus-nginx-exporter-${version}"; + version = "git-2015-06-01"; + goPackagePath = "github.com/discordianfish/nginx_exporter"; + + src = fetchFromGitHub { + owner = "discordianfish"; + repo = "nginx_exporter"; + rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + }; + + buildInputs = [ + goPackages.prometheus.client_golang + goPackages.prometheus.log + ]; + + meta = with lib; { + description = "Metrics relay from nginx stats to Prometheus"; + homepage = https://github.com/discordianfish/nginx_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c28a6c98c7..b62f3be98cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8939,6 +8939,8 @@ let callPackage ../servers/monitoring/prometheus/mesos_exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; + prometheus-nginx-exporter = + callPackage ../servers/monitoring/prometheus/nginx_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 9af04081000..2df0439e4e2 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1991,6 +1991,19 @@ let buildInputs = [ protobuf ]; }; + prometheus.log = buildGoPackage rec { + name = "prometheus-log-${version}"; + version = "git-2015-05-29"; + goPackagePath = "github.com/prometheus/log"; + src = fetchFromGitHub { + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + owner = "prometheus"; + repo = "log"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + propagatedBuildInputs = [ logrus ]; + }; + prometheus.procfs = buildGoPackage rec { rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; From 7cd8874aedaf3a6fb8f35a08213ec9d585e190b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2015 01:37:49 +0200 Subject: [PATCH 051/208] geolite-legacy -> 2015-06-02 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 69baf7bda45..08cf3b545b7 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-05-20"; + version = "2015-06-02"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "09vv3jg6gnz2k30pkwgcakvfvklfrkwsj0xq5q2awcw6ik0vkfcm"; + "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" - "1qdprh1idxa1l4s23lcjg33hi4i8qzlk4fjril2zcd3prff1xkz2"; + "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs"; meta = with stdenv.lib; { inherit version; From 7db1aa06a53b9e65d5f9d453b43029b0e50faf29 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2015 01:44:39 +0200 Subject: [PATCH 052/208] nxproxy & libxcomp: use lite instead of full nx-libs --- pkgs/development/libraries/libxcomp/default.nix | 4 ++-- pkgs/tools/admin/nxproxy/default.nix | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 84dbb0c156f..3a7ca70a85f 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { name = "libxcomp-${version}"; src = fetchurl { - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; - sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; + sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd"; + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 151cd68fdbc..6da78f60630 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { name = "nxproxy-${version}"; src = fetchurl { - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; - sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11"; + sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd"; + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; meta = with stdenv.lib; { @@ -24,4 +24,6 @@ stdenv.mkDerivation { ''; makeFlags = [ "exec_prefix=$(out)" ]; + + enableParallelBuilding = true; } From 58f6da5cc6b96b65c3211fa5a1ab6eb6fc7d1305 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 2 Jun 2015 06:06:02 +0000 Subject: [PATCH 053/208] mwlib may use imagemagick (convert) --- nixos/modules/services/misc/mwlib.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index fb4a24253df..fb349fbeab5 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -226,6 +226,7 @@ in chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' ''; + path = with pkgs; [ imagemagick ]; environment = { PYTHONPATH = concatMapStringsSep ":" (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") From 95c6b835cb064cfdbf06bcfed7341e54e6cd31ee Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 2 Jun 2015 06:14:34 +0000 Subject: [PATCH 054/208] mwlib may use pyfribidi --- nixos/modules/services/misc/mwlib.nix | 2 +- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index fb349fbeab5..d02e1e021a7 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -230,7 +230,7 @@ in environment = { PYTHONPATH = concatMapStringsSep ":" (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") - [ "mwlib-rl" "mwlib-ext" "pygments" ]; + [ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ]; }; serviceConfig = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9a1eaf32ed..1f389a2833f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4991,6 +4991,22 @@ let }; }); + pyfribidi = buildPythonPackage rec { + version = "0.11.0"; + name = "pyfribidi-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; + md5 = "a3fc1f9d34571305782d1a54ee36f904"; + }; + + meta = { + description = "simple wrapper around fribidi."; + homepage = "https://github.com/pediapress/pyfribidi"; + license = stdenv.lib.licenses.gpl2; + }; + }; + docker_compose = buildPythonPackage rec { name = "docker-compose-1.2.0rc2"; disabled = isPy3k || isPyPy; From 32757ef18492132200db5424c8dde0ad34e0b685 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 May 2015 22:38:32 +0200 Subject: [PATCH 055/208] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/bfbb2bc96c267aaee41230c7c5bc7a974abd7dcb with hackage2nix revision d0ef14cd08973bdb61a29700ef07b1149c86b7a3 --- .../haskell-modules/hackage-packages.nix | 690 +++++++++++------- 1 file changed, 431 insertions(+), 259 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1eb15af14ee..934fc10fc06 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -808,10 +808,10 @@ self: { ({ mkDerivation, base, mtl, multirec, parsec }: mkDerivation { pname = "Annotations"; - version = "0.2"; - sha256 = "0i6qicmvz1jryv4zkdcpclfwxg20yvwgx6vhf46mxjzs3kw1a6z3"; + version = "0.2.1"; + sha256 = "1iqcg47rklibps6xjs7zw76npycpa1jj3x68zz75np3r0fnwiqhj"; buildDepends = [ base mtl multirec parsec ]; - jailbreak = true; + testDepends = [ base mtl multirec parsec ]; description = "Constructing, analyzing and destructing annotated trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1537,8 +1537,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8"; - sha256 = "0sii2m3ha5z5di1flswd6c0xih652y73xdrzi3m662vhm9q94slv"; + version = "0.8.1"; + sha256 = "01k71scq4p7iw52m47f24xj21w0dsibhp4kyyl62g69h3iciyhm0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -1554,21 +1554,19 @@ self: { "BlogLiterately-diagrams" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder - , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe + , diagrams-lib, diagrams-rasterific, directory, filepath + , JuicyPixels, pandoc, safe }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.1.4.3"; - revision = "1"; - sha256 = "0p65nyslcvf4qzgrwsi59xil8i5sgh1xfyz431lf4f00nsqb0s2h"; - editedCabalFile = "a9b96a72609bba1d29f628c22171dfb4e49e4c2ed7a8b3f5c2caf1127dff403d"; + version = "0.2"; + sha256 = "12idyzr560m921f4d83m3x2y2gcx9g8dvjbdh8rfjbsc7hqi60rb"; isLibrary = true; isExecutable = true; buildDepends = [ - base BlogLiterately containers diagrams-builder diagrams-cairo - diagrams-lib directory filepath pandoc safe + base BlogLiterately containers diagrams-builder diagrams-lib + diagrams-rasterific directory filepath JuicyPixels pandoc safe ]; - jailbreak = true; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1616,6 +1614,7 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -1997,6 +1996,7 @@ self: { array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb ]; + jailbreak = true; description = "An interpreter for CSPM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2035,6 +2035,7 @@ self: { CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty prettyclass syb transformers xml ]; + jailbreak = true; description = "cspm command line tool for analyzing CSPM specifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2396,6 +2397,7 @@ self: { sha256 = "0z844mxvkhg114wvbs8z3cvhmhsrzx344yj7yh4fzfm4fcx5j3k9"; buildDepends = [ base containers mtl QuickCheck random syb ]; testDepends = [ array base containers mtl QuickCheck random syb ]; + jailbreak = true; description = "For testing partial and infinite values"; license = stdenv.lib.licenses.mit; }) {}; @@ -5708,12 +5710,12 @@ self: { }) {}; "GroteTrap" = callPackage - ({ mkDerivation, base, mtl, parsec, QuickCheck }: + ({ mkDerivation, base, mtl, parsec, QuickCheck, syb }: mkDerivation { pname = "GroteTrap"; - version = "0.5"; - sha256 = "1a43iig84bvmgpjmk6lqzhm3fq5p5hac36icwj4yfyrvzyfn0x7m"; - buildDepends = [ base mtl parsec QuickCheck ]; + version = "0.5.1"; + sha256 = "131i63paaapdbdnqvmacsfqbg1719xlbx8phjchw6zlh9njn727k"; + buildDepends = [ base mtl parsec QuickCheck syb ]; jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GroteTrap"; description = "Parser and selection library for expression languages"; @@ -11847,8 +11849,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.3"; - sha256 = "17zn4sqyfl48fp25wicp5vd518wn26g5qn071zhb989imiqbnvmq"; + version = "0.5.0.4"; + sha256 = "05pipj20bx9is5snwf5nhavrs8873br4xvs3b1ggrvxgvaf8qhqw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16569,6 +16571,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "acme-all-monad" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "acme-all-monad"; + version = "0.1.0.0"; + sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv"; + buildDepends = [ base transformers ]; + jailbreak = true; + description = "A monad which is powerful enough to interpret any action"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-cadre" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17461,8 +17475,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.5"; - sha256 = "04hnllvvgpd941bgjymd0spqv31rww1khaidbvdnrqa3i9gpmvjp"; + version = "0.3.0.6"; + sha256 = "0q1ml5q99lwqgppih9zq24nx01z6idcflz30pvl6bljv0xr52wp2"; buildDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -17474,7 +17488,6 @@ self: { template-haskell temporary test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; @@ -18103,6 +18116,7 @@ self: { version = "0.6"; sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61"; buildDepends = [ base syb template-haskell ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; @@ -21319,6 +21333,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "atom-basic" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, network + , network-uri, old-locale, text, time + }: + mkDerivation { + pname = "atom-basic"; + version = "0.0.1.1"; + sha256 = "0i39rnrfpq4k2p107grhhv0rka8qpd9bb7pvhrbks1m2dxb6pq2v"; + buildDepends = [ + base base64-bytestring bytestring network network-uri old-locale + text time + ]; + description = "Basic Atom feed construction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atom-msp430" = callPackage ({ mkDerivation, atom, base, mtl }: mkDerivation { @@ -24011,15 +24042,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary_0_7_4_0" = callPackage + "binary_0_7_5_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HUnit, QuickCheck, random, test-framework , test-framework-quickcheck2 }: mkDerivation { pname = "binary"; - version = "0.7.4.0"; - sha256 = "0zpyg1m5ihpdlglddnprxhx3pql0h866x5mz4qzfn7ppma6ahccb"; + version = "0.7.5.0"; + sha256 = "06gg61srfva7rvzf4s63c068s838i5jf33d6cnjb9769gjmca2a7"; buildDepends = [ array base bytestring containers ]; testDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -29727,8 +29758,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.4.0.1"; - sha256 = "05mpw0dgn5f9gwnk7jkkm5k6fsfhi70i3fr96b6jca7w1b151hn9"; + version = "0.5.0.1"; + sha256 = "1zdjsd6dqkcpnm8w6macn0v5y48nycc4g2i4rz3gg57v1hlyqrh6"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; @@ -34242,20 +34273,20 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, errors, http-client, http-client-tls - , http-types, monad-control, mtl, network-uri, optparse-applicative - , process, profunctors, text, tls, transformers - , unordered-containers, wai, warp, warp-tls, x509, x509-system - , x509-validation, yaml + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, text, tls + , transformers, unordered-containers, wai, warp, warp-tls, x509 + , x509-system, x509-validation, yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.2.12"; - sha256 = "1cpdy3aizdba55mmq903s9p6az3zkkxm3h7jq0iz9s38r3srxij7"; + version = "0.2.13"; + sha256 = "0rhr5c91bk853zlgld2im0sm0pcss0q6g82c92p85vwkdgrgxlz2"; buildDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions errors + data-default deepseq directory dlist enclosed-exceptions filepath http-client http-client-tls http-types monad-control mtl network-uri optparse-applicative process profunctors text tls transformers unordered-containers x509 x509-system x509-validation @@ -34263,8 +34294,8 @@ self: { ]; testDepends = [ base base-unicode-symbols bytestring Cabal enclosed-exceptions - errors http-types monad-control mtl text unordered-containers wai - warp warp-tls yaml + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml ]; homepage = "https://github.com/alephcloud/hs-configuration-tools"; description = "Tools for specifying and parsing configurations"; @@ -36672,8 +36703,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.1"; - sha256 = "10rcz9547igjpg908cbgk5aws011g861ywprgf3x5yspml1nc6z5"; + version = "0.2"; + sha256 = "11mhfw3qpm71nq6wclj3g9vv66n6fhrvlmdr9byd08imxqlxb8kx"; buildDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -37918,26 +37949,24 @@ self: { }) {}; "dash-haskell" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, direct-sqlite - , directory, either, ghc, haddock-api, mtl, optparse-applicative - , parsec, pipes, process, sqlite-simple, system-fileio - , system-filepath, tagsoup, text, transformers + ({ mkDerivation, base, Cabal, containers, direct-sqlite, directory + , either, filepath, ghc, haddock-api, optparse-applicative, parsec + , pipes, sqlite-simple, tagsoup, text, transformers }: mkDerivation { pname = "dash-haskell"; - version = "1.0.0.5"; - sha256 = "1asfcifmvyrkw0nfb7g7djwzqlgw7l021a5q9i66wj598fgxqn1j"; + version = "1.1.0.1"; + sha256 = "1m82zpr37jdqr06ynqz4bbnvy1s81756frcgfiyk4wvlmmcl2fyk"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal containers direct-sqlite directory either ghc - haddock-api mtl optparse-applicative parsec pipes process - sqlite-simple system-fileio system-filepath tagsoup text - transformers + base Cabal containers direct-sqlite directory either filepath ghc + haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup + text transformers ]; jailbreak = true; homepage = "http://www.github.com/jfeltz/dash-haskell"; - description = "Command line tool to generate Dash docsets (IDE docs) from package haddock"; + description = "Convert package Haddock to Dash docsets (IDE docs)"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -38491,8 +38520,8 @@ self: { }: mkDerivation { pname = "data-lens"; - version = "2.10.5"; - sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90"; + version = "2.10.6"; + sha256 = "0pnn84m6xvqvxmqpddsi4db1w65788yrwdkpfm9z1vkkajqixaxj"; buildDepends = [ base comonad containers semigroupoids transformers ]; @@ -40716,20 +40745,20 @@ self: { }) {}; "diagrams-builder" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, diagrams-cairo - , diagrams-lib, diagrams-postscript, diagrams-rasterific - , diagrams-svg, directory, exceptions, filepath, hashable - , haskell-src-exts, hint, JuicyPixels, lens, lucid-svg, mtl, split - , transformers + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers }: mkDerivation { pname = "diagrams-builder"; - version = "0.7.0.2"; - sha256 = "0gkfnanrim060f1g4brp6qxdiq81fni1kml7n9x79pfqdmfhlhgq"; + version = "0.7.0.4"; + sha256 = "1nxb6fpcjkcwyihhd0dj9zs72flhhg4g9g7r2xlbdi5l7j3kpkjg"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cmdargs diagrams-cairo diagrams-lib + base base-orphans bytestring cmdargs diagrams-cairo diagrams-lib diagrams-postscript diagrams-rasterific diagrams-svg directory exceptions filepath hashable haskell-src-exts hint JuicyPixels lens lucid-svg mtl split transformers @@ -41033,8 +41062,8 @@ self: { ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: mkDerivation { pname = "diagrams-rubiks-cube"; - version = "0.1.1.0"; - sha256 = "0fgyl0skn8z4d9kycdlmmd876v7yd2h3fyx1jqgmx4ygk0cch9z3"; + version = "0.2.0.0"; + sha256 = "1rymsiqwnd37mly5dlq5hkmy5vxvyvzwkn2rm2gwmxy3amk5g4db"; buildDepends = [ base data-default-class diagrams-lib lens ]; homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; @@ -42725,7 +42754,9 @@ self: { mkDerivation { pname = "doctest"; version = "0.9.13"; + revision = "1"; sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00"; + editedCabalFile = "592ab6d62eca8a0b43930f15c8fb653c54d60983bd232ecc505bd5a5aebe6f7f"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -43354,17 +43385,16 @@ self: { }: mkDerivation { pname = "dsh-sql"; - version = "0.2.0.0"; - sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2"; + version = "0.2.0.1"; + sha256 = "0vr9wsad74735py2i2kqwqi4phf49ksw3d4w89jlcgi6xpsc02s1"; + isLibrary = true; + isExecutable = true; buildDepends = [ aeson algebra-dag algebra-sql base bytestring bytestring-lexing - containers Decimal DSH either HDBC HDBC-odbc mtl process random - semigroups set-monad template-haskell text vector - ]; - testDepends = [ - base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc - HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text vector + containers Decimal DSH either HDBC HDBC-odbc HUnit mtl process + QuickCheck random semigroups set-monad template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + vector ]; description = "SQL backend for Database Supported Haskell (DSH)"; license = stdenv.lib.licenses.bsd3; @@ -43902,6 +43932,7 @@ self: { homepage = "https://github.com/emc2/dynamic-pp"; description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-state" = callPackage @@ -45001,8 +45032,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "0.1.1.1"; - sha256 = "1qb61m0jd4c63x8av5v3iaxw1k4isi2yzrqjw0xznkf8m07hz4vb"; + version = "0.1.2.0"; + sha256 = "0s80x6r2h5cwng6x15xmwgpnjv0qgp360g11g2k3hsc5y8fvgmkd"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -46133,14 +46164,13 @@ self: { }: mkDerivation { pname = "ersatz-toysat"; - version = "0.2.0.0"; - sha256 = "0r7a8dcfpsjicndwlcgv1bc7jjjd8b2g9fds95y2cszprqkhjjh3"; + version = "0.2.1.0"; + sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers ersatz toysolver transformers ]; - jailbreak = true; homepage = "https://github.com/msakai/ersatz-toysat"; description = "toysat driver as backend for ersatz"; license = stdenv.lib.licenses.bsd3; @@ -47093,15 +47123,16 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, constraints, profunctors, tagged - , template-haskell, transformers + ({ mkDerivation, base, constraints, monad-skeleton, profunctors + , tagged, template-haskell, transformers }: mkDerivation { pname = "extensible"; - version = "0.3.4"; - sha256 = "09bcynchvfjk0kp5r4609giyissppi08llv33m5j1d9qda6mxhxi"; + version = "0.3.5"; + sha256 = "0jff7vrmhj5sdd3migfi5p2bx35m6jbqlfai7rqpg0iqbxbp6pmy"; buildDepends = [ - base constraints profunctors tagged template-haskell transformers + base constraints monad-skeleton profunctors tagged template-haskell + transformers ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; @@ -47401,13 +47432,10 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck }: mkDerivation { pname = "farmhash"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; - editedCabalFile = "cd08b430fb52fb06590611fdcc555d9056c2d982e8f3c7d6be7b17b0c4b19865"; + version = "0.1.0.3"; + sha256 = "0zqyp55grrkl4x4bhn13ng635zpsnd7g6vj2dqmvn3dg4zhyigf6"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/abhinav/farmhash"; description = "Fast hash functions"; license = stdenv.lib.licenses.bsd3; @@ -47596,8 +47624,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.5"; - sha256 = "07x4v8nq9mg0ydir708mv1bhpg3n5f449vv9ihgpyfdvm4w1bm4r"; + version = "0.23.1.6"; + sha256 = "02c4lxqmgac95nr00qwwxmq5a0lf46fxjiq4nqc3r6giz2m7i9ik"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -47918,8 +47946,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "0.3.9.5"; - sha256 = "1kbi0hb2ywp5qbhjw65p86bj4cxag9ngi5dvjcjd63r673kwicv1"; + version = "0.3.9.7"; + sha256 = "01ssy7a1525cw72igpk1xksyafs7can68gmb81kvlzw8fddl4s0l"; buildDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -48216,8 +48244,8 @@ self: { }: mkDerivation { pname = "fft"; - version = "0.1.8"; - sha256 = "073f0w3hm0zs0gi1s5adhd7z4xj3zq88s1d12mmby5ri3zr927k0"; + version = "0.1.8.1"; + sha256 = "00q1j6swi5y740n5dnbc73aw1nphsgyx7qnv59snqd48fcllhcww"; buildDepends = [ array base carray ix-shapable storable-complex syb ]; @@ -49619,13 +49647,13 @@ self: { }) {}; "fold-debounce" = callPackage - ({ mkDerivation, base, data-default, hspec, stm, time }: + ({ mkDerivation, base, data-default, hspec, stm, stm-delay, time }: mkDerivation { pname = "fold-debounce"; - version = "0.1.0.0"; - sha256 = "1g22npjhjc35n05gyqrfk9cqr3m976cgdav3f8w1f2hbwvnfbxy7"; - buildDepends = [ base data-default stm time ]; - testDepends = [ base hspec stm ]; + version = "0.2.0.0"; + sha256 = "1nq0729wy3v29liwhy5rp706cpspv9jygh0pvxf398ng2plgfjmb"; + buildDepends = [ base data-default stm stm-delay time ]; + testDepends = [ base hspec stm time ]; homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; @@ -53458,6 +53486,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "github-webhook-handler" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptohash, github-types + , text, transformers, uuid, vector + }: + mkDerivation { + pname = "github-webhook-handler"; + version = "0.0.3"; + sha256 = "1dwq1fccgnngh97kxyb3kp4f6xr8dsydlgkydl28lxkbwcapk39h"; + buildDepends = [ + aeson base bytestring cryptohash github-types text transformers + uuid vector + ]; + description = "GitHub WebHook Handler"; + license = stdenv.lib.licenses.mit; + }) {}; + + "github-webhook-handler-snap" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, github-types + , github-webhook-handler, snap-core, uuid + }: + mkDerivation { + pname = "github-webhook-handler-snap"; + version = "0.0.3"; + sha256 = "0v9wman214rj81dfvkgng195s3gsvy5d7csshqwcw9x10giby9iy"; + buildDepends = [ + base bytestring case-insensitive github-types + github-webhook-handler snap-core uuid + ]; + description = "GitHub WebHook Handler implementation for Snap"; + license = stdenv.lib.licenses.mit; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -55379,6 +55439,7 @@ self: { groundhog-sqlite groundhog-th mtl regex-compat syb template-haskell text time transformers ]; + jailbreak = true; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; @@ -58734,6 +58795,7 @@ self: { base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; @@ -58917,8 +58979,8 @@ self: { }: mkDerivation { pname = "happstack-static-routing"; - version = "0.4.0"; - sha256 = "1dpi7nmax447ilagsjdpvnbj6xh27s7bcp69c8y39cs6bmjg42v1"; + version = "0.4.2"; + sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2"; buildDepends = [ base containers happstack-server list-tries transformers ]; @@ -59644,24 +59706,24 @@ self: { }) {}; "haskdeep" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base - , base16-bytestring, bytestring, cereal, conduit, containers + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , cereal, conduit, conduit-combinators, conduit-extra, containers , crypto-api, crypto-conduit, cryptohash, cryptohash-cryptoapi - , filesystem-conduit, old-locale, optparse-applicative, regex-tdfa - , regex-tdfa-text, system-fileio, system-filepath, text, time + , directory, filepath, optparse-applicative, regex-tdfa + , regex-tdfa-text, resourcet, text, time, transformers, unix-compat }: mkDerivation { pname = "haskdeep"; - version = "0.2.0.0"; - sha256 = "1kfrnhcx4805aimb16ji5s9hpyfc113y8m3ajq2wws7phy401r5l"; + version = "0.2.0.1"; + sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec attoparsec-conduit base base16-bytestring bytestring - cereal conduit containers crypto-api crypto-conduit cryptohash - cryptohash-cryptoapi filesystem-conduit old-locale - optparse-applicative regex-tdfa regex-tdfa-text system-fileio - system-filepath text time + attoparsec base base16-bytestring bytestring cereal conduit + conduit-combinators conduit-extra containers crypto-api + crypto-conduit cryptohash cryptohash-cryptoapi directory filepath + optparse-applicative regex-tdfa regex-tdfa-text resourcet text time + transformers unix-compat ]; jailbreak = true; homepage = "https://github.com/maurotrb/haskdeep"; @@ -60335,6 +60397,7 @@ self: { base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; + jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61449,8 +61512,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.3.1"; - sha256 = "1brd3k6v2irg6myp08gl859v5fmmdm2cgq3wqn367k388p3b58c4"; + version = "0.7.3.2"; + sha256 = "1hhqs4acq8g3331av1lm6l7mmd0sswym278wsn3i0p9khyafpkcm"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers @@ -61472,12 +61535,11 @@ self: { }: mkDerivation { pname = "hasql-backend"; - version = "0.4.1"; - sha256 = "037ibla582gwsi17fsfrwlc0azh54iyyfawvy0nlabzg6lc38snm"; + version = "0.4.1.1"; + sha256 = "13llpvppkj2k6kfhmqyllm3m2h8g7lvm6gy8y2bnqq8y5jw9xdm5"; buildDepends = [ base-prelude bytestring either free list-t text transformers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; license = stdenv.lib.licenses.mit; @@ -61493,8 +61555,8 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.3.1"; - sha256 = "0vdqmn7z9w530f2p5ajgfccr0prr2zcivzww0j574v3n9lbi7q1c"; + version = "0.10.3.2"; + sha256 = "1n5r46is6kh1mk20pkkmw3v8gnqlsk2riq2a39kv7j384is02dp3"; buildDepends = [ aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders @@ -61815,18 +61877,20 @@ self: { }) {}; "haxr" = callPackage - ({ mkDerivation, array, base, base64-bytestring, blaze-builder - , bytestring, HaXml, HTTP, mtl, mtl-compat, network, network-uri + ({ mkDerivation, array, base, base-compat, base64-bytestring + , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams + , http-types, io-streams, mtl, mtl-compat, network, network-uri , old-locale, old-time, template-haskell, time, utf8-string }: mkDerivation { pname = "haxr"; - version = "3000.10.4.2"; - sha256 = "1v9sx73lwnamynsjf51pjr84v6qli9jcql5kf8d7af27bm54j0ry"; + version = "3000.11"; + sha256 = "0gydwh9q76wk2qimy9i1ba6ii6a977nih534iz6rgqfhrkcck8mz"; buildDepends = [ - array base base64-bytestring blaze-builder bytestring HaXml HTTP - mtl mtl-compat network network-uri old-locale old-time - template-haskell time utf8-string + array base base-compat base64-bytestring blaze-builder bytestring + HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat + network network-uri old-locale old-time template-haskell time + utf8-string ]; homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; @@ -61907,6 +61971,7 @@ self: { homepage = "https://github.com/Gonzih/hayoo-cli"; description = "Hayoo CLI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hback" = callPackage @@ -62465,8 +62530,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.0.8"; - sha256 = "1a84in8ip037p1f10199g2mk87ymjchyraic8zmxn7vxm1b88217"; + version = "0.1.0.9"; + sha256 = "0wwwsh0fi16j5ybsqplwzr0srijjlqs8ywjakqnh25xsvjzmlh66"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -62838,15 +62903,14 @@ self: { }: mkDerivation { pname = "hein"; - version = "0.1.0.2"; - sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf"; + version = "0.1.0.4"; + sha256 = "0agg7nsnhzg3ngiawa9899qg2pwa39dw6rkivdslsv2i67six832"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring directory filepath http-conduit process transformers ]; - jailbreak = true; homepage = "https://github.com/khanage/heineken"; description = "An extensible build helper for haskell, in the vein of leiningen"; license = stdenv.lib.licenses.asl20; @@ -65347,16 +65411,15 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.1.0"; - revision = "1"; - sha256 = "1dq09m5ag63zzhfa5xkvh3vzrn2ywamvdl41gjrirmbiziqa86l8"; - editedCabalFile = "768c79fd71253719dfd74821dbf070bd3d1ff30a298fd76d9e6c616bd4b5799a"; + version = "0.1.2.0"; + sha256 = "18hby3vjnzfis2ixbkkrk1zwky4rymx5ai00wza9yx4ijnxrzc3z"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; homepage = "https://github.com/jakubfijalkowski/hlibsass"; description = "Low-level bindings to libsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) { sass = null;}; "hlint" = callPackage @@ -65996,14 +66059,13 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "0.4.7"; - sha256 = "1y4bp6b7jxm4cx0xx27kff835jzxdnxiivf9kky2f2q65aj3q9xq"; + version = "0.4.8"; + sha256 = "14rhhk9667asdvdri9xm6jr4blrj5q1mb1g54mi94sz1vqh9hj3f"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring http-conduit http-types text ]; - jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "hoauth2"; license = stdenv.lib.licenses.bsd3; @@ -67110,21 +67172,22 @@ self: { "hpack" = callPackage ({ mkDerivation, aeson, base, base-compat, deepseq, directory - , filepath, hspec, interpolate, mockery, unordered-containers, yaml + , filepath, hspec, interpolate, mockery, text, unordered-containers + , yaml }: mkDerivation { pname = "hpack"; - version = "0.1.2"; - sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh"; + version = "0.2.0"; + sha256 = "1a1kjawmf61znikdg9kw34rqhlqhijb00b1dk1w9s8nx52rcrlaa"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson base base-compat deepseq directory filepath + aeson base base-compat deepseq directory filepath text unordered-containers yaml ]; testDepends = [ aeson base base-compat deepseq directory filepath hspec interpolate - mockery unordered-containers yaml + mockery text unordered-containers yaml ]; homepage = "https://github.com/sol/hpack#readme"; description = "An alternative format for Haskell packages"; @@ -68212,18 +68275,18 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.1.0"; - sha256 = "1hl0lpjkzxhd4svkfvzl6p8gg32qvkggqdphz14fi11p34ksf41i"; + version = "0.2.0"; + sha256 = "0s7p1mv8vwlpgrvnalsfkynd8ps1ndla2yssaq6v650f0vx36jsf"; buildDepends = [ base data-default-class filepath hlibsass monad-loops mtl ]; testDepends = [ base data-default-class hspec hspec-discover temporary ]; - jailbreak = true; homepage = "https://github.com/jakubfijalkowski/hsass"; description = "Integrating Sass into Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsay" = callPackage @@ -69373,7 +69436,9 @@ self: { mkDerivation { pname = "hslua"; version = "0.4.0"; + revision = "1"; sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p"; + editedCabalFile = "a2019a0881b90b842dfa9c88e452a45bbadb25d9461d0549ab8fd328a82757ee"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec hspec-contrib HUnit text ]; extraLibraries = [ lua ]; @@ -72630,6 +72695,7 @@ self: { homepage = "http://sourrust.github.io/hyakko/"; description = "Literate-style Documentation Generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hybrid" = callPackage @@ -73210,12 +73276,9 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "iconv"; - version = "0.4.1.2"; - revision = "1"; - sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142"; - editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451"; + version = "0.4.1.3"; + sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin"; buildDepends = [ base bytestring ]; - jailbreak = true; description = "String encoding conversion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74604,6 +74667,7 @@ self: { homepage = "http://doomanddarkness.eu/pub/informative"; description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini" = callPackage @@ -77041,8 +77105,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.0.1"; - sha256 = "0p06zv61giwbnwcdcg8fq7mmw3islcj807df4xhaxggr8r3dwywv"; + version = "1.0.2"; + sha256 = "00s25fy0w00sbxlgl04jfzipm419dl48mryv7k8pg91nks3vfvdw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77624,22 +77688,21 @@ self: { }) {}; "kafka-client" = callPackage - ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec - , hspec-discover, network, QuickCheck, snappy, time, zlib + ({ mkDerivation, base, bytestring, cereal, containers, digest + , dlist, hspec, hspec-discover, network, process, QuickCheck + , snappy, temporary, time, zlib }: mkDerivation { pname = "kafka-client"; - version = "0.7.0.0"; - revision = "1"; - sha256 = "1qaz47qqrbg1k4jjvq30qy3j57vsa0pqz91dcgx67pvqqw13n7r2"; - editedCabalFile = "2a9089e946bf6bbb67d9e464a672da4b958775a2572faf78554f1d2875eb7357"; + version = "0.7.0.1"; + sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai"; buildDepends = [ base bytestring cereal digest dlist network snappy time zlib ]; testDepends = [ - base bytestring cereal hspec hspec-discover QuickCheck time + base bytestring cereal containers hspec hspec-discover network + process QuickCheck temporary time ]; - jailbreak = true; homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; @@ -78403,6 +78466,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ktx" = callPackage + ({ mkDerivation, base, bytestring, egl, glew, OpenGL }: + mkDerivation { + pname = "ktx"; + version = "0.2"; + sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf"; + buildDepends = [ base bytestring OpenGL ]; + pkgconfigDepends = [ egl glew ]; + homepage = "https://github.com/corngood/ktx"; + description = "A binding for libktx from Khronos"; + license = stdenv.lib.licenses.mit; + }) { egl = null; inherit (pkgs) glew;}; + "kure" = callPackage ({ mkDerivation, base, dlist, transformers }: mkDerivation { @@ -78663,12 +78739,12 @@ self: { }) {}; "lambda-options" = callPackage - ({ mkDerivation, base, containers, mtl }: + ({ mkDerivation, base, containers, mtl, read-bounded }: mkDerivation { pname = "lambda-options"; - version = "0.6.0.0"; - sha256 = "12w53cpqlqcnx3f54xx14dj532xdwdrdp8yz2a43jb3rdf9ffz5c"; - buildDepends = [ base containers mtl ]; + version = "0.7.0.0"; + sha256 = "0y8q9k3lk71703qzm0bvqh30y7r5ms392gfzh2lcrqkr0mhlf89j"; + buildDepends = [ base containers mtl read-bounded ]; jailbreak = true; homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; @@ -79702,8 +79778,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.1.1.2"; - sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4"; + version = "1.1.3.1"; + sha256 = "1h6zsslp3szc3m2ki273a6w47gf9fizyjh0xxby694cmhspknn90"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -79719,7 +79795,6 @@ self: { ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -79846,10 +79921,9 @@ self: { ({ mkDerivation, base, mtl, parsers, text, trifecta }: mkDerivation { pname = "language-thrift"; - version = "0.1.0.0"; - sha256 = "17x6311mrijm1in78nbcgfq4gmhahqcrhf5yynq3g6b1hylgswsv"; + version = "0.1.0.1"; + sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk"; buildDepends = [ base mtl parsers text trifecta ]; - jailbreak = true; homepage = "https://github.com/abhinav/language-thrift"; description = "Parser for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; @@ -80565,7 +80639,9 @@ self: { mkDerivation { pname = "lens-family-th"; version = "0.4.1.0"; + revision = "1"; sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm"; + editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; @@ -80584,6 +80660,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-simple" = callPackage + ({ mkDerivation, base, lens-family, lens-family-core + , lens-family-th + }: + mkDerivation { + pname = "lens-simple"; + version = "0.1.0.2"; + sha256 = "1gsfij0n70wwvcrgr0lq98kwswghv16y1d0gxnyrfgxkpar47fhf"; + buildDepends = [ + base lens-family lens-family-core lens-family-th + ]; + homepage = "https://github.com/michaelt/lens-simple"; + description = "simplified import of elementary lens-family combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-sop" = callPackage ({ mkDerivation, base, fclabels, generics-sop, transformers }: mkDerivation { @@ -81238,6 +81330,7 @@ self: { jailbreak = true; description = "Wrapper for libpafe"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) { pafe = null;}; "libpq" = callPackage @@ -83725,22 +83818,22 @@ self: { }) {}; "ltext" = callPackage - ({ mkDerivation, aeson, base, composition, composition-extra - , containers, data-default, directory, hspec, mtl - , optparse-applicative, parsec, pretty, text, transformers, yaml + ({ mkDerivation, aeson, base, containers, data-default, deepseq + , directory, hspec, mtl, mtl-compat, optparse-applicative, parsec + , pretty, template-haskell, text, transformers, yaml }: mkDerivation { pname = "ltext"; - version = "0.0.0.1"; - sha256 = "1qz4gpdfjqrq6rgbf3zqcmwkf0x0kphnpr4y7q47wb12wq7xaqa1"; + version = "0.0.2.1"; + sha256 = "0dr99prlsbzisaz8jbiw297fw1fysr9zq0g5ywc959ar3nki039f"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base composition composition-extra containers data-default - directory mtl optparse-applicative parsec pretty text transformers - yaml + aeson base containers data-default deepseq directory mtl mtl-compat + optparse-applicative parsec pretty template-haskell text + transformers yaml ]; - testDepends = [ base hspec ]; + testDepends = [ base hspec mtl ]; description = "Higher-order file applicator"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -85774,6 +85867,7 @@ self: { homepage = "https://github.com/dorafmon/mdcat"; description = "Markdown viewer in your terminal"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mdo" = callPackage @@ -86049,6 +86143,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memo-ptr" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "memo-ptr"; + version = "0.1.0.0"; + sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19"; + buildDepends = [ base containers ]; + description = "Pointer equality memoization"; + license = stdenv.lib.licenses.mit; + }) {}; + "memo-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite }: mkDerivation { @@ -86080,8 +86185,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.5"; - sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh"; + version = "0.6"; + sha256 = "18r0rnh2x5sazn2i23v222vxrgsgyyzbfvasg21r2kh42i0vh2bw"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -91415,8 +91520,10 @@ self: { }: mkDerivation { pname = "network-anonymous-tor"; - version = "0.9.0"; - sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0"; + version = "0.9.1"; + sha256 = "1p78xsi1i59z9jkyf182gvfx7qpiqs0l60mp2xl1d4jjwgdnni50"; + isLibrary = true; + isExecutable = true; buildDepends = [ attoparsec base base32string bytestring exceptions hexstring network network-attoparsec network-simple socks text transformers @@ -92957,6 +93064,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "number" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "number"; + version = "0.1.0.0"; + sha256 = "1cl9s5qf7i0kixwqg27znmx4rvnckggpghs3hls77mq22igskd8p"; + buildDepends = [ base ]; + description = "A library for real numbers"; + license = stdenv.lib.licenses.mit; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -93315,8 +93433,8 @@ self: { }: mkDerivation { pname = "objective"; - version = "1.0.4"; - sha256 = "0wadqf19nd7ldh92nv20q20j6zdk7jfafvi3zr06i2jlm8gq9dsn"; + version = "1.0.5"; + sha256 = "07v1srbzd2sxwfwi1jrq63jycr46hwq4wh6wi7sgdpla5m28mhyh"; buildDepends = [ base containers either exceptions free hashable monad-skeleton monad-stm mtl profunctors stm template-haskell transformers @@ -93743,9 +93861,9 @@ self: { mkDerivation { pname = "opaleye"; version = "0.3.1.2"; - revision = "2"; + revision = "3"; sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; - editedCabalFile = "e428ce92e9fc225610dc60c4248dabb125cdb3dd3bf2cda228672cb01d9c6075"; + editedCabalFile = "9ee83219b8bc26fe01cca7484513bc3373d2868855ba8757fd210482f0605852"; buildDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -93755,7 +93873,6 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -94460,8 +94577,8 @@ self: { }: mkDerivation { pname = "optparse-simple"; - version = "0.0.2"; - sha256 = "07zq89bhkfm08mq4wnnxafgvcv5y53fmjiamfj50mqskzv21i9i7"; + version = "0.0.3"; + sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5"; buildDepends = [ base either gitrev optparse-applicative template-haskell transformers @@ -95117,16 +95234,16 @@ self: { , directory, executable-path, extensible-exceptions, filemanip , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-locale, old-time, pandoc-types, parsec - , process, QuickCheck, random, scientific, SHA, syb, tagsoup - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, texmath, text, time - , unordered-containers, vector, xml, yaml, zip-archive, zlib + , network, network-uri, old-time, pandoc-types, parsec, process + , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , texmath, text, time, unordered-containers, vector, xml, yaml + , zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "1.14"; - sha256 = "0n4l3jzvd8jzbsi6n4wli2dhijgywbpbss4syjmfnds9pbk6mhz1"; + version = "1.14.0.3"; + sha256 = "1nbicmngsdx9v4kvsswipf8w1l8rvfsll8fnp2ar5v65b0aba3ic"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95135,9 +95252,9 @@ self: { deepseq-generics directory extensible-exceptions filemanip filepath haddock-library happy highlighting-kate hslua HTTP http-client http-client-tls http-types JuicyPixels mtl network network-uri - old-locale old-time pandoc-types parsec process random scientific - SHA syb tagsoup temporary texmath text time unordered-containers - vector xml yaml zip-archive zlib + old-time pandoc-types parsec process random scientific SHA syb + tagsoup temporary texmath text time unordered-containers vector xml + yaml zip-archive zlib ]; testDepends = [ ansi-terminal base bytestring containers Diff directory @@ -95146,7 +95263,6 @@ self: { test-framework-quickcheck2 text zip-archive ]; configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ]; - jailbreak = true; homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; license = "GPL"; @@ -95216,6 +95332,7 @@ self: { homepage = "https://github.com/baig/pandoc-csv2table-filter"; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-lens" = callPackage @@ -95237,8 +95354,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.3"; - sha256 = "1aj741y28ci039gy9j16jc7v3vfrj0rc11jliahx4202dz6fdyb5"; + version = "1.12.4.4"; + sha256 = "0qk62cn8j3ml0fc12ikfw0pp2b6gqlfn96n5jv9dvyajxqxrby5g"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; @@ -99864,6 +99981,7 @@ self: { unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; + jailbreak = true; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -100970,12 +101088,11 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6.1"; - revision = "2"; + revision = "3"; sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562"; - editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757"; + editedCabalFile = "01edcbebd6228c9fc9dbfbb173651e45cbca28cbd1dc55386a59dd24fb0a6ccd"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -108411,15 +108528,14 @@ self: { }: mkDerivation { pname = "sandman"; - version = "0.1.0.0"; - sha256 = "02lgpcr70icq9cgxzpd79d60pbk2fsg6n7pn8zmvjks7dv86bdvn"; + version = "0.1.0.1"; + sha256 = "184gsdrw10h345ic1bdcdnfaac5fhr6dx77db790fl1lff7z5s1g"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal containers directory filepath optparse-applicative process text unix-compat ]; - jailbreak = true; homepage = "https://github.com/abhinav/sandman"; description = "Manages Cabal sandboxes to avoid rebuilding packages"; license = stdenv.lib.licenses.mit; @@ -108577,8 +108693,8 @@ self: { ({ mkDerivation, array, base, containers, satchmo, toysolver }: mkDerivation { pname = "satchmo-toysat"; - version = "0.2.0.0"; - sha256 = "10prfalf8gic4p5sj35svnypzdgn69f6vwbj9dh55bcq70gqqgn2"; + version = "0.2.1.0"; + sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61"; buildDepends = [ array base containers satchmo toysolver ]; jailbreak = true; homepage = "https://github.com/msakai/satchmo-toysat"; @@ -108805,17 +108921,18 @@ self: { }) {}; "schedule-planner" = callPackage - ({ mkDerivation, base, containers, happstack-lite, json, mtl - , options, transformers + ({ mkDerivation, aeson, base, bytestring, containers, http-types + , mtl, options, text, transformers, wai, warp }: mkDerivation { pname = "schedule-planner"; - version = "0.1.0.2"; - sha256 = "0xpn5jgdbzkwysnjlzmvnrvk55wsffx9zbxd6hi1av4nbqz2269r"; + version = "1.0.0.0"; + sha256 = "0cbx6k3spsdsk8bjwyzyjw9iqdpc7z2vkds51iaxxn3wiwjkxwpq"; isLibrary = false; isExecutable = true; buildDepends = [ - base containers happstack-lite json mtl options transformers + aeson base bytestring containers http-types mtl options text + transformers wai warp ]; description = "Find the ideal lesson layout"; license = stdenv.lib.licenses.gpl3; @@ -109680,8 +109797,8 @@ self: { }: mkDerivation { pname = "second-transfer"; - version = "0.5.2.2"; - sha256 = "0zch87psqszg42rxwjd3px80j867xjqz06lgvndrd01sqzadw18g"; + version = "0.5.3.1"; + sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv"; buildDepends = [ attoparsec base base16-bytestring binary bytestring conduit containers exceptions hashable hashtables hslogger http2 lens @@ -112903,6 +113020,7 @@ self: { ]; description = "ws convert markdown to reveal-js"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sloane" = callPackage @@ -113077,14 +113195,14 @@ self: { }) {}; "smaoin" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, text }: + ({ mkDerivation, base, bytestring, QuickCheck, random, text, uuid + }: mkDerivation { pname = "smaoin"; - version = "0.1.1.2"; - sha256 = "0h8qqbggklw0vj5qf12114ki42kb7cilhd6i24fvlhaffpmpgv21"; - buildDepends = [ base bytestring text ]; - testDepends = [ base QuickCheck ]; - jailbreak = true; + version = "0.2.0.0"; + sha256 = "1zciyb1kknhnrnkw57bfi28sc80fbz6dq4vrnyq1b63b4nmhl2sd"; + buildDepends = [ base bytestring random text uuid ]; + testDepends = [ base bytestring QuickCheck ]; homepage = "http://rel4tion.org/projects/smaoin-hs/"; description = "Utilities for the Smaoin semantic information model"; license = stdenv.lib.licenses.publicDomain; @@ -116279,13 +116397,12 @@ self: { }: mkDerivation { pname = "stack-prism"; - version = "0.1.3"; - sha256 = "0v69gd81b7qaci3f9bmlvpvhnzdksqx4nvazxghrmdq04f28gfjm"; + version = "0.1.4"; + sha256 = "1lw42nkbzsc7mg8fnspjsply67ashrnbkml797fz2nvic84l8820"; buildDepends = [ base profunctors tagged template-haskell transformers ]; testDepends = [ base template-haskell ]; - jailbreak = true; homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; @@ -116462,8 +116579,8 @@ self: { }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.4"; - sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x"; + version = "0.1.5"; + sha256 = "0d5i2wszn4sv797gzdv84abvdm3nzaa1lgn2gp4ywj1iqbbszbns"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -118833,8 +118950,8 @@ self: { ({ mkDerivation, base, containers, HUnit, mtl }: mkDerivation { pname = "syb"; - version = "0.4.4"; - sha256 = "11sc9kmfvcn9bfxf227fgmny502z2h9xs3z0m9ak66lk0dw6f406"; + version = "0.5.1"; + sha256 = "0iiqz5mamk1nsij99rypms7dhx5flm2n02k1x6miqgnhg075zc41"; buildDepends = [ base ]; testDepends = [ base containers HUnit mtl ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; @@ -122582,8 +122699,8 @@ self: { }: mkDerivation { pname = "th-typegraph"; - version = "0.17.1"; - sha256 = "06hyyb1rjm8rvkllvjsgh56fwly99hv33brb4xycc1sc4452cslm"; + version = "0.18"; + sha256 = "0z47q4sj5z3ajv17d4rda8zaqbbay36x1z6vy8i5c1g6971y8vs5"; buildDepends = [ base containers data-default haskell-src-exts lens mtl syb template-haskell th-desugar th-orphans @@ -123390,12 +123507,14 @@ self: { }) {}; "time-qq" = callPackage - ({ mkDerivation, base, hspec, old-locale, template-haskell, time }: + ({ mkDerivation, base, hspec, template-haskell, time + , time-locale-compat + }: mkDerivation { pname = "time-qq"; - version = "0.0.0.1"; - sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq"; - buildDepends = [ base old-locale template-haskell time ]; + version = "0.0.0.2"; + sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7"; + buildDepends = [ base template-haskell time time-locale-compat ]; testDepends = [ base hspec ]; homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; @@ -124295,34 +124414,35 @@ self: { }) {}; "toysolver" = callPackage - ({ mkDerivation, array, base, bytestring, containers - , data-default-class, data-interval, deepseq, exceptions - , extended-reals, filepath, finite-field, ghc-prim, hashable, heaps - , HUnit, intern, loop, mtl, multiset, OptDir, parse-dimacs, parsec - , prettyclass, primes, process, queue, QuickCheck, random, sign - , stm, temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, time + ({ mkDerivation, array, base, bytestring, bytestring-builder + , containers, data-default-class, data-interval, deepseq + , exceptions, extended-reals, filepath, finite-field, ghc-prim + , hashable, heaps, HUnit, intern, loop, mtl, multiset, OptDir + , parse-dimacs, parsec, prettyclass, primes, process + , pseudo-boolean, queue, QuickCheck, random, sign, stm, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, temporary, time , type-level-numbers, unbounded-delays, unordered-containers , vector-space }: mkDerivation { pname = "toysolver"; - version = "0.2.0"; - sha256 = "1lqm4b63cq6iq7f0s70ch6w0n03d2vdpb79ykdbgypvndwwfqy23"; + version = "0.3.0"; + sha256 = "01rhq7mz20bjzqpvwwf7z4v77p9kvwgk4pv7gr6264ha30sygbr8"; isLibrary = true; isExecutable = true; buildDepends = [ - array base bytestring containers data-default-class data-interval - deepseq exceptions extended-reals filepath finite-field ghc-prim - hashable heaps intern loop mtl multiset OptDir parse-dimacs parsec - prettyclass primes process queue random sign stm temporary time + array base bytestring bytestring-builder containers + data-default-class data-interval deepseq exceptions extended-reals + filepath finite-field ghc-prim hashable heaps intern loop mtl + multiset OptDir parse-dimacs parsec prettyclass primes process + pseudo-boolean queue random sign stm temporary time type-level-numbers unbounded-delays unordered-containers vector-space ]; testDepends = [ array base containers data-interval finite-field HUnit mtl OptDir - prettyclass QuickCheck stm test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th vector-space + prettyclass QuickCheck random stm tasty tasty-hunit + tasty-quickcheck tasty-th vector-space ]; description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; @@ -125047,6 +125167,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tubes" = callPackage + ({ mkDerivation, base, free, mtl, transformers }: + mkDerivation { + pname = "tubes"; + version = "0.1.0.0"; + sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k"; + buildDepends = [ base free mtl transformers ]; + homepage = "https://github.com/gatlin/tubes"; + description = "Effectful, iteratee-inspired stream processing based on a free monad"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tuntap" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -130794,8 +130926,8 @@ self: { }: mkDerivation { pname = "wai-request-spec"; - version = "0.10.0.0"; - sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk"; + version = "0.10.0.1"; + sha256 = "13s86z82rcsy3ai4qzjbxinwxzd81zhsvf589mhn2fhfk8qm7wdg"; buildDepends = [ base bytestring case-insensitive containers http-types text wai ]; @@ -131093,6 +131225,7 @@ self: { homepage = "https://github.com/futurice/waitra"; description = "A very simple Wai router"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp" = callPackage @@ -131913,8 +132046,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.4.0"; - sha256 = "0wpiy5i5vs2506s8xy24rxs9szpzga73xdhf1kfmdhl3gka0q7g0"; + version = "0.9.5.0"; + sha256 = "016h213sk3n662ri8ns1sswcnaml61qckprdgxdp0m2a77amivmy"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text @@ -131936,8 +132069,8 @@ self: { }: mkDerivation { pname = "websockets-snap"; - version = "0.9.1.0"; - sha256 = "170bivzyqr46s9l7l6dd1nwx3wai9pv0qpf7bw3rxh2y6lxk2546"; + version = "0.9.2.0"; + sha256 = "03szycdvygw1zkv2s090wn2jii9sqbplgbycmpm5mfm3r0jhbhxp"; buildDepends = [ base bytestring enumerator mtl snap-core snap-server websockets ]; @@ -133291,8 +133424,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.2"; - sha256 = "1h8rnpgzicn46i4narvmjgh4r46q90ch5wgwmxknksnqi55c7gs4"; + version = "0.3.0"; + sha256 = "1ih7wnsy38p7s14fnyg3pnm3hyp3nd6fprl2m66l09cj7ibvnxyc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -135302,6 +135435,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-account-fork" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , email-validate, hspec, http-types, monad-logger, mtl, nonce + , persistent, persistent-sqlite, pwstore-fast, random, resourcet + , tagged, text, xml-conduit, yesod, yesod-auth, yesod-auth-account + , yesod-core, yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-account-fork"; + version = "2.0"; + sha256 = "0y3xd8iw15il05bpnkicnlv9xznqlirapbr6gmr7lxzjhgddrzyn"; + buildDepends = [ + aeson base blaze-html bytestring email-validate http-types mtl + nonce persistent pwstore-fast random tagged text yesod-auth + yesod-core yesod-form yesod-persistent + ]; + testDepends = [ + base bytestring hspec monad-logger mtl persistent-sqlite resourcet + text xml-conduit yesod yesod-auth yesod-auth-account yesod-test + ]; + homepage = "https://github.com/meteficha/yesod-auth-account-fork"; + description = "An account authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-basic" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, exceptions , hlint, hspec, text, wai, word8, yesod, yesod-test @@ -135965,6 +136124,7 @@ self: { homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed" = callPackage @@ -136802,6 +136962,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-solarized" = callPackage + ({ mkDerivation, base, yi }: + mkDerivation { + pname = "yi-solarized"; + version = "0.1.1"; + sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc"; + buildDepends = [ base yi ]; + homepage = "https://github.com/NorfairKing/yi-solarized"; + description = "Solarized colour theme for the Yi text editor"; + license = stdenv.lib.licenses.mit; + }) {}; + "yi-spolsky" = callPackage ({ mkDerivation, base, yi }: mkDerivation { From ecac359ccfecc10af6c0138fedf67db6a703f01c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jun 2015 11:33:37 +0200 Subject: [PATCH 056/208] ghc-7.10.x: trigger re-builds to recover from non-determinstic library ID --- .../haskell-modules/configuration-ghc-7.10.x.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2262819a779..964b221d38c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -92,9 +92,6 @@ self: super: { # https://bitbucket.org/FlorianHartwig/attobencode/issue/1 AttoBencode = dontCheck super.AttoBencode; - # bos/attoparsec#92 - attoparsec = dontCheck super.attoparsec; - # Test suite fails with some (seemingly harmless) error. # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24 syb = dontCheck super.syb; @@ -282,7 +279,18 @@ self: super: { llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; # Ugly hack to trigger a rebuild to fix the broken package on Hydra. + asn1-encoding = appendConfigureFlag super.asn1-encoding "-fignore-me-1"; + asn1-types = appendConfigureFlag super.asn1-types "-fignore-me-1"; + cmdargs = appendConfigureFlag super.cmdargs "-fignore-me-1"; crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; + crypto-pubkey-types = appendConfigureFlag super.crypto-pubkey-types "-fignore-me-1"; + hourglass = appendConfigureFlag super.hourglass "-fignore-me-1"; + math-functions = appendConfigureFlag super.math-functions "-fignore-me-1"; + tagsoup = appendConfigureFlag super.tagsoup "-fignore-me-1"; + X11 = appendConfigureFlag super.X11 "-fignore-me-1"; + x509 = appendConfigureFlag super.x509 "-fignore-me-1"; + x509-store = appendConfigureFlag super.x509-store "-fignore-me-1"; + x509-system = appendConfigureFlag super.x509-system "-fignore-me-1"; # Fix compilation under GHC 7.10, patch has been sent upstream. iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch; From 3e0513ea866f6844c17fcf11b31776c63bb169cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 May 2015 10:29:50 +0200 Subject: [PATCH 057/208] haskell-cabal-helper wants to store test suite data in $HOME --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eb2c1e7c9c0..a54ffc72a50 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -832,4 +832,8 @@ self: super: { # https://github.com/vincenthz/hs-cipher-aes/issues/35 cipher-aes = dontCheck super.cipher-aes; + + # https://github.com/DanielG/cabal-helper/issues/2 + cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; }); + } From 0d484e999bd99c440cd94106cc8c4fb06828ce72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 May 2015 19:46:31 +0200 Subject: [PATCH 058/208] haskell-binary: update to version 0.7.5.0 --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 4 ++-- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a54ffc72a50..715a6da5636 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -809,9 +809,6 @@ self: super: { # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; - # https://github.com/kolmodin/binary/issues/74 - binary_0_7_4_0 = dontCheck super.binary_0_7_4_0; - # https://github.com/kkardzis/curlhs/issues/6 curlhs = dontCheck super.curlhs; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 2fecaa5a532..5299cefdc07 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_4_0; + binary = self.binary_0_7_5_0; # deepseq is not a core library for this compiler. deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index f6b2b2304b9..a3ad255aab8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -35,7 +35,7 @@ self: super: { unix = null; # binary is not a core library for this compiler. - binary = self.binary_0_7_4_0; + binary = self.binary_0_7_5_0; # deepseq is not a core library for this compiler. deepseq = self.deepseq_1_4_1_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 98bad4fa1be..556b86f95eb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -41,7 +41,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; }; # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 2bad8d8b97d..d659406818c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,10 +38,10 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index a90c5f99173..b7129efb8a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 84994bc683f..9327af856e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -86,8 +86,8 @@ self: super: { seqid-streams = super.seqid-streams_0_1_0; # Need binary >= 0.7.2, but our compiler has only 0.7.1.0. - hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); - tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_4_0; }); + hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); + tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); # These packages need mtl 2.2.x directly or indirectly via dependencies. amazonka = markBroken super.amazonka; From 873fa649e8e851ea255fe87c6a8f79097aee6d23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 May 2015 20:22:42 +0200 Subject: [PATCH 059/208] cabal-install: break infinite recursion on ghc 7.6.x and 7.4.x. --- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index d659406818c..e012cda2da9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,10 +38,10 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index b7129efb8a7..16257dcc17b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; }; + Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; From 682e37e58653b6b41077a7a26b2c62f1789703a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jun 2015 17:32:37 +0200 Subject: [PATCH 060/208] haskell-iconv: GHC 7.10.x support was added upstream --- .../configuration-ghc-7.10.x.nix | 3 -- .../haskell-modules/iconv-fix-ghc710.patch | 41 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/haskell-modules/iconv-fix-ghc710.patch 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 964b221d38c..ac02bbc8818 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -292,7 +292,4 @@ self: super: { x509-store = appendConfigureFlag super.x509-store "-fignore-me-1"; x509-system = appendConfigureFlag super.x509-system "-fignore-me-1"; - # Fix compilation under GHC 7.10, patch has been sent upstream. - iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch; - } diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch deleted file mode 100644 index a7c35647a29..00000000000 --- a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch +++ /dev/null @@ -1,41 +0,0 @@ -Running command 'diff -urN old-iconv new-iconv' -Fri May 29 00:42:30 CEST 2015 Robert Helgesson - * Add Functor and Applicative instances for IConv - - This makes iconv successfully build under GHC 7.10. -diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs ---- old-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 -+++ new-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 -@@ -49,6 +49,7 @@ - import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) - import System.IO (hPutStrLn, stderr) - import Control.Exception (assert) -+import Control.Monad (ap, liftM) - - import Prelude hiding (length) - -@@ -192,8 +193,8 @@ - -} - - ------------------------------ ---- IConv monad -+---------------------------------------- -+-- IConv functor, applicative, and monad - -- - - newtype IConv a = I { -@@ -202,6 +203,13 @@ - -> IO (Buffers, a) - } - -+instance Functor IConv where -+ fmap = liftM -+ -+instance Applicative IConv where -+ pure = return -+ (<*>) = ap -+ - instance Monad IConv where - (>>=) = bindI - -- m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f From 921b000fa53b1ff747d6adebb85b70db752605c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 10:14:04 +0200 Subject: [PATCH 061/208] haskell-base-noprelude: disable Haddock phase on empty library --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 715a6da5636..391c0a02865 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -121,6 +121,7 @@ self: super: { # The Haddock phase fails for one reason or another. attoparsec-conduit = dontHaddock super.attoparsec-conduit; + base-noprelude = dontHaddock super.base-noprelude; blaze-builder-conduit = dontHaddock super.blaze-builder-conduit; BNFC-meta = dontHaddock super.BNFC-meta; bytestring-progress = dontHaddock super.bytestring-progress; From 52829ce24a6fc6389364e46e9bf537d625aaa557 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 10:14:27 +0200 Subject: [PATCH 062/208] Disable broken builds for Haskell packages gitit and influxdb. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 391c0a02865..9a4979cd58d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -402,7 +402,6 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; - influxdb = dontCheck (dontJailbreak super.influxdb); itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -834,4 +833,11 @@ self: super: { # https://github.com/DanielG/cabal-helper/issues/2 cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; }); + # https://github.com/jgm/gitit/issues/494 + gitit = markBroken super.gitit; + + # https://github.com/maoe/influxdb-haskell/issues/26 + influxdb = markBroken (dontCheck super.influxdb); + snaplet-influxdb = dontDistribute super.snaplet-influxdb; + } From c86c1b79af8b3eb057c092bde15885ff48729171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 2 Jun 2015 11:02:11 +0200 Subject: [PATCH 063/208] libav(-11): maintenance update, including security --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 41a8b391eb3..23b1402e3e7 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; - libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; + libav_11 = libavFun "11.4" "c2ab12102de187f2675a56b828b4a5e9136ab747"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { From 9c983ade4d56f9585fd2a806c8ee1650e180b3eb Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 2 Jun 2015 11:21:22 +0200 Subject: [PATCH 064/208] doc: fix references --- doc/language-support.xml | 6 +++--- doc/stdenv.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index 14e8aa7a7ba..def0de1d91f 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -257,7 +257,7 @@ are provided with all modules included. buildEnv Function to build python interpreter environments with extra packages bundled together. - See for usage and documentation. + See for usage and documentation. @@ -587,7 +587,7 @@ sed -i '/ = data_files/d' setup.py There is no need to have global site-packages in Nix. Each package has isolated dependency tree and installing any python package will only populate $PATH - inside user environment. See to create self-contained + inside user environment. See to create self-contained interpreter with a set of packages. @@ -876,7 +876,7 @@ Runtime) instead of the OpenJRE. in pkgs/development/lua-modules/generic/default.nix and works similarly to buildPerlPackage. (See - for details.) + for details.) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 58310834fd2..4e51db73010 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -59,7 +59,7 @@ build. To make this easier, the standard environment breaks the package build into a number of phases, all of which can be overridden or modified individually: unpacking the sources, applying patches, configuring, building, and installing. -(There are some others; see .) +(There are some others; see .) For instance, a package that doesn’t supply a makefile but instead has to be compiled “manually†could be handled like this: From 752528ac9cbe00120cd2f36b819f6d54ea2257fa Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 2 Jun 2015 13:14:51 +0200 Subject: [PATCH 065/208] add pdfpc, a presenter console with multi-monitor support for PDF files --- pkgs/applications/misc/pdfpc/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/misc/pdfpc/default.nix diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix new file mode 100644 index 00000000000..a2cffdef58b --- /dev/null +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee, poppler +, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }: + +stdenv.mkDerivation rec { + name = "${product}-${version}"; + product = "pdfpc"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/pdfpc/pdfpc/releases/download/v${version}/${product}-v${version}.tar.gz"; + sha256 = "0qksci11pgvabfdnynkpj2av0iww8m9m41a0vwsqgvg3yiacb4f0"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler + libpthreadstubs makeWrapper librsvg ]; + + postInstall = '' + wrapProgram $out/bin/pdfpc \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + meta = with stdenv.lib; { + description = "A presenter console with multi-monitor support for PDF files"; + homepage = https://pdfpc.github.io/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a7c9a087c8..590f80fa645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12017,6 +12017,12 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; + pdfpc = callPackage ../applications/misc/pdfpc { + vala = vala_0_26; + inherit (gnome3) libgee; + inherit (gst_all_1) gstreamer gst-plugins-base; + }; + photoqt = callPackage ../applications/graphics/photoqt { }; pianobar = callPackage ../applications/audio/pianobar { }; From 6eb4fdeb4d87847f7196115043ffd11dd7ee2985 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Tue, 2 Jun 2015 13:21:53 +0200 Subject: [PATCH 066/208] fix crackxls libgsf dependency --- pkgs/tools/security/crackxls/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index c593650dbd4..37e3e048a76 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, autoconf, automake, openssl, libgsf }: +{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { name = "crackxls-${version}"; - version = "v0.4"; + version = "0.4"; src = fetchgit { url = https://github.com/GavinSmith0123/crackxls2003.git; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - buildInputs = [ openssl libgsf automake autoconf ]; + buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ]; installPhase = '' From d5a4c3d21daab86660b223bb9df0eab7880b5a1f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 2 Jun 2015 08:49:51 +0200 Subject: [PATCH 067/208] coq-tlc: fix package --- pkgs/development/coq-modules/tlc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index b98ff613f9d..2d30db5a80d 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; + preConfigure = '' + patch Makefile < \$(COQC) -R . Tlc \$< + EOF + ''; + installPhase = '' COQLIB=$out/lib/coq/${coq.coq-version}/ mkdir -p $COQLIB/user-contrib/Tlc From a36326d1974ebb25352d895be08eeaf3be0a9fe6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 2 Jun 2015 11:54:54 +0200 Subject: [PATCH 068/208] ocaml-asn1-combinators: update from 0.1.1 to 0.1.2 --- .../ocaml-modules/asn1-combinators/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index bb4b5f7b312..41f73b2f834 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }: +{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; -let version = "0.1.1"; in +let version = "0.1.2"; in stdenv.mkDerivation { name = "ocaml-asn1-combinators-${version}"; src = fetchzip { url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz"; - sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2"; + sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ounit ]; propagatedBuildInputs = [ cstruct zarith ]; createFindlibDestdir = true; + configureFlags = "--enable-tests"; + doCheck = true; + checkTarget = "test"; + meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; description = "Combinators for expressing ASN.1 grammars in OCaml"; From b812e5f0579a810b1adbd219b8a6d3ace9877e27 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 2 Jun 2015 12:23:50 +0200 Subject: [PATCH 069/208] ocaml-uri: update from 1.7.2 to 1.9.0 --- pkgs/development/ocaml-modules/uri/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a00a2408159..41cd2f64823 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, ocaml, findlib, re, sexplib, stringext }: +{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext }: -let version = "1.7.2"; in +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; + +let version = "1.9.0"; in stdenv.mkDerivation { name = "ocaml-uri-${version}"; - src = fetchgit { - url = https://github.com/mirage/ocaml-uri.git; - rev = "refs/tags/v${version}"; - sha256 = "19rq68dzvqzpqc2zvrk5sj1iklknnyrlbcps2vb8iw4cjlrnnaa1"; + src = fetchzip { + url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; + sha256 = "13vbv6q7npl2bvvqfw03mav90jcrrvjbdpdp4y8mcjz0iax5ww9b"; }; buildInputs = [ ocaml findlib ]; From ba809cf9a3aa2aefe9721e003c07d53767f2032b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 13:58:57 +0200 Subject: [PATCH 070/208] haskell: add three new helper functions to the lib module - sdistTarball transforms a normal Haskell build into one that produces a release tarball by running "sdist". For example: $ nix-shell -p "haskell.lib.sdistTarball haskellPackages.mtl" --command 'tar tfv $nativeBuildInputs/*tar.gz' - buildFromSdist transforms a normal Haskell build into one that compiles the package the an sdist release tarball created by Nix. For example: $ nix-shell -p "haskell.lib.buildFromSdist haskellPackages.mtl" --command "exit 0" - buildStrictly transforms a normal Haskell build into one that (a) compiles the source code with "-Wall -Werror" flags and (b) uses as input a locally generated sdist release tarball. For example: $ nix-shell -p "haskell.lib.buildStrictly haskellPackages.mtl" --command "exit 0" This function is particularly useful for continuous Hydra builds of Haskell packages. --- pkgs/development/haskell-modules/lib.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 8f932c87023..e601c7665ac 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -58,4 +58,23 @@ rec { doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { + name = "${drv.pname}-source-${drv.version}"; + buildPhase = "./Setup sdist"; + haddockPhase = ":"; + checkPhase = ":"; + installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; + fixupPhase = ":"; + }); + + buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { + unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' + echo "Source tarball is at ${src}/${tarname}.tar.gz" + tar xf ${src}/${tarname}.tar.gz + cd ${tarname} + ''; + }); + + buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); + } From c12e1d7278c6784da8571cb067dccd2fa9ede5eb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Jun 2015 16:55:36 +0200 Subject: [PATCH 071/208] minimal-iso: enable nixos-manual --- nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index a7498906a86..f34e789e28c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,11 +1,14 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ./installation-cd-base.nix ../../profiles/minimal.nix ]; + + # Enable in installer, even if minimal profile disables it + services.nixosManual.enable = lib.mkOverride 999 true; } From 747c6e913f4cd6c1f1f55da4982ec5597b2602d6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Jun 2015 20:29:17 +0300 Subject: [PATCH 072/208] Add gtdialog tool --- .../libraries/gtdialog/default.nix | 32 +++++++++++++++++++ .../libraries/gtdialog/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/gtdialog/default.nix create mode 100644 pkgs/development/libraries/gtdialog/default.upstream diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix new file mode 100644 index 00000000000..8d8a018f1fe --- /dev/null +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}: +let + s = # Generated upstream information + rec { + baseName="gtdialog"; + version="1.2"; + name="${baseName}-${version}"; + hash="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; + url="http://foicica.com/gtdialog/download/gtdialog_1.2.zip"; + sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; + }; + buildInputs = [ + cdk unzip gtk glib ncurses pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + makeFlags = ["PREFIX=$(out)"]; + meta = { + inherit (s) version; + description = ''Cross-platform helper for creating interactive dialogs''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://foicica.com/gtdialog"; + downloadPage = "http://foicica.com/gtdialog/download"; + }; +} diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/pkgs/development/libraries/gtdialog/default.upstream new file mode 100644 index 00000000000..843c88f55ff --- /dev/null +++ b/pkgs/development/libraries/gtdialog/default.upstream @@ -0,0 +1,3 @@ +url http://foicica.com/gtdialog/download +version_link '[.]zip' +version '.*_([0-9.]*)[.]zip' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0663813f69..bf9cbbb77bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1674,6 +1674,8 @@ let gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; + gtdialog = callPackage ../development/libraries/gtdialog {}; + gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; gtkvnc = callPackage ../tools/admin/gtk-vnc {}; From 8daf4f5445133e097f3a08c14a3e551ba45db1bd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Jun 2015 20:30:59 +0300 Subject: [PATCH 073/208] Add Curses development kit --- pkgs/development/libraries/cdk/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/cdk/default.nix diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix new file mode 100644 index 00000000000..f998f464457 --- /dev/null +++ b/pkgs/development/libraries/cdk/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, ncurses}: +let + buildInputs = [ + ncurses + ]; +in +stdenv.mkDerivation { + name = "cdk"; + inherit buildInputs; + src = fetchurl { + url = "http://invisible-island.net/datafiles/release/cdk.tar.gz"; + sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp"; + }; + meta = { + description = ''Curses development kit''; + license = stdenv.lib.licenses.bsdOriginal ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9cbbb77bc..0b23f2382f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5772,6 +5772,8 @@ let ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + cdk = callPackage ../development/libraries/cdk {}; + cimg = callPackage ../development/libraries/cimg { }; scmccid = callPackage ../development/libraries/scmccid { }; From e66294151a69921e3ce38267ebae3c33121e20ae Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Jun 2015 20:31:34 +0300 Subject: [PATCH 074/208] Adding Lua 5.3, seems to work --- pkgs/development/interpreters/lua-5/5.3.nix | 102 ++++++++++++++++++ .../interpreters/lua-5/lua-5.3-dso.make | 8 ++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 114 insertions(+) create mode 100644 pkgs/development/interpreters/lua-5/5.3.nix create mode 100644 pkgs/development/interpreters/lua-5/lua-5.3-dso.make diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix new file mode 100644 index 00000000000..faa4b7694ee --- /dev/null +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -0,0 +1,102 @@ +{ stdenv, fetchurl, readline, compat ? false }: + +stdenv.mkDerivation rec { + name = "lua-${version}"; + luaversion = "5.3"; + version = "${luaversion}.0"; + + src = fetchurl { + url = "http://www.lua.org/ftp/${name}.tar.gz"; + sha1 = "1c46d1c78c44039939e820126b86a6ae12dadfba"; + }; + + nativeBuildInputs = [ readline ]; + + patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; + + configurePhase = + if stdenv.isDarwin + then '' + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) + '' else '' + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) + cat ${./lua-5.3-dso.make} >> src/Makefile + sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile + ''; + + postBuild = stdenv.lib.optionalString (! stdenv.isDarwin) '' + ( cd src; make liblua.so "''${makeFlagsArray[@]}" ) + ''; + + postInstall = '' + mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" + mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" + rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/lua.pc" < Date: Tue, 2 Jun 2015 20:31:57 +0300 Subject: [PATCH 075/208] Adding TextAdept --- .../editors/textadept/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/editors/textadept/default.nix diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix new file mode 100644 index 00000000000..9eb1bdc7e43 --- /dev/null +++ b/pkgs/applications/editors/textadept/default.nix @@ -0,0 +1,68 @@ +{stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip}: +let + buildInputs = [ + gtk glib pkgconfig unzip ncurses zip + ]; + cached_url = url: sha256: fetchurl { + inherit sha256 url; + }; + get_url = url: sha256: '' + cp ${(cached_url url sha256)} $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@') + touch $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@') + ''; + cached_url_zip = url: sha256: fetchzip { + inherit sha256 url; + }; + get_url_zip = url: sha256: let zipdir = (cached_url_zip url sha256); in '' + ( d=$PWD; cd $TMPDIR; name=$(basename ${zipdir} .zip | sed -e 's/^[a-z0-9]*-//'); + cp -r ${zipdir} $name; chmod u+rwX -R $name; zip -r $d/$name.zip $name ) + touch $name + ''; +in +stdenv.mkDerivation rec{ + version = "8.0"; + scintillua_version = "3.5.5-1"; + name = "textadept-${version}"; + inherit buildInputs; + src = fetchhg { + url = http://foicica.com/hg/textadept; + rev = "textadept_${version}"; + sha256 = "18kcphqkn0l77dbcyvywy3wh13ib280bb0qsffaqy439gk5zr7ql"; + }; + preConfigure = '' + cd src + mkdir wget + echo '#! ${stdenv.shell}' > wget/wget + chmod a+x wget/wget + export PATH="$PATH:$PWD/wget" + ${get_url http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz "11n49h58xh35vj1j85cxasl93rjiv699c5cs5lpv19skfsgs3sb4"} + ${get_url http://foicica.com/scinterm/download/scinterm_1.6.zip "0ixwj9il6ri1xl4nvb6f108z4qhrahysza6frbbaqmbdz21hnmcl"} + ${get_url http://foicica.com/scintillua/download/scintillua_3.5.5-1.zip "0bpz5rmgaisbimhm6rpn961mbv30cwqid7kh9lad94v3y9ppvf35"} + ${get_url http://www.lua.org/ftp/lua-5.3.0.tar.gz "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"} + ${get_url http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12.2.tar.gz "01002avq90yc8rgxa5z9a1768jm054iid3pnfpywdcfij45jgbba"} + ${get_url_zip http://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"} + ${get_url http://foicica.com/lspawn/download/lspawn_1.2.zip "1fhfi274bxlsdvva5q5j0wv8hx68cmf3vnv9spllzad4jdvz82xv"} + ${get_url http://luajit.org/download/LuaJIT-2.0.3.tar.gz "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"} + ${get_url http://foicica.com/gtdialog/download/gtdialog_1.2.zip "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"} + ${get_url http://invisible-island.net/datafiles/release/cdk.tar.gz "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp"} + ${get_url_zip http://foicica.com/hg/bombay/archive/d704272c3629.zip "19dg3ky87rfy0a3319vmv18hgn9spplpznvlqnk3djh239ddpplw"} + mv d704*.zip bombay.zip + ${get_url http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.17.tar.gz "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"} + make deps + ''; + postBuild = '' + make curses + ''; + postInstall = '' + make curses install PREFIX=$out MAKECMDGOALS=curses + ''; + makeFlags = ["PREFIX=$(out)"]; + meta = { + inherit version; + description = "An extensible text editor based on Scintilla with Lua scripting"; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://foicica.com/textadept"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e231d76349..5a8a09cbf0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2977,6 +2977,8 @@ let texstudio = callPackage ../applications/editors/texstudio { }; + textadept = callPackage ../applications/editors/textadept { }; + thc-hydra = callPackage ../tools/security/thc-hydra { }; tiled = callPackage ../applications/editors/tiled { qt = qt4; }; From be03ca926239742932d05c8eb4a52bf3e3053a56 Mon Sep 17 00:00:00 2001 From: jzellner Date: Tue, 2 Jun 2015 11:59:40 -0600 Subject: [PATCH 076/208] fix goimports build, use buildGoPackage --- pkgs/development/tools/goimports/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index 91bd207581d..2a8c897ce5b 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,11 +1,12 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }: +{ lib, goPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { +with goPackages; + +buildGoPackage rec { rev = "7534f4943d94a318edde90212439e538ed54cdde"; version = "git-2015-04-26"; name = "goimports-${version}"; - - buildInputs = [ go ]; + goPackagePath = "golang.org/x/tools"; src = fetchFromGitHub { inherit rev; @@ -14,15 +15,9 @@ stdenv.mkDerivation rec { sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50"; }; - buildPhase = '' - export GOPATH=$src - go build -v -o goimports golang.org/x/tools/cmd/goimports - ''; + subPackages = [ "cmd/goimports" ]; - installPhase = '' - mkdir -p $out/bin - mv goimports $out/bin - ''; + dontInstallSrc = true; meta = with lib; { description = "Import management tool for go"; From 2f96621b6a9646da2e11f391e2c29694b9234a14 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 2 Jun 2015 11:03:51 -0700 Subject: [PATCH 077/208] linux-testing: 4.1-rc5 -> 4.1-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f073a09dd0b..3a0d6a926d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1-rc5"; - modDirVersion = "4.1.0-rc5"; + version = "4.1-rc6"; + modDirVersion = "4.1.0-rc6"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0kqw5y5p8x1qyljlzj78vhg5zmj9ngn3m76c9qyji6izclh3y8vv"; + sha256 = "0b8ylsrnvwf0fsq6i0iar7h92z7q3356rh1x3a5wb5p0q5j7lldr"; }; features.iwlwifi = true; From 0307c27219ba43cc0a78cd370f825deca16eeaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 2 Jun 2015 20:15:35 +0200 Subject: [PATCH 078/208] kmod-blacklist-ubuntu: update to Vivid --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index c750006fcd2..b894908eb13 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gnugrep, findutils }: let - version = "3ubuntu1"; # Saucy + version = "18-3ubuntu1"; # Vivid in stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; - sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; + sha256 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94"; }; installPhase = '' From 99bf7f5698bdb2ba3e84c57d11e8fa19258c7549 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 2 Jun 2015 15:50:44 -0400 Subject: [PATCH 079/208] nixopsUnstable: Bump --- pkgs/tools/package-management/nixops/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 3400d72dea8..e924cd1abe2 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -17,13 +17,13 @@ let in pythonPackages.buildPythonPackage rec { - name = "nixops-1.3pre1484_a932a9e"; + name = "nixops-1.3pre1486_7489764"; namePrefix = ""; src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837"; - sha256 = "010qqpa4yvsra1744afsaj9akqjxzla5p0i4zgan9306m8k3jnpk"; + rev = "7489764a2cc59d29b66b2cf5eea83b467affd982"; + sha256 = "1qahqaj6536mnbz6xjj559j3zvsf2cwzhv7jmxcbib6ycxk2v7r0"; }; buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; From 33a1b14b06b74e00f8c0cea29ec86b8f30cafc1f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 2 Jun 2015 16:23:46 -0400 Subject: [PATCH 080/208] nixopsUnstable: Bring in quick fix --- pkgs/tools/package-management/nixops/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index e924cd1abe2..6f10989f3c7 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -22,8 +22,8 @@ pythonPackages.buildPythonPackage rec { src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "7489764a2cc59d29b66b2cf5eea83b467affd982"; - sha256 = "1qahqaj6536mnbz6xjj559j3zvsf2cwzhv7jmxcbib6ycxk2v7r0"; + rev = "5c7663dfe1e2af9c0396c5c86d995452ef2efc8a"; + sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy"; }; buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; From f0fb53e63ef9ac64a64865338ab7767c64f9246a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jun 2015 09:08:32 -0500 Subject: [PATCH 081/208] Update to plasma-5.3.1 --- pkgs/desktops/plasma-5.3/manifest.nix | 360 +++++++++++++------------- pkgs/desktops/plasma-5.3/manifest.sh | 2 +- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix index 22649b7581e..a815327826a 100644 --- a/pkgs/desktops/plasma-5.3/manifest.nix +++ b/pkgs/desktops/plasma-5.3/manifest.nix @@ -2,327 +2,327 @@ { stdenv, fetchurl, mirror }: [ { - name = stdenv.lib.nameFromURL "kscreen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/hjhbxv0vrv64r22z5zr15av8c6kpa2q3-kscreen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "breeze-5.3.1.tar.xz" ".tar"; + store = "/nix/store/wksay8grc0ihprrjkvfwaa5n0v1dsn7p-breeze-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kscreen-5.3.0.tar.xz"; - sha256 = "1d9qlqszrkz8ia1k20xy645mngg3jwyc9mjvc27z5yx3l2bjdisq"; - name = "kscreen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/breeze-5.3.1.tar.xz"; + sha256 = "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"; + name = "breeze-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.0.tar.xz" ".tar"; - store = "/nix/store/di83lwabjyf21g6bbww68xf3k89zdih5-kde-cli-tools-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "baloo-5.9.1.tar.xz" ".tar"; + store = "/nix/store/yljbiij3svkkmmqpwqxyc5gf8p4gz9zl-baloo-5.9.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kde-cli-tools-5.3.0.tar.xz"; - sha256 = "12i74cq9kghcj7sfhxqdlqjd5n4lpxr8nvlzkh4n8pjrz1w3g9n7"; - name = "kde-cli-tools-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/baloo-5.9.1.tar.xz"; + sha256 = "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"; + name = "baloo-5.9.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "bluez-qt-5.3.0.tar.xz" ".tar"; - store = "/nix/store/7lpwpw24aahx81dq78vbk203w6xpapar-bluez-qt-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "ksshaskpass-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8p1spxbb4iv5wrccipby7khh6r5pj4gb-ksshaskpass-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/bluez-qt-5.3.0.tar.xz"; - sha256 = "0zcqb8fiawprl2qz1lnf875dnkg7nlb6hghqqzp4l5hby20kxnq5"; - name = "bluez-qt-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz"; + sha256 = "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"; + name = "ksshaskpass-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-nm-5.3.0.tar.xz" ".tar"; - store = "/nix/store/hbvm05kcmpc7fncx4padzqx2gqvra88p-plasma-nm-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kscreen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/0gf4avv67cspclipvs1934fa9vn5bday-kscreen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-nm-5.3.0.tar.xz"; - sha256 = "1zldjrdr331shl4xk4yypr22lkav47bjsw4nzdia16x6nsh32yra"; - name = "plasma-nm-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz"; + sha256 = "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"; + name = "kscreen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "libkscreen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/cr0gg8a4asd3yyy5p0rx6r1m9ngww2f7-libkscreen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwayland-5.3.1.tar.xz" ".tar"; + store = "/nix/store/fqs8y8fmkk23biqlicq50m281jf45qbj-kwayland-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/libkscreen-5.3.0.tar.xz"; - sha256 = "1hdgj3l51i277ar9af02sz27bb811amr6b6n4fmcym7ss1r3vljd"; - name = "libkscreen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz"; + sha256 = "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"; + name = "kwayland-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "powerdevil-5.3.0.tar.xz" ".tar"; - store = "/nix/store/zjanbhr6ynx98sra3ibg86ajf2mxpw4v-powerdevil-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "muon-5.3.1.tar.xz" ".tar"; + store = "/nix/store/glhhnkdnn4sancq176mwd3pdw51xg58s-muon-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/powerdevil-5.3.0.tar.xz"; - sha256 = "1pr53yzmra17h7vhp7h9ywsbgk7cm7f2srbdg3ikp2i8a1gzkchm"; - name = "powerdevil-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/muon-5.3.1.tar.xz"; + sha256 = "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"; + name = "muon-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "libksysguard-5.3.0.tar.xz" ".tar"; - store = "/nix/store/k4ccrcbd33iknvamm1v56n2kz86hmcca-libksysguard-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "khelpcenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/s676r82b3lpr3fzrqcw0srl8zx9mj57l-khelpcenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/libksysguard-5.3.0.tar.xz"; - sha256 = "16b8xrkm1b53nwhcr91hiz0nc1bj9yjz3k4ccfmc6nhyjma3n24v"; - name = "libksysguard-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz"; + sha256 = "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"; + name = "khelpcenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.0.tar.xz" ".tar"; - store = "/nix/store/yws33kggkdqd5xpq065cbp0lzvgnn749-plasma-workspace-wallpapers-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.1.tar.xz" ".tar"; + store = "/nix/store/his4ak4djxslvmrdznyzf3v6mr3aq40s-kdeplasma-addons-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-wallpapers-5.3.0.tar.xz"; - sha256 = "0kci4f445624x93k521zva08kggffxqwcg5safzhxxrwyfw65nja"; - name = "plasma-workspace-wallpapers-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz"; + sha256 = "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"; + name = "kdeplasma-addons-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-sdk-5.3.0.tar.xz" ".tar"; - store = "/nix/store/p02z3bzwd2zh62n9hj2mypvvsb0z0396-plasma-sdk-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "systemsettings-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8fyfslw9ip7fsn6gb55v6i1cxajgxmjb-systemsettings-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-sdk-5.3.0.tar.xz"; - sha256 = "1vbi45f8clpzx2hqpnzw4wamwzm4016mzh4q6yhwgappqsgn3x9f"; - name = "plasma-sdk-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz"; + sha256 = "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"; + name = "systemsettings-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-desktop-5.3.0.tar.xz" ".tar"; - store = "/nix/store/livypzdcyjjiqs50varb9m2fbky6gwhm-plasma-desktop-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kinfocenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/flpcnl0mn3mma12nkgymabjgzm1yc4kf-kinfocenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-desktop-5.3.0.tar.xz"; - sha256 = "0f8rs3p1cbvryg6z386kb9pb0ygbw7jqf63hnpcjkbg33rq14q9p"; - name = "plasma-desktop-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz"; + sha256 = "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"; + name = "kinfocenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kinfocenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/w3dl539dn5jczrc50dmsywv79m3iyqxx-kinfocenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "libkscreen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/3i82s0x8hsi0q9hyp8m42m8nxcm6cwx5-libkscreen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kinfocenter-5.3.0.tar.xz"; - sha256 = "02znnw11j37f084bcjp160sm5fs7kc251w07rxly49jdjyy6ddiw"; - name = "kinfocenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz"; + sha256 = "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"; + name = "libkscreen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.0.tar.xz" ".tar"; - store = "/nix/store/v6wgn4l8brv3v4mdjgy0hfqxynwncy2p-polkit-kde-agent-1-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "libksysguard-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8jaxispzwkpdy6kazyhdy6k00f0s7dla-libksysguard-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/polkit-kde-agent-1-5.3.0.tar.xz"; - sha256 = "0z1c354sjm218w30x2whiij43jamfh4lclwcr14bqk2s8i9njhir"; - name = "polkit-kde-agent-1-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz"; + sha256 = "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"; + name = "libksysguard-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kdecoration-5.3.0.tar.xz" ".tar"; - store = "/nix/store/8zx7y39rrcnmfdjkp7g5xrb7xkwn6mp7-kdecoration-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kmenuedit-5.3.1.tar.xz" ".tar"; + store = "/nix/store/p6x58nfjkml2125rpvkr7zcvrv11fn1l-kmenuedit-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kdecoration-5.3.0.tar.xz"; - sha256 = "1abwqd8cxf6gabc74pvhnqhwqkn8a7zszwf031ndicl3n3f93x3d"; - name = "kdecoration-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz"; + sha256 = "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"; + name = "kmenuedit-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.0.tar.xz" ".tar"; - store = "/nix/store/6hivcczg1gp31ayfz802dxdr89zpaqym-kde-gtk-config-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.1.tar.xz" ".tar"; + store = "/nix/store/g9r436iff0714c2ya9xbm0sgd4gdiaq5-plasma-mediacenter-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kde-gtk-config-5.3.0.tar.xz"; - sha256 = "1s7jkrb3750aw0cn5v0g7pdsbkb5ncxfhfclw8lr1nqgi03lphcf"; - name = "kde-gtk-config-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz"; + sha256 = "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"; + name = "plasma-mediacenter-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "systemsettings-5.3.0.tar.xz" ".tar"; - store = "/nix/store/vzxxqpvapq8fnbf88ljhhnrpzl7vl6wf-systemsettings-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-sdk-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mifrpgvf29kzr7n4lk1xq8s1b3a1d29q-plasma-sdk-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/systemsettings-5.3.0.tar.xz"; - sha256 = "0ryhm9d46r5691alnrrg88qxbdwm10y1k7jdk7czrnjm5jkg86vh"; - name = "systemsettings-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz"; + sha256 = "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"; + name = "plasma-sdk-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "muon-5.3.0.tar.xz" ".tar"; - store = "/nix/store/46mqwn6l763jq9qgvp9d6lg184760ff8-muon-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwrited-5.3.1.tar.xz" ".tar"; + store = "/nix/store/agrv0yx7fzkjyx8b4bl0anbhi99v6l6y-kwrited-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/muon-5.3.0.tar.xz"; - sha256 = "0f9bnp2pf0npil189a0g3pn6bnb9nwqdclrk7scrk4xck7c66v0r"; - name = "muon-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz"; + sha256 = "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"; + name = "kwrited-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "milou-5.3.0.tar.xz" ".tar"; - store = "/nix/store/zdx8hxf5w0yqypjk08w5hfhkzngdy6pm-milou-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "khotkeys-5.3.1.tar.xz" ".tar"; + store = "/nix/store/m1v47sjjn9hz8pdfzql5xx9r0j1zpd4q-khotkeys-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/milou-5.3.0.tar.xz"; - sha256 = "089dvxpwiwa3sasah27n4yk8l3jbmi71p4080q8pslx6j4dhhmsq"; - name = "milou-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz"; + sha256 = "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"; + name = "khotkeys-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kmenuedit-5.3.0.tar.xz" ".tar"; - store = "/nix/store/1hjwhla1d23gbmmigxmm4w2ahkayyfr8-kmenuedit-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-nm-5.3.1.tar.xz" ".tar"; + store = "/nix/store/r8sbla68dniy9snbni1g4h9rwwm5bghh-plasma-nm-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kmenuedit-5.3.0.tar.xz"; - sha256 = "0jzzl043jq9afknj1pc75ywmbs5ff4rjnbqgim5xgrbr08bsam9j"; - name = "kmenuedit-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz"; + sha256 = "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"; + name = "plasma-nm-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-workspace-5.3.0.tar.xz" ".tar"; - store = "/nix/store/sji2iki8crvy81q6mrc1dd3gibv88mrn-plasma-workspace-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdecoration-5.3.1.tar.xz" ".tar"; + store = "/nix/store/g9163zl8sjxnr32mmy70cbw0a0arsm8c-kdecoration-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-5.3.0.tar.xz"; - sha256 = "05kk8vnhsny3k8pn27pjawdfxcjf4c6pcl2k7s43zim0khqv5xcm"; - name = "plasma-workspace-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz"; + sha256 = "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"; + name = "kdecoration-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.0.tar.xz" ".tar"; - store = "/nix/store/70mkx8jw7dhs1lvqgdjhcvr6y5y4bfck-oxygen-fonts-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-5.3.1.tar.xz" ".tar"; + store = "/nix/store/8z7cjvfh9bw6402ccipzpgfh4a5rwvmd-oxygen-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/oxygen-fonts-5.3.0.tar.xz"; - sha256 = "0wiqn91m5b421c46fbicmzhkp7lgzck0mrqn7ng0daw8aj6am94y"; - name = "oxygen-fonts-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz"; + sha256 = "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"; + name = "oxygen-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kio-extras-5.3.0.tar.xz" ".tar"; - store = "/nix/store/g889cng2b9pwz2yhp3qyjyqzhs6h5jvx-kio-extras-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.1.tar.xz" ".tar"; + store = "/nix/store/safa43z9955m484jnfagz4rxby5jhn9l-kde-gtk-config-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kio-extras-5.3.0.tar.xz"; - sha256 = "0n6fb4cadp16m1ck11d2zp6lrsjmj1q4iav5gydg3i7bds9kwlhf"; - name = "kio-extras-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz"; + sha256 = "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"; + name = "kde-gtk-config-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "oxygen-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3hdjzpgy699qpfxj17dq913nf8qw2wgg-oxygen-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "bluez-qt-5.3.1.tar.xz" ".tar"; + store = "/nix/store/s8k9h017za3z3j3h046ialysxxna2avs-bluez-qt-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/oxygen-5.3.0.tar.xz"; - sha256 = "0a55zncpa156rlkpg26j2gwl8ibc1fjb014sm4j07c3q85zd7n73"; - name = "oxygen-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz"; + sha256 = "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"; + name = "bluez-qt-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.0.tar.xz" ".tar"; - store = "/nix/store/qrhvjbik2vzxrln457kyl80yhpsk2byx-kdeplasma-addons-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.1.tar.xz" ".tar"; + store = "/nix/store/z9hb5dcjbvnrrkhba58vbhism9djavh9-polkit-kde-agent-1-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kdeplasma-addons-5.3.0.tar.xz"; - sha256 = "10h68sqm536j972mqn216b0304r2gpy76klgdr2d2pzqs0vwywll"; - name = "kdeplasma-addons-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz"; + sha256 = "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"; + name = "polkit-kde-agent-1-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "ksshaskpass-5.3.0.tar.xz" ".tar"; - store = "/nix/store/23bkyxca8ydz1g1zj8rlyd14xn073jlw-ksshaskpass-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.1.tar.xz" ".tar"; + store = "/nix/store/gfah83qmrzhfjxjvgaczz4bggyvxqq2l-kde-cli-tools-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/ksshaskpass-5.3.0.tar.xz"; - sha256 = "1f7kn163hnxh47q6h73lqhzkzpjhlbhq670lkr89s5i7kxjnla54"; - name = "ksshaskpass-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz"; + sha256 = "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"; + name = "kde-cli-tools-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/f3bwrgk52fj27b3bpgix8zy1vmwryh5f-plasma-mediacenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "sddm-kcm-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mhvhgh8n3a6dzjsxzgp8ynsryv3y54kv-sddm-kcm-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/plasma-mediacenter-5.3.0.tar.xz"; - sha256 = "1iw6v35mg6p8g7pxnqqm1sqs75kmk04jzaakmfs6xjn8h34s0kmp"; - name = "plasma-mediacenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz"; + sha256 = "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"; + name = "sddm-kcm-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "breeze-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3d28b0pqh4qjgbff556q475fgkhx0f5r-breeze-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "powerdevil-5.3.1.tar.xz" ".tar"; + store = "/nix/store/y571p4chd574qvzjbc7pbbixsb7g4g45-powerdevil-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/breeze-5.3.0.tar.xz"; - sha256 = "12drbw4j7bk0yd7g45j1w70v3jnm4z323zsad3lnnzw448lm9vck"; - name = "breeze-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz"; + sha256 = "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"; + name = "powerdevil-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "bluedevil-5.3.0.tar.xz" ".tar"; - store = "/nix/store/9wq45x6vk9kf9c01ba2xhsdibhaqq7hc-bluedevil-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-5.3.1.tar.xz" ".tar"; + store = "/nix/store/kxn9mq9hrqzwpw8ldxqjdaxm5zqnq1jb-plasma-workspace-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/bluedevil-5.3.0.tar.xz"; - sha256 = "0bw03kkfzpcq6s2kx8zi66f308zc153m4ddknlvf5cnm7wvykx4q"; - name = "bluedevil-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz"; + sha256 = "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"; + name = "plasma-workspace-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kfilemetadata-5.9.0.tar.xz" ".tar"; - store = "/nix/store/whv1mw43461l69j1qa2dp95953si4mcy-kfilemetadata-5.9.0.tar.xz"; + name = stdenv.lib.nameFromURL "milou-5.3.1.tar.xz" ".tar"; + store = "/nix/store/02qx55q40iwpwwdr5dmnpdg5hhzcdb7a-milou-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kfilemetadata-5.9.0.tar.xz"; - sha256 = "0rgcdpys13qpv11sqrfjxxp75dlchnffvvz7bi7vps1xypnvk4jw"; - name = "kfilemetadata-5.9.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/milou-5.3.1.tar.xz"; + sha256 = "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"; + name = "milou-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "khelpcenter-5.3.0.tar.xz" ".tar"; - store = "/nix/store/7x373jrlqhj9jq6j3qcz9vimzzr3za5z-khelpcenter-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "ksysguard-5.3.1.tar.xz" ".tar"; + store = "/nix/store/m8q2mc88168lkh4j3jxqjyshf0h5d7gs-ksysguard-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/khelpcenter-5.3.0.tar.xz"; - sha256 = "1zk70bc2zmnh37qp2w7rh6lzid5hmavm7amyzllsksakj6ba40ki"; - name = "khelpcenter-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz"; + sha256 = "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"; + name = "ksysguard-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "khotkeys-5.3.0.tar.xz" ".tar"; - store = "/nix/store/ml95kbmiczriikch5jgk6iwljinsb28b-khotkeys-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-desktop-5.3.1.tar.xz" ".tar"; + store = "/nix/store/bilfn2r9akz2mxyl03q1a9i8nndbabhg-plasma-desktop-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/khotkeys-5.3.0.tar.xz"; - sha256 = "19dy7v67l2xb1x1fqjwljg940gcc9jrvywx2xxvv2lfxgc1i0da4"; - name = "khotkeys-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz"; + sha256 = "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"; + name = "plasma-desktop-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwrited-5.3.0.tar.xz" ".tar"; - store = "/nix/store/rfhx33pghmghr0kxlwijc6lfwpzs8a91-kwrited-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwin-5.3.1.tar.xz" ".tar"; + store = "/nix/store/0b3mjqqacgl23xqkhimqpgswwvsqz7bc-kwin-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwrited-5.3.0.tar.xz"; - sha256 = "0mv7nrlgwrb10dcf91mrnpjmrzwgdsylnd4b4grccc13c2f55lad"; - name = "kwrited-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kwin-5.3.1.tar.xz"; + sha256 = "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"; + name = "kwin-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwayland-5.3.0.tar.xz" ".tar"; - store = "/nix/store/0bnhdabiq55i43gwcvpj52ysi2w0zvw0-kwayland-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.1.tar.xz" ".tar"; + store = "/nix/store/mfn2ga4yr0v8pgknsxsgnvxayn6p7sal-plasma-workspace-wallpapers-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwayland-5.3.0.tar.xz"; - sha256 = "1ghxwhnk68nadj48r9cxl250ryylwqrarw26jvv7k7kxs6gqlncr"; - name = "kwayland-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz"; + sha256 = "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"; + name = "plasma-workspace-wallpapers-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "sddm-kcm-5.3.0.tar.xz" ".tar"; - store = "/nix/store/wfp80cwqkxifmdgqv8p6mgc1k6gf5shd-sddm-kcm-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kfilemetadata-5.9.1.tar.xz" ".tar"; + store = "/nix/store/pshcx9qvc0z4w486q4a51ygm86p7w06a-kfilemetadata-5.9.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/sddm-kcm-5.3.0.tar.xz"; - sha256 = "15x0ad6zlpdnc4z398ydpr5w0bfla3r5x6mkgakis0mx6vpyzwcc"; - name = "sddm-kcm-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz"; + sha256 = "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"; + name = "kfilemetadata-5.9.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "kwin-5.3.0.tar.xz" ".tar"; - store = "/nix/store/3mzgg28m89a0g0wlysil39g8lzzip46p-kwin-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "kio-extras-5.3.1.tar.xz" ".tar"; + store = "/nix/store/gy53gcnhk83ab62a2w1x0lm7lxxkn9wh-kio-extras-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/kwin-5.3.0.tar.xz"; - sha256 = "1mvgmjmxjmv0vl0xfxyqa43rh5n65p3z5zz1ban7lbp16sn6qkqn"; - name = "kwin-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz"; + sha256 = "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"; + name = "kio-extras-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "baloo-5.9.0.tar.xz" ".tar"; - store = "/nix/store/kz17030nf6rifv84p2y08wrygbsl66xg-baloo-5.9.0.tar.xz"; + name = stdenv.lib.nameFromURL "bluedevil-5.3.1.tar.xz" ".tar"; + store = "/nix/store/v3k1px6zx4dqz77s0l48lky1zh22c2ps-bluedevil-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/baloo-5.9.0.tar.xz"; - sha256 = "1n6k6mznnjccqirr8371z0n0h2cpg6lk50n6dcx0cbqc5mfsckyn"; - name = "baloo-5.9.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz"; + sha256 = "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"; + name = "bluedevil-5.3.1.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "ksysguard-5.3.0.tar.xz" ".tar"; - store = "/nix/store/ixm26iv7hhgkss8carpln178df1p56xv-ksysguard-5.3.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.1.tar.xz" ".tar"; + store = "/nix/store/lbvr2fw8361mmd8gpqk9m917qmg8h381-oxygen-fonts-5.3.1.tar.xz"; src = fetchurl { - url = "${mirror}/stable/plasma/5.3.0/ksysguard-5.3.0.tar.xz"; - sha256 = "0pz2v2lxcgn2jp0nzci1yrnxlcs3sf3a2bipaz31w5bhz128k7wi"; - name = "ksysguard-5.3.0.tar.xz"; + url = "${mirror}/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz"; + sha256 = "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"; + name = "oxygen-fonts-5.3.1.tar.xz"; }; } ] diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh index befd14f0b12..3ccfc8da3da 100755 --- a/pkgs/desktops/plasma-5.3/manifest.sh +++ b/pkgs/desktops/plasma-5.3/manifest.sh @@ -6,5 +6,5 @@ KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ - "${KDE_MIRROR}/stable/plasma/5.3.0/" \ + "${KDE_MIRROR}/stable/plasma/5.3.1/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' From 7d2e419597bc2a716f1d8386eb44c4a662f5e8dc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jun 2015 16:23:00 -0500 Subject: [PATCH 082/208] plasma-5.3: run startkde with `set -x` --- .../0001-startkde-NixOS-patches.patch | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch index 68f32862b21..a542fb7b87d 100644 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,23 +1,25 @@ -From 9aa37de6cd887c6cdd7ea2356cbb6aecdb988b75 Mon Sep 17 00:00:00 2001 +From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 3 May 2015 14:51:04 -0500 +Date: Tue, 2 Jun 2015 11:21:43 -0500 Subject: [PATCH] startkde: NixOS patches --- - startkde/startkde.cmake | 212 +++++++++++++++++++----------------------------- - 1 file changed, 85 insertions(+), 127 deletions(-) + startkde/startkde.cmake | 214 ++++++++++++++++++++---------------------------- + 1 file changed, 87 insertions(+), 127 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 24e5c1b..d8642d3 100644 +index 24e5c1b..787d719 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake -@@ -1,8 +1,29 @@ +@@ -1,8 +1,31 @@ -#!/bin/sh +#!@bash@/bin/bash # # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # ++set -x ++ +# The KDE icon cache is supposed to update itself +# automatically, but it uses the timestamp on the icon +# theme directory as a trigger. Since in Nix the @@ -42,7 +44,7 @@ index 24e5c1b..d8642d3 100644 if test "x$1" = x--failsafe; then KDE_FAILSAFE=1 # General failsafe flag KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +37,16 @@ trap 'echo GOT SIGHUP' HUP +@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -75,7 +77,7 @@ index 24e5c1b..d8642d3 100644 fi # Boot sequence: -@@ -56,13 +64,8 @@ fi +@@ -56,13 +66,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys @@ -91,7 +93,7 @@ index 24e5c1b..d8642d3 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <&2 @@ -275,7 +277,7 @@ index 24e5c1b..d8642d3 100644 # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -332,11 +284,11 @@ fi +@@ -332,11 +286,11 @@ fi # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -289,7 +291,7 @@ index 24e5c1b..d8642d3 100644 KDE_SESSION_UID=`id -ru` export KDE_SESSION_UID -@@ -346,30 +298,36 @@ export XDG_CURRENT_DESKTOP +@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP # At this point all the environment is ready, let's send it to kwalletd if running if test -n "$PAM_KWALLET_LOGIN" ; then @@ -331,7 +333,7 @@ index 24e5c1b..d8642d3 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -385,27 +343,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" +@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" @@ -366,7 +368,7 @@ index 24e5c1b..d8642d3 100644 done break fi -@@ -417,21 +375,21 @@ echo 'startkde: Shutting down...' 1>&2 +@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up @@ -393,5 +395,5 @@ index 24e5c1b..d8642d3 100644 echo 'startkde: Done.' 1>&2 -- -2.3.6 +2.4.1 From 1a64d9251c39fc403802d53c7ae3a13b7171b1fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2015 23:56:56 +0200 Subject: [PATCH 083/208] Add git-hub: command line GitHub interface Rather cool, actually. --- .../git-and-tools/git-hub/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-hub/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix new file mode 100644 index 00000000000..d9cf0b3d84d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, docutils, python }: + +let version = "0.9.0"; in +stdenv.mkDerivation { + name = "git-hub-${version}"; + + src = fetchFromGitHub { + sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h"; + rev = "v${version}"; + repo = "git-hub"; + owner = "sociomantic"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Git command line interface to GitHub"; + longDescription = '' + A simple command line interface to GitHub, enabling most useful GitHub + tasks (like creating and listing pull request or issues) to be accessed + directly through the Git command line. + ''; + homepage = https://github.com/sociomantic/git-hub; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ python ]; + nativeBuildInputs = [ docutils ]; + + postPatch = '' + substituteInPlace Makefile --replace rst2man rst2man.py + patchShebangs . + ''; + + enableParallelBuilding = true; + + installFlags = "prefix=$(out)"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a8a09cbf0e..0311f6ac7b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1519,6 +1519,8 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; + git-hub = callPackage ../applications/version-management/git-hub { }; + gitlab = callPackage ../applications/version-management/gitlab { ruby = ruby_2_1_3; }; From b4a3ec347ffe31dd48a06ad02dcf30625b23ba73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 01:05:48 +0200 Subject: [PATCH 084/208] git-hub: fix package path... --- 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 0311f6ac7b8..a739a699641 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1519,7 +1519,7 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; - git-hub = callPackage ../applications/version-management/git-hub { }; + git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; gitlab = callPackage ../applications/version-management/gitlab { ruby = ruby_2_1_3; From 26a7698116022072f2058a0045a44290a4984a34 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 2 Jun 2015 16:58:55 -0700 Subject: [PATCH 085/208] emacs-packages: haskell-mode 13.12 -> 13.14 --- pkgs/top-level/emacs-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d74d1840449..2662f94f0da 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -686,12 +686,12 @@ let self = _self // overrides; haskell-mode = melpaBuild rec { pname = "haskell-mode"; - version = "13.12"; + version = "13.14"; src = fetchFromGitHub { owner = "haskell"; repo = pname; rev = "v${version}"; - sha256 = "1l8sby2626hpp0li23mic3qq8w7jirsp1hd08hkx2z84gvz4j6fz"; + sha256 = "1mxr2cflgafcr8wkvgbq8l3wmc9qhhb7bn9zl1bkf10zspw9m58z"; }; meta = { license = gpl3Plus; }; }; From df95d3eca7f6847b13f04a0dd2e6d4c47c699ce6 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 2 Jun 2015 16:59:25 -0700 Subject: [PATCH 086/208] emacs-packages: add perspective-el --- pkgs/top-level/emacs-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2662f94f0da..f1581d83f0d 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -888,6 +888,18 @@ let self = _self // overrides; }; }; + perspective = melpaBuild rec { + pname = "perspective"; + version = "1.12"; + src = fetchFromGitHub { + owner = "nex3"; + repo = "${pname}-el"; + rev = version; + sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q"; + }; + meta = { license = gpl3Plus; }; + }; + pkg-info = melpaBuild rec { pname = "pkg-info"; version = "20140610"; From ef667f779fa27f61cbdc3063f7b80ce0b3e80baf Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 2 Jun 2015 16:59:41 -0700 Subject: [PATCH 087/208] emacs-packages: separate helm- and persp-projectile from projectile mirrors current MELPA division --- pkgs/top-level/emacs-packages.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index f1581d83f0d..c2f06ee920c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -934,7 +934,24 @@ let self = _self // overrides; rev = "v${version}"; sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m"; }; - packageRequires = [ dash helm s pkg-info epl ]; + fileSpecs = [ "projectile.el" ]; + packageRequires = [ dash helm pkg-info ]; + meta = { license = gpl3Plus; }; + }; + helm-projectile = melpaBuild rec { + pname = "helm-projectile"; + version = projectile.version; + src = projectile.src; + fileSpecs = [ "helm-projectile.el" ]; + packageRequires = [ helm projectile ]; + meta = { license = gpl3Plus; }; + }; + persp-projectile = melpaBuild rec { + pname = "persp-projectile"; + version = projectile.version; + src = projectile.src; + fileSpecs = [ "persp-projectile.el" ]; + packageRequires = [ perspective projectile ]; meta = { license = gpl3Plus; }; }; From def4876d4133ce84864baf437846031b78b6c5b5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 3 Jun 2015 09:32:11 +0900 Subject: [PATCH 088/208] firefox-bin: update to version 38.0.5 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index c5d82573a32..aaaeb354f40 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "38.0.1"; + version = "38.0.5"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; } - { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; } - { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; } - { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; } - { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; } - { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; } - { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; } - { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; } - { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; } - { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; } - { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; } - { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; } - { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; } - { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; } - { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; } - { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; } - { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; } - { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; } - { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; } - { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; } - { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "71e7e8194190bebcdde40a0e265b7dcb3d6173d1"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "eda799cc394838cf2a5eea4a182149ff2616bc00"; } + { locale = "af"; arch = "linux-i686"; sha1 = "9162c87b2d1f420ccc5475b59bca72d45918fed3"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "4f1d9f1bebea6a9adb085191b4bdb7b3367c4b9b"; } + { locale = "an"; arch = "linux-i686"; sha1 = "537e6ea08c546d1ed704b1e9dd28b1219e1e5e8a"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "34b9e09b3f29e1263105b713e743038b3a166cec"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "17b25623c086778caffd7ed45e10870a3d17baa1"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "4e35d4704dfd1218b783156d0a97340480eabe30"; } + { locale = "as"; arch = "linux-i686"; sha1 = "596d66e6b3a8818ddd07ea285c08ca6ad508e4f6"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "80b92c1881e2841dee4f955156237aadfdf37a33"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "7f6b67bbf751fb55419bb3893e121b50f4d5e34b"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "4705cda1e366b2be2be5164fedf22f5724454101"; } + { locale = "az"; arch = "linux-i686"; sha1 = "5fa3021fcb1c0f7317738dcdd95f0f76ca70eb55"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "b16d8a1e56ba3818f590952c19463b4eb08bb4a4"; } + { locale = "be"; arch = "linux-i686"; sha1 = "300fca8783d59df6b4459760d0aaa5ac6af2a6cc"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "d8d56febf53ed513628dc1604f65c60ac8460a37"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "4aad8ed44d69c3aecb9c629168f62d0e4711eea6"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "9eaddf470789ca0574ea07bbfdfbbcaca635c69d"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "873db2012724c313f956ee0aca72341d443ff201"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3192ab016485d10abfb0dd7bccdbd94f3d33a706"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "bb7b5dee4134546ce341e324a53c77e35e95b627"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "057e4c7bc2a06c53209e87804516cb12a644be12"; } + { locale = "br"; arch = "linux-i686"; sha1 = "d3a08e420b46d17f702c5b4bf1ed52160e8532c8"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "e18d7a198b0bd1c08a3b0ef5ab453daacc7528a2"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "5ccfa1e2e8058707c6d0428bab370f8517c4e231"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "98e7ae1ca507e58b297acb39b7aa026530b75974"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "ff54c24002b0b1161a859771497f9a31013c265b"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "781161113c8719d8932365f113c1bfa1994caa63"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "f697723873da7961159ef17318b1b64c2d021a7c"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "44d20f198bbeca2c69fccbfc8d21c2861145102e"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "8ae202815c3c60aef0287f18b857ba432f122a84"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "c06b25151929540760d2d10dcdb0f4087a9f531a"; } + { locale = "da"; arch = "linux-i686"; sha1 = "02690ab49d10976d5176c95f0cbc72509908fc1f"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "0a4733b4e56e99976a53d99e209f84527c2a3059"; } + { locale = "de"; arch = "linux-i686"; sha1 = "e3e067f028a018e4ae61542da9ae4e43c736f65b"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "8161109d11373b07626b563c4ca494feca3abd41"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "01fc9ebe4ac4a86a2bd4fedb6b07a9a832980a57"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7de40c35552ce74b66bdcf56a5e4edb75995f8d5"; } + { locale = "el"; arch = "linux-i686"; sha1 = "f53b5bb439e882701dfe1efdcb7fb42ba15cc72d"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "05843b9324fc255a4123a70d460e6db421cf55a7"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "c93568ad64a96235aec83ff8740335b07191d2ef"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "536b58997a39aed71a985d9eb9ab96602c9ab057"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "8bfc35a45e9d0f2a2d4359ccaaee54c564d3b5e3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b86e07f455da243f1236b8044aeccf41c4ade1b0"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cd3722feaebc63944e927ab244a95deb2a55aced"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "0daf7c897bf695338310050374d29c2acdaea553"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "d79ecbf48f47a3e34e0bcf897d37d2a2abbf466a"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "95c616e21fe9d948d363db89c0a6a1a4e31301db"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "5ab97d5aebbde63477cf1868bf0cb5f1b79ee820"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "02d49650094d336e17f57fa43c9969d0b3221ca3"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "e8d10a3465e7efd01ee03e57316d60176710b124"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "f40a1ec33e5018d423b65bd26563ac8db100e50d"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "66a1bc0c31061d5738bc80e9254262ada65bfb71"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "8f22bab29fb4e7359aa1261f2333faecbafe4c08"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "34f60fef14360b754510a5378d4b5d6855d49326"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "9d024945473b55373c155dbbec8880f79ee2de5e"; } + { locale = "et"; arch = "linux-i686"; sha1 = "2fd526c6fd23e5b0e7b292d99a60cf1530bb84e1"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "15628af429866cac3a1604f587b08d4bbeccb7e9"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "ea55480fd572173c1461a9e41c2080af890c4667"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "1e7f8cd86df1cf74525f8d07d13bcd8ea2a22b87"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "24982ebb6d6cac67673a9c39c91da7adc4c825c2"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "02f221c5526e03edadb2c36bfa5d9e35557d03a3"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "f3b8962106a9a4bc5b4f1d2928255cfaaa9094b0"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "3a8ebe66407e6369ebc26757562b4f48a6773cdd"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "c8a838618b2a8d267e24596c6cbc25f539676762"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "3382937e58f6e244d3c6dcef1051aa6bdd38692c"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "6fefc6e8548fa8fcc7182a05b06b00a3b50bb5d6"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b58fe2c383d4d43d1731f25dc52754712bc207d"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "118c326cdedbc4e5a1bac1ff6b1bb92f5d054847"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "384e13b51d09e99b2abce566d06d7cd522a532a7"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "ae6002a1a9b1be4f29a56176aa4dfd2fee543bdd"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c87ac5ff79b4dbf3d8738cc3309c882d7573eb3b"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "2bfd0ccec6d84b22d3f6f471f4ad096e6dc1edd3"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "cc919edd60169de8167c9e9fcf32f94fe9df4f52"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "70cdf62012d3d98b028d6b9fb9adf077c37e7c0c"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "a090ce8a36f3182aba809823ba171a0702bf17b5"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "5698a36c3f1372446e38ada59e45468f07fd5d19"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "18b49c1004778b8b11d2f3961dfed29ba562430a"; } + { locale = "he"; arch = "linux-i686"; sha1 = "9edddef1ce1361d76917ce255f348e208bb16697"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "64136eeab22a5150a95bdc916ce81e2f1b42a6df"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "314f99e05cf58ec8a2c50f8fe93ebe648a62a570"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "2e9245f46a28c70aa5451011bd2c59e8100a1804"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "4cc1112e81ec7f8df2ef95bbab3b3eb398ea67eb"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "e9d643c799542b118ce8cf274ab36aaec89850b3"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "e525b1c0a77274c851417c1d3af887657d9dcb18"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "016e3fcbaeb7844e3639e1c2599172de5c3f7b2f"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "2234cff2bb19e849d1a6ace38dd63258a54c192f"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "9498c156b33d8a9f90ccef6ccc202c69e4ee6c3d"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "49e7923e60daea2e0df4c27d1f6baad70b24b030"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "c9bed347d74b399901ee3f8e745ed1832462357e"; } + { locale = "id"; arch = "linux-i686"; sha1 = "7fecad428f80346a6333aa6cdc912cec0644b306"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "7370cb725b9087e5bff8943208762bc5bf4d01d9"; } + { locale = "is"; arch = "linux-i686"; sha1 = "c1139da81e8e581e7ddd511d0ce16c0b169d46f0"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "63c64558cd22ac170b39e186c1dd0e77a09c3200"; } + { locale = "it"; arch = "linux-i686"; sha1 = "4eb39e3fc5c3847a85a618100d3a9edc9d3bfe78"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "37fa87367363d7e337e75da89f8e5ce8f762c755"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "47b6d53050cf10535a5f7d6a8cee78ab15ad36b7"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "48b20dd2a743a1b887d15179c87b266dbe89a1ae"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "4046e0f75d4657d7423b4a0da53778348442ee5e"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "039f3c025f562e9278b16fb065d07511a3ca1f54"; } + { locale = "km"; arch = "linux-i686"; sha1 = "7baebf01741af616e69520f4bc95dd56187c12a2"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "f1a0557ac698f79bf926756cca2c33bd12a8ae83"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "1d2c2f8d9f455e0b6c793749f2298436167c25e4"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "473abeac7637b82d910427cac7e6da8ece20a4e5"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "41fe278dc963a7464679f4ec8a9e586666e7ceb3"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "58563ea60e40b73d1d5c9b10797d05aba5d13c95"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "dfa1c12416a9e7e6d04e5f4aaed3a03731d98372"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "75f9fb66b6610b65b402d3c8664096b4194ce1b0"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "667f035cb58c56967ed28f9cde44864cb15d5afa"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "d5709105b8255ee94c96358d2ac447dc5e4acc2d"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "b090761ded023ed465fc9629873e08ecdbaf924b"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "529312d4e7109472bf5b97ed4a9fff58bb8adbd5"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "d2ced083aefcdcd5aca84471bc382be8247e8745"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "be7a808a391a4fd1dde215834756bc61ae5e85fa"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "8a079d8ee62e3bf8fb37f81385a270af5e474aef"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "c644e5c7a6506ab203d1be61264f6bcf9fa52946"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "d3bd6308643ae805c69eeee8b716b97dc844ed9c"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "33f0f47e125f8a67a30d807775c7d0743135da84"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "9d38caee6d6c0baa8a7ea6148c65e7a28362a0fe"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "3c3f93fd22c8ae7d7056bbfae3df0ecaa7d7dcaf"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "8486b9a81265430e876410a6040e09f0bf6d4eed"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "6cd3c0ab1c33d8eb3de6f68ce7c7a219e80f49f9"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "bcd8e685a023c9919479ffe0f77c16df4fe3e2e8"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8052c43680c9720783b6e1947c949030f1cfa51a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "c0ae9e1fb361a7d085ef296f5afcc61a5b106c94"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "246213bd7baa7bb32b15c39237c0eece624a8dae"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "f5f7b590544228f110ddb1153f1c5354bea58656"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "c62e1e681736dbdf19d1a8c6a7f3eff01764d050"; } + { locale = "or"; arch = "linux-i686"; sha1 = "8008fd2095b86bd05daee4e48f95aa9003982ebf"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a52d6d27d9612fe9b1aa3dac377d783bcc53baa1"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a819a01f2968030cc2102640f50e31cb340e5044"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2b8e58cf70e8cc841e720706a511e0626439b8ac"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "db1bb9bbf35166ba760274dd4c813bf4b52db2da"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "1a97efa01142188d282743bd3f97dec2bf51067a"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d3b3f3de01e6970909d6083a2164eb840897d46e"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e842275df31fa1202a6e5214424b870ed8e04789"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "86001510f93e7063442415325cea1772a8fe04e8"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "7090a6adb110be77527bca5a40ea5c44515e07d3"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "42087d61aed17ce567503cc944bbada7d5bc77a4"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "7b3a8078235ca307dc75b931b060d46a7b3e8e95"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "1ff6eb3feef71d37f943667945f4547fe9daca37"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "acf3f0c0ad5bd9b3c2edcafe7dd7b6e8e45a7ec4"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "3e9b32187704caec231fce83e5519d2b2fc066a7"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "065fee4f21ff6ebdc21a81aadc86a20ab3281dad"; } + { locale = "si"; arch = "linux-i686"; sha1 = "d742e451a73195d0445b393b0f1127835ad4684b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "6341e742bfab7379d8a9de9545a126efa9f129ba"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "c714445df861c7073e8c840d904c91578c08db7a"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "a8fbdfa4c68092ff5258f88b7413d64fd0729ce6"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "dc4ef7a8aedbebcd3b9a0e6701c8b2fb245f784a"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "6165e3a1ef198eae25d56fa5b8dde4e37b037b9f"; } + { locale = "son"; arch = "linux-i686"; sha1 = "2dd5909759dc85ae7a9401eb4c759748805b0729"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "d09741294a24d80ddacb80676a2824cbd51a5585"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1f2e3fa864c7c8f7f2d0ecca7812bfdfe7991d29"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "db5c95f01d258db2dfc04b7efecd1d7826663db8"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "54c0f91e41622e8263f7897d0b5a385870ae0d7a"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8b9c9001ed87429ce868144a50e6ab1ac7ccd5f"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "667ed9f21997fc79e9ce40b8bf5e607258292699"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cb5abaca549b30ba5385ea3ef0a57be0bf446d44"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "13fdda06ab9a36a24128e12651a06f0499fbe581"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "95cd3149f404cfd0beadcdece8dfd5c102dbc72a"; } + { locale = "te"; arch = "linux-i686"; sha1 = "4ec9f9b30078e70451bbf5bb06cc1c07530ed5a8"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "1d5cbfee0731dfe10e3eb3aafe102e73c9e9eede"; } + { locale = "th"; arch = "linux-i686"; sha1 = "a6809b082761293aca28b456b1489f270234f8bf"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "77dba4a3eec1474be026dfc9021420af889172ad"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "eaa7a43b155ffbfc23e72b48fe0e150695a779e7"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "dfc241131ef4e46801e86bfe10e80b4c2bb5fdb3"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "fa5346d0c36f88a6a50259f0e170bbe5167f2393"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb5d61d9c14997958af850d663d48b607aa3e43e"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "d634d94bc28779757535d05295db33e186c15abc"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "0f469e0d5f2d92b4b3f2b47efef3aa44cd25803f"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "639aa1abebe1b670ecef9df6e9d06841124ddf0b"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "16f1319cb63cc4634a215a1c9b3e0e65c1833003"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "960338fec19485c733ebd7fbacd9b55ebd1b9981"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "3a795ffee6d119741fceaa0a4825e72f5cc4e0f2"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "63dbb0328ea991b827fd5747d99aa3075486fce0"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a1d047de7685d70750850cfb0084259041d33cd4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "6f56944d2e31ab714d648bfd9262d39731e167b9"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "d3cd71c2ceeb1856bea66de8d7220a8529888e86"; } ]; } From 13ea5b65dbd081d395ed0d8e0bbf34762666b462 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Wed, 3 Jun 2015 11:06:24 +0800 Subject: [PATCH 089/208] wavegain: Add package. This adds wavegain which is a normalizer for WAV audio files. --- pkgs/applications/audio/wavegain/default.nix | 22 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/audio/wavegain/default.nix diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix new file mode 100644 index 00000000000..2ce59f005fd --- /dev/null +++ b/pkgs/applications/audio/wavegain/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "wavegain-1.3.1"; + src = fetchgit { + url = "https://github.com/MestreLion/wavegain.git"; + sha256 = "1h886xijc9d7h4p6qx12c6kgwmp6s1bdycnyylkayfncczzlbi24"; + }; + + installPhase = '' + strip -s wavegain + install -vD wavegain "$out/bin/wavegain" + ''; + + meta = { + description = "ReplayGain for wave files"; + homepage = https://github.com/MestreLion/wavegain; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a739a699641..1687602fa3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14677,6 +14677,8 @@ let VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; + wavegain = callPackage ../applications/audio/wavegain { }; + # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86 wine = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; From 9712e379da3bebe614474576dc30d461d1850eee Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Wed, 3 Jun 2015 00:15:14 -0400 Subject: [PATCH 090/208] Rename microHttpd to micro-httpd --- 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 a739a699641..0705f89d119 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8771,7 +8771,7 @@ let mpdscribble = callPackage ../tools/misc/mpdscribble { }; - microHttpd = callPackage ../servers/http/micro-httpd { }; + micro-httpd = callPackage ../servers/http/micro-httpd { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; From ac355ac095de56279bcf49ffcf8ec32a0138bb96 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 2 Jun 2015 23:30:30 +0200 Subject: [PATCH 091/208] Update version: jitsi: 2.4.4997 -> 2.8.5426 --- .../networking/instant-messengers/jitsi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index e6dd6569a55..195c9588478 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation rec { name = "jitsi-${version}"; - version = "2.4.4997"; + version = "2.8.5426"; src = fetchurl { url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; - sha256 = "f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825"; + sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6"; }; + patches = [ ./jitsi.patch ]; jitsiItem = makeDesktopItem { From 3af4c7065dfceb6e76537f2e9fe023a1e191c722 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 3 Jun 2015 11:06:51 +0200 Subject: [PATCH 092/208] Update HOL Light to svn r232 (2015-05-31) --- pkgs/applications/science/logic/hol_light/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 212da932c28..86d7bfd8427 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "218"; + version = "232"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "0lidcadyjpyqd2iw90gfrm8hb6g9gpabp54c0ps6z0lb6hdzln74"; + sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8"; }; buildInputs = [ ocaml findlib camlp5 ]; From 4564a0e5e223e647a504d57cd364778e1930ccb1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jun 2015 11:35:06 +0200 Subject: [PATCH 093/208] firefox: Update to 38.0.5 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 0fa1d2068f1..03b96acc712 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "38.0.1"; in +let version = "38.0.5"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8"; + sha1 = "74da3e225d5b542e784549be63475802c45e1b02"; }; buildInputs = From 3467aa462a47548f7db76ef641bf950e1420449f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 01:43:07 +0200 Subject: [PATCH 094/208] stress-ng 0.04.04 -> 0.04.05 Changes: - Ensure maximum sizes don't exceed 4GB-1 for 32 bit systems - stress-crypt: only use re-entrant crypt_r on Linux for now - Add perf reference in manual, update date - stress-vm-rw: zero msg_wr just to be totally safe - stress-crypt: use reentrant crypt_r to avoid any memory leaks - stress-zombie: free items on list head on exit - stress-lockf: free items on list head on exit - stress-wcstr: fix incorrect wide string size - Add int8, int16, int32 and int64 versions of mwc*() - Increase various stressors upper memory limits - Make --aggressive force more CPU migrations and context switches - Fix comment for stress_get_ticks_per_second - perf: enable inherit flag to trace children - Add the new --getrandom stressor - Fix sigq options, missing because not using STRESS_SIGQUEUE - Fix help -h option, was --h, should be -h - avoid builtins when libs shall be tested - add stressor for wide character sting operations - fix string names - avoid compiler error in stress-vector - fix EPOLL build --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index ebe6306120e..2a0b2816ba7 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.04"; in +let version = "0.04.05"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1rq78s4xrylm63xygakrvjg5g774qmm968p0v69x2c795dv3s8di"; + sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From bcc8eeca48bc679077fb53b7c16005e27dc5db00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 13:38:25 +0200 Subject: [PATCH 095/208] geolite-legacy -> 2015-06-03 --- pkgs/data/misc/geolite-legacy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 08cf3b545b7..f1e48fff580 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,19 +8,19 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-06-02"; + version = "2015-06-03"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" - "15p8is7jml8xsy7a8afsjq7q20pkisbk5b7nj465ljaz5svq6rgv"; + "1cd25xsw214bdmc657q3a1dcivjnh6ravdsgia2w7q8bq8g61yfp"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" - "0apiypf500k9k89x6zm1109gw6j9xs83c80iyl17rxlik1hhqf8g"; + "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" "12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb"; + "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" From 7b2448d0214cbde8149ccb0ff831bdc0e92c20e6 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jun 2015 15:21:40 +0200 Subject: [PATCH 096/208] cygwin: perl-Encode-Locale fix disabling tests which test setting environment variable with a name outside 7-bit ASCII. this causes a segmentation fault in cygwin. --- pkgs/top-level/perl-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a007242487..891d72497b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3384,6 +3384,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp"; }; + preCheck = if stdenv.isCygwin then '' + sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t + sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t + sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t + '' else null; }; EnvPath = buildPerlPackage { From 7c6b935b60128e700630561424a8bb1b80f4afac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jun 2015 16:38:52 +0200 Subject: [PATCH 097/208] Remove dead code --- nixos/tests/installer.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 603dfbe224f..fc65f392a1f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -98,12 +98,6 @@ let channelContents = [ pkgs.rlwrap ]; - efiBios = pkgs.runCommand "ovmf-bios" {} '' - mkdir $out - ln -s ${pkgs.OVMF}/FV/OVMF.fd $out/bios.bin - ''; - - # The test script boots the CD, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create From 165cb05ea5f42866a5b38521a8266f10045d48b2 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Wed, 3 Jun 2015 16:50:53 +0200 Subject: [PATCH 098/208] fix spotify by using older libgcrypt --- pkgs/development/libraries/libgcrypt/1.5.nix | 50 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/libraries/libgcrypt/1.5.nix diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix new file mode 100644 index 00000000000..ebafd0747d8 --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl +, libgpgerror + +# Optional Dependencies +, libcap ? null +}: + +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 ""}"; + mkWith = mkFlag "with-" "without-"; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optLibcap = shouldUsePkg libcap; +in +stdenv.mkDerivation rec { + name = "libgcrypt-1.5.4"; + + src = fetchurl { + url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; + sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m"; + }; + + buildInputs = [ libgpgerror optLibcap ]; + + configureFlags = [ + (mkWith (optLibcap != null) "capabilities" null) + ]; + + # Make sure libraries are correct for .pc and .la files + # Also make sure includes are fixed for callers who don't use libgpgcrypt-config + postInstall = '' + sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h + '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' + sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://www.gnu.org/software/libgcrypt/; + description = "General-pupose cryptographic library"; + license = licenses.lgpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + repositories.git = git://git.gnupg.org/libgcrypt.git; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d642c4188c7..d22f7d15498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6763,6 +6763,8 @@ let libcap = null; }; + libgcrypt_1_5 = lowPrio (callPackage ../development/libraries/libgcrypt/1.5.nix { }); + libgdiplus = callPackage ../development/libraries/libgdiplus { }; libgksu = callPackage ../development/libraries/libgksu { }; @@ -12384,6 +12386,7 @@ let spotify = callPackage ../applications/audio/spotify { inherit (gnome) GConf; + libgcrypt = libgcrypt_1_5; libpng = libpng12; }; From 35ff30c73fa312990d88a74aa5951094ecd1b461 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jun 2015 17:03:07 +0200 Subject: [PATCH 099/208] Streamline contributing section --- doc/contributing.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/contributing.xml b/doc/contributing.xml index f622845bf1a..ee93be4447a 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -4,16 +4,17 @@ Contributing -If you make modifications to the manual, it's important to build the manual before contributing: +The DocBook sources of the Nixpkgs manual are in the doc +subdirectory of the Nixpkgs repository. If you make modifications to +the manual, it's important to build it before committing. You can do that as follows: - + +$ cd /path/to/nixpkgs +$ nix-build doc + - $ git clone git://github.com/NixOS/nixpkgs.git - - $ nix-build -A manual nixpkgs/pkgs/top-level/release.nix - - Inside the built derivation you shall see manual/index.html file. - - +If the build succeeds, the manual will be in +./result/share/doc/nixpkgs/manual.html. From 07b212b09dc15c983df28b91fd1323b172ac07c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jun 2015 17:04:26 +0200 Subject: [PATCH 100/208] Strip indentation from programlistings --- doc/coding-conventions.xml | 56 +++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index b041a73d818..4967295db08 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -620,33 +620,39 @@ evaluate correctly. fetchers from pkgs/build-support/. As an example going from bad to good: - Uses git:// which won't be proxied. - - src = fetchgit { - url = "git://github.com/NixOS/nix.git"; - rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; - } - + + Uses git:// which won't be proxied. + +src = fetchgit { + url = "git://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; +} + + - This is ok, but an archive fetch will still be faster. - - src = fetchgit { - url = "https://github.com/NixOS/nix.git"; - rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; - } - + + This is ok, but an archive fetch will still be faster. + +src = fetchgit { + url = "https://github.com/NixOS/nix.git"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; +} + + - Fetches a snapshot archive and you get the rev you want. - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; - } - + + Fetches a snapshot archive and you get the rev you want. + +src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; + sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; +} + + From a4ac0caa5257ffe1a281962a520c53d2d47529af Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 3 Jun 2015 17:08:45 +0200 Subject: [PATCH 101/208] Add signing-party (aka., gpg-tools) --- pkgs/tools/security/signing-party/default.nix | 37 +++++++++++++++++++ .../signing-party/gpgwrap_makefile.patch | 16 ++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/tools/security/signing-party/default.nix create mode 100644 pkgs/tools/security/signing-party/gpgwrap_makefile.patch diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix new file mode 100644 index 00000000000..ec4197933ec --- /dev/null +++ b/pkgs/tools/security/signing-party/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, gnupg, perl, automake111x, autoconf}: + +stdenv.mkDerivation rec { + version = "2.0"; + basename = "signing-party"; + name = "${basename}-${version}"; + src = fetchurl { + url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz"; + sha256 = "0vn15sb2yyzd57xdblw48p5hi6fnpvgy83mqyz5ygph65y5y88yc"; + }; + + sourceRoot = "."; + + preBuild = '' + substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace keylookup/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace springgraph/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out" + ''; + + # - perl is required for its pod2man (used in caff) + buildInputs = [ automake111x autoconf perl gnupg ]; + + patches = [ ./gpgwrap_makefile.patch ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + doCheck = false; # no check rule + + meta = { + description = "PGP Tools is a collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc."; + homepage = http://pgp-tools.alioth.debian.org; + platforms = gnupg.meta.platforms; + licence = stdenv.lib.licences.gpl2; + }; +} diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/pkgs/tools/security/signing-party/gpgwrap_makefile.patch new file mode 100644 index 00000000000..4beaf5b8088 --- /dev/null +++ b/pkgs/tools/security/signing-party/gpgwrap_makefile.patch @@ -0,0 +1,16 @@ +--- a/gpgwrap/Makefile 2015-06-03 16:24:48.723129144 +0200 ++++ b/gpgwrap/Makefile 2015-06-03 16:24:11.639744346 +0200 +@@ -1,9 +1,12 @@ + MAKE=make + +-.PHONY: all clean ++.PHONY: all clean install + + all: + cd src && ${MAKE} all DIET="${DIET}" + ++install: ++ ++ + clean: + cd src && ${MAKE} clean diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c15f9ce0a4..3ceaafb3d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2769,6 +2769,9 @@ let sigil = callPackage ../applications/editors/sigil { }; + # aka., gpg-tools + signing-party = callPackage ../tools/security/signing-party { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; From 07c26ee6807b997a3d5412d3cb9a9784e19c38fc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 3 Jun 2015 19:37:10 +0200 Subject: [PATCH 102/208] grsecurity: Update stable and test patches stable: 3.1-3.14.43-201505272112 -> 3.1-3.14.43-201506021902 test: 3.1-4.0.4-201505272113 -> 3.1-4.0.4-201506021902 --- 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 000dfbd21c5..f622bf9c782 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.43"; - revision = "201505272112"; + revision = "201506021902"; branch = "stable"; - sha256 = "06zwwzrqp59rkv5pi75iskznnlnmc6hsc91dqxymfgd533sbpxp9"; + sha256 = "1b8kp9q9kslxz4adv1h0qahd96wnidpaa3k1mqmcaf8ia1b63dsk"; }; grsecurity_unstable = grsecPatch { kversion = "4.0.4"; - revision = "201505272113"; + revision = "201506021902"; branch = "test"; - sha256 = "1aa8qc4g68ybdjc4gb1p0rk1m2bqhj8a5iz6cica6lrr54lda9hx"; + sha256 = "03fbx2vmlvh0bng3l4nxkfdxkgl9sgjkmwd0irq2bvb3gwk2bp03"; }; grsec_fix_path = From 142cf0de0d46fc9c03e640feb2e6060346b8416d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 22:19:32 +0200 Subject: [PATCH 103/208] geolite-legacy: GeoLiteCity -> 2015-06-03 The update of this file seems to have been delayed. --- pkgs/data/misc/geolite-legacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index f1e48fff580..a34c10630aa 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" - "12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk"; + "1z87ng2a2zmqnvxhcmapnarc9w2ycb18vpivvzx893y7fh39h34s"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" From a714ddcbd588432906497347b9613b6a32fca920 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 22:40:10 +0200 Subject: [PATCH 104/208] signing-party: Americanise licence -> license --- pkgs/tools/security/signing-party/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index ec4197933ec..dd05030e712 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "PGP Tools is a collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc."; homepage = http://pgp-tools.alioth.debian.org; platforms = gnupg.meta.platforms; - licence = stdenv.lib.licences.gpl2; + license = stdenv.lib.licenses.gpl2; }; } From 33ad641be9b97446320723bb604ce0fd449fcc03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2015 02:45:26 +0200 Subject: [PATCH 105/208] libnl 3.2.25 -> 3.2.26 Changes (also in project hosting): --- pkgs/os-specific/linux/libnl/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index fe844226a64..afd9695420e 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,16 +1,20 @@ -{stdenv, fetchurl, bison, flex}: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }: -stdenv.mkDerivation rec { - name = "libnl-3.2.25"; +let version = "3.2.26"; in +stdenv.mkDerivation { + name = "libnl-${version}"; - src = fetchurl { - url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1icfrv8yihcb74as1gcgmp0wfpdq632q2zvbvqqvjms9cy87bswb"; + src = fetchFromGitHub { + sha256 = "1cbqdhirn6hxmv8xkm8xp3n6ayyxw7sbi15fym167rdz0h9rkhmm"; + rev = "libnl3_2_26"; + repo = "libnl"; + owner = "thom311"; }; - buildInputs = [ bison flex ]; + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; meta = { + inherit version; homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux NetLink interface library"; maintainers = [ stdenv.lib.maintainers.urkud ]; From 560d52f51e3ce412753ad98e7e864d996d662631 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Wed, 3 Jun 2015 15:43:08 -0500 Subject: [PATCH 106/208] switched to python.executable --- pkgs/top-level/python-packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 332e32a0ddf..7033d102f85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8123,6 +8123,15 @@ let echo $second > pandas/tests/test_format.py echo $first >> pandas/tests/test_format.py echo "$rest" >> pandas/tests/test_format.py + + # Need to skip this test; insert a line here... hacky but oh well. + badtest=pandas/tseries/tests/test_timezones.py + fixed=$TMPDIR/fixed_test_timezones.py + touch $fixed + head -n 602 $badtest > $fixed + echo ' raise nose.SkipTest("Not working")' >> $fixed + tail -n +603 $badtest >> $fixed + mv $fixed $badtest ''; checkPhase = '' @@ -8130,7 +8139,8 @@ let # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. - python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3 + ${python.executable} setup.py nosetests -A 'not network' --stop \ + -e 'test_clipboard|test_series' --verbosity=3 runHook postCheck ''; From 78f2410865195085eb88c16cd547682fda334f97 Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Tue, 2 Jun 2015 22:33:27 -0700 Subject: [PATCH 107/208] kodi: Enable RTMP support Ports over similar XBMC changes from d221fd91a3d156bb3cdb4789ee8e068d0641ee8d. --- pkgs/applications/video/kodi/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index dafa381d9ec..cd24f2bfc2a 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -21,7 +21,7 @@ , samba ? null, sambaSupport ? true , libmicrohttpd, bash # TODO: would be nice to have nfsSupport (needs libnfs library) -# TODO: librtmp +, rtmpdump ? null, rtmpSupport ? true , libvdpau ? null, vdpauSupport ? true , libpulseaudio ? null, pulseSupport ? true , libcec ? null, cecSupport ? true @@ -34,6 +34,7 @@ assert sambaSupport -> samba != null; assert vdpauSupport -> libvdpau != null; assert pulseSupport -> libpulseaudio != null; assert cecSupport -> libcec != null; +assert rtmpSupport -> rtmpdump != null; let rel = "Helix"; @@ -75,7 +76,8 @@ in stdenv.mkDerivation rec { ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional cecSupport libcec; + ++ lib.optional cecSupport libcec + ++ lib.optional rtmpSupport rtmpdump; dontUseCmakeConfigure = true; @@ -96,7 +98,8 @@ in stdenv.mkDerivation rec { ] ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" - ++ lib.optional pulseSupport "--enable-pulse"; + ++ lib.optional pulseSupport "--enable-pulse" + ++ lib.optional rtmpSupport "--enable-rtmp"; postInstall = '' for p in $(ls $out/bin/) ; do @@ -108,7 +111,8 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" + --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" done ''; From 472642ebfffa0dca0284ae8b522e843025f555c2 Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Wed, 3 Jun 2015 23:43:00 -0700 Subject: [PATCH 108/208] Make Loxodo into a real package There's no reason to keep it hidden in python27Packages hierarchy. Promote it to be a top-level package. --- pkgs/applications/misc/loxodo/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 21 ------------------ 3 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/misc/loxodo/default.nix diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix new file mode 100644 index 00000000000..81c6d3a4bc8 --- /dev/null +++ b/pkgs/applications/misc/loxodo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python27Packages, fetchgit }: +let + py = python27Packages; + python = py.python; +in +py.buildPythonPackage rec { + name = "loxodo-0.20150124"; + + src = fetchgit { + url = "https://github.com/sommer/loxodo.git"; + rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; + sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2"; + }; + + propagatedBuildInputs = with py; [ wxPython python.modules.readline ]; + + postInstall = '' + mv $out/bin/loxodo.py $out/bin/loxodo + ''; + + meta = with stdenv.lib; { + description = "A Password Safe V3 compatible password vault"; + homepage = http://www.christoph-sommer.de/loxodo/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be12bcfe524..ecf2d68e9fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11674,6 +11674,8 @@ let lmms = callPackage ../applications/audio/lmms { }; + loxodo = callPackage ../applications/misc/loxodo { }; + lrzsz = callPackage ../tools/misc/lrzsz { }; luakit = callPackage ../applications/networking/browsers/luakit { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac800873860..c87928ccf26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6662,27 +6662,6 @@ let propagatedBuildInputs = with self; [ unittest2 six ]; }; - loxodo = buildPythonPackage { - name = "loxodo-0.20150124"; - disabled = isPy3k; - - src = pkgs.fetchgit { - url = "https://github.com/sommer/loxodo.git"; - rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; - sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2"; - }; - - propagatedBuildInputs = with self; [ wxPython modules.readline ]; - postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo"; - - meta = { - description = "A Password Safe V3 compatible password vault"; - homepage = http://www.christoph-sommer.de/loxodo/; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - }; - lxml = buildPythonPackage ( rec { name = "lxml-3.3.6"; From 19108c1b6c6b8d0e1e67e3dc69f9a52d178840c8 Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Wed, 3 Jun 2015 21:32:17 -0700 Subject: [PATCH 109/208] Add a .desktop file for Loxodo --- pkgs/applications/misc/loxodo/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 81c6d3a4bc8..05d29ce7e09 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -16,6 +16,16 @@ py.buildPythonPackage rec { postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo + mkdir -p $out/share/applications + cat > $out/share/applications/loxodo.desktop < Date: Wed, 3 Jun 2015 23:42:37 -0700 Subject: [PATCH 110/208] make a wrapper so that dunst can find dbus-launch Prior to this change, the following would fail nix-shell --pure -p dunst --command dunst while this would succeed nix-shell --pure -p dunst -p dbus_daemon --command dunst because dunst tries to execve 'dbus-launch'. The same issue hit if dunst was used inside a (user) systemd service (which is what I actually care about). --- pkgs/applications/misc/dunst/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 33371c93b86..c398c3c43d0 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus -, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify -, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf +{ stdenv, fetchurl, coreutils, unzip, which, pkgconfig, dbus +, freetype, xdg_utils, libXext, glib, pango, cairo, libX11, libnotify +, libxdg_basedir, libXScrnSaver, xproto, libXinerama, perl, gdk_pixbuf +, dbus_daemon, makeWrapper }: stdenv.mkDerivation rec { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf xdg_utils libXext glib pango cairo libX11 libxdg_basedir - libXScrnSaver xproto libXinerama perl]; + libXScrnSaver xproto libXinerama perl dbus_daemon makeWrapper ]; buildPhase = '' export VERSION=${version}; @@ -23,6 +24,11 @@ stdenv.mkDerivation rec { make dunst; ''; + postFixup = '' + wrapProgram "$out/bin/dunst" \ + --prefix PATH : '${dbus_daemon}/bin' + ''; + meta = { description = "lightweight and customizable notification daemon"; homepage = http://www.knopwob.org/dunst/; From 6bf18533878c751c2f630d16ccfec471441e8477 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 10:33:52 +0200 Subject: [PATCH 111/208] Don't include 4 editors in the minimal installation CD Emphasis on "minimal". --- .../cd-dvd/installation-cd-graphical.nix | 17 ++++++++++++----- nixos/modules/profiles/base.nix | 5 ----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix index 189cca9e23b..d14768bc107 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix @@ -11,9 +11,16 @@ with lib; # Provide wicd for easy wireless configuration. #networking.wicd.enable = true; - # Include gparted for partitioning disks - environment.systemPackages = [ pkgs.gparted ]; - + environment.systemPackages = + [ # Include gparted for partitioning disks. + pkgs.gparted + + # Include some editors. + pkgs.vim + pkgs.bvi # binary editor + pkgs.joe + ]; + # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; networking.wireless.enable = mkForce false; @@ -67,7 +74,7 @@ with lib; loadTemplate("org.kde.plasma-desktop.defaultPanel") for (var i = 0; i < screenCount; ++i) { - var desktop = new Activity + var desktop = new Activity desktop.name = i18n("Desktop") desktop.screen = i desktop.wallpaperPlugin = 'image' @@ -75,7 +82,7 @@ with lib; var folderview = desktop.addWidget("folderview"); folderview.writeConfig("url", "desktop:/"); - + //Create more panels for other screens if (i > 0){ var panel = new Panel diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 6c8e9994379..c207829aabd 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -44,11 +44,6 @@ pkgs.zip pkgs.dar # disk archiver pkgs.cabextract - - # Some editors. - pkgs.vim - pkgs.bvi # binary editor - pkgs.joe ]; # Include support for various filesystems. From 7318ff0e385fde083d3bd2a0dcf0aedf88376124 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 10:34:48 +0200 Subject: [PATCH 112/208] =?UTF-8?q?Add=20option=20=E2=80=98system.extraDep?= =?UTF-8?q?endencies=E2=80=99=20for=20including=20stuff=20in=20the=20syste?= =?UTF-8?q?m=20closure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mostly useful for installer tests that don't have network access. This generalizes virtualisation.pathsInNixDB and isoImage.storeContents. --- nixos/modules/system/activation/top-level.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index d7a1e205b4d..b19fea57f6b 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -81,6 +81,8 @@ let substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration + echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies + ${config.system.extraSystemBuilderCmds} ''; @@ -188,6 +190,16 @@ in ''; }; + system.extraDependencies = mkOption { + type = types.listOf types.package; + default = []; + description = '' + A list of packages that should be included in the system + closure but not otherwise made available to users. This is + primarily used by the installation tests. + ''; + }; + system.replaceRuntimeDependencies = mkOption { default = []; example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]"; From cdeb2711017b776a80d9e8adfb39963722a915bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 11:00:50 +0200 Subject: [PATCH 113/208] zfs: Nuke references to linux.dev in *.ko files This prevents linux.dev being included in the installation CD. --- pkgs/os-specific/linux/zfs/generic.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 9a97bef22bb..b040201cf33 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, utillinux +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences , configFile ? "all" # Userspace dependencies @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit version src patches; - buildInputs = [ autoconf automake libtool ] + buildInputs = [ autoreconfHook nukeReferences ] ++ optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python ]; @@ -68,8 +68,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Remove provided services as they are buggy - postInstall = optionalString buildUser '' + postInstall = '' + # Prevent kernel modules from depending on the Linux -dev output. + nuke-refs $(find $out -name "*.ko") + '' + optionalString buildUser '' + # Remove provided services as they are buggy rm $out/etc/systemd/system/zfs-import-*.service sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/* @@ -78,7 +81,7 @@ stdenv.mkDerivation rec { substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" done - # Fix pkgconfig + # Fix pkgconfig. ln -s ../share/pkgconfig $out/lib/pkgconfig ''; From 1db87a34e9bcd9cb65328ed1a03d36d9275b8042 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Sat, 28 Feb 2015 10:24:07 +0000 Subject: [PATCH 114/208] Add xsettingsd. --- pkgs/tools/X11/xsettingsd/SConstruct.patch | 13 ++++++++ pkgs/tools/X11/xsettingsd/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/tools/X11/xsettingsd/SConstruct.patch create mode 100644 pkgs/tools/X11/xsettingsd/default.nix diff --git a/pkgs/tools/X11/xsettingsd/SConstruct.patch b/pkgs/tools/X11/xsettingsd/SConstruct.patch new file mode 100644 index 00000000000..bae8d1efc14 --- /dev/null +++ b/pkgs/tools/X11/xsettingsd/SConstruct.patch @@ -0,0 +1,13 @@ +diff --git a/SConstruct b/SConstruct +index bebc82e..3e0127b 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -59,6 +59,8 @@ srcs = Split('''\ + ''') + libxsettingsd = env.Library('xsettingsd', srcs) + env['LIBS'] = libxsettingsd ++env['ENV']['PATH'] = os.environ.get('PATH', '') ++env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '') + env.ParseConfig('pkg-config --cflags --libs x11') + + xsettingsd = env.Program('xsettingsd', 'xsettingsd.cc') diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix new file mode 100644 index 00000000000..254cc8a4961 --- /dev/null +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }: + +stdenv.mkDerivation rec { + name = "xsettingsd-${version}"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "derat"; + repo = "xsettingsd"; + rev = "2a516a91d8352b3b93a7a1ef5606dbd21fa06b7c"; + sha256 = "0f9lc5w18x6xs9kf72jpixprp3xb7wqag23cy8zrm33n2bza9dj0"; + }; + + patches = [ + ./SConstruct.patch + ]; + + buildInputs = [ libX11 scons pkgconfig ]; + buildPhase = '' + mkdir -p "$out" + scons \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + "prefix=$out" + ''; + + installPhase = '' + mkdir -p "$out"/bin + install xsettingsd "$out"/bin + install dump_xsettings "$out"/bin + ''; + + meta = with stdenv.lib; { + description = "Provides settings to X11 applications via the XSETTINGS specification"; + homepage = https://github.com/derat/xsettingsd; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be12bcfe524..72bf9c32495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3223,6 +3223,8 @@ let xbrightness = callPackage ../tools/X11/xbrightness { }; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; unarj = callPackage ../tools/archivers/unarj { }; From c659105ef8b2fe87822acf52f191a189f62e4d8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:33:57 +0200 Subject: [PATCH 115/208] cabal2nix: get rid of the '-dirty' version suffix The fetchgit builder performs some freak magic in the name of deterministic hashes that screws up git's idea of a clean directory tree. --- pkgs/development/tools/haskell/cabal2nix/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 7c36390b91e..240353b6e75 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -31,7 +31,10 @@ mkDerivation rec { split transformers utf8-string ]; buildTools = [ gitMinimal makeWrapper ]; - preConfigure = "runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal"; + preConfigure = '' + sed -i -e 's|, "--dirty"||' generate-cabal-file.hs + runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal + ''; postInstall = '' exe=$out/libexec/${pname}-${version}/cabal2nix install -D $out/bin/cabal2nix $exe From 18b5bd8dcac19e040b34dd6393ac3bdf757c3566 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 13:10:26 +0200 Subject: [PATCH 116/208] Add some info about editors --- nixos/doc/manual/installation/installing.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index c21759bc926..e40c15e8316 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -120,7 +120,11 @@ $ nixos-generate-config --root /mnt $ nano /mnt/etc/nixos/configuration.nix - The vim text editor is also available. + If you’re using the graphical ISO image, other editors may be + available (such as vim). If you have network + access, you can also install other editors — for instance, you can + install Emacs by running nix-env -i + emacs. You must set the option to specify on which disk @@ -189,11 +193,13 @@ $ reboot - You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list - of available configurations (initially just one). Every time - you change the NixOS configuration (seeChanging - Configuration ), a new item appears in the menu. This allows you to - easily roll back to another configuration if something goes wrong. + You should now be able to boot into the installed NixOS. The + GRUB boot menu shows a list of available + configurations (initially just one). Every time you + change the NixOS configuration (see Changing Configuration ), a + new item is added to the menu. This allows you to easily roll back + to a previous configuration if something goes wrong. You should log in and change the root password with passwd. From 4f60156afbb8d61d8d28db8ab594ec9328946d71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:49:35 +0200 Subject: [PATCH 117/208] Revert "qemu-nix: Build statically" This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe. --- pkgs/applications/virtualization/qemu/default.nix | 10 +++------- pkgs/development/libraries/glib/default.nix | 7 ++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f04ff311930..0d57a8d9f57 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -41,7 +41,7 @@ let optLibuuid = if isNix then null else shouldUsePkg libuuid; optVde2 = if isNix then null else shouldUsePkg vde2; optLibaio = shouldUsePkg libaio; - optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng; + optLibcap_ng = shouldUsePkg libcap_ng; optSpice = if isNix then null else shouldUsePkg spice; optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; optLibceph = if isNix then null else shouldUsePkg libceph; @@ -95,8 +95,6 @@ let targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" else if stdenv.system == "i686-linux" then "i386-softmmu" else null; - - hasModules = if isNix then null else true; in stdenv.mkDerivation rec { @@ -140,7 +138,7 @@ stdenv.mkDerivation rec { (mkOther "smbd" "smbd") (mkOther "sysconfdir" "/etc") (mkOther "localstatedir" "/var") - (mkEnable hasModules "modules" null) + (mkEnable true "modules" null) (mkEnable false "debug-tcg" null) (mkEnable false "debug-info" null) (mkEnable false "sparse" null) @@ -169,7 +167,7 @@ stdenv.mkDerivation rec { (mkEnable (!isNix) "system" null) (mkEnable (!isKvmOnly) "user" null) (mkEnable (!isKvmOnly) "guest-base" null) - (mkEnable (!isNix) "pie" null) + (mkEnable true "pie" null) (mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optVde2 != null) "vde" null) (mkEnable false "netmap" null) # TODO(wkennington): Add Support @@ -201,8 +199,6 @@ stdenv.mkDerivation rec { (mkEnable (optNumactl != null) "numa" null) ] ++ optionals isKvmOnly [ (mkOther "target-list" targetList) - ] ++ optionals isNix [ - "--static" ]; installFlags = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 518d713026a..7d61bea64e1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; - # Static is necessary for qemu-nix to support static userspace translators - configureFlags = [ "--enable-static" ] - ++ optional stdenv.isDarwin "--disable-compile-warnings" + configureFlags = + optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isSunOS "--disable-modular-tests"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" @@ -76,8 +75,6 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET= ''; - dontDisableStatic = true; - enableParallelBuilding = true; DETERMINISTIC_BUILD = 1; From 3096d03435bb177af8c4868a8efa637b393f2715 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:52:03 +0200 Subject: [PATCH 118/208] Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9. --- lib/customisation.nix | 23 ----- .../virtualization/qemu/default.nix | 93 ++++++++++--------- .../libraries/kerberos/heimdal.nix | 13 ++- .../libraries/libgcrypt/default.nix | 15 ++- .../libraries/libmicrohttpd/default.nix | 10 +- pkgs/development/libraries/libssh/default.nix | 3 +- .../development/libraries/libssh2/default.nix | 10 +- .../development/libraries/libxml2/default.nix | 11 ++- .../development/libraries/ncurses/default.nix | 18 +++- .../development/libraries/nghttp2/default.nix | 15 ++- .../libraries/wiredtiger/default.nix | 12 ++- pkgs/misc/jackaudio/default.nix | 3 +- pkgs/misc/jackaudio/jack1.nix | 3 +- pkgs/os-specific/linux/ffado/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 21 +++-- pkgs/servers/shishi/default.nix | 10 +- pkgs/stdenv/generic/default.nix | 2 - pkgs/tools/networking/curl/default.nix | 14 ++- 18 files changed, 176 insertions(+), 104 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index ca3dd4980da..91a25055df2 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -158,27 +158,4 @@ rec { drv' = (lib.head outputsList).value; in lib.deepSeq drv' drv'; - - /* Tests whether a derivation can be used by the current platform - Returns the derivation if true, otherwise null. */ - shouldUsePkgSystem = system: pkg_: let pkg = (builtins.tryEval pkg_).value; - in if lib.any (x: x == system) (pkg.meta.platforms or []) - then pkg - else null; - - /* Returns a configure flag string in an autotools format - trueStr: Prepended when cond is true - falseStr: Prepended when cond is false - cond: The condition for the prepended string type and value - name: The flag name - val: The value of the flag only set when cond is true */ - 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 ""}"; - - /* Flag setting helpers for autotools like packages */ - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0d57a8d9f57..f9433a1a409 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -17,60 +17,65 @@ , type ? "" }: -with stdenv; with stdenv.lib; let n = "qemu-2.3.0"; - isKvmOnly = type == "kvm-only"; - isNix = type == "nix"; + 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; - optSDL2 = if isNix then null else shouldUsePkg SDL2; - optGtk = if isNix then null else shouldUsePkg gtk; - optLibcap = if isNix then null else shouldUsePkg libcap; - optAttr = if isNix then null else shouldUsePkg attr; - optGnutls = if isNix then null else shouldUsePkg gnutls; - optCyrus_sasl = if isNix then null else shouldUsePkg cyrus_sasl; - optLibjpeg = if isNix then null else shouldUsePkg libjpeg; - optLibpng = if isNix then null else shouldUsePkg libpng; - optNcurses = if isNix then null else shouldUsePkg ncurses; - optCurl = if isNix then null else shouldUsePkg curl; - optBluez = if isNix then null else shouldUsePkg bluez; - optLibibverbs = if isNix then null else shouldUsePkg libibverbs; - optLibrdmacm = if isNix then null else shouldUsePkg librdmacm; - optLibuuid = if isNix then null else shouldUsePkg libuuid; - optVde2 = if isNix then null else shouldUsePkg vde2; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optSDL2 = if type == "nix" then null else shouldUsePkg SDL2; + optGtk = if type == "nix" then null else shouldUsePkg gtk; + optLibcap = if type == "nix" then null else shouldUsePkg libcap; + optAttr = if type == "nix" then null else shouldUsePkg attr; + optGnutls = if type == "nix" then null else shouldUsePkg gnutls; + optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl; + optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg; + optLibpng = if type == "nix" then null else shouldUsePkg libpng; + optNcurses = if type == "nix" then null else shouldUsePkg ncurses; + optCurl = if type == "nix" then null else shouldUsePkg curl; + optBluez = if type == "nix" then null else shouldUsePkg bluez; + optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs; + optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm; + optLibuuid = if type == "nix" then null else shouldUsePkg libuuid; + optVde2 = if type == "nix" then null else shouldUsePkg vde2; optLibaio = shouldUsePkg libaio; optLibcap_ng = shouldUsePkg libcap_ng; - optSpice = if isNix then null else shouldUsePkg spice; - optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol; - optLibceph = if isNix then null else shouldUsePkg libceph; - optLibxfs = if isNix then null else shouldUsePkg libxfs; - optNss = if isNix then null else shouldUsePkg nss; - optNspr = if isNix then null else shouldUsePkg nspr; - optLibusb = if isNix then null else shouldUsePkg libusb; - optUsbredir = if isNix then null else shouldUsePkg usbredir; - optMesa = if isNix then null else shouldUsePkg mesa; - optLzo = if isNix then null else shouldUsePkg lzo; - optSnappy = if isNix then null else shouldUsePkg snappy; - optBzip2 = if isNix then null else shouldUsePkg bzip2; - optLibseccomp = if isNix then null else shouldUsePkg libseccomp; - optGlusterfs = if isNix then null else shouldUsePkg glusterfs; - optLibssh2 = if isNix then null else shouldUsePkg libssh2; - optNumactl = if isNix then null else shouldUsePkg numactl; + optSpice = if type == "nix" then null else shouldUsePkg spice; + optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol; + optLibceph = if type == "nix" then null else shouldUsePkg libceph; + optLibxfs = if type == "nix" then null else shouldUsePkg libxfs; + optNss = if type == "nix" then null else shouldUsePkg nss; + optNspr = if type == "nix" then null else shouldUsePkg nspr; + optLibusb = if type == "nix" then null else shouldUsePkg libusb; + optUsbredir = if type == "nix" then null else shouldUsePkg usbredir; + optMesa = if type == "nix" then null else shouldUsePkg mesa; + optLzo = if type == "nix" then null else shouldUsePkg lzo; + optSnappy = if type == "nix" then null else shouldUsePkg snappy; + optBzip2 = if type == "nix" then null else shouldUsePkg bzip2; + optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp; + optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs; + optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2; + optNumactl = if type == "nix" then null else shouldUsePkg numactl; hasSDLAbi = if optSDL2 != null then true else null; hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; - hasVnc = !isNix; + hasVnc = type != "nix"; hasVncTls = hasVnc && optGnutls != null; hasVncSasl = hasVnc && optCyrus_sasl != null; hasVncJpeg = hasVnc && optLibjpeg != null; hasVncPng = hasVnc && optLibpng != null; hasVncWs = hasVnc && optGnutls != null; - hasFdt = !isNix; + hasFdt = type != "nix"; hasRdma = optLibibverbs != null && optLibrdmacm != null; @@ -80,8 +85,8 @@ let hasNss = optNss != null && optNspr != null; - optLibpulseaudio = if isNix then null else shouldUsePkg libpulseaudio; - optAlsaLib = if isNix then null else shouldUsePkg alsaLib; + optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio; + optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib; audio = concatStringsSep "," ( optional (optSDL2 != null) "sdl" ++ optional (optLibpulseaudio != null) "pa" @@ -164,9 +169,9 @@ stdenv.mkDerivation rec { (mkEnable (optBluez != null) "bluez" null) (mkEnable stdenv.isLinux "kvm" null) (mkEnable hasRdma "rdma" null) - (mkEnable (!isNix) "system" null) - (mkEnable (!isKvmOnly) "user" null) - (mkEnable (!isKvmOnly) "guest-base" null) + (mkEnable (type != "nix") "system" null) + (mkEnable (type != "kvm-only") "user" null) + (mkEnable (type != "kvm-only") "guest-base" null) (mkEnable true "pie" null) (mkEnable (optLibuuid != null) "uuid" null) (mkEnable (optVde2 != null) "vde" null) @@ -174,7 +179,7 @@ stdenv.mkDerivation rec { (mkEnable hasLinuxAio "linux-aio" null) (mkEnable (optLibcap_ng != null) "cap-ng" null) (mkEnable (optAttr != null) "attr" null) - (mkEnable (!isNix) "docs" null) + (mkEnable (type != "nix") "docs" null) (mkEnable stdenv.isLinux "vhost-net" null) (mkEnable hasSpice "spice" null) (mkEnable (optLibceph != null) "rbd" null) @@ -197,7 +202,7 @@ stdenv.mkDerivation rec { (mkEnable (optLibuuid != null) "vhdx" null) (mkEnable (optGnutls != null) "quorum" null) (mkEnable (optNumactl != null) "numa" null) - ] ++ optionals isKvmOnly [ + ] ++ optionals (type == "kvm-only") [ (mkOther "target-list" targetList) ]; @@ -220,6 +225,6 @@ stdenv.mkDerivation rec { description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; maintainers = with maintainers; [ viric shlevy eelco wkennington ]; - platforms = if isKvmOnly then platforms.linux else platforms.all; + platforms = if type == "kvm-only" then platforms.linux else platforms.all; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 6050891ba27..b0de8c15146 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -8,9 +8,16 @@ #, sqlite, db, ncurses, openssl, cyrus_sasl }: -with stdenv; -with stdenv.lib; 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; + optOpenldap = shouldUsePkg openldap; optLibcap_ng = shouldUsePkg libcap_ng; optSqlite = shouldUsePkg sqlite; @@ -90,7 +97,7 @@ stdenv.mkDerivation rec { rmdir $out/libexec ''; - meta = { + meta = with stdenv.lib; { description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 702d54392a6..7d327a499bc 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,9 +5,16 @@ , libcap ? null, pth ? null }: -with stdenv; -with stdenv.lib; 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; + optLibcap = shouldUsePkg libcap; #optPth = shouldUsePkg pth; optPth = null; # Broken as of 1.6.3 @@ -31,13 +38,13 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + optionalString (!stdenv.isDarwin && optLibcap != null) '' + '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index c7892716c9d..9eca6bd84b9 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -5,8 +5,16 @@ , openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null }: -with stdenv; 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; + optOpenssl = shouldUsePkg openssl; optZlib = shouldUsePkg zlib; hasSpdy = optOpenssl != null && optZlib != null; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 8ea2ac72da0..17bcf227c0e 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -7,8 +7,9 @@ , openssl ? null, libgcrypt ? null }: -with stdenv; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a8e8777f06c..3434fde1a62 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -7,8 +7,16 @@ , openssl ? null, libgcrypt ? null }: -with stdenv; 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; + # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 77050a1d3b3..0d70a6502fe 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -6,8 +6,16 @@ #TODO: share most stuff between python and non-python builds, perhaps via multiple-output -with stdenv; 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; + optIcu = shouldUsePkg icu; optPython = shouldUsePkg python; optReadline = shouldUsePkg readline; @@ -17,7 +25,6 @@ let sitePackages = if optPython == null then null else "\${out}/lib/${python.libPrefix}/site-packages"; in -with stdenv.lib; stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.2"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index f0519fa981d..bea4754a1f5 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,11 +8,23 @@ , unicode ? true }: -with stdenv.lib; 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_: let + pkg = (builtins.tryEval pkg_).value; + in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or []) + then pkg + else null; + buildShared = !stdenv.isDarwin; - optGpm = stdenv.shouldUsePkg gpm; + optGpm = shouldUsePkg gpm; in stdenv.mkDerivation rec { name = "ncurses-5.9"; @@ -124,7 +136,7 @@ stdenv.mkDerivation rec { ln -svf libncurses.so $out/lib/libcurses.so ''; - meta = { + meta = with stdenv.lib; { description = "Free software emulation of curses in SVR4 and more"; longDescription = '' diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d8fd36ecba6..bc8c599a901 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,9 +8,16 @@ , prefix ? "" }: -with stdenv; -with stdenv.lib; 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; @@ -43,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ] - ++ optionals hasApp [ optOpenssl optLibev optZlib ]; + ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ]; configureFlags = [ (mkEnable false "werror" null) @@ -61,7 +68,7 @@ stdenv.mkDerivation rec { (mkWith false "cython" null) ]; - meta = { + meta = with stdenv.lib; { homepage = http://nghttp2.org/; description = "an implementation of HTTP/2 in C"; license = licenses.mit; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 514dcd5972a..da4dc9d6bbc 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -5,8 +5,17 @@ , gperftools ? null, leveldb ? null }: -with stdenv; +with stdenv.lib; 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 && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; optZlib = shouldUsePkg zlib; @@ -15,7 +24,6 @@ let optGperftools = shouldUsePkg gperftools; optLeveldb = shouldUsePkg leveldb; in -with stdenv.lib; stdenv.mkDerivation rec { name = "wiredtiger-${version}"; version = "2.6.0"; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index adddd3ac211..47511cf58b0 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,9 +9,10 @@ , prefix ? "" }: -with stdenv; with stdenv.lib; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + libOnly = prefix == "lib"; optDbus = shouldUsePkg dbus; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 343c3af9cee..1c5c78548f5 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -4,8 +4,9 @@ , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: -with stdenv; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 49a7d820a1c..b0f545b2171 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -9,8 +9,10 @@ , prefix ? "" }: -with stdenv; let + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + libOnly = prefix == "lib"; optLibjack2 = shouldUsePkg libjack2; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 3930c45a097..8196caa08d9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -15,8 +15,16 @@ , prefix ? "" }: -with stdenv; 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; + libOnly = prefix == "lib"; hasXlibs = xlibs != null; @@ -58,7 +66,6 @@ let simple = null; }.${databaseName}; in -with stdenv.lib; stdenv.mkDerivation rec { name = "${prefix}pulseaudio-${version}"; version = "6.0"; @@ -77,9 +84,9 @@ stdenv.mkDerivation rec { optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing - ] ++ optionals hasXlibs (with xlibs; [ + ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [ libX11 libxcb libICE libSM libXtst xextproto libXi - ]) ++ optionals (optBluez5 != null) [ optBluez5 optSbc ]; + ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ]; preConfigure = '' # Performs and autoreconf @@ -155,7 +162,7 @@ stdenv.mkDerivation rec { # the alternative is to copy the files from /usr/include to src, but there are # probably a large number of files that would need to be copied (I stopped # after the seventh) - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I/usr/include"; installFlags = [ @@ -163,11 +170,11 @@ stdenv.mkDerivation rec { "pulseconfdir=$(out)/etc/pulse" ]; - postInstall = optionalString libOnly '' + postInstall = stdenv.lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} ''; - meta = { + meta = with stdenv.lib; { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; # Note: Practically, the server is under the GPL due to the diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index bc4e57ba116..a97e6847a45 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -5,8 +5,16 @@ , pam ? null, libidn ? null, gnutls ? null }: -with stdenv; 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; + optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; optGnutls = shouldUsePkg gnutls; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index cca89487462..863acc31a61 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -232,8 +232,6 @@ let || system == "armv7l-linux"; isBigEndian = system == "powerpc-linux"; - shouldUsePkg = lib.shouldUsePkgSystem system; - # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 8a101e9845a..ad2c9ec6897 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -8,12 +8,19 @@ , suffix ? "" }: -with stdenv; -with stdenv.lib; 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; + isLight = suffix == "light"; isFull = suffix == "full"; - nameSuffix = optionalString (suffix != "") "-${suffix}"; + nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}"; # Normal Depedencies optZlib = if isLight then null else shouldUsePkg zlib; @@ -28,6 +35,7 @@ let optOpenldap = if !isFull then null else shouldUsePkg openldap; optLibidn = if !isFull then null else shouldUsePkg libidn; in +with stdenv.lib; stdenv.mkDerivation rec { name = "curl${nameSuffix}-${version}"; version = "7.42.1"; From 98a4eabd99782484a3df73554bccc4a36af80bb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:55:53 +0200 Subject: [PATCH 119/208] Revert "qemu: 2.2.2 -> 2.3.0" This reverts commit 19c259161b987fcb5e1c3b7a87c746372ce017ee. --- .../virtualization/qemu/default.nix | 252 ++++-------------- pkgs/development/libraries/attr/default.nix | 3 +- pkgs/development/libraries/mesa/default.nix | 6 +- pkgs/development/libraries/nspr/default.nix | 3 +- pkgs/development/libraries/nss/default.nix | 3 +- pkgs/tools/networking/vde2/default.nix | 3 +- pkgs/top-level/all-packages.nix | 11 +- 7 files changed, 55 insertions(+), 226 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f9433a1a409..5fc502a5846 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,230 +1,70 @@ -{ stdenv, fetchurl, pkgconfig, libtool, python, perl, texinfo, flex, bison -, gettext, makeWrapper, glib, zlib, pixman - -# Optional Arguments -, SDL2 ? null, gtk ? null, gnutls ? null, cyrus_sasl ? null, libjpeg ? null -, libpng ? null, ncurses ? null, curl ? null, libcap ? null, attr ? null -, bluez ? null, libibverbs ? null, librdmacm ? null, libuuid ? null, vde2 ? null -, libaio ? null, libcap_ng ? null, spice ? null, spice_protocol ? null -, libceph ? null, libxfs ? null, nss ? null, nspr ? null, libusb ? null -, usbredir ? null, mesa ? null, lzo ? null, snappy ? null, bzip2 ? null -, libseccomp ? null, glusterfs ? null, libssh2 ? null, numactl ? null - -# Audio libraries -, libpulseaudio ? null, alsaLib ? null - -# Extra options -, type ? "" +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman +, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, libseccomp, libaio, libcap_ng, gnutls +, makeWrapper +, pulseSupport ? true, libpulseaudio +, sdlSupport ? true, SDL +, vncSupport ? true, libjpeg, libpng +, spiceSupport ? true, spice, spice_protocol, usbredir +, x86Only ? false }: with stdenv.lib; let - n = "qemu-2.3.0"; - - 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; - - optSDL2 = if type == "nix" then null else shouldUsePkg SDL2; - optGtk = if type == "nix" then null else shouldUsePkg gtk; - optLibcap = if type == "nix" then null else shouldUsePkg libcap; - optAttr = if type == "nix" then null else shouldUsePkg attr; - optGnutls = if type == "nix" then null else shouldUsePkg gnutls; - optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl; - optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg; - optLibpng = if type == "nix" then null else shouldUsePkg libpng; - optNcurses = if type == "nix" then null else shouldUsePkg ncurses; - optCurl = if type == "nix" then null else shouldUsePkg curl; - optBluez = if type == "nix" then null else shouldUsePkg bluez; - optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs; - optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm; - optLibuuid = if type == "nix" then null else shouldUsePkg libuuid; - optVde2 = if type == "nix" then null else shouldUsePkg vde2; - optLibaio = shouldUsePkg libaio; - optLibcap_ng = shouldUsePkg libcap_ng; - optSpice = if type == "nix" then null else shouldUsePkg spice; - optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol; - optLibceph = if type == "nix" then null else shouldUsePkg libceph; - optLibxfs = if type == "nix" then null else shouldUsePkg libxfs; - optNss = if type == "nix" then null else shouldUsePkg nss; - optNspr = if type == "nix" then null else shouldUsePkg nspr; - optLibusb = if type == "nix" then null else shouldUsePkg libusb; - optUsbredir = if type == "nix" then null else shouldUsePkg usbredir; - optMesa = if type == "nix" then null else shouldUsePkg mesa; - optLzo = if type == "nix" then null else shouldUsePkg lzo; - optSnappy = if type == "nix" then null else shouldUsePkg snappy; - optBzip2 = if type == "nix" then null else shouldUsePkg bzip2; - optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp; - optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs; - optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2; - optNumactl = if type == "nix" then null else shouldUsePkg numactl; - - hasSDLAbi = if optSDL2 != null then true else null; - - hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; - - hasVnc = type != "nix"; - hasVncTls = hasVnc && optGnutls != null; - hasVncSasl = hasVnc && optCyrus_sasl != null; - hasVncJpeg = hasVnc && optLibjpeg != null; - hasVncPng = hasVnc && optLibpng != null; - hasVncWs = hasVnc && optGnutls != null; - - hasFdt = type != "nix"; - - hasRdma = optLibibverbs != null && optLibrdmacm != null; - - hasLinuxAio = stdenv.isLinux && optLibaio != null; - - hasSpice = optSpice != null && optSpice_protocol != null; - - hasNss = optNss != null && optNspr != null; - - optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio; - optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib; - audio = concatStringsSep "," ( - optional (optSDL2 != null) "sdl" - ++ optional (optLibpulseaudio != null) "pa" - ++ optional (optAlsaLib != null) "alsa" - ); - - systemBinary = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "i386" - else null; - - targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" - else if stdenv.system == "i686-linux" then "i386-softmmu" - else null; + n = "qemu-2.2.1"; + audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + + optionalString pulseSupport "pa," + + optionalString sdlSupport "sdl,"; in stdenv.mkDerivation rec { - name = "${n}${optionalString (type != null && type != "") "-${type}"}"; + name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; - nativeBuildInputs = [ pkgconfig libtool perl texinfo flex bison gettext makeWrapper ]; - - buildInputs = [ - python glib zlib pixman optSDL2 optGtk optNcurses optCurl optBluez optVde2 - optLibcap_ng optAttr optLibuuid optLibceph optLibxfs optLibusb optUsbredir - optMesa optLzo optSnappy optBzip2 optLibseccomp optGlusterfs optLibssh2 - optNumactl optLibpulseaudio optAlsaLib - ] ++ optionals (hasVncTls || hasVncWs) [ - optGnutls - ] ++ optionals hasVncSasl [ - optCyrus_sasl - ] ++ optionals hasVncJpeg [ - optLibjpeg - ] ++ optionals hasVncPng [ - optLibpng - ] ++ optionals hasVirtfs [ - optLibcap - ] ++ optionals hasRdma [ - optLibibverbs optLibrdmacm - ] ++ optionals hasLinuxAio [ - optLibaio - ] ++ optionals hasSpice [ - optSpice optSpice_protocol - ] ++ optionals hasNss [ - optNss optNspr - ]; + buildInputs = + [ python zlib pkgconfig glib ncurses perl pixman attr libcap + vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp + libcap_ng gnutls + ] + ++ optionals pulseSupport [ libpulseaudio ] + ++ optionals sdlSupport [ SDL ] + ++ optionals vncSupport [ libjpeg libpng ] + ++ optionals spiceSupport [ spice_protocol spice usbredir ] + ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; enableParallelBuilding = true; - configureFlags = [ - (mkOther "smbd" "smbd") - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "modules" null) - (mkEnable false "debug-tcg" null) - (mkEnable false "debug-info" null) - (mkEnable false "sparse" null) - (mkEnable false "werror" null) - (mkEnable (optSDL2 != null) "sdl" null) - (mkWith hasSDLAbi "sdlabi" "2.0") - (mkEnable (optGtk != null) "gtk" null) - (mkEnable hasVirtfs "virtfs" null) - (mkEnable hasVnc "vnc" null) - (mkEnable stdenv.isDarwin "cocoa" null) - (mkOther "audio-drv-list" audio) - (mkEnable false "xen" null) - (mkEnable false "xen-pci-passthrough" null) - (mkEnable false "brlapi" null) - (mkEnable hasVncTls "vnc-tls" null) - (mkEnable hasVncSasl "vnc-sasl" null) - (mkEnable hasVncJpeg "vnc-jpeg" null) - (mkEnable hasVncPng "vnc-png" null) - (mkEnable hasVncWs "vnc-ws" null) - (mkEnable (optNcurses != null) "curses" null) - (mkEnable (optCurl != null) "curl" null) - (mkEnable hasFdt "fdt" null) - (mkEnable (optBluez != null) "bluez" null) - (mkEnable stdenv.isLinux "kvm" null) - (mkEnable hasRdma "rdma" null) - (mkEnable (type != "nix") "system" null) - (mkEnable (type != "kvm-only") "user" null) - (mkEnable (type != "kvm-only") "guest-base" null) - (mkEnable true "pie" null) - (mkEnable (optLibuuid != null) "uuid" null) - (mkEnable (optVde2 != null) "vde" null) - (mkEnable false "netmap" null) # TODO(wkennington): Add Support - (mkEnable hasLinuxAio "linux-aio" null) - (mkEnable (optLibcap_ng != null) "cap-ng" null) - (mkEnable (optAttr != null) "attr" null) - (mkEnable (type != "nix") "docs" null) - (mkEnable stdenv.isLinux "vhost-net" null) - (mkEnable hasSpice "spice" null) - (mkEnable (optLibceph != null) "rbd" null) - (mkEnable false "libiscsi" null) # TODO(wkennington): Add support - (mkEnable false "libnfs" null) # TODO(wkennington): Add support - (mkEnable (optLibxfs != null) "xfsctl" null) - (mkEnable hasNss "smartcard-nss" null) - (mkEnable (optLibusb != null) "libusb" null) - (mkEnable (optUsbredir != null) "usb-redir" null) - (mkEnable (optMesa != null) "opengl" null) - (mkEnable (optLzo != null) "lzo" null) - (mkEnable (optSnappy != null) "snappy" null) - (mkEnable (optBzip2 != null) "bzip2" null) - (mkEnable true "guest-agent" null) - (mkEnable (optLibseccomp != null) "seccomp" null) - (mkEnable (optGlusterfs != null) "glusterfs" null) - (mkEnable false "archipelago" null) - (mkEnable true "tpm" null) - (mkEnable (optLibssh2 != null) "libssh2" null) - (mkEnable (optLibuuid != null) "vhdx" null) - (mkEnable (optGnutls != null) "quorum" null) - (mkEnable (optNumactl != null) "numa" null) - ] ++ optionals (type == "kvm-only") [ - (mkOther "target-list" targetList) - ]; + patches = [ ./no-etc-install.patch ]; - installFlags = [ - "sysconfdir=\${out}/etc" - "qemu_confdir=\${out}/etc/qemu" - "qemu_localstatedir=\${TMPDIR}" - ]; + configureFlags = + [ "--enable-seccomp" + "--smbd=smbd" # use `smbd' from $PATH + "--audio-drv-list=${audio}" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] + ++ optional spiceSupport "--enable-spice" + ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" + ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; - postInstall = optionalString (systemBinary != null) '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${systemBinary}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + postInstall = + '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + fi + ''; meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric shlevy eelco wkennington ]; - platforms = if type == "kvm-only" then platforms.linux else platforms.all; + maintainers = with maintainers; [ viric shlevy eelco ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 75dd10d8caa..8d87e2ee50d 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { installTargets = "install install-lib install-dev"; - meta = with stdenv.lib; { + meta = { homepage = http://savannah.nongnu.org/projects/attr/; description = "Library and tools for manipulating extended attributes"; - platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e444264b3a8..8364cab7623 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -182,11 +182,11 @@ stdenv.mkDerivation { passthru = { inherit libdrm version driverLink; }; - meta = with stdenv.lib; { + meta = { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; license = "bsd"; - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ eduarrrd simons vcunat ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index dd508d68748..1494092fc47 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 037ab3c03c0..f8822c9d0a4 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -79,9 +79,8 @@ in stdenv.mkDerivation rec { find $out/bin -type f \( -name nss-config -o -delete \) ''; - meta = with stdenv.lib; { + meta = { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 282b6666aa4..72a31262e26 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libpcap python ]; - meta = with stdenv.lib; { + meta = { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; - platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcc861b5d4d..7162549565f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9896,7 +9896,7 @@ let watch = callPackage ../os-specific/linux/procps/watch.nix { }; - qemu_kvm = lowPrio (qemu.override { type = "kvm-only"; }); + qemu_kvm = lowPrio (qemu.override { x86Only = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; @@ -12144,14 +12144,7 @@ let eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; - qemu = callPackage ../applications/virtualization/qemu { - gtk = gtk3; - bluez = bluez5; - libusb = libusb1; - mesa = mesa_noglu; - }; - - qemu-nix = qemu.override { type = "nix"; }; + qemu = callPackage ../applications/virtualization/qemu { }; qjackctl = callPackage ../applications/audio/qjackctl { }; From 80ebb879cd32e5a0ca8f5321a494bbea9612be1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 20:57:15 +0200 Subject: [PATCH 120/208] Revert "e2fsprogs: 1.14.12 -> 1.14.13" This reverts commit 3f4f90b58ba4d09352111c98a3e99019673ff64f. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++--------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c4b44b824f0..7617e82f1a8 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,66 +1,34 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, libuuid }: -# Optional Dependencies -, libuuid -}: - -with stdenv; -let - optLibuuid = shouldUsePkg libuuid; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.42.12"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optLibuuid ]; + buildInputs = [ pkgconfig libuuid ]; - configureFlags = [ - (mkEnable true "symlink-install" null) - (mkEnable true "relative-symlinks" null) - (mkEnable true "symlink-relative-symlinks" null) - (mkEnable false "compression" null) - (mkEnable true "htree" null) - (mkEnable true "elf-shlibs" null) - (mkEnable false "profile" null) - (mkEnable false "gcov" null) - (mkEnable false "jbd-debug" null) - (mkEnable false "blkid-debug" null) - (mkEnable false "testio-debug" null) - (mkEnable (optLibuuid == null) "libuuid" null) - (mkEnable (optLibuuid == null) "libblkid" null) - (mkEnable true "quota" null) - (mkEnable false "backtrace" null) - (mkEnable false "debugfs" null) - (mkEnable true "imager" null) - (mkEnable true "resizer" null) - (mkEnable true "defrag" null) - (mkEnable true "fsck" null) - (mkEnable false "e2initrd-helper" null) - (mkEnable true "tls" null) - (mkEnable false "uuidd" null) # Build is broken in 1.42.13 - ]; + crossAttrs = { + preConfigure = '' + export CC=$crossConfig-gcc + ''; + }; + + # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). + configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; enableParallelBuilding = true; - installFlags = [ - "LN=ln -s" - ]; + preInstall = "installFlagsArray=('LN=ln -s')"; - postInstall = '' - make install-libs - ''; + postInstall = "make install-libs"; - meta = with stdenv.lib; { + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ eelco wkennington ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } From b5dea5c86a67593c6618f08429ec7c81c16622c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:01:53 +0200 Subject: [PATCH 121/208] Fix wayland --- pkgs/development/libraries/wayland/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 00061e79fa5..16d2298279b 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: @@ -6,7 +6,6 @@ # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; -with stdenv.lib; stdenv.mkDerivation rec { name = "wayland-${version}"; version = "1.7.0"; @@ -16,9 +15,7 @@ stdenv.mkDerivation rec { sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx"; }; - configureFlags = [ - (mkEnable (expat != null) "scanner" null) - ]; + configureFlags = "--with-scanner"; nativeBuildInputs = [ pkgconfig ]; @@ -27,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; homepage = http://wayland.freedesktop.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ codyopel wkennington ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ codyopel wkennington ]; }; passthru.version = version; From c449f292d2f3ff48432c367f0109346cab480225 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:03:32 +0200 Subject: [PATCH 122/208] Revert "krb5: Make lib build parallel" This reverts commit ac2f05a50ae5113cbdd7e66599ff54b728ae10e4. --- pkgs/development/libraries/kerberos/krb5.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index c4974c51e81..6d3d8eec58f 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -97,19 +97,19 @@ stdenv.mkDerivation rec { ]; buildPhase = optionalString libOnly '' - (cd util; make -j $NIX_BUILD_CORES) - (cd include; make -j $NIX_BUILD_CORES) - (cd lib; make -j $NIX_BUILD_CORES) - (cd build-tools; make -j $NIX_BUILD_CORES) + (cd util; make) + (cd include; make) + (cd lib; make) + (cd build-tools; make) ''; installPhase = optionalString libOnly '' mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} - (cd util; make -j $NIX_BUILD_CORES install) - (cd include; make -j $NIX_BUILD_CORES install) - (cd lib; make -j $NIX_BUILD_CORES install) - (cd build-tools; make -j $NIX_BUILD_CORES install) + (cd util; make install) + (cd include; make install) + (cd lib; make install) + (cd build-tools; make install) rm -rf $out/{sbin,share} find $out/bin -type f | grep -v 'krb5-config' | xargs rm From 1b32ae03f3be8c5233ddd7f7d7db2db6ef4d2f18 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:03:44 +0200 Subject: [PATCH 123/208] Revert "krb5: Fixes" This reverts commit a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d. --- pkgs/development/libraries/kerberos/krb5.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 6d3d8eec58f..c60ff03aa67 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -3,7 +3,7 @@ # Optional Dependencies , libedit ? null, readline ? null, ncurses ? null, libverto ? null -, openldap ? null +, openldap ? null, db ? null # Crypto Dependencies , openssl ? null, nss ? null, nspr ? null @@ -24,6 +24,7 @@ let optNcurses = if libOnly then null else shouldUsePkg ncurses; optLibverto = shouldUsePkg libverto; optOpenldap = if libOnly then null else shouldUsePkg openldap; + optDb = if libOnly then null else shouldUsePkg db; # Prefer the openssl implementation cryptoStr = if optOpenssl != null then "openssl" @@ -93,7 +94,7 @@ stdenv.mkDerivation rec { (mkWith (optLibverto != null) "system-verto" null) (mkWith (optOpenldap != null) "ldap" null) (mkWith false "tcl" null) - (mkWith false "system-db" null) # Requires db v1.85 + (mkWith (optDb != null) "system-db" null) ]; buildPhase = optionalString libOnly '' @@ -105,14 +106,11 @@ stdenv.mkDerivation rec { installPhase = optionalString libOnly '' mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} - (cd util; make install) (cd include; make install) (cd lib; make install) (cd build-tools; make install) - - rm -rf $out/{sbin,share} - find $out/bin -type f | grep -v 'krb5-config' | xargs rm + rm -rf $out/{bin,sbin,share} ''; enableParallelBuilding = true; From 1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:09:42 +0200 Subject: [PATCH 124/208] Revert "krb5: 1.13.1 -> 1.13.2" This reverts commit 85932bc5a998060e76090273b51d35133a7a2dbb. --- .../core/gnome-control-center/default.nix | 4 +- pkgs/development/compilers/hhvm/default.nix | 4 +- pkgs/development/libraries/kerberos/krb5.nix | 120 +++--------------- pkgs/development/libraries/ti-rpc/default.nix | 4 +- pkgs/tools/system/rsyslog/default.nix | 6 +- pkgs/top-level/all-packages.nix | 3 - 6 files changed, 26 insertions(+), 115 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index 0c676c38efa..e2ec96b5469 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -2,7 +2,7 @@ , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager +, cracklib, python, krb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gnome3.vino udev libcanberra_gtk3 diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index a5586117588..72bdabb4349 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 +, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit , libvpx, imagemagick, fribidi @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5 gmp libyaml libedit libvpx imagemagick fribidi ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index c60ff03aa67..41c570ee554 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,127 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, perl -, yacc, bootstrap_cmds +{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }: -# Optional Dependencies -, libedit ? null, readline ? null, ncurses ? null, libverto ? null -, openldap ? null, db ? null - -# Crypto Dependencies -, openssl ? null, nss ? null, nspr ? null - -# Extra Arguments -, prefix ? "" -}: - -with stdenv; let - libOnly = prefix == "lib"; - - optOpenssl = shouldUsePkg openssl; - optNss = shouldUsePkg nss; - optNspr = shouldUsePkg nspr; - optLibedit = if libOnly then null else shouldUsePkg libedit; - optReadline = if libOnly then null else shouldUsePkg readline; - optNcurses = if libOnly then null else shouldUsePkg ncurses; - optLibverto = shouldUsePkg libverto; - optOpenldap = if libOnly then null else shouldUsePkg openldap; - optDb = if libOnly then null else shouldUsePkg db; - - # Prefer the openssl implementation - cryptoStr = if optOpenssl != null then "openssl" - else if optNss != null && optNspr != null then "nss" - else "builtin"; - - cryptoInputs = { - "openssl" = [ optOpenssl ]; - "nss" = [ optNss optNspr ]; - "builtin" = [ ]; - }.${cryptoStr}; - - tlsStr = if optOpenssl != null then "openssl" - else "no"; - - tlsInputs = { - "openssl" = [ optOpenssl ]; - "no" = [ ]; - }.${tlsStr}; - - # Libedit is less buggy in krb5, readline breaks tests - lineParserStr = if optLibedit != null then "libedit" - else if optReadline != null && optNcurses != null then "readline" - else "no"; - - lineParserInputs = { - "libedit" = [ optLibedit ]; - "readline" = [ optReadline optNcurses ]; - "no" = [ ]; - }.${lineParserStr}; + pname = "krb5"; + version = "1.13.1"; + name = "${pname}-${version}"; + webpage = http://web.mit.edu/kerberos/; in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "${prefix}krb5-${version}"; - version = "1.13.2"; + +stdenv.mkDerivation (rec { + inherit name; src = fetchurl { - url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar"; - sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"; + url = "${webpage}dist/krb5/1.13/${name}-signed.tar"; + sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; }; - nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ yacc optOpenssl optLibverto optOpenldap ] - ++ cryptoInputs ++ tlsInputs ++ lineParserInputs + buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ] # Provides the mig command used by the build scripts - ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds; + ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ; unpackPhase = '' tar -xf $src - tar -xzf krb5-${version}.tar.gz - cd krb5-${version}/src + tar -xzf ${name}.tar.gz + cd ${name}/src ''; - configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable false "athena" null) - (mkWith false "vague-errors" null) - (mkWith true "crypto-impl" cryptoStr) - (mkWith true "pkinit-crypto-impl" cryptoStr) - (mkWith true "tls-impl" tlsStr) - (mkEnable true "aesni" null) - (mkEnable true "kdc-lookaside-cache" null) - (mkEnable (optOpenssl != null) "pkinit" null) - (mkWith (lineParserStr == "libedit") "libedit" null) - (mkWith (lineParserStr == "readline") "readline" null) - (mkWith (optLibverto != null) "system-verto" null) - (mkWith (optOpenldap != null) "ldap" null) - (mkWith false "tcl" null) - (mkWith (optDb != null) "system-db" null) - ]; - - buildPhase = optionalString libOnly '' - (cd util; make) - (cd include; make) - (cd lib; make) - (cd build-tools; make) - ''; - - installPhase = optionalString libOnly '' - mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} - (cd util; make install) - (cd include; make install) - (cd lib; make install) - (cd build-tools; make install) - rm -rf $out/{bin,sbin,share} - ''; + configureFlags = [ "--with-tcl=no" ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://web.mit.edu/kerberos/; description = "MIT Kerberos 5"; + homepage = webpage; license = "MPL"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "krb5"; -} +}) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index eb795d6b28e..b135e49f52b 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libkrb5 }: +{ fetchurl, stdenv, krb5 }: stdenv.mkDerivation rec { name = "libtirpc-0.3.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna"; }; - propagatedBuildInputs = [ libkrb5 ]; + propagatedBuildInputs = [ krb5 ]; # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e8abe0ef0d0..195e6bc4329 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis ] ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") (mkEnable true "largefile" null) (mkEnable true "regexp" null) - (mkEnable (libkrb5 != null) "gssapi-krb5" null) + (mkEnable (krb5 != null) "gssapi-krb5" null) (mkEnable true "klog" null) (mkEnable true "kmsg" null) (mkEnable (systemd != null) "imjournal" null) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7162549565f..3bc4b6d11c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6503,9 +6503,6 @@ let }; inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5.override { - prefix = "lib"; - }; LASzip = callPackage ../development/libraries/LASzip { }; From aa2a0ff1d8899586b9d7d04d1f159640192b237d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:12:16 +0200 Subject: [PATCH 125/208] Revert "postgres: Fix maintainers" This reverts commit e8392bb33f087912d6602b239fa836b05741c9b8. --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index ded9247f42a..f8d1ad0a475 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles wkennington ]; + maintainers = with maintaiers; [ ocharles wkennington ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; From c82da1ece689bfb6f18d8019ef0e64c67590c6b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:12:25 +0200 Subject: [PATCH 126/208] Revert "postgresql: 9.4.1 -> 9.4.2" This reverts commit 6775c0696f9e8b2c148f9be382f30bce7a4ec4a0. --- pkgs/servers/sql/postgresql/9.4.x.nix | 47 +++++++++++++++++++++---- pkgs/servers/sql/postgresql/generic.nix | 8 ++--- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 0d8b573dcc5..73f416912a2 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,11 +1,44 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: -callPackage ./generic.nix (args // rec { - psqlSchema = "9.4"; - version = "${psqlSchema}.2"; +with stdenv.lib; + +let version = "9.4.1"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; }; -}) + + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; + + patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.4"; + }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index f8d1ad0a475..88e2b77cf83 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -69,12 +69,14 @@ stdenv.mkDerivation rec { (mkWith false "perl" null) # Maybe enable some day (mkWith false "python" null) # Maybe enable some day (mkWith (optKerberos != null) "gssapi" null) + (mkWith false "krb5" null) (mkWith (optPam != null) "pam" null) (mkWith (optOpenldap != null) "ldap" null) (mkWith false "bonjour" null) (mkWith (optOpenssl != null) "openssl" null) (mkWith (optReadline != null) "readline" null) (mkWith false "libedit-preferred" null) + (mkWith (optLibossp_uuid != null) "ossp-uuid" null) (mkWith (optLibxml2 != null) "libxml" null) (mkWith (optLibxslt != null) "libxslt" null) (mkWith (optZlib != null) "zlib" null) @@ -82,12 +84,6 @@ stdenv.mkDerivation rec { (mkWith false "selinux" null) ] ++ optionals (versionOlder version "9.3.0") [ (mkEnable true "shared" null) - ] ++ optionals (versionAtLeast version "9.4.0") [ - (mkEnable false "tap-tests" null) - (mkWith (optLibossp_uuid != null) "uuid" "ossp") - ] ++ optionals (versionOlder version "9.4.0") [ - (mkWith false "krb5" null) - (mkWith (optLibossp_uuid != null) "ossp-uuid" null) ]; enableParallelBuilding = true; From f4b5cd8dde3cfc87bc5d344093fb91bc229eadcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:14:17 +0200 Subject: [PATCH 127/208] Revert "postgresql: Fix sha256 for 9.3.7" This reverts commit adcf1c7a90b48eda3eec707f164c64b38af27e41. --- pkgs/servers/sql/postgresql/9.3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index fabc6dbc1de..9671c316832 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec { src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; + sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; }) From ef5647d7570181ebf936ca3056145e809836428e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:15:43 +0200 Subject: [PATCH 128/208] Revert "postgresql: 9.3.6 -> 9.3.7" This reverts commit 5486c08dc27c5cdc7b251adf6d50d306501ba3b1. --- pkgs/servers/sql/postgresql/9.3.x.nix | 47 +++++++++++++++++++++---- pkgs/servers/sql/postgresql/generic.nix | 3 +- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 9671c316832..4406aecaa89 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -1,11 +1,44 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}: -callPackage ./generic.nix (args // rec { - psqlSchema = "9.3"; - version = "${psqlSchema}.7"; +with stdenv.lib; + +let version = "9.3.6"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; }; -}) + + buildInputs = [ zlib readline openssl ] + ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + configureFlags = [ "--with-openssl" ] + ++ optional (!stdenv.isDarwin) "--with-ossp-uuid"; + + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.3"; + }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 88e2b77cf83..46d2030224d 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { (mkEnable true "integer-datetimes" null) (mkEnable true "nls" null) (mkWith true "pgport" "5432") + (mkEnable true "shared" null) (mkEnable true "rpath" null) (mkEnable true "spinlocks" null) (mkEnable false "debug" null) @@ -82,8 +83,6 @@ stdenv.mkDerivation rec { (mkWith (optZlib != null) "zlib" null) ] ++ optionals (versionAtLeast version "9.1.0") [ (mkWith false "selinux" null) - ] ++ optionals (versionOlder version "9.3.0") [ - (mkEnable true "shared" null) ]; enableParallelBuilding = true; From f1b8931cc9ff6264b80d842a5fea38e1c5122908 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:15:50 +0200 Subject: [PATCH 129/208] Revert "postgresql: Consolidate patches" This reverts commit 7174391e5bff8206025d4c7c7107d11487c534f7. --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++ pkgs/servers/sql/postgresql/9.2.x.nix | 2 ++ pkgs/servers/sql/postgresql/generic.nix | 12 ++++-------- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 0254bbe951d..f946f9fc145 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index dba42e4fb11..b2a53bfc4b1 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 138bc4a3023..1debe457e1f 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 9517b4e803c..477bb9d2484 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; }; + + patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 46d2030224d..b7b2e3014ce 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, psqlSchema , version, src +, psqlSchema , version, src, patches ? [ ] , ... }: @@ -25,6 +25,8 @@ let optLibxml2 = shouldUsePkg libxml2; optLibxslt = shouldUsePkg libxslt; optZlib = shouldUsePkg zlib; + + patches' = [ ./less-is-more.patch ] ++ patches; in with stdenv.lib; stdenv.mkDerivation rec { @@ -32,13 +34,7 @@ stdenv.mkDerivation rec { inherit src; - patches = [ - ./less-is-more.patch - ] ++ optionals (versionOlder version "9.4.0") [ - ./disable-resolve_symlinks.patch - ] ++ optionals (versionAtLeast version "9.4.0") [ - ./disable-resolve_symlinks-94.patch - ]; + patches = patches'; nativeBuildInputs = [ bison flex ]; buildInputs = [ From bcd9f792da65ecc35a9023124dd564fe915326f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:16:00 +0200 Subject: [PATCH 130/208] Revert "postgresql: Correct propagated readline" This reverts commit d9efd0676fec01fe0161b882a5f84f23b1c89f87. --- pkgs/servers/sql/postgresql/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b7b2e3014ce..40c5ff660ce 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation rec { }; passthru = { - inherit psqlSchema; - readline = optReadline; + inherit readline psqlSchema; }; } From 4d0156025d1c181c373f8278eef4996320fce56f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:16:07 +0200 Subject: [PATCH 131/208] Revert "postgresql: 9.2.10 -> 9.2.11" This reverts commit 601e713bb84a9c4f27a38d7d4595b49301b98dcc. --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 -- pkgs/servers/sql/postgresql/9.0.x.nix | 2 -- pkgs/servers/sql/postgresql/9.1.x.nix | 2 -- pkgs/servers/sql/postgresql/9.2.x.nix | 43 ++++++++++++++++++++----- pkgs/servers/sql/postgresql/generic.nix | 10 +++--- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index f946f9fc145..0254bbe951d 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index b2a53bfc4b1..dba42e4fb11 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 1debe457e1f..138bc4a3023 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; - - patches = [ ./disable-resolve_symlinks.patch ]; }) diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 477bb9d2484..3c21a96e9b2 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,40 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, openssl }: -callPackage ./generic.nix (args // rec { - psqlSchema = "9.2"; - version = "${psqlSchema}.11"; +let version = "9.2.10"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; }; - patches = [ ./disable-resolve_symlinks.patch ]; -}) + buildInputs = [ zlib readline openssl ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + configureFlags = [ "--with-openssl" ]; + + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.2"; + }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 40c5ff660ce..74c7b2906b4 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, psqlSchema , version, src, patches ? [ ] +, version, src, psqlSchema , ... }: @@ -25,8 +25,6 @@ let optLibxml2 = shouldUsePkg libxml2; optLibxslt = shouldUsePkg libxslt; optZlib = shouldUsePkg zlib; - - patches' = [ ./less-is-more.patch ] ++ patches; in with stdenv.lib; stdenv.mkDerivation rec { @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { inherit src; - patches = patches'; + patches = [ ./less-is-more.patch ]; nativeBuildInputs = [ bison flex ]; buildInputs = [ @@ -42,6 +40,8 @@ stdenv.mkDerivation rec { optLibossp_uuid optLibxml2 optLibxslt optZlib ]; + #LC_ALL = "C"; + configureFlags = [ (mkOther "sysconfdir" "/etc") (mkOther "localstatedir" "/var") @@ -81,8 +81,6 @@ stdenv.mkDerivation rec { (mkWith false "selinux" null) ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; From 3da0f6408844904bf490adb1b81dee1481374507 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:16:21 +0200 Subject: [PATCH 132/208] Revert "postgresql: Add myself as maintainer" This reverts commit e9d0c395d1e9e1616ae07fa9eacbbfc9df52d4a8. --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 74c7b2906b4..721a3b6323f 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles wkennington ]; + maintainers = with maintaiers; [ ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; From eb269336f1e2c691a9d9265d21ad64446c8a9c20 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:17:12 +0200 Subject: [PATCH 133/208] Revert "postgresql: Add schema version" This reverts commit 243dc10b0b54fbc840ebae39bcb224d9e0717add. --- pkgs/servers/sql/postgresql/8.4.x.nix | 3 +-- pkgs/servers/sql/postgresql/9.0.x.nix | 3 +-- pkgs/servers/sql/postgresql/9.1.x.nix | 3 +-- pkgs/servers/sql/postgresql/generic.nix | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 0254bbe951d..66933f2ad42 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "8.4"; - version = "${psqlSchema}.22"; + version = "8.4.22"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index dba42e4fb11..6c24e6aa4c4 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "9.0"; - version = "${psqlSchema}.20"; + version = "9.0.20"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 138bc4a3023..b481f292ec5 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,8 +1,7 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - psqlSchema = "9.1"; - version = "${psqlSchema}.16"; + version = "9.1.16"; src = fetchurl { url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 721a3b6323f..06e6d1e79d6 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -10,7 +10,7 @@ , walBlockSizeKB ? 8, walSegmentSizeMB ? 16 # Version specific arguments -, version, src, psqlSchema +, version, src , ... }: @@ -90,7 +90,5 @@ stdenv.mkDerivation rec { hydraPlatforms = platforms.linux; }; - passthru = { - inherit readline psqlSchema; - }; + passthru = { inherit readline; }; } From e3ab9804ba86bfca50e522ddfbdc7c3df9e79d64 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:17:19 +0200 Subject: [PATCH 134/208] Revert "postgresql: 9.1.15 -> 9.1.16" This reverts commit be94d4bc25e27583ee36024dd9b45ead29c7f796. --- pkgs/servers/sql/postgresql/9.1.x.nix | 44 +++++++++++++++++++++---- pkgs/servers/sql/postgresql/generic.nix | 2 -- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index b481f292ec5..87ed9abe690 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,10 +1,42 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, openssl }: -callPackage ./generic.nix (args // rec { - version = "9.1.16"; +let version = "9.1.15"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; }; -}) + + buildInputs = [ zlib readline openssl ]; + + enableParallelBuilding = true; + + LC_ALL = "C"; + + configureFlags = [ "--with-openssl" ]; + + patches = [ ./less-is-more.patch ]; + + postInstall = + '' + mkdir -p $out/share/man + cp -rvd doc/src/sgml/man1 $out/share/man + ''; + + passthru = { + inherit readline; + psqlSchema = "9.1"; + }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 06e6d1e79d6..b2af6dd5331 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -77,8 +77,6 @@ stdenv.mkDerivation rec { (mkWith (optLibxml2 != null) "libxml" null) (mkWith (optLibxslt != null) "libxslt" null) (mkWith (optZlib != null) "zlib" null) - ] ++ optionals (versionAtLeast version "9.1.0") [ - (mkWith false "selinux" null) ]; meta = with stdenv.lib; { From 5efd73fce6f3e07fb255c4ad895994402beb034a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:17:27 +0200 Subject: [PATCH 135/208] Revert "postgresql: 9.0.19 -> 9.0.20" This reverts commit 8c99f2e3d65add9bca5df66f7f2f3014ea337c85. --- pkgs/servers/sql/postgresql/9.0.x.nix | 36 +++++++++++++--- pkgs/servers/sql/postgresql/generic.nix | 56 ++++++++++++------------- 2 files changed, 58 insertions(+), 34 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 6c24e6aa4c4..a27bc012b6e 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,10 +1,34 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, openssl }: -callPackage ./generic.nix (args // rec { - version = "9.0.20"; +let version = "9.0.19"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; }; -}) + + buildInputs = [ zlib readline openssl ]; + + LC_ALL = "C"; + + configureFlags = [ "--with-openssl" ]; + + patches = [ ./less-is-more.patch ]; + + passthru = { + inherit readline; + psqlSchema = "9.0"; + }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b2af6dd5331..d7fd28ccb68 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -43,34 +43,34 @@ stdenv.mkDerivation rec { #LC_ALL = "C"; configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "integer-datetimes" null) - (mkEnable true "nls" null) - (mkWith true "pgport" "5432") - (mkEnable true "shared" null) - (mkEnable true "rpath" null) - (mkEnable true "spinlocks" null) - (mkEnable false "debug" null) - (mkEnable false "profiling" null) - (mkEnable false "coverage" null) - (mkEnable false "dtrace" null) - (mkWith true "blocksize" (toString blockSizeKB)) - (mkWith true "segsize" (toString segmentSizeGB)) - (mkWith true "wal-blocksize" (toString walBlockSizeKB)) - (mkWith true "wal-segsize" (toString walSegmentSizeMB)) - (mkEnable true "depend" null) - (mkEnable false "cassert" null) - (mkEnable true "thread-safety" null) - (mkWith false "tcl" null) # Maybe enable some day - (mkWith false "perl" null) # Maybe enable some day - (mkWith false "python" null) # Maybe enable some day - (mkWith (optKerberos != null) "gssapi" null) - (mkWith false "krb5" null) - (mkWith (optPam != null) "pam" null) - (mkWith (optOpenldap != null) "ldap" null) - (mkWith false "bonjour" null) - (mkWith (optOpenssl != null) "openssl" null) + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "integer-datetimes" null) + (mkEnable true "nls" null) + (mkWith true "pgport" "5432") + (mkEnable true "shared" null) + (mkEnable true "rpath" null) + (mkEnable true "spinlocks" null) + (mkEnable false "debug" null) + (mkEnable false "profiling" null) + (mkEnable false "coverage" null) + (mkEnable false "dtrace" null) + (mkWith true "blocksize" (toString blockSizeKB)) + (mkWith true "segsize" (toString segmentSizeGB)) + (mkWith true "wal-blocksize" (toString walBlockSizeKB)) + (mkWith true "wal-segsize" (toString walSegmentSizeMB)) + (mkEnable true "autodepend" null) + (mkEnable false "cassert" null) + (mkEnable true "thread-safety" null) + (mkWith false "tcl" null) # Maybe enable some day + (mkWith false "perl" null) # Maybe enable some day + (mkWith false "python" null) # Maybe enable some day + (mkWith (optKerberos != null) "gssapi" null) + (mkWith false "krb5" null) + (mkWith (optPam != null) "pam" null) + (mkWith (optOpenldap != null) "ldap" null) + (mkWith false "bonjour" null) + (mkWith (optOpenssl != null) "openssl" null) (mkWith (optReadline != null) "readline" null) (mkWith false "libedit-preferred" null) (mkWith (optLibossp_uuid != null) "ossp-uuid" null) From 05f1457c1e7bfa376e949ac196db0b0412faaa85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:17:33 +0200 Subject: [PATCH 136/208] Revert "postgresql: Refactor 8.4 into generic" This reverts commit 1bb67e514b2514b9267919784524821952cd73b3. --- pkgs/servers/sql/postgresql/8.4.x.nix | 31 +++++++-- pkgs/servers/sql/postgresql/generic.nix | 92 ------------------------- 2 files changed, 26 insertions(+), 97 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/generic.nix diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 66933f2ad42..4c72dbfd448 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,10 +1,31 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: -callPackage ./generic.nix (args // rec { - version = "8.4.22"; +let version = "8.4.22"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; -}) + + buildInputs = [ zlib ncurses readline openssl ]; + + LC_ALL = "C"; + + configureFlags = [ "--with-openssl" ]; + + patches = [ ./less-is-more.patch ]; + + passthru = { inherit readline; }; + + meta = with stdenv.lib; { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = licenses.postgresql; + maintainers = with maintaiers; [ ocharles ]; + platforms = platforms.unix; + hydraPlatforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix deleted file mode 100644 index d7fd28ccb68..00000000000 --- a/pkgs/servers/sql/postgresql/generic.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, bison, flex -, gettext - -# Optional Dependencies -, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null -, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null - -# Extra Arguments -, blockSizeKB ? 8, segmentSizeGB ? 1 -, walBlockSizeKB ? 8, walSegmentSizeMB ? 16 - -# Version specific arguments -, version, src -, ... -}: - -with stdenv; -let - optKerberos = shouldUsePkg kerberos; - optPam = shouldUsePkg pam; - optOpenldap = shouldUsePkg openldap; - optOpenssl = shouldUsePkg openssl; - optReadline = shouldUsePkg readline; - optLibossp_uuid = shouldUsePkg libossp_uuid; - optLibxml2 = shouldUsePkg libxml2; - optLibxslt = shouldUsePkg libxslt; - optZlib = shouldUsePkg zlib; -in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - inherit src; - - patches = [ ./less-is-more.patch ]; - - nativeBuildInputs = [ bison flex ]; - buildInputs = [ - gettext optKerberos optPam optOpenldap optOpenssl optReadline - optLibossp_uuid optLibxml2 optLibxslt optZlib - ]; - - #LC_ALL = "C"; - - configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "integer-datetimes" null) - (mkEnable true "nls" null) - (mkWith true "pgport" "5432") - (mkEnable true "shared" null) - (mkEnable true "rpath" null) - (mkEnable true "spinlocks" null) - (mkEnable false "debug" null) - (mkEnable false "profiling" null) - (mkEnable false "coverage" null) - (mkEnable false "dtrace" null) - (mkWith true "blocksize" (toString blockSizeKB)) - (mkWith true "segsize" (toString segmentSizeGB)) - (mkWith true "wal-blocksize" (toString walBlockSizeKB)) - (mkWith true "wal-segsize" (toString walSegmentSizeMB)) - (mkEnable true "autodepend" null) - (mkEnable false "cassert" null) - (mkEnable true "thread-safety" null) - (mkWith false "tcl" null) # Maybe enable some day - (mkWith false "perl" null) # Maybe enable some day - (mkWith false "python" null) # Maybe enable some day - (mkWith (optKerberos != null) "gssapi" null) - (mkWith false "krb5" null) - (mkWith (optPam != null) "pam" null) - (mkWith (optOpenldap != null) "ldap" null) - (mkWith false "bonjour" null) - (mkWith (optOpenssl != null) "openssl" null) - (mkWith (optReadline != null) "readline" null) - (mkWith false "libedit-preferred" null) - (mkWith (optLibossp_uuid != null) "ossp-uuid" null) - (mkWith (optLibxml2 != null) "libxml" null) - (mkWith (optLibxslt != null) "libxslt" null) - (mkWith (optZlib != null) "zlib" null) - ]; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; - - passthru = { inherit readline; }; -} From 24390ab377e036b55e4331b6aed89a9d068d1b11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:28:45 +0200 Subject: [PATCH 137/208] Revert "ceph: Update git" This reverts commit 2154348ba0285b243a143114d87751ef744cfdc2. --- pkgs/tools/filesystems/ceph/generic.nix | 72 ++++++++++++------------- pkgs/tools/filesystems/ceph/git.nix | 6 +-- 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 056440d4afe..43cbb75de6f 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -98,8 +98,7 @@ stdenv.mkDerivation { ./0001-Makefile-env-Don-t-force-sbin.patch ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ] - ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ @@ -152,43 +151,42 @@ stdenv.mkDerivation { "--libdir=\${lib}/lib" "--includedir=\${lib}/include" - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) - (mkWith (optLibs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) ] ++ optional (versionAtLeast version "10.0.0") [ - (mkWith true "man-pages" null) - (mkWith false "tcmalloc-minimal" null) - (mkWith false "valgrind" null) - (mkWith true "systemd-libexec-dir" "\${TMPDIR}") + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index c964548b65e..8aa4bbd34bb 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,11 +1,11 @@ { callPackage, fetchgit, git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-05-29"; + version = "2015-04-22"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; - sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; + rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; + sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; }; }) From 660e85a0d9a95373d0cc9610d3040cd8d3774df9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:28:51 +0200 Subject: [PATCH 138/208] Revert "ceph: Add development version" This reverts commit 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d. --- pkgs/tools/filesystems/ceph/dev.nix | 14 +------------- pkgs/tools/filesystems/ceph/generic.nix | 13 +++---------- 2 files changed, 4 insertions(+), 23 deletions(-) mode change 100644 => 120000 pkgs/tools/filesystems/ceph/dev.nix diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix deleted file mode 100644 index aec5d35b51a..00000000000 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "9.0.0"; - - src = fetchgit { - url = "https://github.com/ceph/ceph.git"; - rev = "refs/tags/v${version}"; - sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg"; - }; - - patches = [ ./fix-pgrefdebugging.patch ]; -}) diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix new file mode 120000 index 00000000000..31d5e95359c --- /dev/null +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -0,0 +1 @@ +0.94.nix \ No newline at end of file diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 43cbb75de6f..9dbc85a3243 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -63,13 +63,13 @@ let hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "9.0.0" && + versionAtLeast version "0.95" && optAccelio != null && optLibibverbs != null && optLibrdmacm != null; - hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; + hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null; # TODO: Reenable when kinetic support is fixed - #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null; + #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null; hasKinetic = false; # Malloc implementation (can be jemalloc, tcmalloc or null) @@ -124,9 +124,6 @@ stdenv.mkDerivation { # Fix seagate kinetic linking sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am - '' + optionalString (versionAtLeast version "9.0.0") '' - # Fix gmock - patchShebangs src/gmock ''; preConfigure = '' @@ -189,10 +186,6 @@ stdenv.mkDerivation { (mkWith false "valgrind" null) ]; - preBuild = optionalString (versionAtLeast version "9.0.0") '' - (cd src/gmock; make -j $NIX_BUILD_CORES) - ''; - installFlags = [ "sysconfdir=\${out}/etc" ]; outputs = [ "out" "lib" ]; From 17b6a597fb36063e4832983d3470ce695f809b31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:28:56 +0200 Subject: [PATCH 139/208] Revert "ceph: Now evaluate on darwin" This reverts commit 54963fb5b7495ad3f63baa0b6d5d75d3f7c8a874. --- pkgs/tools/filesystems/ceph/generic.nix | 79 ++++++++----------------- 1 file changed, 25 insertions(+), 54 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 9dbc85a3243..5d4932e36b4 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -26,61 +26,32 @@ # We must have one crypto library assert cryptopp != null || (nss != null && nspr != null); -with stdenv; with stdenv.lib; let - optSnappy = shouldUsePkg snappy; - optLeveldb = shouldUsePkg leveldb; - optYasm = shouldUsePkg yasm; - optFcgi = shouldUsePkg fcgi; - optExpat = shouldUsePkg expat; - optCurl = shouldUsePkg curl; - optFuse = shouldUsePkg fuse; - optAccelio = shouldUsePkg accelio; - optLibibverbs = shouldUsePkg libibverbs; - optLibrdmacm = shouldUsePkg librdmacm; - optLibedit = shouldUsePkg libedit; - optLibatomic_ops = shouldUsePkg libatomic_ops; - optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; - optRocksdb = shouldUsePkg rocksdb; - optLibs3 = shouldUsePkg libs3; - - optJemalloc = shouldUsePkg jemalloc; - optGperftools = shouldUsePkg gperftools; - - optCryptopp = shouldUsePkg cryptopp; - optNss = shouldUsePkg nss; - optNspr = shouldUsePkg nspr; - - optLibaio = shouldUsePkg libaio; - optLibxfs = shouldUsePkg libxfs; - optZfs = shouldUsePkg zfs; - - hasServer = optSnappy != null && optLeveldb != null; + hasServer = snappy != null && leveldb != null; hasMon = hasServer; hasMds = hasServer; hasOsd = hasServer; - hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; + hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && versionAtLeast version "0.95" && - optAccelio != null && optLibibverbs != null && optLibrdmacm != null; + accelio != null && libibverbs != null && librdmacm != null; - hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null; + hasRocksdb = versionAtLeast version "0.95" && rocksdb != null; # TODO: Reenable when kinetic support is fixed - #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null; - hasKinetic = false; + hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false; # Malloc implementation (can be jemalloc, tcmalloc or null) - malloc = if optJemalloc != null then optJemalloc else optGperftools; + malloc = if jemalloc != null then jemalloc else gperftools; # We prefer nss over cryptopp - cryptoStr = if optNss != null && optNspr != null then "nss" else - if optCryptopp != null then "cryptopp" else "none"; + cryptoStr = if nss != null && nspr != null then "nss" else + if cryptopp != null then "cryptopp" else "none"; cryptoLibsMap = { - nss = [ optNss optNspr ]; - cryptopp = [ optCryptopp ]; + nss = [ nss nspr ]; + cryptopp = [ cryptopp ]; none = [ ]; }; @@ -100,22 +71,22 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib + boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ - linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs + linuxHeaders libuuid udev keyutils libaio libxfs zfs ] ++ optional hasServer [ - optSnappy optLeveldb + snappy leveldb ] ++ optional hasRadosgw [ - optFcgi optExpat optCurl optFuse optLibedit + fcgi expat curl fuse libedit ] ++ optional hasXio [ - optAccelio optLibibverbs optLibrdmacm + accelio libibverbs librdmacm ] ++ optional hasRocksdb [ - optRocksdb + rocksdb ] ++ optional hasKinetic [ - optKinetic-cpp-client + kinetic-cpp-client ]; postPatch = '' @@ -163,23 +134,23 @@ stdenv.mkDerivation { (mkWith false "profiler" null) (mkWith false "debug" null) (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkWith (fuse != null) "fuse" null) + (mkWith (malloc == jemalloc) "jemalloc" null) + (mkWith (malloc == gperftools) "tcmalloc" null) (mkEnable false "pgrefdebugging" null) (mkEnable false "cephfs-java" null) (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith (libatomic_ops != null) "libatomic-ops" null) (mkWith true "ocf" null) (mkWith hasKinetic "kinetic" null) (mkWith hasRocksdb "librocksdb" null) (mkWith false "librocksdb-static" null) - (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith (libs3 != null) "system-libs3" null) (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (libaio != null) "libaio" null) + (mkWith (libxfs != null) "libxfs" null) + (mkWith (zfs != null) "libzfs" null) ] ++ optional (versionAtLeast version "10.0.0") [ (mkWith true "man-pages" null) (mkWith false "tcmalloc-minimal" null) From 5d8fe045b6376851c33a1c772cfe46882411cd21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:29:47 +0200 Subject: [PATCH 140/208] Revert "Refactor mkFlag out of old packages" This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be. Conflicts: pkgs/development/libraries/wayland/default.nix pkgs/servers/samba/4.x.nix --- .../graphics/ImageMagick/default.nix | 68 ++++----- pkgs/development/libraries/lame/default.nix | 25 ++-- pkgs/development/libraries/libass/default.nix | 14 +- .../libraries/libinput/default.nix | 10 +- .../development/libraries/libwebp/default.nix | 30 ++-- pkgs/development/libraries/stxxl/default.nix | 6 +- pkgs/servers/mpd/default.nix | 64 ++++----- pkgs/servers/samba/4.x.nix | 2 +- pkgs/tools/filesystems/ceph/generic.nix | 7 + pkgs/tools/security/pinentry/default.nix | 15 +- pkgs/tools/system/rsyslog/default.nix | 131 +++++++++--------- 11 files changed, 202 insertions(+), 170 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 011e75fbc1c..7ae24b38c01 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,6 +17,10 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; + mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; + mkWith = mkFlag "with" "without"; + mkEnable = mkFlag "enable" "disable"; + hasX11 = libX11 != null && libXext != null && libXt != null; in @@ -33,38 +37,38 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - (mkEnable (libcl != null) "opencl" null) - (mkWith true "modules" null) - (mkWith true "gcc-arch" arch) - #(mkEnable true "hdri" null) This breaks some dependencies - (mkWith (perl != null) "perl" null) - (mkWith (jemalloc != null) "jemalloc" null) - (mkWith true "frozenpaths" null) - (mkWith (bzip2 != null) "bzlib" null) - (mkWith hasX11 "x" null) - (mkWith (zlib != null) "zlib" null) - (mkWith false "dps" null) - (mkWith (fftw != null) "fftw" null) - (mkWith (libfpx != null) "fpx" null) - (mkWith (djvulibre != null) "djvu" null) - (mkWith (fontconfig != null) "fontconfig" null) - (mkWith (freetype != null) "freetype" null) - (mkWith (ghostscript != null) "gslib" null) - (mkWith (graphviz != null) "gvc" null) - (mkWith (jbigkit != null) "jbig" null) - (mkWith (libjpeg != null) "jpeg" null) - (mkWith (lcms2 != null) "lcms2" null) - (mkWith false "lcms" null) - (mkWith (openjpeg != null) "openjp2" null) - (mkWith (liblqr1 != null) "lqr" null) - (mkWith (xz != null) "lzma" null) - (mkWith (openexr != null) "openexr" null) - (mkWith (pango != null) "pango" null) - (mkWith (libpng != null) "png" null) - (mkWith (librsvg != null) "rsvg" null) - (mkWith (libtiff != null) "tiff" null) - (mkWith (libwebp != null) "webp" null) - (mkWith (libxml2 != null) "xml" null) + (mkEnable (libcl != null) "opencl") + (mkWith true "modules") + (mkWith true "gcc-arch=${arch}") + #(mkEnable true "hdri") This breaks some dependencies + (mkWith (perl != null) "perl") + (mkWith (jemalloc != null) "jemalloc") + (mkWith true "frozenpaths") + (mkWith (bzip2 != null) "bzlib") + (mkWith hasX11 "x") + (mkWith (zlib != null) "zlib") + (mkWith false "dps") + (mkWith (fftw != null) "fftw") + (mkWith (libfpx != null) "fpx") + (mkWith (djvulibre != null) "djvu") + (mkWith (fontconfig != null) "fontconfig") + (mkWith (freetype != null) "freetype") + (mkWith (ghostscript != null) "gslib") + (mkWith (graphviz != null) "gvc") + (mkWith (jbigkit != null) "jbig") + (mkWith (libjpeg != null) "jpeg") + (mkWith (lcms2 != null) "lcms2") + (mkWith false "lcms") + (mkWith (openjpeg != null) "openjp2") + (mkWith (liblqr1 != null) "lqr") + (mkWith (xz != null) "lzma") + (mkWith (openexr != null) "openexr") + (mkWith (pango != null) "pango") + (mkWith (libpng != null) "png") + (mkWith (librsvg != null) "rsvg") + (mkWith (libtiff != null) "tiff") + (mkWith (libwebp != null) "webp") + (mkWith (libxml2 != null) "xml") ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 4a61d188ef6..562e292791a 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null); #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); let - sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame"; + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in with stdenv.lib; @@ -39,18 +39,17 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkEnable nasmSupport "nasm" null) - (mkEnable cpmlSupport "cpml" null) - #(mkEnable efenceSupport "efence" null) - (mkWith true "fileio" sndfileFileIO) - (mkEnable analyzerHooksSupport "analyzer-hooks" null) - (mkEnable decoderSupport "decoder" null) - (mkEnable frontendSupport "frontend" null) - (mkEnable frontendSupport "dynamic-frontends" null) - #(mkEnable mp3xSupport "mp3x" null) - (mkEnable mp3rtpSupport "mp3rtp" null) - ] ++ optional debugSupport [ - (mkEnable true "debug" "alot") + (mkFlag nasmSupport "nasm") + (mkFlag cpmlSupport "cpml") + #(mkFlag efenceSupport "efence") + (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") + (mkFlag analyzerHooksSupport "analyzer-hooks") + (mkFlag decoderSupport "decoder") + (mkFlag frontendSupport "frontend") + (mkFlag frontendSupport "dynamic-frontends") + #(mkFlag mp3xSupport "mp3x") + (mkFlag mp3rtpSupport "mp3rtp") + (if debugSupport then "--enable-debug=alot" else "") ]; meta = { diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 502f95dca9a..ab300729acc 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -11,6 +11,10 @@ assert encaSupport -> enca != null; assert fontconfigSupport -> fontconfig != null; assert harfbuzzSupport -> harfbuzz != null; +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; @@ -22,11 +26,11 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkEnable encaSupport "enca" null) - (mkEnable fontconfigSupport "fontconfig" null) - (mkEnable harfbuzzSupport "harfbuzz" null) - (mkEnable rasterizerSupport "rasterizer" null) - (mkEnable largeTilesSupport "large-tiles" null) + (mkFlag encaSupport "enca") + (mkFlag fontconfigSupport "fontconfig") + (mkFlag harfbuzzSupport "harfbuzz") + (mkFlag rasterizerSupport "rasterizer") + (mkFlag largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkgconfig yasm ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 3b8b7565e77..87d8154e5aa 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -9,6 +9,10 @@ assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-0.15.0"; @@ -19,9 +23,9 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkEnable documentationSupport "documentation" null) - (mkEnable eventGUISupport "event-gui" null) - (mkEnable testsSupport "tests" null) + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "event-gui") + (mkFlag testsSupport "tests") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 871dff0aa8a..6da1b00ee81 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -20,6 +20,10 @@ assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); assert gifSupport -> (giflib != null); +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; @@ -31,19 +35,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkEnable threadingSupport "threading" null) - (mkEnable openglSupport "gl" null) - (mkEnable pngSupport "png" null) - (mkEnable jpegSupport "jpeg" null) - (mkEnable tiffSupport "tiff" null) - (mkEnable gifSupport "gif" null) - #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null) - (mkEnable alignedSupport "aligned" null) - (mkEnable swap16bitcspSupport "swap-16bit-csp" null) - (mkEnable experimentalSupport "experimental" null) - (mkEnable libwebpmuxSupport "libwebpmux" null) - (mkEnable libwebpdemuxSupport "libwebpdemux" null) - (mkEnable libwebpdecoderSupport "libwebpdecoder" null) + (mkFlag threadingSupport "threading") + (mkFlag openglSupport "gl") + (mkFlag pngSupport "png") + (mkFlag jpegSupport "jpeg") + (mkFlag tiffSupport "tiff") + (mkFlag gifSupport "gif") + #(mkFlag (wicSupport && stdenv.isCygwin) "wic") + (mkFlag alignedSupport "aligned") + (mkFlag swap16bitcspSupport "swap-16bit-csp") + (mkFlag experimentalSupport "experimental") + (mkFlag libwebpmuxSupport "libwebpmux") + (mkFlag libwebpdemuxSupport "libwebpdemux") + (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; buildInputs = [ ] diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 9ebd27e8277..9fb25aa36e0 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -2,6 +2,10 @@ , parallel ? true }: +let + mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; +in + stdenv.mkDerivation rec { name = "stxxl-${version}"; version = "1.4.1"; @@ -17,7 +21,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}" + (mkFlag parallel "USE_GNU_PARALLEL") ]; passthru = { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c1611952a1e..90dd2040e5d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ , opusSupport ? true, libopus }: -with stdenv.lib; let - opt = optional; + opt = stdenv.lib.optional; + mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; minor = "9"; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; @@ -68,33 +68,33 @@ stdenv.mkDerivation rec { ++ opt opusSupport libopus; configureFlags = - [ (mkEnable (!stdenv.isDarwin && alsaSupport) "alsa" null) - (mkEnable flacSupport "flac" null) - (mkEnable vorbisSupport "vorbis" null) - (mkEnable vorbisSupport "vorbis-encoder" null) - (mkEnable (!stdenv.isDarwin && madSupport) "mad" null) - (mkEnable mikmodSupport "mikmod" null) - (mkEnable id3tagSupport "id3" null) - (mkEnable shoutSupport "shout" null) - (mkEnable sqliteSupport "sqlite" null) - (mkEnable curlSupport "curl" null) - (mkEnable audiofileSupport "audiofile" null) - (mkEnable bzip2Support "bzip2" null) - (mkEnable ffmpegSupport "ffmpeg" null) - (mkEnable fluidsynthSupport "fluidsynth" null) - (mkEnable zipSupport "zzip" null) - (mkEnable samplerateSupport "lsr" null) - (mkEnable mmsSupport "mms" null) - (mkEnable mpg123Support "mpg123" null) - (mkEnable aacSupport "aac" null) - (mkEnable pulseaudioSupport "pulse" null) - (mkEnable jackSupport "jack" null) - (mkEnable stdenv.isDarwin "osx" null) - (mkEnable icuSupport "icu" null) - (mkEnable gmeSupport "gme" null) - (mkEnable clientSupport "libmpdclient" null) - (mkEnable opusSupport "opus" null) - (mkEnable true "debug" null) + [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") + (mkFlag flacSupport "flac") + (mkFlag vorbisSupport "vorbis") + (mkFlag vorbisSupport "vorbis-encoder") + (mkFlag (!stdenv.isDarwin && madSupport) "mad") + (mkFlag mikmodSupport "mikmod") + (mkFlag id3tagSupport "id3") + (mkFlag shoutSupport "shout") + (mkFlag sqliteSupport "sqlite") + (mkFlag curlSupport "curl") + (mkFlag audiofileSupport "audiofile") + (mkFlag bzip2Support "bzip2") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag fluidsynthSupport "fluidsynth") + (mkFlag zipSupport "zzip") + (mkFlag samplerateSupport "lsr") + (mkFlag mmsSupport "mms") + (mkFlag mpg123Support "mpg123") + (mkFlag aacSupport "aac") + (mkFlag pulseaudioSupport "pulse") + (mkFlag jackSupport "jack") + (mkFlag stdenv.isDarwin "osx") + (mkFlag icuSupport "icu") + (mkFlag gmeSupport "gme") + (mkFlag clientSupport "libmpdclient") + (mkFlag opusSupport "opus") + "--enable-debug" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ${if shoutSupport then "-lshout" else ""} ''; - meta = { + meta = with stdenv.lib; { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 6a6e2469e78..269ba2ec186 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { find $out -type f -exec $SHELL -c "$SCRIPT" \; ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 5d4932e36b4..33d9b3dc64f 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -28,6 +28,13 @@ assert cryptopp != null || (nss != null && nspr != null); with stdenv.lib; 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; + hasServer = snappy != null && leveldb != null; hasMon = hasServer; hasMds = hasServer; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 3849c773a3e..757959f5345 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,6 +3,9 @@ }: let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; hasX = gtk2 != null || qt4 != null; in with stdenv.lib; @@ -17,12 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; configureFlags = [ - (mkWith (libcap != null) "libcap" null) - (mkWith (hasX) "x" null) - (mkEnable (ncurses != null) "pinentry-curses" null) - (mkEnable true "pinentry-tty" null) - (mkEnable (gtk2 != null) "pinentry-gtk2" null) - (mkEnable (qt4 != null) "pinentry-qt4" null) + (mkWith (libcap != null) "libcap") + (mkWith (hasX) "x") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (qt4 != null) "pinentry-qt4") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 195e6bc4329..a9fdcf6fa64 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -7,6 +7,9 @@ }: with stdenv.lib; +let + mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; +in stdenv.mkDerivation rec { name = "rsyslog-8.9.0"; @@ -23,70 +26,70 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux systemd; configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") - (mkEnable true "largefile" null) - (mkEnable true "regexp" null) - (mkEnable (krb5 != null) "gssapi-krb5" null) - (mkEnable true "klog" null) - (mkEnable true "kmsg" null) - (mkEnable (systemd != null) "imjournal" null) - (mkEnable true "inet" null) - (mkEnable (jemalloc != null) "jemalloc" null) - (mkEnable true "unlimited-select" null) - (mkEnable true "usertools" null) - (mkEnable (libmysql != null) "mysql" null) - (mkEnable (postgresql != null) "pgsql" null) - (mkEnable (libdbi != null) "libdbi" null) - (mkEnable (net_snmp != null) "snmp" null) - (mkEnable (libuuid != null) "uuid" null) - (mkEnable (curl != null) "elasticsearch" null) - (mkEnable (gnutls != null) "gnutls" null) - (mkEnable (libgcrypt != null) "libgcrypt" null) - (mkEnable true "rsyslogrt" null) - (mkEnable true "rsyslogd" null) - (mkEnable true "mail" null) - (mkEnable (liblognorm != null) "mmnormalize" null) - (mkEnable true "mmjsonparse" null) - (mkEnable true "mmaudit" null) - (mkEnable true "mmanon" null) - (mkEnable true "mmutf8fix" null) - (mkEnable true "mmcount" null) - (mkEnable true "mmsequence" null) - (mkEnable true "mmfields" null) - (mkEnable true "mmpstrucdata" null) - (mkEnable (openssl != null) "mmrfc5424addhmac" null) - (mkEnable (librelp != null) "relp" null) - (mkEnable (libgt != null) "guardtime" null) - (mkEnable (liblogging != null) "liblogging-stdlog" null) - (mkEnable (liblogging != null) "rfc3195" null) - (mkEnable true "imfile" null) - (mkEnable false "imsolaris" null) - (mkEnable true "imptcp" null) - (mkEnable true "impstats" null) - (mkEnable true "omprog" null) - (mkEnable (libnet != null) "omudpspoof" null) - (mkEnable true "omstdout" null) - (mkEnable (systemd != null) "omjournal" null) - (mkEnable true "pmlastmsg" null) - (mkEnable true "pmcisconames" null) - (mkEnable true "pmciscoios" null) - (mkEnable true "pmaixforwardedfrom" null) - (mkEnable true "pmsnare" null) - (mkEnable true "omruleset" null) - (mkEnable true "omuxsock" null) - (mkEnable true "mmsnmptrapd" null) - (mkEnable (hadoop != null) "omhdfs" null) - (mkEnable (rdkafka != null) "omkafka" null) - (mkEnable (libmongo-client != null) "ommongodb" null) - (mkEnable (czmq != null) "imzmq3" null) - (mkEnable (czmq != null) "imczmq" null) - (mkEnable (czmq != null) "omzmq3" null) - (mkEnable (czmq != null) "omczmq" null) - (mkEnable (rabbitmq-c != null) "omrabbitmq" null) - (mkEnable (hiredis != null) "omhiredis" null) - (mkEnable true "generate-man-pages" null) + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + (mkFlag true "largefile") + (mkFlag true "regexp") + (mkFlag (krb5 != null) "gssapi-krb5") + (mkFlag true "klog") + (mkFlag true "kmsg") + (mkFlag (systemd != null) "imjournal") + (mkFlag true "inet") + (mkFlag (jemalloc != null) "jemalloc") + (mkFlag true "unlimited-select") + (mkFlag true "usertools") + (mkFlag (libmysql != null) "mysql") + (mkFlag (postgresql != null) "pgsql") + (mkFlag (libdbi != null) "libdbi") + (mkFlag (net_snmp != null) "snmp") + (mkFlag (libuuid != null) "uuid") + (mkFlag (curl != null) "elasticsearch") + (mkFlag (gnutls != null) "gnutls") + (mkFlag (libgcrypt != null) "libgcrypt") + (mkFlag true "rsyslogrt") + (mkFlag true "rsyslogd") + (mkFlag true "mail") + (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag true "mmjsonparse") + (mkFlag true "mmaudit") + (mkFlag true "mmanon") + (mkFlag true "mmutf8fix") + (mkFlag true "mmcount") + (mkFlag true "mmsequence") + (mkFlag true "mmfields") + (mkFlag true "mmpstrucdata") + (mkFlag (openssl != null) "mmrfc5424addhmac") + (mkFlag (librelp != null) "relp") + (mkFlag (libgt != null) "guardtime") + (mkFlag (liblogging != null) "liblogging-stdlog") + (mkFlag (liblogging != null) "rfc3195") + (mkFlag true "imfile") + (mkFlag false "imsolaris") + (mkFlag true "imptcp") + (mkFlag true "impstats") + (mkFlag true "omprog") + (mkFlag (libnet != null) "omudpspoof") + (mkFlag true "omstdout") + (mkFlag (systemd != null) "omjournal") + (mkFlag true "pmlastmsg") + (mkFlag true "pmcisconames") + (mkFlag true "pmciscoios") + (mkFlag true "pmaixforwardedfrom") + (mkFlag true "pmsnare") + (mkFlag true "omruleset") + (mkFlag true "omuxsock") + (mkFlag true "mmsnmptrapd") + (mkFlag (hadoop != null) "omhdfs") + (mkFlag (rdkafka != null) "omkafka") + (mkFlag (libmongo-client != null) "ommongodb") + (mkFlag (czmq != null) "imzmq3") + (mkFlag (czmq != null) "imczmq") + (mkFlag (czmq != null) "omzmq3") + (mkFlag (czmq != null) "omczmq") + (mkFlag (rabbitmq-c != null) "omrabbitmq") + (mkFlag (hiredis != null) "omhiredis") + (mkFlag true "generate-man-pages") ]; meta = { From 93bd7f95aae0bc9f60c4e5cb5f50608bf57a3a13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:33:47 +0200 Subject: [PATCH 141/208] Revert "389-ds-base: Remove kerberos line as it is strictly dependent on krb5" This reverts commit b1e4371a1cb5b8aa45ee3cd8b5ba5537f60d53b0. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bc4b6d11c6..d90d75a8948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8587,7 +8587,9 @@ let ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { }; + "389-ds-base" = callPackage ../servers/ldap/389 { + kerberos = libkrb5; + }; rdf4store = callPackage ../servers/http/4store { }; From 832aeb66f87fdd2fda341f2c58df570ac05e09c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:33:51 +0200 Subject: [PATCH 142/208] Revert "Fix krb5 reference" This reverts commit 9f0da5315b4595c45ace01727808e2ae8750efc0. --- pkgs/servers/ldap/389/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 33d63f6ee03..685d365ed18 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages +, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let version = "1.3.3.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp libkrb5 pcre + net_snmp kerberos pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90d75a8948..d3bf954a73b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8588,7 +8588,7 @@ let ### SERVERS "389-ds-base" = callPackage ../servers/ldap/389 { - kerberos = libkrb5; + kerberos = krb5; }; rdf4store = callPackage ../servers/http/4store { }; From 5931932f05e0855785c309abdf5f147438bd3dfb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:34:42 +0200 Subject: [PATCH 143/208] Revert "rsyslog: krb5 -> libkrb5 argument changed few commits ago" This reverts commit 6a5126348bd29124f8d9846170edac5a463240d5. --- 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 d3bf954a73b..376b66431e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -868,7 +868,7 @@ let }; rsyslog-light = callPackage ../tools/system/rsyslog { - libkrb5 = null; + krb5 = null; systemd = null; jemalloc = null; libmysql = null; From 4c16c271f6730ca73e33a350208495c61aaf65a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:35:08 +0200 Subject: [PATCH 144/208] Revert "audit: 2.9.1 -> 2.9.2" This reverts commit 7e126ac83ee1689df4d22bb4ad9c4163acc734a0. --- pkgs/os-specific/linux/audit/default.nix | 58 +++++-------------- .../os-specific/linux/libsemanage/default.nix | 4 +- pkgs/top-level/all-packages.nix | 8 +-- 3 files changed, 16 insertions(+), 54 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 8365017d13b..05b9eb9e56f 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,61 +1,29 @@ -{ stdenv, fetchurl -, libcap_ng - -# Optional Dependencies -, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null - -# Extra arguments -, prefix ? "" +{ stdenv, fetchurl, openldap +, enablePython ? false, python ? null }: -with stdenv; -let - libOnly = prefix == "lib"; +assert enablePython -> python != null; - optOpenldap = if libOnly then null else shouldUsePkg openldap; - optPython = shouldUsePkg python; - optGo = shouldUsePkg go; - optKrb5 = if libOnly then null else shouldUsePkg krb5; - optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "${prefix}audit-${version}"; - version = "2.4.2"; + name = "audit-2.4.1"; src = fetchurl { - url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; - sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j"; + url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5"; }; - buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ]; + buildInputs = [ openldap ] + ++ stdenv.lib.optional enablePython python; - # For libs only build and install the lib portion - preBuild = optionalString libOnly '' - cd lib + configureFlags = '' + ${if enablePython then "--with-python" else "--without-python"} ''; - configureFlags = [ - (mkWith (optPython != null) "python" null) - (mkWith (optGo != null) "golang" null) - (mkEnable (!libOnly) "listener" null) - (mkEnable (optKrb5 != null) "gssapi-krb5" null) - (mkEnable false "systemd" null) - (mkWith false "debug" null) - (mkWith false "warn" null) - (mkWith false "alpha" null) # TODO: Support - (mkWith false "arm" null) # TODO: Support - (mkWith false "aarch64" null) # TODO: Support - (mkWith (!libOnly) "apparmor" null) - (mkWith false "prelude" null) - (mkWith (optTcp_wrappers != null) "libwrap" optTcp_wrappers) - ]; - meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ fuuzetsu wkennington ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index fbb4be53211..599da9e4b3c 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }: +{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }: stdenv.mkDerivation rec { name = "libsemanage-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_LINK = "-lsepol"; - buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ]; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ]; meta = with stdenv.lib; { inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 376b66431e3..46cd16c1210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9190,13 +9190,7 @@ let atop = callPackage ../os-specific/linux/atop { }; - audit = callPackage ../os-specific/linux/audit { - python = null; - go = null; - }; - libaudit = audit.override { - prefix = "lib"; - }; + audit = callPackage ../os-specific/linux/audit { }; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; From 0a4de71cb09a89f9f21591b01d81d86e16a5d0c8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:35:39 +0200 Subject: [PATCH 145/208] Revert "bind: Add propagatedBuildInputs" This reverts commit 9f70b1ab313ecfd6322e488879deb32ab58ccaf3. --- pkgs/servers/dns/bind/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 604908a4522..70d88b2a968 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -55,11 +55,6 @@ stdenv.mkDerivation rec { optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql optDb optOpenldap ]; - # TODO(wkennington): Remove this hack once we fix header / .la / .pc files - propagatedBuildInputs = [ - optKerberos optOpenssl optLibxml2 optJson_c - optLibseccomp optLibcap - ]; configureFlags = [ (mkOther "localstatedir" "/var") From 4fdf48907374c20a14d211bf16746091eb90f0d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:35:41 +0200 Subject: [PATCH 146/208] Revert "dnsutils: Add smaller derivation of bind" This reverts commit bb6ac771c40342d578aa5959d81454b3676b0e49. --- pkgs/servers/dns/bind/default.nix | 35 +++++++++---------------------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 70d88b2a968..bb4e1a0f8d4 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -7,19 +7,15 @@ # Optional DLZ Modules , postgresql ? null, libmysql ? null, db ? null, openldap ? null - -# Extra arguments -, suffix ? "" }: +assert postgresql != null; with stdenv; let version = "9.10.2"; - toolsOnly = suffix == "tools"; - optLibseccomp = shouldUsePkg libseccomp; - optPython = if toolsOnly then null else shouldUsePkg python; + optPython = shouldUsePkg python; optKerberos = shouldUsePkg kerberos; optOpenssl = shouldUsePkg openssl; optLibxml2 = shouldUsePkg libxml2; @@ -29,19 +25,18 @@ let optIdnkit = shouldUsePkg idnkit; optLibiconv = shouldUsePkg libiconv; - optPostgresql = if toolsOnly then null else shouldUsePkg postgresql; - optLibmysql = if toolsOnly then null else shouldUsePkg libmysql; - optDb = if toolsOnly then null else shouldUsePkg db; - optOpenldap = if toolsOnly then null else shouldUsePkg openldap; - - pythonBin = if optPython == null then null else "${optPython}/bin/python"; + optPostgresql = shouldUsePkg postgresql; + optLibmysql = shouldUsePkg libmysql; + optDb = shouldUsePkg db; + optOpenldap = shouldUsePkg openldap; in +assert optPostgresql != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}"; + name = "bind-${version}"; src = fetchurl { - url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"; + url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg"; }; @@ -60,7 +55,7 @@ stdenv.mkDerivation rec { (mkOther "localstatedir" "/var") (mkOther "sysconfdir" "/etc") (mkEnable (optLibseccomp != null) "seccomp" null) - (mkWith (optPython != null) "python" pythonBin) + (mkWith (optPython != null) "python" "${optPython}/bin/python") (mkEnable true "kqueue" null) (mkEnable true "epoll" null) (mkEnable true "devpoll" null) @@ -114,18 +109,8 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" - ] ++ optionals toolsOnly [ - "DESTDIR=\${TMPDIR}" ]; - postInstall = optionalString toolsOnly '' - mkdir -p $out/{bin,etc,lib,share/man/man1} - install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin - install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc - install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib - install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1 - ''; - enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46cd16c1210..0a7090ae4bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8642,9 +8642,6 @@ let sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { }; - dnsutils = bind.override { - suffix = "tools"; - }; bird = callPackage ../servers/bird { }; From 676fbc257872c0329ec7d4e42da4233d8629bba4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:35:49 +0200 Subject: [PATCH 147/208] Revert "bind: Enable parallel building" This reverts commit e74b5704a854ad796b0df36d0d38f1ec1ba2da4e. --- pkgs/servers/dns/bind/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bb4e1a0f8d4..b60998ce6aa 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -111,8 +111,6 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - enableParallelBuilding = true; - meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; From ab8b68cd9988a17ccda07b57dcc2c11c30056690 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:35:51 +0200 Subject: [PATCH 148/208] Revert "bind: Modify build" This reverts commit 0a06b99d69000e5da2b6dc33abf91ab73961f1cf. --- pkgs/servers/dns/bind/default.nix | 118 +++++------------------------- 1 file changed, 20 insertions(+), 98 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b60998ce6aa..fbfa2d8d9b7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,37 +1,7 @@ -{ stdenv, fetchurl, libtool, docbook5_xsl +{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -# Optional Dependencies -, libseccomp ? null, python ? null, kerberos ? null, openssl ? null -, libxml2 ? null, json_c ? null, readline ? null, libcap ? null, idnkit ? null -, libiconv ? null +let version = "9.10.2"; in -# Optional DLZ Modules -, postgresql ? null, libmysql ? null, db ? null, openldap ? null -}: - -assert postgresql != null; -with stdenv; -let - version = "9.10.2"; - - optLibseccomp = shouldUsePkg libseccomp; - optPython = shouldUsePkg python; - optKerberos = shouldUsePkg kerberos; - optOpenssl = shouldUsePkg openssl; - optLibxml2 = shouldUsePkg libxml2; - optJson_c = shouldUsePkg json_c; - optReadline = shouldUsePkg readline; - optLibcap = if !stdenv.isLinux then null else shouldUsePkg libcap; - optIdnkit = shouldUsePkg idnkit; - optLibiconv = shouldUsePkg libiconv; - - optPostgresql = shouldUsePkg postgresql; - optLibmysql = shouldUsePkg libmysql; - optDb = shouldUsePkg db; - optOpenldap = shouldUsePkg openldap; -in -assert optPostgresql != null; -with stdenv.lib; stdenv.mkDerivation rec { name = "bind-${version}"; @@ -44,78 +14,30 @@ stdenv.mkDerivation rec { sed -i 's/^\t.*run/\t/' Makefile.in ''; - nativeBuildInputs = [ optPython libtool docbook5_xsl ]; - buildInputs = [ - optLibseccomp optPython optKerberos optOpenssl optLibxml2 optJson_c - optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql - optDb optOpenldap - ]; + buildInputs = [ openssl libtool perl libxml2 ]; configureFlags = [ - (mkOther "localstatedir" "/var") - (mkOther "sysconfdir" "/etc") - (mkEnable (optLibseccomp != null) "seccomp" null) - (mkWith (optPython != null) "python" "${optPython}/bin/python") - (mkEnable true "kqueue" null) - (mkEnable true "epoll" null) - (mkEnable true "devpoll" null) - (mkWith false "geoip" null) # TODO(wkennington): GeoDNS support - (mkWith (optKerberos != null) "gssapi" optKerberos) - (mkWith true "libtool" null) - (mkEnable (optOpenssl == null) "native-pkcs11" null) - (mkWith (optOpenssl != null) "openssl" optOpenssl) - (mkWith true "pkcs11" null) - (mkWith true "ecdsa" null) - (mkWith false "gost" null) # Insecure cipher - (mkWith true "aes" null) - (mkEnable (optOpenssl != null) "openssl-hash" null) - (mkEnable true "sit" null) - (mkWith true "sit-alg" "aes") - (mkWith (optLibxml2 != null) "libxml2" optLibxml2) - (mkWith (optJson_c != null) "libjson" optJson_c) - (mkEnable true "largefile" null) - (mkWith false "purify" null) - (mkWith false "gperftools-profiler" null) - (mkEnable false "backtrace" null) - (mkEnable false "symtable" null) - (mkEnable true "ipv6" null) - (mkWith false "kame" null) - (mkWith (optReadline != null) "readline" null) - (mkEnable (optKerberos == null) "isc-spnego" null) - (mkEnable true "chroot" null) - (mkEnable (optLibcap != null) "linux-caps" null) - (mkEnable true "atomic" null) - (mkEnable false "fixed-rrset" null) - (mkEnable true "rpz-nsip" null) - (mkEnable true "rpz-nsdname" null) - (mkEnable true "filter-aaaa" null) - (mkWith true "docbook-xsl" "${docbook5_xsl}/share/xsl/docbook") - (mkWith (optIdnkit != null) "idn" optIdnkit) - (mkWith (optLibiconv != null) "libiconv" optLibiconv) - (mkWith false "atf" null) - (mkWith true "tuning" "large") - (mkWith true "dlopen" null) - (mkWith false "make-clean" null) - (mkEnable true "full-report" null) - (mkWith (optPostgresql != null) "dlz-postgres" optPostgresql) - (mkWith (optLibmysql != null) "dlz-mysql" optLibmysql) - (mkWith (optDb != null) "dlz-bdb" optDb) - (mkWith true "dlz-filesystem" null) - (mkWith (optOpenldap != null) "dlz-ldap" optOpenldap) - (mkWith false "dlz-odbc" null) - (mkWith true "dlz-stub" null) - ]; - - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "--localstatedir=/var" + "--with-libtool" + "--with-libxml2=${libxml2}" + "--with-openssl=${openssl}" + "--without-atf" + "--without-dlopen" + "--without-docbook-xsl" + "--without-gssapi" + "--without-idn" + "--without-idnlib" + "--without-pkcs11" + "--without-purify" + "--without-python" ]; meta = { homepage = "http://www.isc.org/software/bind"; description = "Domain name server"; - license = licenses.isc; - maintainers = with maintainers; [ viric simons wkennington ]; - platforms = platforms.unix; + license = stdenv.lib.licenses.isc; + + maintainers = with stdenv.lib.maintainers; [viric simons]; + platforms = with stdenv.lib.platforms; unix; }; } From 16f87d772f68840b342285f550565e74850ef42d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:37:16 +0200 Subject: [PATCH 149/208] Revert "libverto: Add derivation" This reverts commit 4389ae5208ec9b7e80b3b0e4ee10e2709333519f. --- .../libraries/libverto/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/development/libraries/libverto/default.nix diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix deleted file mode 100644 index e4097aa57d6..00000000000 --- a/pkgs/development/libraries/libverto/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig - -# Optional Dependencies -, glib ? null, libev ? null, libevent ? null, tevent ? null, talloc ? null -}: -with stdenv; -let - optGlib = shouldUsePkg glib; - optLibev = shouldUsePkg libev; - optLibevent = shouldUsePkg libevent; - optTevent = shouldUsePkg tevent; - optTalloc = shouldUsePkg talloc; -in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "libverto-0.2.6"; - - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libverto/${name}.tar.gz"; - sha256 = "17hwr55ga0rkm5cnyfiipyrk9n372x892ph9wzi88j2zhnisdv0p"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optGlib optLibev optLibevent ] - ++ optionals (optTevent != null && optTalloc != null) [ - optTevent optTalloc - ]; - - postInstall = '' - # In v0.2.6 the shipped pkg-config files have an out of order - # declaration of exec_prefix breaking them. This fixes that issue - sed -i 's,''${exec_prefix},''${prefix},g' $out/lib/pkgconfig/*.pc - ''; - - meta = { - homepage = https://fedorahosted.org/libverto/; - 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 0a7090ae4bd..a599eb12d5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7213,10 +7213,6 @@ let libvdpau = callPackage ../development/libraries/libvdpau { }; - libverto = callPackage ../development/libraries/libverto { - glib = null; # Don't include fairly heavy dependency - }; - libvirt = callPackage ../development/libraries/libvirt { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; From eae17c3743bd8ea710308db7fad4602c97ff7893 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:38:03 +0200 Subject: [PATCH 150/208] Revert "libxml2: Refactor and fix library propagation" This reverts commit 287ec76b8fb2f670b068266d77edc8714d0d06df. --- .../development/libraries/libxml2/default.nix | 72 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 0d70a6502fe..153096ee45c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,63 +1,49 @@ -{ stdenv, fetchurl, findXMLCatalogs +{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }: -# Optional Dependencies -, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null -}: +assert pythonSupport -> python != null; #TODO: share most stuff between python and non-python builds, perhaps via multiple-output 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; - - optIcu = shouldUsePkg icu; - optPython = shouldUsePkg python; - optReadline = shouldUsePkg readline; - optZlib = shouldUsePkg zlib; - optXz = shouldUsePkg xz; - - sitePackages = if optPython == null then null else - "\${out}/lib/${python.libPrefix}/site-packages"; -in -stdenv.mkDerivation rec { - name = "libxml2-${version}"; version = "2.9.2"; +in + +stdenv.mkDerivation (rec { + name = "libxml2-${version}"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i"; }; - buildInputs = [ optIcu optPython optReadline optZlib optXz ]; - propagatedBuildInputs = [ findXMLCatalogs ]; + buildInputs = stdenv.lib.optional pythonSupport python + # Libxml2 has an optional dependency on liblzma. However, on impure + # platforms, it may end up using that from /usr/lib, and thus lack a + # RUNPATH for that, leading to undefined references for its users. + ++ (stdenv.lib.optional stdenv.isFreeBSD xz); - configureFlags = [ - (mkWith (optIcu != null) "icu" optIcu) - (mkWith (optPython != null) "python" optPython) - (mkWith (optPython != null) "python-install-dir" sitePackages) - (mkWith (optReadline != null) "readline" optReadline) - (mkWith (optZlib != null) "zlib" optZlib) - (mkWith (optXz != null) "lzma" optXz) - ]; + propagatedBuildInputs = [ zlib findXMLCatalogs ]; + + passthru = { inherit pythonSupport version; }; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ eelco wkennington ]; + license = "bsd"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; - passthru = { - inherit version; - pythonSupport = python != null; - }; -} +} // stdenv.lib.optionalAttrs pythonSupport { + configureFlags = "--with-python=${python}"; + + # this is a pair of ugly hacks to make python stuff install into the right place + preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; + installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; + +} // stdenv.lib.optionalAttrs (!pythonSupport) { + configureFlags = "--with-python=no"; # otherwise build impurity bites us +}) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a599eb12d5f..853965959fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7259,11 +7259,11 @@ let libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { - python = null; + pythonSupport = false; }; libxml2Python = lowPrio (libxml2.override { - inherit python; + pythonSupport = true; }); libxmlxx = callPackage ../development/libraries/libxmlxx { }; From 513bd8bd2226c6191b8086e1c1dac9198d8b8a84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:38:40 +0200 Subject: [PATCH 151/208] Revert "libmicrohttpd: Modernize" This reverts commit c5d13d4fe96674a4fcb04b54ea552847302e13ee. --- .../libraries/libmicrohttpd/default.nix | 69 ++++++------------- 1 file changed, 21 insertions(+), 48 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 9eca6bd84b9..8b9f6f1dca5 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,65 +1,38 @@ -{ stdenv, fetchurl, pkgconfig -, curl +{stdenv, fetchurl, curl, libgcrypt}: -# Optional Dependencies -, openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null -}: - -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; - - optOpenssl = shouldUsePkg openssl; - optZlib = shouldUsePkg zlib; - hasSpdy = optOpenssl != null && optZlib != null; - - optLibgcrypt = shouldUsePkg libgcrypt; - optGnutls = shouldUsePkg gnutls; - hasHttps = optLibgcrypt != null && optGnutls != null; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.41"; + name = "libmicrohttpd-0.9.38"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p"; + sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = optional doCheck curl - ++ optionals hasSpdy [ optOpenssl optZlib ] - ++ optionals hasHttps [ optLibgcrypt optGnutls ]; + buildInputs = [ curl libgcrypt ]; - configureFlags = [ - (mkWith true "threads" "posix") - (mkEnable true "doc" null) - (mkEnable false "examples" null) - (mkEnable true "epoll" "auto") - (mkEnable doCheck "curl" null) - (mkEnable hasSpdy "spdy" null) - (mkEnable true "messages" null) - (mkEnable true "postprocessor" null) - (mkWith hasHttps "gnutls" null) - (mkEnable hasHttps "https" null) - (mkEnable true "bauth" null) - (mkEnable true "dauth" null) - ]; + preCheck = + # Since `localhost' can't be resolved in a chroot, work around it. + '' for i in "src/test"*"/"*.[ch] + do + sed -i "$i" -es/localhost/127.0.0.1/g + done + ''; # Disabled because the tests can time-out. doCheck = false; meta = { description = "Embeddable HTTP server library"; + + longDescription = '' + GNU libmicrohttpd is a small C library that is supposed to make + it easy to run an HTTP server as part of another application. + ''; + + license = stdenv.lib.licenses.lgpl2Plus; + homepage = http://www.gnu.org/software/libmicrohttpd/; - license = licenses.lgpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + + maintainers = [ ]; }; } From 68493cd8dc25a1e2e4d1007305a39cc710855d86 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:32:16 +0200 Subject: [PATCH 152/208] Revert "curl: propagate inputs instead of patching pkgconfig" This reverts commit 206d63edaccfccaeedbc5d7fb8828fe8fb6d8305. --- pkgs/tools/networking/curl/default.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ad2c9ec6897..f8b3ad9355a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # Use pkgconfig only when necessary nativeBuildInputs = optional (!isLight) pkgconfig; - propagatedBuildInputs = [ + buildInputs = [ optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares optGss optRtmpdump optOpenldap optLibidn ]; @@ -102,6 +102,27 @@ stdenv.mkDerivation rec { (mkEnable (optC-ares != null) "ares" null) ]; + # Fix all broken refernces to dependencies in .la and .pc files + postInstall = optionalString (optZlib != null) '' + sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + '' + optionalString (optOpenssl != null) '' + sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc + '' + optionalString (optLibssh2 != null) '' + sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc + '' + optionalString (optLibnghttp2 != null) '' + sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc + '' + optionalString (optC-ares != null) '' + sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + '' + optionalString (optGss != null) '' + sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + '' + optionalString (optRtmpdump != null) '' + sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc + '' + optionalString (optOpenldap != null) '' + sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} + '' + optionalString (optLibidn != null) '' + sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc + ''; + meta = { description = "A command line tool for transferring files with URL syntax"; homepage = http://curl.haxx.se/; From cde5053d9a9affc2c60b7446f5d091296d8fa139 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:32:28 +0200 Subject: [PATCH 153/208] Revert "curl: Modernize build" This reverts commit 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6. --- .../linux/make-bootstrap-tools-cross.nix | 10 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 +- pkgs/tools/networking/curl/default.nix | 172 ++++++------------ pkgs/top-level/all-packages.nix | 16 +- 4 files changed, 86 insertions(+), 122 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 520bdd208e3..bf060329be6 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -92,7 +92,11 @@ rec { aclSupport = false; })).crossDrv; - curl-light = pkgs.curl-light.crossDrv; + curlMinimal = (pkgs.curl.override { + zlibSupport = false; + sslSupport = false; + scpSupport = false; + }).crossDrv; busyboxMinimal = (pkgs.busybox.override { # TBD: uClibc is broken. @@ -166,8 +170,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curl-light}/bin/curl $out/bin - cp -d ${curl-light}/lib/libcurl* $out/lib + cp ${curlMinimal}/bin/curl $out/bin + cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 6bd67d8c7a0..a995606886f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -10,6 +10,12 @@ rec { aclSupport = false; }); + curlMinimal = curl.override { + zlibSupport = false; + sslSupport = false; + scpSupport = false; + }; + busyboxMinimal = busybox.override { useMusl = true; enableStatic = true; @@ -77,8 +83,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curl-light}/bin/curl $out/bin - cp -d ${curl-light}/lib/libcurl* $out/lib + cp ${curlMinimal}/bin/curl $out/bin + cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index f8b3ad9355a..28f28c9a4f9 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,133 +1,81 @@ -{ stdenv, fetchurl, pkgconfig - -# Optional Dependencies -, zlib ? null, openssl ? null, libssh2 ? null, libnghttp2 ? null, c-ares ? null -, gss ? null, rtmpdump ? null, openldap ? null, libidn ? null - -# Extra arguments -, suffix ? "" +{ stdenv, fetchurl +, idnSupport ? false, libidn ? null +, ldapSupport ? false, openldap ? null +, zlibSupport ? false, zlib ? null +, sslSupport ? false, openssl ? null +, scpSupport ? false, libssh2 ? null +, gssSupport ? false, gss ? null +, c-aresSupport ? false, c-ares ? null }: -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; +assert idnSupport -> libidn != null; +assert ldapSupport -> openldap != null; +assert zlibSupport -> zlib != null; +assert sslSupport -> openssl != null; +assert scpSupport -> libssh2 != null; +assert c-aresSupport -> c-ares != null; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - isLight = suffix == "light"; - isFull = suffix == "full"; - nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}"; - - # Normal Depedencies - optZlib = if isLight then null else shouldUsePkg zlib; - optOpenssl = if isLight then null else shouldUsePkg openssl; - optLibssh2 = if isLight then null else shouldUsePkg libssh2; - optLibnghttp2 = if isLight then null else shouldUsePkg libnghttp2; - optC-ares = if isLight then null else shouldUsePkg c-ares; - - # Full dependencies - optGss = if !isFull then null else shouldUsePkg gss; - optRtmpdump = if !isFull then null else shouldUsePkg rtmpdump; - optOpenldap = if !isFull then null else shouldUsePkg openldap; - optLibidn = if !isFull then null else shouldUsePkg libidn; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "curl${nameSuffix}-${version}"; - version = "7.42.1"; + name = "curl-7.42.1"; src = fetchurl { - url = "http://curl.haxx.se/download/curl-${version}.tar.bz2"; + url = "http://curl.haxx.se/download/${name}.tar.bz2"; sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472"; }; - # Use pkgconfig only when necessary - nativeBuildInputs = optional (!isLight) pkgconfig; - buildInputs = [ - optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares - optGss optRtmpdump optOpenldap optLibidn - ]; + # Zlib and OpenSSL must be propagated because `libcurl.la' contains + # "-lz -lssl", which aren't necessary direct build inputs of + # applications that use Curl. + propagatedBuildInputs = with stdenv.lib; + optional idnSupport libidn ++ + optional ldapSupport openldap ++ + optional zlibSupport zlib ++ + optional gssSupport gss ++ + optional c-aresSupport c-ares ++ + optional sslSupport openssl ++ + optional scpSupport libssh2; - # Make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE + # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html + preConfigure = '' + sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure + rm src/tool_hugehelp.c + ''; + + # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE postConfigure = '' - echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h + echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h ''; configureFlags = [ - (mkEnable true "http" null) - (mkEnable true "ftp" null) - (mkEnable true "file" null) - (mkEnable (optOpenldap != null) "ldap" null) - (mkEnable (optOpenldap != null) "ldaps" null) - (mkEnable true "rtsp" null) - (mkEnable true "proxy" null) - (mkEnable true "dict" null) - (mkEnable true "telnet" null) - (mkEnable true "tftp" null) - (mkEnable true "pop3" null) - (mkEnable true "imap" null) - (mkEnable true "smb" null) - (mkEnable true "smtp" null) - (mkEnable true "gopher" null) - (mkEnable (!isLight) "manual" null) - (mkEnable true "libcurl_option" null) - (mkEnable false "libgcc" null) # TODO: Enable on gcc - (mkWith (optZlib != null) "zlib" null) - (mkEnable true "ipv4" null) - (mkWith (optGss != null) "gssapi" null) - (mkWith false "winssl" null) - (mkWith false "darwinssl" null) - (mkWith (optOpenssl != null) "ssl" null) - (mkWith false "gnutls" null) - (mkWith false "polarssl" null) - (mkWith false "cyassl" null) - (mkWith false "nss" null) - (mkWith false "axtls" null) - (mkWith false "libmetalink" null) - (mkWith (optLibssh2 != null) "libssh2" null) - (mkWith (optRtmpdump!= null) "librtmp" null) - (mkEnable false "versioned-symbols" null) - (mkWith false "winidn" null) - (mkWith (optLibidn != null) "libidn" null) - (mkWith (optLibnghttp2 != null) "nghttp2" null) - (mkEnable false "sspi" null) - (mkEnable true "crypto-auth" null) - (mkEnable (optOpenssl != null) "tls-srp" null) - (mkEnable true "unix-sockets" null) - (mkEnable true "cookies" null) - (mkEnable (optC-ares != null) "ares" null) - ]; + ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) + ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) + ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) + ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" ) + ] + ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" + ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; - # Fix all broken refernces to dependencies in .la and .pc files - postInstall = optionalString (optZlib != null) '' - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optOpenssl != null) '' - sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optLibssh2 != null) '' - sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optLibnghttp2 != null) '' - sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optC-ares != null) '' - sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optGss != null) '' - sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optRtmpdump != null) '' - sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc - '' + optionalString (optOpenldap != null) '' - sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} - '' + optionalString (optLibidn != null) '' - sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc - ''; + CXX = "g++"; + CXXCPP = "g++ -E"; - meta = { + crossAttrs = { + # We should refer to the cross built openssl + # For the 'urandom', maybe it should be a cross-system option + configureFlags = [ + ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) + "--with-random /dev/urandom" + ]; + }; + + passthru = { + inherit sslSupport openssl; + }; + + meta = with stdenv.lib; { description = "A command line tool for transferring files with URL syntax"; homepage = http://curl.haxx.se/; - license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 853965959fc..465717c6e40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1145,12 +1145,18 @@ let cudatoolkit = cudatoolkit5; - curl-light = curl.override { suffix = "light"; }; - curl = curl-full.override { - fetchurl = fetchurlBoot; - suffix = ""; + curlFull = curl.override { + idnSupport = true; + ldapSupport = true; + gssSupport = true; + }; + + curl = callPackage ../tools/networking/curl rec { + fetchurl = fetchurlBoot; + zlibSupport = true; + sslSupport = zlibSupport; + scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; - curl-full = callPackage ../tools/networking/curl { suffix = "full"; }; curl3 = callPackage ../tools/networking/curl/7.15.nix rec { zlibSupport = true; From 6c878e0d0505ff02d583da405c6d3cf89851d05c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:33:56 +0200 Subject: [PATCH 154/208] Fix cacert --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 205d051ddb2..d743fc47b94 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nss, curl-full, perl, perlPackages }: +{ stdenv, nss, curl, perl, perlPackages }: stdenv.mkDerivation rec { name = "nss-cacert-${nss.version}"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = nss.src; postPatch = '' - unpackFile ${curl-full.src}; + unpackFile ${curl.src}; ''; nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]); From 6cfea50ad14b3225226e64bd77925dc05a593689 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:35:20 +0200 Subject: [PATCH 155/208] Revert "Explicitly pass -pthread flag to fix the build after some updates" This reverts commit ed38a2d32b643e5ea545f09058d3774b097675b4. --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b0de8c15146..a615854a6b2 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -77,10 +77,6 @@ stdenv.mkDerivation rec { (mkEnable true "heimdal-documentation" null) ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread" - ''; - # We need to build hcrypt for applications like samba postBuild = '' (cd lib/hcrypto; make) From 056e2c8d6aec835c72edd852d64a67da10451868 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:35:24 +0200 Subject: [PATCH 156/208] Revert "heimdal: Disable DCE as it was breaking the build" This reverts commit 0f2de4c64e451a82ff5b7cbef3fead5c1cb01120. --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index a615854a6b2..c06fcdb384e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { (mkWith (optLibcap_ng != null) "capng" null) (mkWith (optSqlite != null) "sqlite3" sqlite) (mkEnable (optSqlite != null) "sqlite-cache" null) - (mkWith false "libintl" null) # TODO libintl fix + #(mkWith true "libintl" glibc) # TODO libintl fix (mkWith true "hdbdir" "/var/lib/heimdal") (mkWith (optOpenssl != null) "openssl" optOpenssl) (mkEnable true "pthread-support" null) - (mkEnable false "dce" null) # TODO: Add support + (mkEnable true "dce" null) (mkEnable true "afs-support" null) (mkWith (optDb != null) "berkeley-db" optDb) (mkEnable false "nmdb" null) From 020cb43f551006173582d1f8b440865572770c84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:35:28 +0200 Subject: [PATCH 157/208] Revert "kerberos: Modernize build" This reverts commit 9740b0d12d467aaa0ddc1cc27559374250ae5549. --- .../libraries/kerberos/heimdal.nix | 79 ++++--------------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 16 insertions(+), 64 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index c06fcdb384e..aeea290bdb2 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,32 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, flex, yacc - -# Optional Dependencies -, openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null -, readline ? null, libedit ? null, pam ? null - -#, readline, openldap, libcap_ng -#, sqlite, db, ncurses, openssl, cyrus_sasl +{ stdenv, fetchurl, pkgconfig, flex, yacc, readline, openldap, libcap_ng +, sqlite, db, ncurses, openssl, cyrus_sasl }: -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; - - optOpenldap = shouldUsePkg openldap; - optLibcap_ng = shouldUsePkg libcap_ng; - optSqlite = shouldUsePkg sqlite; - optOpenssl = shouldUsePkg openssl; - optDb = shouldUsePkg db; - optReadline = shouldUsePkg readline; - optLibedit = shouldUsePkg libedit; - optPam = shouldUsePkg pam; -in stdenv.mkDerivation rec { name = "heimdal-1.5.3"; @@ -38,43 +13,14 @@ stdenv.mkDerivation rec { sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"; }; - nativeBuildInputs = [ pkgconfig flex yacc ]; - buildInputs = [ - optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit - optPam - ]; - + ## ugly, X should be made an option configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkWith (optOpenldap != null) "openldap" optOpenldap) - (mkEnable (optOpenldap != null) "hdb-openldap-module" null) - (mkEnable true "pk-init" null) - (mkEnable true "digest" null) - (mkEnable true "kx509" null) - (mkWith (optLibcap_ng != null) "capng" null) - (mkWith (optSqlite != null) "sqlite3" sqlite) - (mkEnable (optSqlite != null) "sqlite-cache" null) - #(mkWith true "libintl" glibc) # TODO libintl fix - (mkWith true "hdbdir" "/var/lib/heimdal") - (mkWith (optOpenssl != null) "openssl" optOpenssl) - (mkEnable true "pthread-support" null) - (mkEnable true "dce" null) - (mkEnable true "afs-support" null) - (mkWith (optDb != null) "berkeley-db" optDb) - (mkEnable false "nmdb" null) - (mkEnable false "developer" null) - (mkWith true "ipv6" null) - (mkEnable false "socket-wrapper" null) - (mkEnable true "otp" null) - (mkEnable false "osfc2" null) - (mkEnable true "mmap" null) - (mkEnable true "afs-string-to-key" null) - (mkWith (optReadline != null) "readline" optReadline) - (mkWith (optLibedit != null) "libedit" optLibedit) - (mkWith false "x" null) - (mkEnable true "kcm" null) - (mkEnable true "heimdal-documentation" null) + "--enable-hdb-openldap-module" + "--with-capng" + "--with-openldap=${openldap}" + "--with-sqlite3=${sqlite}" + "--with-openssl-lib=${openssl}/lib" + "--without-x" ]; # We need to build hcrypt for applications like samba @@ -88,11 +34,16 @@ stdenv.mkDerivation rec { (cd lib/hcrypto; make install) (cd include/hcrypto; make install) - # Doesn't succeed with --libexec=$out/sbin, so + # dont succeed with --libexec=$out/sbin, so mv "$out/libexec/"* $out/sbin/ rmdir $out/libexec ''; + buildInputs = [ + pkgconfig flex yacc readline openldap libcap_ng sqlite db ncurses + cyrus_sasl openssl + ]; + meta = with stdenv.lib; { description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden"; license = licenses.bsd3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465717c6e40..529a89befce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6376,6 +6376,7 @@ let openldap = openldap.override { cyrus_sasl = cyrus_sasl.override { kerberos = null; }; }; + cyrus_sasl = cyrus_sasl.override { kerberos = null; }; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; From f1f7bd9a931e4b1f2578ca0c8bc27a5bc2a00b47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:41:30 +0200 Subject: [PATCH 158/208] libmicrohttpd: Fix build and drop curl dependency Curl was only used for the test suite, which was disabled anyway. --- pkgs/development/libraries/libmicrohttpd/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 8b9f6f1dca5..f1d5a2c43b0 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libgcrypt}: +{ lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { name = "libmicrohttpd-0.9.38"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld"; }; - buildInputs = [ curl libgcrypt ]; + buildInputs = [ libgcrypt ]; preCheck = # Since `localhost' can't be resolved in a chroot, work around it. @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; - maintainers = [ ]; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 529a89befce..e7856b140cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6959,10 +6959,7 @@ let libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { - openssl = null; - gnutls = null; - }; + libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; libmikmod = callPackage ../development/libraries/libmikmod { }; From 487736dc6227c67ac918e3df03a7484ae2f094f3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:43:11 +0200 Subject: [PATCH 159/208] Revert "libssh2: Fix for darwin" This reverts commit 2c9481e0fdea4ce96053d6c0720adbdba21db334. --- pkgs/development/libraries/libssh2/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 3434fde1a62..dfaee909620 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -55,17 +55,13 @@ stdenv.mkDerivation rec { (mkEnable false "examples-build" null) ]; - postInstall = optionalString (!stdenv.isDarwin) ('' - sed -i \ - '' + optionalString (optZlib != null) '' - -e 's,\(-lz\),-L${optZlib}/lib \1,' \ + postInstall = optionalString (optZlib != null) '' + sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la '' + optionalString (cryptoStr == "openssl") '' - -e 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' \ + sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la '' + optionalString (cryptoStr == "libgcrypt") '' - -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \ - '' + '' - $out/lib/libssh2.la - ''); + sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la + ''; meta = { description = "A client-side C library implementing the SSH2 protocol"; From e3356b396d308264ab04cb3e997edc048af2fea2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:43:15 +0200 Subject: [PATCH 160/208] Revert "libssh2: Modernize Build" This reverts commit e9ee5f99615d0980538e60b1079c8438f8d8135c. --- .../development/libraries/libssh2/default.nix | 64 ++----------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 6 insertions(+), 62 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index dfaee909620..daeb39bc982 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,73 +1,19 @@ -{ stdenv, fetchurl +{stdenv, fetchurlBoot, openssl, zlib}: -# Optional Dependencies -, zlib ? null - -# Crypto Dependencies -, openssl ? null, libgcrypt ? null -}: - -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; - - # Prefer openssl - cryptoStr = if shouldUsePkg openssl != null then "openssl" - else if shouldUsePkg libgcrypt != null then "libgcrypt" - else "none"; - crypto = { - openssl = openssl; - libgcrypt = libgcrypt; - none = null; - }.${cryptoStr}; - - optZlib = shouldUsePkg zlib; -in - -assert crypto != null; - -with stdenv.lib; stdenv.mkDerivation rec { name = "libssh2-1.5.0"; - src = fetchurl { + src = fetchurlBoot { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3"; }; - buildInputs = [ crypto optZlib ]; - - configureFlags = [ - (mkWith (cryptoStr == "openssl") "openssl" null) - (mkWith (cryptoStr == "libgcrypt") "libgcrypt" null) - (mkWith false "wicng" null) - (mkWith optZlib "libz" null) - (mkEnable false "crypt-none" null) - (mkEnable false "mac-none" null) - (mkEnable true "gex-new" null) - (mkEnable false "debug" null) - (mkEnable false "examples-build" null) - ]; - - postInstall = optionalString (optZlib != null) '' - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la - '' + optionalString (cryptoStr == "openssl") '' - sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la - '' + optionalString (cryptoStr == "libgcrypt") '' - sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la - ''; + buildInputs = [ openssl zlib ]; meta = { description = "A client-side C library implementing the SSH2 protocol"; homepage = http://www.libssh2.org; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ urkud wkennington ]; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7856b140cb..b06895ecb05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7115,9 +7115,7 @@ let libssh = callPackage ../development/libraries/libssh { }; - libssh2 = callPackage ../development/libraries/libssh2 { - fetchurl = fetchurlBoot; - }; + libssh2 = callPackage ../development/libraries/libssh2 { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; From 7fae300ebc0d3ee36d8386c010eb9a1e4c497908 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:49:55 +0200 Subject: [PATCH 161/208] e2fsprogs: Update to 1.42.13 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7617e82f1a8..a53e93960ae 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.12"; + name = "e2fsprogs-1.42.13"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; + sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; buildInputs = [ pkgconfig libuuid ]; From 5b7c6d044068e6e7f823b4804cd223909db0fb69 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:55:16 +0200 Subject: [PATCH 162/208] audit: Update to 2.4.2 --- pkgs/os-specific/linux/audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 05b9eb9e56f..8a7c573ac0e 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.4.1"; + name = "audit-2.4.2"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5"; + sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j"; }; buildInputs = [ openldap ] From c47e78bbeccd9b535140ca0a1157b48ca3def2d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:55:30 +0200 Subject: [PATCH 163/208] libssh: Revert to old style --- pkgs/development/libraries/libssh/default.nix | 58 ++----------------- 1 file changed, 5 insertions(+), 53 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 17bcf227c0e..ef4540db2b2 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,37 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, cmake - -# Optional Dependencies -, heimdal ? null, zlib ? null, libsodium ? null - -# Crypto Dependencies -, openssl ? null, libgcrypt ? null -}: - -let - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - # Prefer openssl - cryptoStr = if shouldUsePkg openssl != null then "openssl" - else if shouldUsePkg libgcrypt != null then "libgcrypt" - else "none"; - crypto = { - openssl = openssl; - libgcrypt = libgcrypt; - none = null; - }.${cryptoStr}; - - optHeimdal = shouldUsePkg heimdal; - optZlib = shouldUsePkg zlib; - optLibsodium = shouldUsePkg libsodium; -in - -assert crypto != null; +{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.7.0"; src = fetchurl { - url = "https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.0.tar.gz"; + url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz"; sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0"; }; @@ -42,35 +15,14 @@ stdenv.mkDerivation rec { sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; - cmakeFlags = [ - "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}" - "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}" - "-DWITH_SSH1=OFF" - "-DWITH_SFTP=ON" - "-DWITH_SERVER=ON" - "-DWITH_STATIC_LIB=OFF" - "-DWITH_DEBUG_CRYPTO=OFF" - "-DWITH_DEBUG_CALLTRACE=OFF" - "-DWITH_GCRYPT=${if cryptoStr == "libgcrypt" then "ON" else "OFF"}" - "-DWITH_PCAP=ON" - "-DWITH_INTERNAL_DOC=OFF" - "-DWITH_TESTING=OFF" - "-DWITH_CLIENT_TESTING=OFF" - "-DWITH_BENCHMARKS=OFF" - "-DWITH_EXAMPLES=OFF" - "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (optLibsodium != null) [ - "-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so" - "-DNACL_INCLUDE_DIR=${optLibsodium}/include" - ]; + buildInputs = [ zlib openssl libsodium ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { description = "SSH client library"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ sander urkud wkennington ]; + maintainers = with maintainers; [ sander urkud ]; platforms = platforms.all; }; } From 330d198be1b06c482f46545830e65bbeab3a35d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 11:14:24 +0200 Subject: [PATCH 164/208] libgcrypt: Revert to old style --- pkgs/development/libraries/libgcrypt/1.5.nix | 29 ++++--------- .../libraries/libgcrypt/default.nix | 42 +++++-------------- pkgs/top-level/all-packages.nix | 8 +--- 3 files changed, 20 insertions(+), 59 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index ebafd0747d8..990e73d0a63 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -1,20 +1,7 @@ -{ stdenv, fetchurl -, libgpgerror +{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: -# Optional Dependencies -, libcap ? null -}: +assert enableCapabilities -> stdenv.isLinux; -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 ""}"; - mkWith = mkFlag "with-" "without-"; - - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - optLibcap = shouldUsePkg libcap; -in stdenv.mkDerivation rec { name = "libgcrypt-1.5.4"; @@ -23,18 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m"; }; - buildInputs = [ libgpgerror optLibcap ]; - - configureFlags = [ - (mkWith (optLibcap != null) "capabilities" null) - ]; + buildInputs = + [ libgpgerror ] + ++ lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' - sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la + '' + stdenv.lib.optionalString enableCapabilities '' + sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 7d327a499bc..b01caeb5dd3 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,24 +1,7 @@ -{ stdenv, fetchurl -, libgpgerror +{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: -# Optional Dependencies -, libcap ? null, pth ? null -}: +assert enableCapabilities -> stdenv.isLinux; -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; - - optLibcap = shouldUsePkg libcap; - #optPth = shouldUsePkg pth; - optPth = null; # Broken as of 1.6.3 -in stdenv.mkDerivation rec { name = "libgcrypt-1.6.3"; @@ -27,29 +10,26 @@ stdenv.mkDerivation rec { sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21"; }; - buildInputs = [ libgpgerror optLibcap optPth ]; - - configureFlags = [ - (mkWith (optLibcap != null) "capabilities" null) - (mkEnable (optPth != null) "random-daemon" null) - ]; + buildInputs = + [ libgpgerror ] + ++ lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postInstall = '' sed -i 's,#include ,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' - sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la + '' + stdenv.lib.optionalString enableCapabilities '' + sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = with stdenv.lib; { + meta = { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.wkennington ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b06895ecb05..f39a2836a1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6787,13 +6787,9 @@ let libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; - libgcrypt = callPackage ../development/libraries/libgcrypt { - # Breaks packages that expect to have elevated privileges - # Ex. Lightdm, cryptsetup - libcap = null; - }; + libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_5 = lowPrio (callPackage ../development/libraries/libgcrypt/1.5.nix { }); + libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; libgdiplus = callPackage ../development/libraries/libgdiplus { }; From fb2d45233a513bf9c7305ba507b0f5e6a4ee72e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 11:16:44 +0200 Subject: [PATCH 165/208] Fix typos --- pkgs/servers/sql/postgresql/8.4.x.nix | 2 +- pkgs/servers/sql/postgresql/9.0.x.nix | 2 +- pkgs/servers/sql/postgresql/9.1.x.nix | 2 +- pkgs/servers/sql/postgresql/9.2.x.nix | 2 +- pkgs/servers/sql/postgresql/9.3.x.nix | 2 +- pkgs/servers/sql/postgresql/9.4.x.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 4c72dbfd448..0dc556619b9 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index a27bc012b6e..b997d4a3742 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 87ed9abe690..6801c355c68 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3c21a96e9b2..12afc998443 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 4406aecaa89..ad20a23f24c 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 73f416912a2..d51856b9853 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.postgresql.org/; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintaiers; [ ocharles ]; + maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; }; From 22c627bf5bc432329236702665272215274b4c89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 11:17:41 +0200 Subject: [PATCH 166/208] Remove PostgreSQL 8.4 (EOL) --- pkgs/servers/sql/postgresql/8.4.x.nix | 31 --------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/8.4.x.nix diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix deleted file mode 100644 index 0dc556619b9..00000000000 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: - -let version = "8.4.22"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; - }; - - buildInputs = [ zlib ncurses readline openssl ]; - - LC_ALL = "C"; - - configureFlags = [ "--with-openssl" ]; - - patches = [ ./less-is-more.patch ]; - - passthru = { inherit readline; }; - - meta = with stdenv.lib; { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = [ maintainers.ocharles ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f39a2836a1c..f99cf9f6bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8923,8 +8923,6 @@ let postgresql = postgresql92; - postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; - postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { }; postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { }; From f08c8bc752825ddacb12bcaeea1b2744a45aafd7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 11:49:37 +0200 Subject: [PATCH 167/208] postgresql: Latest versions --- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.4.x.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index b997d4a3742..f1abfa3fb0f 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.0.19"; in +let version = "9.0.20"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; + sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 6801c355c68..93bf5e1e716 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.1.15"; in +let version = "9.1.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; + sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 12afc998443..e04309fc466 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.2.10"; in +let version = "9.2.11"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; + sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index ad20a23f24c..71f3d7a826f 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.6"; in +let version = "9.3.7"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; + sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; }; buildInputs = [ zlib readline openssl ] diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index d51856b9853..f1834d301de 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.4.1"; in +let version = "9.4.2"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; + sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; }; buildInputs = [ zlib readline openssl ] From f1d465f429252d7c58a920ad9d7ee93e34e7fad9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 12:57:12 +0200 Subject: [PATCH 168/208] pulseaudio: Revert to regular style Also, the NixOS module uses pulseaudioLight in order to prevent excessive dependency bloat. --- nixos/modules/config/pulseaudio.nix | 8 +- pkgs/servers/pulseaudio/default.nix | 210 ++++++++++------------------ pkgs/top-level/all-packages.nix | 38 ++--- 3 files changed, 86 insertions(+), 170 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 04f274e99e1..566130feb6d 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -89,12 +89,12 @@ in { package = mkOption { type = types.package; - default = pulseaudioFull; + default = pulseaudioLight; example = literalExample "pkgs.pulseaudioFull"; description = '' - The PulseAudio derivation to use. This can be used to disable - features (such as JACK support, Bluetooth) that are enabled in the - pulseaudioFull package in Nixpkgs. + The PulseAudio derivation to use. This can be used to enable + features (such as JACK support, Bluetooth) via the + pulseaudioFull package. ''; }; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 8196caa08d9..5de447da0dd 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,73 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, intltool, automake, autoconf, libtool -, json_c, libsndfile, gettext, check - -# Optional Dependencies -, xlibs ? null, libcap ? null, valgrind ? null, oss ? null, coreaudio ? null -, alsaLib ? null, esound ? null, glib ? null, gtk3 ? null, gconf ? null -, avahi ? null, libjack2 ? null, libasyncns ? null, lirc ? null, dbus ? null -, sbc ? null, bluez5 ? null, udev ? null, openssl ? null, fftw ? null -, speexdsp ? null, systemd ? null, webrtc-audio-processing ? null +{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +, json_c, libsndfile +, xlibs, libcap, alsaLib, glib +, avahi, libjack2, libasyncns, lirc, dbus +, sbc, bluez5, udev, openssl, fftwFloat +, speexdsp, systemd, webrtc-audio-processing, gconf ? null # Database selection , tdb ? null, gdbm ? null -# Extra options -, prefix ? "" +, x11Support ? false + +, useSystemd ? true + +, # Whether to support the JACK sound system as a backend. + jackaudioSupport ? false + +, # Whether to build the OSS wrapper ("padsp"). + ossWrapper ? true + +, airtunesSupport ? false + +, gconfSupport ? false + +, bluetoothSupport ? false + +, remoteControlSupport ? false + +, zeroconfSupport ? false + +, # Whether to build only the library. + libOnly ? false }: -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; - - libOnly = prefix == "lib"; - - hasXlibs = xlibs != null; - - optLibcap = shouldUsePkg libcap; - hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD - - optOss = if libOnly then null else shouldUsePkg oss; - hasOss = optOss != null || stdenv.isFreeBSD; # Built-in on FreeBSD - - optCoreaudio = if libOnly then null else shouldUsePkg coreaudio; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; - optEsound = if libOnly then null else shouldUsePkg esound; - optGlib = shouldUsePkg glib; - optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3; - optGconf = if libOnly then null else shouldUsePkg gconf; - optAvahi = if libOnly then null else shouldUsePkg avahi; - optLibjack2 = if libOnly then null else shouldUsePkg libjack2; - optLibasyncns = shouldUsePkg libasyncns; - optLirc = if libOnly then null else shouldUsePkg lirc; - optDbus = shouldUsePkg dbus; - optSbc = if libOnly then null else shouldUsePkg sbc; - optBluez5 = if optDbus == null || optSbc == null then null - else shouldUsePkg bluez5; - optUdev = if libOnly then null else shouldUsePkg udev; - optOpenssl = if libOnly then null else shouldUsePkg openssl; - optFftw = shouldUsePkg fftw; - optSpeexdsp = shouldUsePkg speexdsp; - optSystemd = shouldUsePkg systemd; - optWebrtc-audio-processing = if libOnly then null else shouldUsePkg webrtc-audio-processing; - hasWebrtc = if libOnly then null else optWebrtc-audio-processing != null; - - # Pick a database to use - databaseName = if tdb != null then "tdb" else - if gdbm != null then "gdbm" else "simple"; - database = { - tdb = tdb; - gdbm = gdbm; - simple = null; - }.${databaseName}; -in stdenv.mkDerivation rec { - name = "${prefix}pulseaudio-${version}"; + name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; version = "6.0"; src = fetchurl { @@ -77,16 +43,23 @@ stdenv.mkDerivation rec { patches = [ ./caps-fix.patch ]; - nativeBuildInputs = [ pkgconfig intltool automake autoconf libtool ]; - buildInputs = [ - json_c libsndfile gettext check database + nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; - optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib - optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev - optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing - ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [ - libX11 libxcb libICE libSM libXtst xextproto libXi - ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ]; + buildInputs = + [ json_c libsndfile speexdsp fftwFloat ] + ++ lib.optionals stdenv.isLinux [ libcap glib dbus.libs ] + ++ lib.optionals (!libOnly) ( + [ libasyncns webrtc-audio-processing ] + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ lib.optional useSystemd systemd + ++ lib.optionals stdenv.isLinux [ alsaLib udev ] + ++ lib.optional airtunesSupport openssl + ++ lib.optional gconfSupport gconf + ++ lib.optionals bluetoothSupport [ bluez5 sbc ] + ++ lib.optional remoteControlSupport lirc + ++ lib.optional zeroconfSupport avahi + ); preConfigure = '' # Performs and autoreconf @@ -98,62 +71,24 @@ stdenv.mkDerivation rec { sed -i "src/Makefile.in" \ -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g" - # don't install proximity-helper as root and setuid - sed -i "src/Makefile.in" \ - -e "s|chown root|true |" \ - -e "s|chmod r+s |true |" + # don't install proximity-helper as root and setuid + sed -i "src/Makefile.in" \ + -e "s|chown root|true |" \ + -e "s|chmod r+s |true |" ''; - configureFlags = [ - (mkOther "localstatedir" "/var") - (mkOther "sysconfdir" "/etc") - (mkEnable false "atomic-arm-memory-barrier" null) # TODO: Enable on armv8 - (mkEnable false "neon-opt" null) # TODO: Enable on armv8 - (mkEnable hasXlibs "x11" null) - (mkWith hasCaps "caps" optLibcap) - (mkEnable true "tests" null) - (mkEnable false "samplerate" null) # Deprecated - (mkWith true "database" databaseName) - (mkEnable hasOss "oss-output" null) - (mkEnable true "oss-wrapper" null) # Does not use OSS - (mkEnable (optCoreaudio != null) "coreaudio-output" null) - (mkEnable (optAlsaLib != null) "alsa" null) - (mkEnable (optEsound != null) "esound" null) - (mkEnable false "solaris" null) - (mkEnable false "waveout" null) # Windows Only - (mkEnable (optGlib != null) "glib2" null) - (mkEnable (optGtk3 != null) "gtk3" null) - (mkEnable (optGconf != null) "gconf" null) - (mkEnable (optAvahi != null) "avahi" null) - (mkEnable (optLibjack2 != null) "jack" null) - (mkEnable (optLibasyncns != null) "asyncns" null) - (mkEnable false "tcpwrap" null) - (mkEnable (optLirc != null) "lirc" null) - (mkEnable (optDbus != null) "dbus" null) - (mkEnable false "bluez4" null) - (mkEnable (optBluez5 != null) "bluez5" null) - (mkEnable (optBluez5 != null) "bluez5-ofono-headset" null) - (mkEnable (optBluez5 != null) "bluez5-native-headset" null) - (mkEnable (optUdev != null) "udev" null) - (mkEnable false "hal-compat" null) - (mkEnable true "ipv6" null) - (mkEnable (optOpenssl != null) "openssl" null) - (mkWith (optFftw != null) "fftw" null) - (mkWith (optSpeexdsp != null) "speex" null) - (mkEnable false "xen" null) - (mkEnable false "gcov" null) - (mkEnable (optSystemd != null) "systemd-daemon" null) - (mkEnable (optSystemd != null) "systemd-login" null) - (mkEnable (optSystemd != null) "systemd-journal" null) - (mkEnable true "manpages" null) - (mkEnable hasWebrtc "webrtc-aec" null) - (mkEnable true "adrian-aec" null) - (mkWith true "system-user" "pulse") - (mkWith true "system-group" "pulse") - (mkWith true "access-group" "audio") - (mkWith true "systemduserunitdir" "\${out}/lib/systemd/user") - (mkWith stdenv.isDarwin "mac-sysroot" "/") - ]; + configureFlags = + [ "--disable-solaris" + "--disable-jack" + "--disable-oss-output" + ] ++ lib.optional (!ossWrapper) "--disable-oss-wrapper" ++ + [ "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-access-group=audio" + ] + ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" + ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" + ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=\${out}/lib/systemd/user"; enableParallelBuilding = true; @@ -162,26 +97,23 @@ stdenv.mkDerivation rec { # the alternative is to copy the files from /usr/include to src, but there are # probably a large number of files that would need to be copied (I stopped # after the seventh) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-I/usr/include"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include"; - installFlags = [ - "sysconfdir=$(out)/etc" - "pulseconfdir=$(out)/etc/pulse" - ]; + installFlags = + [ "sysconfdir=$(out)/etc" + "pulseconfdir=$(out)/etc/pulse" + ]; - postInstall = stdenv.lib.optionalString libOnly '' + postInstall = lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} ''; - meta = with stdenv.lib; { + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; - # Note: Practically, the server is under the GPL due to the - # dependency on `libsamplerate'. See `LICENSE' for details. - licenses = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 wkennington ]; - platforms = platforms.unix; + licenses = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lovek323 wkennington ]; + platforms = lib.platforms.unix; longDescription = '' PulseAudio is a sound server for POSIX and Win32 systems. A diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f99cf9f6bbd..6b54674cb65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8816,37 +8816,21 @@ let pshs = callPackage ../servers/http/pshs { }; - libpulseaudio = pulseaudioFull.override { - prefix = "lib"; - }; + libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; - # Name is changed to prevent use in packages - # please use libpulseaudio instead - pulseaudioLight = pulseaudioFull.override { - # The following are disabled in the default build, because if this - # functionality is desired, they are only needed in the PulseAudio - # server. - xlibs = null; - coreaudio = null; - esound = null; - libjack2 = null; - avahi = null; - lirc = null; - bluez5 = null; - tdb = null; - gdbm = null; - gtk3 = null; - webrtc-audio-processing = null; - gconf = null; - libasyncns = null; - }; + # Name is changed to prevent use in packages; + # please use libpulseaudio instead. + pulseaudioLight = callPackage ../servers/pulseaudio { }; pulseaudioFull = callPackage ../servers/pulseaudio { gconf = gnome3.gconf; - fftw = fftwFloat; - - # Disabled unless debugging - valgrind = null; + x11Support = true; + jackaudioSupport = true; + airtunesSupport = true; + gconfSupport = true; + bluetoothSupport = true; + remoteControlSupport = true; + zeroconfSupport = true; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; From 3afae4037b7deac7af54f45dc4b2e027c4335e48 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 4 Jun 2015 17:31:30 +0200 Subject: [PATCH 169/208] zfs: Fix systemd warning The `zfs-share` service was trying to execute the `rm` binary, but it was providing an invalid `/bin` path. This should fix #8171. --- pkgs/os-specific/linux/zfs/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b040201cf33..1613dcb311a 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils , configFile ? "all" # Userspace dependencies @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " ./autogen.sh ''; From 80e98ba00a308c5f5d0e212c07b82e889264f3d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 10:38:18 +0200 Subject: [PATCH 170/208] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-files/commit/25f7b30351dfe1a8403f70bb5b9d1abebd6ac2fc with hackage2nix revision d8b7e62373ad16bdc2a5a93d0870bc05b814ac39 --- .../haskell-modules/hackage-packages.nix | 1028 ++++++++++++----- 1 file changed, 723 insertions(+), 305 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 934fc10fc06..e049946d44a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8,8 +8,8 @@ self: { ({ mkDerivation, base, GLUT, OpenGL, random }: mkDerivation { pname = "3d-graphics-examples"; - version = "0.0.0.0"; - sha256 = "1v2zv94npviggqfqabfzp7ab54nnw9wdb60y20f1lzw13an0a14q"; + version = "0.0.0.1"; + sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGL random ]; @@ -3202,8 +3202,8 @@ self: { }: mkDerivation { pname = "DSH"; - version = "0.12.0.0"; - sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv"; + version = "0.12.0.1"; + sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -3958,12 +3958,17 @@ self: { }) {}; "Earley" = callPackage - ({ mkDerivation, base, containers, ListLike }: + ({ mkDerivation, base, containers, ListLike, tasty, tasty-hunit + , tasty-quickcheck, unordered-containers + }: mkDerivation { pname = "Earley"; - version = "0.8.0"; - sha256 = "0vg672jfj9a814pcbx19hkb2nsy0zndm1a98z5ygssy7m098cvgh"; - buildDepends = [ base containers ListLike ]; + version = "0.8.1"; + sha256 = "0bzm6pwim3fv0d1fv6k3078661vlpc0pcrds4ywsqvgc4hd91myk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers ListLike unordered-containers ]; + testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6755,8 +6760,8 @@ self: { ({ mkDerivation, base, hashable, mtl, unordered-containers }: mkDerivation { pname = "HMap"; - version = "1.2.3"; - sha256 = "0gxs0l5v2kzgy8lfyz0l3ivv1w6cb8sm30h6yv91np1nvj231nf3"; + version = "1.2.4"; + sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13"; buildDepends = [ base hashable mtl unordered-containers ]; homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; @@ -10078,6 +10083,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MissingK" = callPackage + ({ mkDerivation, base, glib, template-haskell }: + mkDerivation { + pname = "MissingK"; + version = "0.0.0.2"; + sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03"; + buildDepends = [ base glib template-haskell ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Useful types and definitions missing from other libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "MissingM" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers @@ -17051,6 +17068,7 @@ self: { transformers ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -18536,14 +18554,15 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.4"; - sha256 = "19fzhsrlsqrncngcmdl8wr0rbv8ff0k8y91dn6j1hacz0dv1whhk"; + version = "0.3.5"; + sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers transformers-base transformers-compat ]; + jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -18553,8 +18572,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.4"; - sha256 = "0kndkj4x7wmmxpsr3a42ck2zq7amm33axxlhwzlgi1gnv8v2v4y4"; + version = "0.3.5"; + sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -18565,8 +18584,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.4"; - sha256 = "0nhy1qn8abhnmr85n1ddshwjwns0gc0l1syznfg6g6cmazwq7809"; + version = "0.3.5"; + sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -18577,8 +18596,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.4"; - sha256 = "1yp59hdxnnvjsdpaw4c311p30bg9xyj231hn2r1zis3awck8jlkk"; + version = "0.3.5"; + sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -18589,8 +18608,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.4"; - sha256 = "1f26vpfxqkkm1yli42xhbhhzya07gvg9kjhq5p51p32500aax4my"; + version = "0.3.5"; + sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -18601,8 +18620,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.4"; - sha256 = "0lp09i3h527g8l7xcxqk6n1pjlbdhxncpgdsrd8bv91an39cnj12"; + version = "0.3.5"; + sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -18613,8 +18632,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.4"; - sha256 = "06sb1zmgvsbshndix9gdx8vq4378p8sgwnnkwhzm1sr92yzfv4is"; + version = "0.3.5"; + sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -18625,8 +18644,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.4"; - sha256 = "125vn9vk4mk61r4r5c3parhrqdxkmlvqprly1x0chd044nx5ai80"; + version = "0.3.5"; + sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -18637,8 +18656,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.4"; - sha256 = "1lsdy65cg3wrhpzsaiir0mq510dilia1m0lqwg1fnrcl62xlcsd9"; + version = "0.3.5"; + sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -18649,8 +18668,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.4"; - sha256 = "1wxrxak7l8drba6hckhx0idqj26fbppnxw5hj4cnmjrg4pvjpnmn"; + version = "0.3.5"; + sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -18661,8 +18680,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.4"; - sha256 = "1sws6d2a21r7wwd2dyf4k7g2n2f0r5azydj7pg6g5a2sjfazimi0"; + version = "0.3.5"; + sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -18673,8 +18692,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.4"; - sha256 = "0vp1r171myahkx8n5mndjabggy219mzbzxyfz93mwpnyf1z7cdvm"; + version = "0.3.5"; + sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -18685,8 +18704,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.4"; - sha256 = "04mc8cjn1hdprki0hvbbyb7gzsdxdr7lci41vnmhw6ic3gcy2mhv"; + version = "0.3.5"; + sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -18697,8 +18716,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.4"; - sha256 = "1qxkzqvfid2g7hcc427zhy8llfa25wpimi7cfdzl9dqmmkqlxinm"; + version = "0.3.5"; + sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -18716,8 +18735,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.4"; - sha256 = "0sih0wvncrz6v4xcn34ckhxc7b15bx87qbr7icwk1w6zs08809jz"; + version = "0.3.5"; + sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -18738,8 +18757,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.4"; - sha256 = "0f7y3wb9ijd8hjxbzav63zdwrjhzh000xqc4n2cnx0lrcrssvs2i"; + version = "0.3.5"; + sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18750,8 +18769,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.4"; - sha256 = "1y6nyjf8m2py5wnk3cbypi0ckqv7nyr2la3h8nm1wj8njwh359jn"; + version = "0.3.5"; + sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18762,8 +18781,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.4"; - sha256 = "160nk75112sdnf834gpc0y1fzsbb0lrp98g9zim38rd4v7pz2ax9"; + version = "0.3.5"; + sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18774,8 +18793,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.4"; - sha256 = "0chfyyryyk8vd1783021awvwwla5fdm04x3w500157xvazhk286m"; + version = "0.3.5"; + sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18786,8 +18805,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.4"; - sha256 = "1pv79b0865gqpf89abjjk4y24d6nr2lk45xpn0n7ckri0b54dga4"; + version = "0.3.5"; + sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18798,8 +18817,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.4"; - sha256 = "01mg116sqxa4z7ss0fwzvsgkmxrqs52ac9z6mrsfymjspyd9fbli"; + version = "0.3.5"; + sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18810,8 +18829,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.4"; - sha256 = "13lzdnwg9x2jrhk251b0vrg4y2avg77ppq4wdgjzmbb2myp618ll"; + version = "0.3.5"; + sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18822,8 +18841,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.4"; - sha256 = "1wi1h07pp8n45ynn9lqvjfz265k0bp7qqxk5qmqlg93yajgjfkcl"; + version = "0.3.5"; + sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18834,8 +18853,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.4"; - sha256 = "11ky0g8cgnd6lcjdc6a9087ka5f6hc3x08xnvjjfwipmdhps4k9r"; + version = "0.3.5"; + sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18846,8 +18865,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.4"; - sha256 = "1dq1xs7simxcag3c2bcr22k1595avl69jz6zv3nrsn1rvzj9milv"; + version = "0.3.5"; + sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18858,8 +18877,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.4"; - sha256 = "1dd635s0i9imj62dg9rqvfrx2aqw6593z61ckqixlb247jii82i6"; + version = "0.3.5"; + sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18870,8 +18889,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.4"; - sha256 = "1snh7xs2f2mjr3ln24xj73y5idmb45in1ykaz3v5wbqdb19m4w94"; + version = "0.3.5"; + sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18882,8 +18901,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.4"; - sha256 = "15xgfxlrjhn8inl5a0rfsyyy8sp0rinlwll9snpdl7nrnqvmn00s"; + version = "0.3.5"; + sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18894,8 +18913,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.4"; - sha256 = "0fag3xr9w2gi038hh9kiqmqgbsn53x48h9jwj49cr1r9qrrs86wa"; + version = "0.3.5"; + sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18906,8 +18925,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.4"; - sha256 = "0ds97lk5ifc529199lmvijs5gif4bzh8lwczpz1xspin37bjiz62"; + version = "0.3.5"; + sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18918,8 +18937,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.4"; - sha256 = "1njdwml6mp8phd323cgyfw7v2iv8l4k7r6pi4vq4mygpa2gx0dn1"; + version = "0.3.5"; + sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18930,8 +18949,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ml"; - version = "0.3.4"; - sha256 = "1sv6a74gk30rhsh98j2f6xsad6hfcr3cjyi8ahz1qjh4nqjrrssc"; + version = "0.3.5"; + sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; @@ -18942,8 +18961,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.4"; - sha256 = "07l7a4v7s380vj8348bgv1m1hk1ldc41aphl67f17v2cndys3ml0"; + version = "0.3.5"; + sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18954,8 +18973,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.4"; - sha256 = "1ji80nn9k10l9w5k5dqwhc0i2aaxa4l6bl995im5lrihilmazqgw"; + version = "0.3.5"; + sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18966,8 +18985,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.4"; - sha256 = "18sd3abhpifwb4ylz35bnxzappgslpvzkrv9wh3hxqzs4mvxdj1n"; + version = "0.3.5"; + sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18978,8 +18997,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.4"; - sha256 = "05a77qcjlkjk0mv2ry25dlci43h5b9hh50f32ngqccjqmg4128ky"; + version = "0.3.5"; + sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18990,8 +19009,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.4"; - sha256 = "15qvmw6fgfcqgkqafywpai5i1in9iibl1r8m8pfxfdckmrbzaxz2"; + version = "0.3.5"; + sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -19002,8 +19021,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.4"; - sha256 = "0miyf7nnkxwybps3yg5fyqpxq5hkz4kllks5w4r7c62hd7sjq9dn"; + version = "0.3.5"; + sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -19014,8 +19033,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.4"; - sha256 = "0jsg4g911qm3r8saxwax4rhdmg1kgfmagnnyzjv4rb02jkdfr7i1"; + version = "0.3.5"; + sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -19026,8 +19045,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.4"; - sha256 = "0s0aa3fryvqwmp0zzmlzd0mk591i1c63qds0si3svf85zgl3slr4"; + version = "0.3.5"; + sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -19038,8 +19057,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.4"; - sha256 = "1plrzqlvfn2aa0c4l2dh4nlygnv0biykz414yblcrj53w03yhqs2"; + version = "0.3.5"; + sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -19050,8 +19069,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.4"; - sha256 = "0bc0n71vhmcirij5agxy7h0zvqvm4psw5h3kzrnbib9wa2hkq8m4"; + version = "0.3.5"; + sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -19062,8 +19081,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.4"; - sha256 = "03p76rska5gl2ic7vjyhhdb89ikl17n8xkiwcb4184jzsvnscqzi"; + version = "0.3.5"; + sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -19074,8 +19093,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.4"; - sha256 = "016wi9cq86z0giv68kzfdg2ia0m4kvlcsl6dj9d3cnvbcsg7s6xy"; + version = "0.3.5"; + sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -19086,8 +19105,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.4"; - sha256 = "1fmjsvcxjrls98jd3vcldjy9wvsdkyi614rzs1d5bi11b6db202z"; + version = "0.3.5"; + sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -19098,8 +19117,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.4"; - sha256 = "1kzy3nbc17dbbhi2k60da7rl6k2zbahzd9rjshvmn1fdsb61piq5"; + version = "0.3.5"; + sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -19110,8 +19129,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.4"; - sha256 = "1w7ac4d7gj53hjvlk0sldww67gkgsbi8vmqhbcbqrbg2mrqr6l9d"; + version = "0.3.5"; + sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -19122,8 +19141,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-workspaces"; - version = "0.3.4"; - sha256 = "00gdahix24cm3qan11a9n2l1n9x0cnnxgid2gf4zhjqmvc3342sa"; + version = "0.3.5"; + sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; @@ -21324,11 +21343,11 @@ self: { ({ mkDerivation, base, bimap, containers, mtl, process, syb }: mkDerivation { pname = "atom"; - version = "1.0.12"; - sha256 = "0mavmgaw9wb7sjrmr49h2xw4xvzywgbflvvxym0l9wc91dd3zhrp"; + version = "1.0.13"; + sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807"; buildDepends = [ base bimap containers mtl process syb ]; homepage = "http://tomahawkins.org"; - description = "A DSL for embedded hard realtime applications"; + description = "An EDSL for embedded hard realtime applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -24941,8 +24960,8 @@ self: { }: mkDerivation { pname = "bindings-nettle"; - version = "0.2"; - sha256 = "1pk2gwd5wbs1bhna5npwrzrvd6cxss8sbigsa8lsqsarh8mbd5sr"; + version = "0.4"; + sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph"; buildDepends = [ base bindings-DSL ]; testDepends = [ base bytestring hspec HUnit QuickCheck quickcheck-io @@ -26691,6 +26710,7 @@ self: { testDepends = [ base directory doctest filepath prelude-extras transformers vector ]; + jailbreak = true; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; @@ -27321,22 +27341,22 @@ self: { "bustle" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, dbus - , directory, filepath, glib, gtk, hgettext, HUnit, mtl, pango + , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango , parsec, pcap, process, QuickCheck, setlocale, test-framework , test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; - version = "0.4.8"; - sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq"; + version = "0.5.0"; + sha256 = "0wj3abvkpalr40zyqwxi2bwgrfzmnjjg7y577qj2fzv8l5bl2mn0"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring cairo containers dbus directory filepath glib gtk - hgettext mtl pango parsec pcap process setlocale text time + base bytestring cairo containers dbus directory filepath gio glib + gtk3 hgettext mtl pango parsec pcap process setlocale text time ]; testDepends = [ - base bytestring cairo containers dbus directory filepath gtk + base bytestring cairo containers dbus directory filepath gtk3 hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; @@ -27664,6 +27684,7 @@ self: { sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; + jailbreak = true; homepage = "https://github.com/philopon/bytestring-read"; description = "fast ByteString to number converting library"; license = stdenv.lib.licenses.mit; @@ -29617,20 +29638,22 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, HUnit, QuickCheck, test-framework + , containers, deepseq, hashable, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.4.2.4"; - sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a"; + version = "0.4.3.0"; + revision = "1"; + sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3"; + editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq - text unordered-containers vector + hashable text unordered-containers vector ]; testDepends = [ - attoparsec base bytestring HUnit QuickCheck test-framework + attoparsec base bytestring hashable HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; @@ -29677,6 +29700,7 @@ self: { homepage = "https://github.com/pjones/cassava-streams"; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassette" = callPackage @@ -29758,10 +29782,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.5.0.1"; - sha256 = "1zdjsd6dqkcpnm8w6macn0v5y48nycc4g2i4rz3gg57v1hlyqrh6"; + version = "0.5.1.0"; + sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq"; buildDepends = [ base template-haskell ]; - homepage = "http://github.com/frerich/catamorphism"; + homepage = "https://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -31378,22 +31402,23 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-vhdl, containers - , directory, filepath, ghc, ghc-typelits-natnormalise, hashable - , haskeline, lens, mtl, process, text, transformers + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-natnormalise + , hashable, haskeline, lens, mtl, process, text, transformers , unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.5.6"; - sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9"; + version = "0.5.7"; + sha256 = "0bia1yqww40prj2n6x4chvfkx05la73056mlpsgilakxwqsab2m7"; isLibrary = false; isExecutable = true; buildDepends = [ array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-vhdl containers directory filepath ghc - ghc-typelits-natnormalise hashable haskeline lens mtl process text - transformers unbound-generics unix unordered-containers + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl + process text transformers unbound-generics unix + unordered-containers ]; jailbreak = true; homepage = "http://www.clash-lang.org/"; @@ -31411,8 +31436,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.5"; - sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx"; + version = "0.5.6"; + sha256 = "1dgcnxzk7l7hywv1p268xrm2dfbgfgcvjs5w14vmsfxv1rfzkad0"; buildDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -31426,16 +31451,18 @@ self: { "clash-prelude" = callPackage ({ mkDerivation, base, data-default, doctest, ghc-prim - , ghc-typelits-natnormalise, Glob, integer-gmp, singletons - , template-haskell, th-lift + , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.7.5"; - sha256 = "0li9y6cb56yf28yrma2c1japhl6c4rk0x9d8wnf3wq9n499bj6iv"; + version = "0.8"; + revision = "1"; + sha256 = "0hd8faq69wvm679gyplbzccz3k4iyp1108xm0hc4x7cdrkmg01r1"; + editedCabalFile = "e549747128c6452eca30da937a03b8d0ff2577466a5a242f50754db3d3f6a648"; buildDepends = [ base data-default ghc-prim ghc-typelits-natnormalise integer-gmp - singletons template-haskell th-lift + lens QuickCheck singletons template-haskell th-lift ]; testDepends = [ base doctest Glob ]; homepage = "http://www.clash-lang.org/"; @@ -31451,6 +31478,7 @@ self: { version = "0.1.2.1"; sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w"; buildDepends = [ base clash-prelude QuickCheck ]; + jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -31462,8 +31490,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.5.4"; - sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289"; + version = "0.5.5"; + sha256 = "1dks6saxp24xm478bgx2bkzx4qq6yv79f92z8kw6a2y29c3bjfrg"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -31474,14 +31502,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.5.5"; + sha256 = "0wjnjdl9slcrxnd0vz7m6y5jhs6gcaij7f9jjrgfcljq4wmk05rf"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.4"; - sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc"; + version = "0.5.5"; + sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -31619,8 +31664,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.7"; - sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba"; + version = "0.23.8"; + sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd"; buildDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -31634,7 +31679,6 @@ self: { ]; buildTools = [ hsx2hs ]; extraLibraries = [ openssl ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -31677,6 +31721,7 @@ self: { text web-plugins ]; buildTools = [ hsx2hs ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; @@ -31719,8 +31764,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.12"; - sha256 = "1pi8qrm71zdszc1fkwyvdx0qnlj4gzsyajw70w4s6sgmn7mgny69"; + version = "0.6.14"; + sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2"; buildDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -31728,7 +31773,6 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -31769,8 +31813,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.3.10"; - sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb"; + version = "0.4.0"; + sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws"; buildDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -31779,7 +31823,6 @@ self: { web-plugins web-routes web-routes-happstack web-routes-th ]; buildTools = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -32553,6 +32596,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "codec" = callPackage + ({ mkDerivation, aeson, base, binary, binary-bits, bytestring + , data-default-class, mtl, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "codec"; + version = "0.1.1"; + sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k"; + buildDepends = [ + aeson base binary binary-bits bytestring data-default-class mtl + template-haskell text transformers unordered-containers + ]; + testDepends = [ + aeson base binary binary-bits bytestring data-default-class mtl + template-haskell text transformers unordered-containers + ]; + homepage = "https://github.com/chpatrick/codec"; + description = "First-class record construction and bidirectional serialization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "codec-libevent" = callPackage ({ mkDerivation, array, base, binary, binary-strict, bytestring , containers, parsec, QuickCheck, regex-compat @@ -33163,15 +33228,16 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.6"; + version = "4.2.7"; revision = "1"; - sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i"; - editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556"; + sha256 = "03h36hr7vgxxyxfp9yc87vahbm3d6chvrkcrjh5abxg6i42aflma"; + editedCabalFile = "70542238a847c5b973832fa7e5623a76a485df25b36d511bfd5f5116e4014619"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/comonad/"; description = "Comonads"; license = stdenv.lib.licenses.bsd3; @@ -34172,6 +34238,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conduit-parse" = callPackage + ({ mkDerivation, base, conduit, exceptions, hlint, parsers + , resourcet, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "conduit-parse"; + version = "0.1.0.0"; + sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3"; + buildDepends = [ + base conduit exceptions parsers text transformers + ]; + testDepends = [ + base conduit exceptions hlint parsers resourcet tasty tasty-hunit + ]; + homepage = "https://github.com/k0ral/conduit-parse"; + description = "Parsing framework based on conduit"; + license = "unknown"; + }) {}; + "conduit-resumablesink" = callPackage ({ mkDerivation, base, bytestring, conduit, hspec, transformers , void @@ -34554,18 +34639,22 @@ self: { "consul-haskell" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , http-client, HUnit, network, tasty, tasty-hunit, text + , http-client, http-types, HUnit, lifted-async, lifted-base + , monad-control, network, stm, tasty, tasty-hunit, text , transformers }: mkDerivation { pname = "consul-haskell"; - version = "0.1"; - sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6"; + version = "0.2.1"; + sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7"; buildDepends = [ - aeson base base64-bytestring bytestring http-client network text + aeson base base64-bytestring bytestring http-client http-types + lifted-async lifted-base monad-control network stm text transformers ]; - testDepends = [ base http-client HUnit network tasty tasty-hunit ]; + testDepends = [ + base http-client HUnit network tasty tasty-hunit text transformers + ]; homepage = "https://github.com/alphaHeavy/consul-haskell"; description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -36680,8 +36769,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.2.3"; - sha256 = "0g8xf65v255z8qm30n3d1h4fval763lns14vb36cyrp1gp48rf2i"; + version = "2.2.4"; + sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42550,8 +42639,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "1.4.5"; - sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5"; + version = "2.0.0"; + sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay"; buildDepends = [ attoparsec base binary blaze-builder bytestring conduit conduit-extra containers iproute mtl network random resourcet @@ -42753,10 +42842,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.9.13"; - revision = "1"; - sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00"; - editedCabalFile = "592ab6d62eca8a0b43930f15c8fb653c54d60983bd232ecc505bd5a5aebe6f7f"; + version = "0.10.0"; + sha256 = "161k9brapz6hbwl3naar07kpfsgqp4b52i5nfsbxsqa2a9al40kb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -45032,8 +45119,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "0.1.2.0"; - sha256 = "0s80x6r2h5cwng6x15xmwgpnjv0qgp360g11g2k3hsc5y8fvgmkd"; + version = "0.1.2.1"; + sha256 = "0x5p5jwxz07m515421xpcw777lgc3bx40mnl0y9fdw2gz4f3svs2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -45042,6 +45129,7 @@ self: { ]; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-make" = callPackage @@ -49005,6 +49093,7 @@ self: { sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir"; buildDepends = [ base deepseq primitive ]; testDepends = [ base doctest filemanip primitive ]; + jailbreak = true; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49400,10 +49489,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.0"; - revision = "1"; - sha256 = "15vr7d1fyabr9v9r9vnh9m2x0r2i0ggg714cc7r6zxhjbrrc9rbn"; - editedCabalFile = "acf5b2b49db56bf047774bc90e57e6c81c5c4d413849d4cdff9dfaf4c71246ab"; + version = "1.0.1"; + sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y"; buildDepends = [ base ]; testDepends = [ base doctest QuickCheck template-haskell ]; homepage = "http://taylor.fausak.me/flow/"; @@ -49661,15 +49748,15 @@ self: { "foldl" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random - , primitive, text, transformers, vector + , primitive, profunctors, text, transformers, vector }: mkDerivation { pname = "foldl"; - version = "1.0.10"; - sha256 = "04ghbn78hsqp92k9mljpa5xgjrmddwrhj90wb1f1v4lliw1inn9q"; + version = "1.0.11"; + sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr"; buildDepends = [ - base bytestring containers mwc-random primitive text transformers - vector + base bytestring containers mwc-random primitive profunctors text + transformers vector ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; @@ -50230,10 +50317,9 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "fraction"; - version = "0.1.0.3"; - sha256 = "0kjpfqy528s11kfigp27kr5a4xw8kn11mpgjzb6fapdbip6y9579"; + version = "0.1.0.4"; + sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf"; buildDepends = [ base semigroups ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction"; description = "Fractions"; license = stdenv.lib.licenses.bsd3; @@ -50592,15 +50678,14 @@ self: { }: mkDerivation { pname = "friday"; - version = "0.2.1.2"; - sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q"; + version = "0.2.2.0"; + sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr"; buildDepends = [ base convertible deepseq primitive ratio-int transformers vector ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.gpl3; @@ -51991,8 +52076,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.6.0.7"; - sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz"; + version = "0.7.1"; + sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30"; buildDepends = [ base mtl template-haskell ]; homepage = "https://github.com/danr/geniplate"; description = "Use Template Haskell to generate Uniplate-like functions"; @@ -52144,6 +52229,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "geom2d" = callPackage + ({ mkDerivation, base, ieee754, QuickCheck }: + mkDerivation { + pname = "geom2d"; + version = "0.1.2.1"; + sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj"; + buildDepends = [ base ieee754 QuickCheck ]; + testDepends = [ base ieee754 QuickCheck ]; + jailbreak = true; + description = "package for geometry in euklidean 2d space"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt , mtl, old-locale, process, time @@ -52183,8 +52282,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.6.3"; - sha256 = "18d9cbk87gx31fk1bdylllicbnxj2xmb5xzss27amy8xcmlb3qds"; + version = "0.7"; + sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -52192,6 +52291,7 @@ self: { base base-compat base-orphans generics-sop hspec hspec-expectations markdown-unlit QuickCheck silently tagged ]; + homepage = "https://github.com/zalora/getopt-generics#readme"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52707,6 +52807,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-tcplugins-extra" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.1"; + sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf"; + buildDepends = [ base ghc ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, text, time }: mkDerivation { @@ -52722,12 +52835,13 @@ self: { }) {}; "ghc-typelits-natnormalise" = callPackage - ({ mkDerivation, base, ghc, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit + }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.2.1"; - sha256 = "0dflzqhqax06nx4qc5xw6k1aihny7d2pxg1ldyw1y57mjg44clah"; - buildDepends = [ base ghc ]; + version = "0.3"; + sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r"; + buildDepends = [ base ghc ghc-tcplugins-extra ]; testDepends = [ base tasty tasty-hunit ]; jailbreak = true; homepage = "http://www.clash-lang.org/"; @@ -53550,8 +53664,8 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.10.6.3"; - sha256 = "1pzxk4zsk1992gsgyi0pfj8x0dggf56v78345jl282hvb2psm371"; + version = "0.10.7"; + sha256 = "1gj94z2c2jpdm9bkfnc6wbyhipgbss0j70ql26hn8g3fh1ykcpbj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -53563,7 +53677,6 @@ self: { random recaptcha safe SHA split syb tagsoup text time uri url utf8-string uuid xhtml xml xss-sanitize zlib ]; - jailbreak = true; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; @@ -53934,12 +54047,12 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.1.0.1"; - sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv"; - buildDepends = [ array base containers ]; + version = "0.2.0.1"; + sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7"; + buildDepends = [ array base containers TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55769,6 +55882,22 @@ self: { license = stdenv.lib.licenses.lgpl21; }) { inherit (pkgs.gnome) gtk;}; + "gtk-helpers" = callPackage + ({ mkDerivation, array, base, gio, glib, gtk, mtl, process + , template-haskell + }: + mkDerivation { + pname = "gtk-helpers"; + version = "0.0.7"; + sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7"; + buildDepends = [ + array base gio glib gtk mtl process template-haskell + ]; + homepage = "http://keera.es/blog/community"; + description = "A collection of auxiliary operations and widgets related to Gtk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gtk-jsinput" = callPackage ({ mkDerivation, base, gtk, json, transformers }: mkDerivation { @@ -56470,8 +56599,8 @@ self: { }: mkDerivation { pname = "hPDB"; - version = "1.2.0.3"; - sha256 = "1lciijgn137gmi190if41akj4pv9030rbbvys5lfh4q5kk8p2dsp"; + version = "1.2.0.4"; + sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s"; buildDepends = [ AC-Vector base bytestring containers deepseq directory ghc-prim iterable mmap mtl Octree parallel QuickCheck tagged @@ -62717,6 +62846,7 @@ self: { sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b"; buildDepends = [ base ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; @@ -65411,8 +65541,8 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.2.0"; - sha256 = "18hby3vjnzfis2ixbkkrk1zwky4rymx5ai00wza9yx4ijnxrzc3z"; + version = "0.1.2.1"; + sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; @@ -66368,6 +66498,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "homplexity" = callPackage + ({ mkDerivation, base, containers, cpphs, deepseq, directory + , filepath, happy, haskell-src-exts, hflags, template-haskell + , uniplate + }: + mkDerivation { + pname = "homplexity"; + version = "0.4.2.0"; + sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers cpphs deepseq directory filepath haskell-src-exts + hflags template-haskell uniplate + ]; + buildTools = [ happy ]; + homepage = "https://github.com/mgajda/homplexity"; + description = "Haskell code quality tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -67027,6 +67178,7 @@ self: { homepage = "https://github.com/yihuang/hosts-server"; description = "An dns server which is extremely easy to config"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hothasktags" = callPackage @@ -67990,8 +68142,8 @@ self: { }: mkDerivation { pname = "hs-mesos"; - version = "0.20.2.0"; - sha256 = "1vnfmb5mnp3wsbd7s1ls6rz0ywlirykdx7dclkxcc3rh1y0mxp1n"; + version = "0.20.3.0"; + sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring lens managed template-haskell ]; @@ -72682,8 +72834,8 @@ self: { }: mkDerivation { pname = "hyakko"; - version = "0.6.6"; - sha256 = "1y0b5rxgiaygy0y42s2rnnw87br4d73nbjii9gpbf80rlvhdjagw"; + version = "0.6.7"; + sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -73103,6 +73255,7 @@ self: { testDepends = [ base containers directory doctest filepath unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; @@ -74420,12 +74573,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "index-core"; - version = "1.0.1"; - revision = "1"; - sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4"; - editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f"; + version = "1.0.2"; + sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw"; buildDepends = [ base ]; - jailbreak = true; description = "Indexed Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74627,8 +74777,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.1.2"; - sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00"; + version = "0.9.1.3"; + sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74640,7 +74790,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -74720,8 +74869,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.3.1"; - sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi"; + version = "0.5.3.2"; + sha256 = "0sihzjscdrk02z2d22j0fcqgk05nhpg16zy2cdkxjj4cp09nbaac"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -75682,18 +75831,16 @@ self: { "ircbot" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , irc, mtl, network, old-locale, parsec, random, SafeSemaphore, stm - , time, unix + , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix }: mkDerivation { pname = "ircbot"; - version = "0.6.2"; - sha256 = "0jl6sgm7bk4yi1l4s6j3yir3rpbxx8r4ri267xcw77b2vzbxq7l0"; + version = "0.6.4"; + sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd"; buildDepends = [ base bytestring containers directory filepath irc mtl network - old-locale parsec random SafeSemaphore stm time unix + parsec random SafeSemaphore stm time unix ]; - jailbreak = true; homepage = "http://hub.darcs.net/stepcut/ircbot"; description = "A library for writing irc bots"; license = stdenv.lib.licenses.bsd3; @@ -77955,6 +78102,242 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "keera-callbacks" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "keera-callbacks"; + version = "0.1"; + sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq"; + buildDepends = [ base mtl ]; + description = "Mutable memory locations with callbacks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-i18n" = callPackage + ({ mkDerivation, base, directory, filepath, glib, hgettext + , MissingK, setlocale, utf8-string + }: + mkDerivation { + pname = "keera-hails-i18n"; + version = "0.0.3.3"; + sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i"; + buildDepends = [ + base directory filepath glib hgettext MissingK setlocale + utf8-string + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - I18N"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-controller" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "keera-hails-mvc-controller"; + version = "0.0.3.3"; + sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb"; + buildDepends = [ base ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based controller for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-environment-gtk" = callPackage + ({ mkDerivation, base, keera-hails-mvc-model-protectedmodel + , keera-hails-mvc-view, keera-hails-mvc-view-gtk + }: + mkDerivation { + pname = "keera-hails-mvc-environment-gtk"; + version = "0.0.3.3"; + sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr"; + buildDepends = [ + base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view + keera-hails-mvc-view-gtk + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-model-lightmodel" = callPackage + ({ mkDerivation, base, containers, keera-hails-reactivevalues + , MissingK, stm, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-model-lightmodel"; + version = "0.0.3.4"; + sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190"; + buildDepends = [ + base containers keera-hails-reactivevalues MissingK stm + template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - Reactive Protected Light Models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keera-hails-mvc-model-protectedmodel" = callPackage + ({ mkDerivation, base, containers, keera-hails-reactivevalues + , MissingK, stm, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-model-protectedmodel"; + version = "0.0.3.5"; + sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx"; + buildDepends = [ + base containers keera-hails-reactivevalues MissingK stm + template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Rapid Gtk Application Development - Protected Reactive Models"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-solutions-config" = callPackage + ({ mkDerivation, base, directory, filepath, MissingK }: + mkDerivation { + pname = "keera-hails-mvc-solutions-config"; + version = "0.0.3.3"; + sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1"; + buildDepends = [ base directory filepath MissingK ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Easy handling of configuration files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-solutions-gtk" = callPackage + ({ mkDerivation, base, gtk, hslogger, HTTP + , keera-hails-mvc-environment-gtk + , keera-hails-mvc-model-protectedmodel, keera-hails-mvc-view + , keera-hails-mvc-view-gtk, keera-hails-reactivevalues, MissingK + , mtl, network, network-uri, template-haskell + }: + mkDerivation { + pname = "keera-hails-mvc-solutions-gtk"; + version = "0.0.3.3"; + sha256 = "1j0821aysvzpa8qnnz9066gwxk1bwn0sykihb5p5br62n7xzhgkf"; + buildDepends = [ + base gtk hslogger HTTP keera-hails-mvc-environment-gtk + keera-hails-mvc-model-protectedmodel keera-hails-mvc-view + keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl + network network-uri template-haskell + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-view" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "keera-hails-mvc-view"; + version = "0.0.3.3"; + sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p"; + buildDepends = [ base ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Generic View for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-mvc-view-gtk" = callPackage + ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-mvc-view }: + mkDerivation { + pname = "keera-hails-mvc-view-gtk"; + version = "0.0.3.3"; + sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z"; + buildDepends = [ base gtk gtk-helpers keera-hails-mvc-view ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-fs" = callPackage + ({ mkDerivation, base, directory, fsnotify + , keera-hails-reactivevalues, system-filepath + }: + mkDerivation { + pname = "keera-hails-reactive-fs"; + version = "0.0.3.3"; + sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08"; + buildDepends = [ + base directory fsnotify keera-hails-reactivevalues system-filepath + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Files as Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-gtk" = callPackage + ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-reactivevalues + , mtl, transformers + }: + mkDerivation { + pname = "keera-hails-reactive-gtk"; + version = "0.0.3.5"; + sha256 = "01hvakmxjm9vpfwp4s7c1s3jqiy21yqb9rgjs2drf2kb66ndvsq9"; + buildDepends = [ + base gtk gtk-helpers keera-hails-reactivevalues mtl transformers + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keera-hails-reactive-network" = callPackage + ({ mkDerivation, base, keera-hails-reactivevalues, network }: + mkDerivation { + pname = "keera-hails-reactive-network"; + version = "0.0.3.3"; + sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3"; + buildDepends = [ base keera-hails-reactivevalues network ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Sockets as Reactive Values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-polling" = callPackage + ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues + }: + mkDerivation { + pname = "keera-hails-reactive-polling"; + version = "0.0.3.3"; + sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8"; + buildDepends = [ base keera-callbacks keera-hails-reactivevalues ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Polling based Readable RVs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-wx" = callPackage + ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }: + mkDerivation { + pname = "keera-hails-reactive-wx"; + version = "0.0.3.3"; + sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw"; + buildDepends = [ base keera-hails-reactivevalues wx wxcore ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - Reactive Fields for WX widgets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "keera-hails-reactive-yampa" = callPackage + ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues + , time, Yampa + }: + mkDerivation { + pname = "keera-hails-reactive-yampa"; + version = "0.0.3.3"; + sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1"; + buildDepends = [ + base keera-callbacks keera-hails-reactivevalues time Yampa + ]; + homepage = "http://www.keera.es/blog/community/"; + description = "Haskell on Rails - FRP Yampa Signal Functions as RVs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keera-hails-reactivevalues" = callPackage ({ mkDerivation, base, contravariant }: mkDerivation { @@ -79422,8 +79805,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.10.2.1"; - sha256 = "0klr7b4sdi8bsln9hw3xa56d3s1h869zkyqnm97fiyvzar91g532"; + version = "0.10.2.2"; + sha256 = "0y65mlx4zx1n7n6y3gjvzqzr2k8bxbbjn4wsjr8mzpib0gqfqpss"; buildDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -81840,6 +82223,7 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -83230,8 +83614,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.2.0"; - sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0"; + version = "0.2.1"; + sha256 = "0jply63w04pnkfv3s8lpnwvjf43sfhf3mk72p3wva4p28c6mql31"; buildDepends = [ aeson aeson-pretty base bytestring deepseq exceptions hpqtypes monad-control monad-time mtl old-locale split stm text time @@ -84287,6 +84671,7 @@ self: { transformers void ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; @@ -86185,8 +86570,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.6"; - sha256 = "18r0rnh2x5sazn2i23v222vxrgsgyyzbfvasg21r2kh42i0vh2bw"; + version = "0.7"; + sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1"; buildDepends = [ base bytestring deepseq ghc-prim ]; testDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -86392,8 +86777,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.3.0.0"; - sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg"; + version = "0.3.0.1"; + sha256 = "1mj4x5pq9mch71vk5cqi2wjaqjhgsllvjbsz7yyv6sg4cps63d8l"; buildDepends = [ ansi-terminal base bytestring containers lens mtl mwc-random primitive text time unix unordered-containers vector @@ -86802,8 +87187,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.8.2"; - sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia"; + version = "0.4.9"; + sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -87403,6 +87788,7 @@ self: { sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av"; buildDepends = [ base ]; testDepends = [ base doctest Glob ]; + jailbreak = true; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; @@ -88219,8 +88605,11 @@ self: { mkDerivation { pname = "monad-unify"; version = "0.2.2"; + revision = "1"; sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp"; + editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2"; buildDepends = [ base mtl unordered-containers ]; + jailbreak = true; description = "Generic first-order unification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -91334,8 +91723,8 @@ self: { }: mkDerivation { pname = "nettle"; - version = "0.1.0"; - sha256 = "1ms96laa9d2ns39ymw6mlwm0mj03vss7855cs9npymhb4fmqkcas"; + version = "0.1.1"; + sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr"; buildDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -91516,17 +91905,18 @@ self: { ({ mkDerivation, attoparsec, base, base32string, bytestring , exceptions, hexstring, hspec, hspec-attoparsec , hspec-expectations, network, network-attoparsec, network-simple - , socks, text, transformers + , socks, splice, text, transformers }: mkDerivation { pname = "network-anonymous-tor"; - version = "0.9.1"; - sha256 = "1p78xsi1i59z9jkyf182gvfx7qpiqs0l60mp2xl1d4jjwgdnni50"; + version = "0.9.2"; + sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base base32string bytestring exceptions hexstring - network network-attoparsec network-simple socks text transformers + network network-attoparsec network-simple socks splice text + transformers ]; testDepends = [ attoparsec base base32string bytestring exceptions hspec @@ -94678,15 +95068,21 @@ self: { }) {}; "order-maintenance" = callPackage - ({ mkDerivation, base, containers, transformers }: + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers + , QuickCheck, transformers + }: mkDerivation { pname = "order-maintenance"; - version = "0.0.0.0"; - sha256 = "1d416a277fcchcgyn4n5m7kpn0aky8gsi8fkk0gh3a4lcap18h2d"; + version = "0.0.1.0"; + sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k"; buildDepends = [ base containers transformers ]; + testDepends = [ + base Cabal cabal-test-quickcheck containers QuickCheck transformers + ]; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance"; description = "Algorithms for the order maintenance problem with a safe interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "order-statistics" = callPackage @@ -94928,6 +95324,7 @@ self: { sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; buildDepends = [ base ]; testDepends = [ base doctest ]; + jailbreak = true; description = "An alternative to some of the Prelude"; license = stdenv.lib.licenses.mit; }) {}; @@ -95005,8 +95402,8 @@ self: { }: mkDerivation { pname = "packed-dawg"; - version = "0.2.0.5"; - sha256 = "1b8lhigpzj1zvah6f4ra7pczhpm8dxcwaqna8p1ifbbx2ys6x59p"; + version = "0.2.0.7"; + sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y"; buildDepends = [ base binary deepseq mtl unordered-containers vector vector-binary-instances @@ -95242,8 +95639,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.14.0.3"; - sha256 = "1nbicmngsdx9v4kvsswipf8w1l8rvfsll8fnp2ar5v65b0aba3ic"; + version = "1.14.0.4"; + sha256 = "1pzs4ysf7q3sxd8vyydzi5r4n8gjnkvjs3p1phmw4zir3zxmp581"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -95322,10 +95719,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.0"; - revision = "1"; - sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r"; - editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d"; + version = "1.0.1"; + sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb"; isLibrary = true; isExecutable = true; buildDepends = [ base csv pandoc pandoc-types text ]; @@ -98937,6 +99332,7 @@ self: { ]; description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointed" = callPackage @@ -99155,16 +99551,16 @@ self: { }) {}; "poly-arity" = callPackage - ({ mkDerivation, base, constraints, hspec, QuickCheck + ({ mkDerivation, base, constraints, HList, hspec, QuickCheck , quickcheck-instances }: mkDerivation { pname = "poly-arity"; - version = "0.0.4"; - revision = "1"; - sha256 = "0cg312hlfylablw4h840xhm72cs70xk9rla4wrmzpqm45g91fhyq"; - editedCabalFile = "e099e3cdd06f5ab832bfc920265cd97304f92c2e89126306f7e1d9bff98cbe86"; - buildDepends = [ base constraints ]; + version = "0.0.4.1"; + revision = "2"; + sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp"; + editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af"; + buildDepends = [ base constraints HList ]; testDepends = [ base hspec QuickCheck quickcheck-instances ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; @@ -99957,8 +100353,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.2.9.1"; - sha256 = "0rgvqhhpg6q99q1bdbk3dhnlad8nfrl3xihcg3c0j55dlx3q1860"; + version = "0.2.10.0"; + sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104204,6 +104600,7 @@ self: { attoparsec base base-prelude template-haskell text transformers ]; testDepends = [ base base-prelude directory doctest filepath ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; description = "First class records implemented with quasi-quotation"; license = stdenv.lib.licenses.mit; @@ -104284,8 +104681,8 @@ self: { ({ mkDerivation, base, comonad, free, transformers }: mkDerivation { pname = "recursion-schemes"; - version = "4.1.1"; - sha256 = "00izjknk7g2546p35hrha413nji6013wfbjic8jgmlzzjlr1cjwl"; + version = "4.1.2"; + sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n"; buildDepends = [ base comonad free transformers ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; @@ -109675,8 +110072,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.2"; - sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j"; + version = "0.1.0.3"; + sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc"; buildDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL @@ -109890,8 +110287,8 @@ self: { ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: mkDerivation { pname = "securemem"; - version = "0.1.8"; - sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2"; + version = "0.1.9"; + sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy"; buildDepends = [ base byteable bytestring ghc-prim memory ]; homepage = "http://github.com/vincenthz/hs-securemem"; description = "abstraction to an auto scrubbing and const time eq, memory chunk"; @@ -110051,15 +110448,14 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.0.0.1"; - revision = "1"; - sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l"; - editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575"; + version = "5.0.0.2"; + sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw"; buildDepends = [ base base-orphans bifunctors comonad containers contravariant distributive semigroups tagged transformers transformers-compat ]; testDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -110526,6 +110922,7 @@ self: { filepath hspec parsec QuickCheck quickcheck-instances string-conversions text url ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -110598,8 +110995,8 @@ self: { }: mkDerivation { pname = "servant-ede"; - version = "0.4"; - sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd"; + version = "0.4.0.1"; + sha256 = "1yxqjd6dk5bhh6qwjshm1fcizsm1vd5nk8sdbfdasgsfw6ynlgfp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110783,18 +111180,16 @@ self: { "ses-html" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, byteable - , bytestring, cryptohash, HsOpenSSL, http-streams, old-locale - , tagsoup, time + , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time }: mkDerivation { pname = "ses-html"; - version = "0.2.0.2"; - sha256 = "0dfrhsn6scwid7ycnq4j21nkq64s59hkc05ygcg4qsf7vcizgs0d"; + version = "0.2.1.2"; + sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f"; buildDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash - HsOpenSSL http-streams old-locale tagsoup time + HsOpenSSL http-streams tagsoup time ]; - jailbreak = true; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113426,14 +113821,14 @@ self: { , clientsession, comonad, configurator, containers, directory , directory-tree, dlist, errors, filepath, hashable, heist, lens , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time - , pwstore-fast, regex-posix, snap-core, snap-server, stm, syb + , pwstore-fast, regex-posix, snap-core, snap-server, stm , template-haskell, text, time, transformers, unordered-containers , vector, vector-algorithms, xmlhtml }: mkDerivation { pname = "snap"; - version = "0.14.0.4"; - sha256 = "0z0w6dig658cbl6adwq738dr9z56a3sj8lfhh5zfnmmy7x1794xs"; + version = "0.14.0.5"; + sha256 = "0wifww6mry2lxj572j9gwjxpjz4z7z9hd9jzhfyfwv2c67b39iyr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113441,8 +113836,8 @@ self: { configurator containers directory directory-tree dlist errors filepath hashable heist lens logict MonadCatchIO-transformers mtl mwc-random old-time pwstore-fast regex-posix snap-core snap-server - stm syb template-haskell text time transformers - unordered-containers vector vector-algorithms xmlhtml + stm template-haskell text time transformers unordered-containers + vector vector-algorithms xmlhtml ]; jailbreak = true; homepage = "http://snapframework.com/"; @@ -117990,8 +118385,8 @@ self: { ({ mkDerivation, base, bytestring, text, utf8-string }: mkDerivation { pname = "string-conversions"; - version = "0.3.0.3"; - sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p"; + version = "0.4"; + sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s"; buildDepends = [ base bytestring text utf8-string ]; description = "Simplifies dealing with different types for strings"; license = stdenv.lib.licenses.bsd3; @@ -118358,8 +118753,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.5.13.0"; - sha256 = "1284x4g6k24v3k2ii5jfyly6b788477qih3lq81x72x22d36d168"; + version = "0.5.14.0"; + sha256 = "1z8fya123cldakf15fc4p9vp0gp9gxql4x7faz12gfp9d6ffj4f5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125350,6 +125745,7 @@ self: { system-filepath temporary text time transformers unix ]; testDepends = [ base doctest ]; + jailbreak = true; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -131577,8 +131973,8 @@ self: { ({ mkDerivation, base, containers, mtl, stm, text }: mkDerivation { pname = "web-plugins"; - version = "0.2.7"; - sha256 = "0pvwhr5mr960lramlnz7sffxrr7mxqskqk5pqbspck7cabzwzsxd"; + version = "0.2.8"; + sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969"; buildDepends = [ base containers mtl stm text ]; homepage = "http://www.happstack.com/"; description = "dynamic plugin system for web applications"; @@ -131741,6 +132137,7 @@ self: { base bytestring primitive text types-compat unordered-containers ]; testDepends = [ base doctest ]; + jailbreak = true; homepage = "https://github.com/philopon/web-routing"; description = "simple routing library"; license = stdenv.lib.licenses.mit; @@ -133046,6 +133443,7 @@ self: { sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc"; buildDepends = [ base bytestring connection network websockets ]; testDepends = [ base doctest ]; + jailbreak = true; homepage = "http://taylor.fausak.me/wuss/"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; @@ -133424,8 +133822,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.3.0"; - sha256 = "1ih7wnsy38p7s14fnyg3pnm3hyp3nd6fprl2m66l09cj7ibvnxyc"; + version = "0.3.2"; + sha256 = "0njsflaxz2l01vbwndsmqmq37i6nl4cfczy776jdpnv7043b1ynv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -133886,6 +134284,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-conduit-parse" = callPackage + ({ mkDerivation, base, conduit, conduit-parse, containers + , data-default, exceptions, hlint, parsers, resourcet, tasty + , tasty-hunit, text, xml-conduit, xml-types + }: + mkDerivation { + pname = "xml-conduit-parse"; + version = "0.1.0.0"; + sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v"; + buildDepends = [ + base conduit conduit-parse containers exceptions parsers text + xml-conduit xml-types + ]; + testDepends = [ + base conduit conduit-parse data-default hlint parsers resourcet + tasty tasty-hunit + ]; + homepage = "https://github.com/k0ral/xml-conduit-parse"; + description = "Streaming XML parser based on conduits"; + license = "unknown"; + }) {}; + "xml-conduit-writer" = callPackage ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit , xml-types @@ -135774,8 +136194,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.9.1"; - sha256 = "1fqla2cahqr51jgr0l8pl2wq4rai2dq6yky75qjg5a4xrxcdq6sc"; + version = "1.4.10"; + sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -135859,23 +136279,22 @@ self: { }) {}; "yesod-dsl" = callPackage - ({ mkDerivation, alex, array, base, Cabal, containers, directory - , filepath, happy, MissingH, mtl, shakespeare, shakespeare-text - , strict, syb, text, transformers, uniplate + ({ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring + , Cabal, containers, directory, filepath, happy, MissingH, mtl + , shakespeare, strict, syb, text, transformers, uniplate, vector }: mkDerivation { pname = "yesod-dsl"; - version = "0.1.1.23"; - sha256 = "01rafa5klq1qjrl5w7ii4h27kiqhnacn95x7f2f7b1gxxp26psrx"; + version = "0.1.1.24"; + sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7"; isLibrary = true; isExecutable = true; buildDepends = [ - array base Cabal containers directory filepath MissingH mtl - shakespeare shakespeare-text strict syb text transformers uniplate + aeson aeson-pretty array base bytestring Cabal containers directory + filepath MissingH mtl shakespeare strict syb text transformers + uniplate vector ]; buildTools = [ alex happy ]; - jailbreak = true; - homepage = "https://github.com/tlaitinen/yesod-dsl"; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -137194,8 +137613,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.0.2"; - sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; + version = "0.5.0.3"; + sha256 = "15r381vsffqyzvgksipik0y9f41sy8ylsmvzw7hih4nrzp0w32ch"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -137203,7 +137622,6 @@ self: { HStringTemplate lucid old-locale old-time pandoc parsec scientific split text time unordered-containers yaml ]; - jailbreak = true; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; From 6130aa2a4dccd68c18b02f690d775dc66d41a4a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jun 2015 15:41:09 +0200 Subject: [PATCH 171/208] haskell-cipher-aes: test suite has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a4979cd58d..b16b95558df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -827,9 +827,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/vincenthz/hs-cipher-aes/issues/35 - cipher-aes = dontCheck super.cipher-aes; - # https://github.com/DanielG/cabal-helper/issues/2 cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; }); From 697a80c004f65c7694c4cae33dd9f27513654dd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jun 2015 16:12:21 +0200 Subject: [PATCH 172/208] haskell-influxdb: build has been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b16b95558df..ca1ea03f903 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -402,6 +402,7 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; + influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -833,8 +834,4 @@ self: super: { # https://github.com/jgm/gitit/issues/494 gitit = markBroken super.gitit; - # https://github.com/maoe/influxdb-haskell/issues/26 - influxdb = markBroken (dontCheck super.influxdb); - snaplet-influxdb = dontDistribute super.snaplet-influxdb; - } From dbf55842e89c35dcef7130705bcdc7001eba4960 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jun 2015 16:13:09 +0200 Subject: [PATCH 173/208] haskell-comonad: disable test suite to work avoid doctest failure --- 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 ca1ea03f903..5373a507ffb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -834,4 +834,7 @@ self: super: { # https://github.com/jgm/gitit/issues/494 gitit = markBroken super.gitit; + # https://github.com/ekmett/comonad/issues/25 + comonad = dontCheck super.comonad; + } From a982892116d0a02cbaea595b006a6341e8b7d80a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:18:06 +0200 Subject: [PATCH 174/208] Fix evaluation errors on Hydra. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5373a507ffb..51aab68907a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -780,11 +780,12 @@ self: super: { # https://github.com/goldfirere/singletons/issues/116 # https://github.com/goldfirere/singletons/issues/117 # https://github.com/goldfirere/singletons/issues/118 - singletons = markBroken super.singletons; - singleton-nats = dontDistribute super.singleton-nats; + clash-lib = dontDistribute super.clash-lib; + clash-verilog = dontDistribute super.clash-verilog; hgeometry = dontDistribute super.hgeometry; hipe = dontDistribute super.hipe; - clash-lib = dontDistribute super.clash-lib; + singleton-nats = dontDistribute super.singleton-nats; + singletons = markBroken super.singletons; # https://github.com/anton-k/temporal-music-notation/issues/1 temporal-music-notation = markBroken super.temporal-music-notation; From e0f7ab678acbaafe52640068df01804a5cfc2556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:20:44 +0200 Subject: [PATCH 175/208] ghc-events: fix build of latest version with ghc-7.8.x --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 9327af856e8..2e95c78c625 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -131,4 +131,7 @@ self: super: { patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } ); + # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable. + ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; }; + } From 2db9a8289d6dc34cdb335b1acacd126bce42c88b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 13:25:00 +0200 Subject: [PATCH 176/208] haskell-semigroupoids: disable doctests suite to avoid version conflict with doctest 0.10.x --- 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 51aab68907a..ade2055187d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -838,4 +838,7 @@ self: super: { # https://github.com/ekmett/comonad/issues/25 comonad = dontCheck super.comonad; + # https://github.com/ekmett/semigroupoids/issues/35 + semigroupoids = disableCabalFlag super.semigroupoids "doctests"; + } From f5c5e4af74346687a2a5e7cd409056daac2af565 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 14:51:51 +0200 Subject: [PATCH 177/208] perl-packages: IOSocketSSL -> 2.016 Many, many fixes. Too many to list here. See: --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 891d72497b5..c166457add2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4761,10 +4761,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage { - name = "IO-Socket-SSL-1.981"; + name = "IO-Socket-SSL-2.016"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.981.tar.gz; - sha256 = "d78f3aac72888a350962c2da87b2b459513a175d7ac641cb1482bacbb81e76eb"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.016.tar.gz; + sha256 = "0hgyggdbw16nm85fds48m79lxy5318panqhpkh7r192jq6rnhqlk"; }; propagatedBuildInputs = [ URI NetSSLeay ]; meta = { From 5cb1af03ef698c2a8f70ec0ad63171dabd6a0414 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:16:10 +0200 Subject: [PATCH 178/208] libkeyfinder -> 0.11 (final) --- pkgs/development/libraries/libkeyfinder/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 6ab80d55a45..f0e75b34059 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, boost, fftw, qt5 }: -stdenv.mkDerivation rec { - version = "0.11.0-20141105"; +let version = "0.11"; in +stdenv.mkDerivation { name = "libkeyfinder-${version}"; src = fetchFromGitHub { + sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9"; + rev = "v${version}"; repo = "libKeyFinder"; owner = "ibsh"; - rev = "592ef1f3d3ada489f80814d5ccfbc8de6029dc9d"; - sha256 = "0xcqpizwbn6wik3w7h9k1lvgrp3r3w6yyy55flvnwwwgvkry48as"; }; meta = with stdenv.lib; { + inherit version; description = "Musical key detection for digital audio (C++ library)"; homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; From 921249e13da448aedcec7d5f7698d22752c10284 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:16:26 +0200 Subject: [PATCH 179/208] keyfinder -> 1.26 --- pkgs/applications/audio/keyfinder/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index bea869ea318..d3438e1ada4 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: -stdenv.mkDerivation rec { - version = "1.25-17-gf670607"; +let version = "1.26"; in +stdenv.mkDerivation { name = "keyfinder-${version}"; src = fetchFromGitHub { + sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc"; + rev = version; repo = "is_KeyFinder"; owner = "ibsh"; - rev = "f6706074435ac14c5238ee3f0dd22ac22d72af9c"; - sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc"; }; meta = with stdenv.lib; { + inherit version; description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' KeyFinder is an open source key detection tool, for DJs interested in From fcee71066b61fe5384caaa172ebdcf02d0cffedb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 18:28:30 +0200 Subject: [PATCH 180/208] rsstail -> 1.9.1 --- .../applications/networking/feedreaders/rsstail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index ee9d1dbbf8d..2d4b9741375 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -let version = "1.9"; in +let version = "1.9.1"; in stdenv.mkDerivation rec { name = "rsstail-${version}"; src = fetchFromGitHub { - sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf"; - rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef"; + sha256 = "0jhf7vr7y56r751wy4ix80iwhgxhk6mbbin8gnx59i457gf6sjl1"; + rev = "1220d63aaa233961636f859d9a406536fffb64f4"; repo = "rsstail"; owner = "flok99"; }; From f1587a2d1ecfebdf9a8b20c2408adfec8806f879 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jun 2015 19:59:46 +0200 Subject: [PATCH 181/208] Move numpy-scipy-support.nix file from the top-level to development/python-modules. The top-level is not supposed to contain sub-directories, IMHO. --- .../python-modules}/numpy-scipy-support.nix | 0 pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{top-level/python-support => development/python-modules}/numpy-scipy-support.nix (100%) diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix similarity index 100% rename from pkgs/top-level/python-support/numpy-scipy-support.nix rename to pkgs/development/python-modules/numpy-scipy-support.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38fda4ad406..fa01d1ef488 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7796,7 +7796,7 @@ let }; numpy = let - support = import ./python-support/numpy-scipy-support.nix { + support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; atlas = pkgs.atlasWithLapack; pkgName = "numpy"; @@ -11258,7 +11258,7 @@ let scipy = let - support = import ./python-support/numpy-scipy-support.nix { + support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; atlas = pkgs.atlasWithLapack; pkgName = "numpy"; From 8bf170f280436cfdfda5ead492cf9ab5e04b4637 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Tue, 2 Jun 2015 10:58:17 -0500 Subject: [PATCH 182/208] Remove lingering dependence on atlas with numpy. Closes https://github.com/NixOS/nixpkgs/pull/8133. --- pkgs/development/python-modules/numpy-scipy-support.nix | 5 ++++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 6cca704dcda..22be22633c2 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -8,6 +8,9 @@ }: { + # Re-export atlas here so that it can be sure that the same one will be used + # in the propagatedBuildInputs. + inherit atlas; # First "install" the package, then import what was installed, and call the # .test() function, which will run the test suite. @@ -40,7 +43,7 @@ runHook postCheck ''; - # Creates a site.cfg telling the setup script where to find depended-on + # Creates a site.cfg telling the setup script where to find depended-on # math libraries. preBuild = '' echo "Creating site.cfg file..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa01d1ef488..a5ad7e46f4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7821,7 +7821,7 @@ let setupPyBuildFlags = ["--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ pkgs.atlas ]; + propagatedBuildInputs = [ support.atlas ]; meta = { description = "Scientific tools for Python"; From 99d2e80d973b7ab1c04754e1f270d4786c46f2a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jun 2015 20:08:24 +0200 Subject: [PATCH 183/208] In VM builds, connect stdin to /dev/null This prevents programs from hanging while trying to read from stdin. --- pkgs/build-support/vm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a9f9f0d184c..53a01365435 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -187,6 +187,7 @@ rec { # then don't start the build again, but instead drop the user into # an interactive shell. if test -n "$origBuilder" -a ! -e /.debug; then + exec < /dev/null ${coreutils}/bin/touch /.debug $origBuilder $origArgs echo $? > /tmp/xchg/in-vm-exit From 860589227b17805902779c85e9879d00351e2412 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2015 19:29:41 +0200 Subject: [PATCH 184/208] eid-mw: don't install useless about-eid-mw.desktop --- pkgs/tools/security/eid-mw/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index ef15967330d..1833d460081 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { install -D ${./eid-nssdb.in} $out/bin/eid-nssdb substituteInPlace $out/bin/eid-nssdb \ --replace "modutil" "${nssTools}/bin/modutil" + + # Only provides a useless "about-eid-mw.desktop" that doesn't even work: + rm -rf $out/share/applications ''; meta = with stdenv.lib; { From daf4ec39a5613d277706f0f559e074a06df2a23c Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 4 Jun 2015 20:22:36 +0300 Subject: [PATCH 185/208] fix: add missing versions --- pkgs/applications/audio/dirt/default.nix | 2 +- pkgs/applications/audio/pd-plugins/puremapping/default.nix | 2 +- pkgs/applications/misc/cortex/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 2 +- .../networking/instant-messengers/telegram-cli/default.nix | 2 +- pkgs/applications/networking/p2p/opentracker/default.nix | 4 ++-- pkgs/development/interpreters/ruby/bundler-head.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- pkgs/development/libraries/nvidia-texture-tools/default.nix | 2 +- pkgs/development/libraries/xcb-util-cursor/HEAD.nix | 2 +- pkgs/development/ocaml-modules/optcomp/default.nix | 2 +- pkgs/development/tools/misc/bossa/default.nix | 2 +- pkgs/games/thePenguinMachine/default.nix | 2 ++ pkgs/misc/drivers/xwiimote/default.nix | 4 ++-- pkgs/misc/screensavers/xss-lock/default.nix | 2 +- pkgs/os-specific/linux/android-udev-rules/default.nix | 2 +- pkgs/os-specific/linux/disk-indicator/default.nix | 2 +- pkgs/os-specific/linux/lightum/default.nix | 2 +- pkgs/os-specific/linux/seturgent/default.nix | 4 ++-- pkgs/servers/sql/monetdb/default.nix | 2 +- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/audio/pa-applet/default.nix | 2 +- pkgs/tools/audio/pnmixer/default.nix | 2 +- pkgs/tools/misc/vfdecrypt/default.nix | 3 ++- pkgs/tools/misc/xflux/default.nix | 2 +- pkgs/tools/networking/curl-unix-socket/default.nix | 2 +- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 2 +- pkgs/tools/networking/p2p/libtorrent/git.nix | 4 ++-- pkgs/tools/networking/p2p/rtorrent/git.nix | 4 ++-- pkgs/tools/security/fprint_demo/default.nix | 2 +- 31 files changed, 38 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index b5436fde7e9..1db4515ae23 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }: stdenv.mkDerivation rec { - name = "dirt-git"; + name = "dirt-2015-04-28"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index fc7fc5ee3d0..2e9a37a2f0d 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { - name = "puremapping"; + name = "puremapping-1.01"; src = fetchurl { url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix index 79d19f45a25..2aad3b20e22 100644 --- a/pkgs/applications/misc/cortex/default.nix +++ b/pkgs/applications/misc/cortex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, python3 }: stdenv.mkDerivation { - name = "cortex"; + name = "cortex-2014-08-01"; src = fetchgit { url = "https://github.com/gglucas/cortex"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 3c5caeda789..6a1acca48d9 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "urxvt-perls"; + name = "urxvt-perls-2015-03-28"; src = fetchgit { url = "git://github.com/muennich/urxvt-perls"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index ba68a46cf0c..e924c3127ab 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "urxvt-tabbedex"; + name = "urxvt-tabbedex-2015-03-03"; src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 812f00829e2..a68e0ee1104 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "telegram-cli"; + name = "telegram-cli-2014-03-04"; src = fetchgit { url = "https://github.com/vysheng/tg.git"; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 32ceeb6fc8d..29dbd086a77 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker"; + name = "opentracker-2014-08-03"; src = fetchgit { url = "https://github.com/masroore/opentracker.git"; rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; @@ -21,4 +21,4 @@ stdenv.mkDerivation { platforms = platforms.linux; description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 3e10a1e4b54..6edc01041f2 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -1,7 +1,7 @@ { buildRubyGem, coreutils, fetchgit }: buildRubyGem { - name = "bundler-HEAD"; + name = "bundler-2015-01-11"; src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 510af3df824..481c80994e8 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "cppzmq"; + name = "cppzmq-2015-03-05"; src = fetchgit { url = "git://github.com/zeromq/cppzmq"; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 78932259841..754ab4233e5 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # No support yet for cg, cuda, glew, glut, openexr. - name = "nvidia-texture-tools"; + name = "nvidia-texture-tools-1388"; src = fetchsvn { url = "http://nvidia-texture-tools.googlecode.com/svn/trunk"; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 9ca3474ce3b..e503ade3ebc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -2,7 +2,7 @@ , git, xlibs, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { - name = "xcb-util-cursor-HEAD"; + name = "xcb-util-cursor-0.1.1-3-gf03cc27"; src = fetchgit { url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 4449766767c..b134a842c5c 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: stdenv.mkDerivation { - name = "ocaml-optcomp"; + name = "ocaml-optcomp-1.6"; src = fetchurl { url = https://github.com/diml/optcomp/archive/1.6.tar.gz; md5 = "d3587244dba1b8b10f24d0b60a8c700d"; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 71148755a75..8884021c3a3 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "bossa"; + name = "bossa-2014-08-18"; src = fetchgit { url = https://github.com/shumatech/BOSSA; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index e1a87f22538..479004a9af4 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv"; }; + broken = true; # Not found + buildInputs = [python pil pygame SDL]; configurePhase = '' diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 75e071a05ef..9cf70db471c 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,9 +1,9 @@ { stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: stdenv.mkDerivation rec { - name = "xwiimote"; + name = "xwiimote-2"; src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-2/xwiimote-2.tar.xz"; + url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz"; sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index a95f9ae8613..49dd8bebaed 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -2,7 +2,7 @@ , libXau, libXdmcp, xcbutil }: stdenv.mkDerivation { - name = "xss-lock-git"; + name = "xss-lock-git-2014-03-02"; src = fetchgit { url = https://bitbucket.org/raymonad/xss-lock.git; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b30e0f61b1b..7f0e345a2b0 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "android-udev-rules"; + name = "android-udev-rules-2015-02-28"; src = fetchgit { url = "git://github.com/M0Rf30/android-udev-rules"; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 11c1e7ee8a2..406492db236 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libX11 }: stdenv.mkDerivation { - name = "disk-indicator"; + name = "disk-indicator-2014-05-19"; src = fetchgit { url = git://github.com/MeanEYE/Disk-Indicator.git; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index fea188f8949..62fbecf27d1 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }: stdenv.mkDerivation { - name = "lightum"; + name = "lightum-2014-06-07"; src = fetchgit { url = https://github.com/poliva/lightum; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index ad77a7a1031..4491bb7bf93 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, xproto, xdotool, unzip }: stdenv.mkDerivation { - name = "seturgent"; + name = "seturgent-2012-08-17"; src = fetchurl { url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip"; @@ -24,4 +24,4 @@ stdenv.mkDerivation { homepage = https://github.com/hiltjo/seturgent; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index ebc0cffb3aa..afd2222918e 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,7 +4,7 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} { - name = "monetdb-may-2009"; + name = "monetdb-2009-05-01"; src = fetchurl { url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index d885a6ac902..c00efecc0b3 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { - name = "gvolicon"; + name = "gvolicon-2014-04-28"; src = fetchgit { url = "https://github.com/Unia/gvolicon"; rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167"; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index d6dcba32233..b0dfda6bfc7 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation rec { - name = "pa-applet"; + name = "pa-applet-2012-04-11"; src = fetchgit { url = "git://github.com/fernandotcl/pa-applet.git"; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index d7964c0961c..f65a151905c 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: stdenv.mkDerivation rec { - name = "pnmixer"; + name = "pnmixer-2014-07-24"; src = fetchgit { url = "git://github.com/nicklan/pnmixer.git"; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index de7ee27d704..552fa0c763d 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { rev = "4e2fa32816254907e82886b936afcae9859a876c"; sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; }; - buildInputs = [openssl]; + buildInputs = [ openssl ]; + broken = true; # No such repo installPhase = '' mkdir -p $out/bin cp vfdecrypt $out/bin diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index 0032eb24c97..d0f35844695 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { - name = "xflux"; + name = "xflux-2013-09-01"; src = fetchurl { url = https://justgetflux.com/linux/xflux64.tgz; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index 88d75ba570e..4f0b68ce4be 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation { - name = "curl-unix-socket"; + name = "curl-unix-socket-2014-09-01"; src = fetchFromGitHub { owner = "Soulou"; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index d6f67d065d9..de04c1419e2 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, makeWrapper, openresolv, coreutils }: stdenv.mkDerivation rec { - name = "update-resolv-conf"; + name = "update-resolv-conf-2014-10-03"; src = fetchgit { url = https://github.com/masterkorp/openvpn-update-resolv-conf/; diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix index 9a46740de51..e187a96dc0a 100644 --- a/pkgs/tools/networking/p2p/libtorrent/git.nix +++ b/pkgs/tools/networking/p2p/libtorrent/git.nix @@ -1,7 +1,7 @@ { stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: stdenv.mkDerivation { - name = "libtorrent-git"; + name = "libtorrent-git-2014-08-20"; src = fetchFromGitHub rec { owner = "rakshasa"; @@ -25,4 +25,4 @@ stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix index 6320a75f726..dcdd2e68e15 100644 --- a/pkgs/tools/networking/p2p/rtorrent/git.nix +++ b/pkgs/tools/networking/p2p/rtorrent/git.nix @@ -9,7 +9,7 @@ # https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc stdenv.mkDerivation { - name = "rtorrent-git"; + name = "rtorrent-git-2014-07-02"; src = fetchFromGitHub { owner = "rakshasa"; @@ -60,4 +60,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ codyopel ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix index 20413ca626c..282c3541dde 100644 --- a/pkgs/tools/security/fprint_demo/default.nix +++ b/pkgs/tools/security/fprint_demo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }: stdenv.mkDerivation rec { - name = "fprint_demo"; + name = "fprint_demo-2008-03-03"; src = fetchgit { url = "git://github.com/dsd/fprint_demo"; From fdc1887a6ea15685ae725f5c8a33e1f699d98294 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 00:14:58 +0200 Subject: [PATCH 186/208] doc: add user's guide for the Haskell infrastructure Resolves https://github.com/NixOS/nixpkgs/issues/4941. --- doc/haskell-users-guide.xml | 757 ++++++++++++++++++++++++++++++++++++ doc/manual.xml | 1 + 2 files changed, 758 insertions(+) create mode 100644 doc/haskell-users-guide.xml diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml new file mode 100644 index 00000000000..ca6c387e8df --- /dev/null +++ b/doc/haskell-users-guide.xml @@ -0,0 +1,757 @@ + + +User's Guide to the Haskell Infrastructure + +
+ How to install Haskell packages + + Nixpkgs distributes build instructions for all Haskell packages + registered on + Hackage, but + strangely enough normal Nix package lookups don't seem to discover + any of them: + + +$ nix-env -qa cabal-install +error: selector ‘cabal-install’ matches no derivations + +$ nix-env -i ghc +error: selector ‘ghc’ matches no derivations + + + The Haskell package set is not registered in the top-level namespace + because it is huge. If all Haskell packages + were visible to these commands, then name-based search/install + operations would be much slower than they are now. We avoided that + by keeping all Haskell-related packages in a separate attribute set + called haskellPackages, which the following + command will list: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskellPackages +haskellPackages.a50 a50-0.5 +haskellPackages.abacate haskell-abacate-0.0.0.0 +haskellPackages.abcBridge haskell-abcBridge-0.12 +haskellPackages.afv afv-0.1.1 +haskellPackages.alex alex-3.1.4 +haskellPackages.Allure Allure-0.4.101.1 +haskellPackages.alms alms-0.6.7 +[... some 8000 entries omitted ...] + + + To install any of those packages into your profile, refer to them by + their attribute path (first column): + + +$ nix-env -f "<nixpkgs>" -iA haskellPackages.Allure ... + + + The attribute path of any Haskell packages corresponds to the name + of that particular package on Hackage: the package + cabal-install has the attribute + haskellPackages.cabal-install, and so on. + (Actually, this convention causes trouble with packages like + 3dmodels and 4Blocks, because + these names are invalid identifiers in the Nix language. The issue + of how to deal with these rare corner cases is currently + unresolved.) + + + Haskell packages who's Nix name (second column) begins with a + haskell- prefix are packages that provide a + library whereas packages without that prefix provide just + executables. Libraries may provide executables too, though: the + package haskell-pandoc, for example, installs + both a library and an application. You can install and use Haskell + executables just like any other program in Nixpkgs, but using + Haskell libraries for development is a bit trickier and we'll + address that subject in great detail in section + How to + create a development environment. + + + Attribute paths are deterministic inside of Nixpkgs, but the path + necessary to reach Nixpkgs varies from system to system. We dodged + that problem by giving nix-env an explicit + -f "<nixpkgs>" parameter, but if + you call nix-env without that flag, then chances + are the invocation fails: + + +$ nix-env -iA haskellPackages.cabal-install +error: attribute ‘haskellPackages’ in selection path + ‘haskellPackages.cabal-install’ not found + + + On NixOS, for example, Nixpkgs does not exist + in the top-level namespace by default. To figure out the proper + attribute path, it's easiest to query for the path of a well-known + Nixpkgs package, i.e.: + + +$ nix-env -qaP coreutils +nixos.pkgs.coreutils coreutils-8.23 + + + If your system responds like that (most NixOS installatios will), + then the attribute path to haskellPackages is + nixos.pkgs.haskellPackages. Thus, if you want to + use nix-env without giving an explicit + -f flag, then that's the way to do it: + + +$ nix-env -qaP -A nixos.pkgs.haskellPackages +$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install + + + Our current default compiler is GHC 7.10.x and the + haskellPackages set contains packages built with + that particular version. Nixpkgs contains the latest major release + of every GHC since 6.10.4, however, and there is a whole family of + package sets available that defines Hackage packages built with each + of those compilers, too: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc6123 +$ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc763 + + + The name haskellPackages is really just a synonym + for haskell.packages.ghc7101, because we prefer + that package set internally and recommend it to our users as their + default choice, but ultimately you are free to compile your Haskell + packages with any GHC version you please. The following command + displays the complete list of available compilers: + + +$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler +haskell.compiler.ghc6104 ghc-6.10.4 +haskell.compiler.ghc6123 ghc-6.12.3 +haskell.compiler.ghc704 ghc-7.0.4 +haskell.compiler.ghc722 ghc-7.2.2 +haskell.compiler.ghc742 ghc-7.4.2 +haskell.compiler.ghc763 ghc-7.6.3 +haskell.compiler.ghc784 ghc-7.8.4 +haskell.compiler.ghc7101 ghc-7.10.1 +haskell.compiler.ghcHEAD ghc-7.11.20150402 +haskell.compiler.ghcjs ghcjs-0.1.0 +haskell.compiler.jhc jhc-0.8.2 +haskell.compiler.uhc uhc-1.1.9.0 + + + We have no package sets for jhc or + uhc yet, unfortunately, but for every version of + GHC listed above, there exists a package set based on that compiler. + Also, the attributes haskell.compiler.ghcXYC and + haskell.packages.ghcXYC.ghc are synonymous for + the sake of convenience. + +
+
+ How to create a development environment +
+ How to install a compiler + + A simple development environment consists of a Haskell compiler + and the tool cabal-install, and we saw in + section How to + install Haskell packages how you can install those programs + into your user profile: + + +$ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install + + + Instead of the default package set + haskellPackages, you can also use the more + precise name haskell.compiler.ghc7101, which + has the advantage that it refers to the same GHC version + regardless of what Nixpkgs considers "default" at any + given time. + + + Once you've made those tools available in + $PATH, it's possible to build Hackage packages + the same way people without access to Nix do it all the time: + + +$ cabal get lens-4.11 && cd lens-4.11 +$ cabal install -j --dependencies-only +$ cabal configure +$ cabal build + + + If you enjoy working with Cabal sandboxes, then that's entirely + possible too: just execute the command + + +$ cabal sandbox init + + + before installing the required dependencies. + + + The nix-shell utility makes it easy to switch + to a different compiler version; just enter the Nix shell + environment with the command + + +$ nix-shell -p haskell.compiler.ghc784 + + + to bring GHC 7.8.4 into $PATH. Re-running + cabal configure switches your build to use that + compiler instead. If you're working on a project that doesn't + depend on any additional system libraries outside of GHC, then + it's sufficient even to run the cabal configure + command inside of the shell: + + +$ nix-shell -p haskell.compiler.ghc784 --command "cabal configure" + + + Afterwards, all other commands like cabal build + work just fine in any shell environment, because the configure + phase recorded the absolute paths to all required tools like GHC + in its build configuration inside of the dist/ + directory. Please note, however, that + nix-collect-garbage can break such an + environment because the Nix store paths created by + nix-shell aren't "alive" anymore once + nix-shell has terminated. If you find that your + Haskell builds no longer work after garbage collection, then + you'll have to re-run cabal configure inside of + a new nix-shell environment. + +
+
+ How to install a compiler with libraries + + GHC expects to find all installed libraries inside of its own + lib directory. This approach works fine on + traditional Unix systems, but it doesn't work for Nix, because + GHC's store path is immutable once it's built. We cannot install + additional libraries into that location. As a consequence, our + copies of GHC don't know any packages except their own core + libraries, like base, + containers, Cabal, etc. + + + We can register additional libraries to GHC, however, using a + special build function called ghcWithPackages. + That function expects one argument: a function that maps from an + attribute set of Haskell packages to a list of packages, which + determines the libraries known to that particular version of GHC. + For example, the Nix expression + ghcWithPackages (pkgs: [pkgs.mtl]) generates a + copy of GHC that has the mtl library registered + in addition to its normal core packages: + + +$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" + +[nix-shell:~]$ ghc-pkg list mtl +/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d: + mtl-2.2.1 + + + This function allows users to define their own development + environment by means of an override. After adding the following + snippet to ~/.nixpkgs/config.nix, + + +{ + packageOverrides = super: let self = super.pkgs; in + { + myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages + (haskellPackages: with haskellPackages; [ + # libraries + arrows async cgi criterion + # tools + cabal-install haskintex + ]); + }; +} + + + it's possible to install that compiler with + nix-env -f "<nixpkgs>" -iA myHaskellEnv. + If you'd like to switch that development environment to a + different version of GHC, just replace the + ghc7101 bit in the previous definition with the + appropriate name. Of course, it's also possible to define any + number of these development environments! (You can't install two + of them into the same profile at the same time, though, because + that would result in file conflicts.) + + + The generated ghc program is a wrapper script + that re-directs the real GHC executable to use a new + lib directory --- one that we specifically + constructed to contain all those packages the user requested: + + +$ cat $(type -p ghc) +#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e +export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc +export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg +export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html +export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1 +exec /nix/store/j50p...-ghc-7.10.1/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" + + + The variables $NIX_GHC, + $NIX_GHCPKG, etc. point to the + new store path + ghcWithPackages constructed specifically for + this environment. The last line of the wrapper script then + executes the real ghc, but passes the path to + the new lib directory using GHC's + -B flag. + + + The purpose of those environment variables is to work around an + impurity in the popular + ghc-paths + library. That library promises to give its users access to GHC's + installation paths. Only, the library can't possible know that + path when it's compiled, because the path GHC considers its own is + determined only much later, when the user configures it through + ghcWithPackages. So we + patched + ghc-paths to return the paths found in those environment + variables at run-time rather than trying to guess them at + compile-time. + + + To make sure that mechanism works properly all the time, we + recommend that you set those variables to meaningful values in + your shell environment, too, i.e. by adding the following code to + your ~/.bashrc: + + +if type >/dev/null 2>&1 -p ghc; then + eval "$(egrep ^export "$(type -p ghc)")" +fi + + + If you are certain that you'll use only one GHC environment which + is located in your user profile, then you can use the following + code, too, which has the advantage that it doesn't contain any + paths from the Nix store, i.e. those settings always remain valid + even if a nix-env -u operation updates the GHC + environment in your profile: + + +if [ -e ~/.nix-profile/bin/ghc ]; then + export NIX_GHC="$HOME/.nix-profile/bin/ghc" + export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" + export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" + export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" +fi + +
+
+ How to create ad hoc environments for + <literal>nix-shell</literal> + + The easiest way to create an ad hoc development environment is to + run nix-shell with the appropriate GHC + environment given on the command-line: + + +nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" + + + For more sophisticated use-cases, however, it's more convenient to + save the desired configuration in a file called + shell.nix that looks like this: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +let + inherit (nixpkgs) pkgs; + ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ + monad-par mtl + ]); +in +pkgs.stdenv.mkDerivation { + name = "my-haskell-env-0"; + buildInputs = [ ghc ]; + shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; +} + + + Now run nix-shell --- or even + nix-shell --pure --- to enter a shell + environment that has the appropriate compiler in + $PATH. If you use --pure, + then add all other packages that your development environment + needs into the buildInputs attribute. If you'd + like to switch to a different compiler version, then pass an + appropriate compiler argument to the + expression, i.e. + nix-shell --argstr compiler ghc784. + + + If you need such an environment because you'd like to compile a + Hackage package outside of Nix --- i.e. because you're hacking on + the latest version from Git ---, then the package set provides + suitable nix-shell environments for you already! Every Haskell + package has an env attribute that provides a + shell environment suitable for compiling that particular package. + If you'd like to hack the lens library, for + example, then you just have to check out the source code and enter + the appropriate environment: + + + $ cabal get lens-4.11 && cd lens-4.11 + Downloading lens-4.11... + Unpacking to lens-4.11/ + + $ nix-shell "<nixpkgs>" -A haskellPackages.lens.env + [nix-shell:/tmp/lens-4.11]$ + + + At point, you can run cabal configure, + cabal build, and all the other development + commands. Note that you need cabal-install + installed in your $PATH already to use it here + --- the nix-shell environment does not provide + it. + +
+
+
+ How to create Nix builds for your own private Haskell + packages + + If your own Haskell packages have build instructions for Cabal, then + you can convert those automatically into build instructions for Nix + using the cabal2nix utility, which you can + install into your profile by running + nix-env -i cabal2nix. + +
+ How to build a stand-alone project + + For example, let's assume that you're working on a private project + called foo. To generate a Nix build expression + for it, change into the project's top-level directory and run the + command: + + +$ cabal2nix . >foo.nix + + + Then write the following snippet into a file called + default.nix: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } + + + Finally, store the following code in a file called + shell.nix: + + +{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }: +(import ./default.nix { inherit nixpkgs compiler; }).env + + + At this point, you can run nix-build to have + Nix compile your project and install it into a Nix store path. The + local directory will contain a symlink called + result after nix-build + returns that points into that location. Of course, passing the + flag --argstr compiler ghc763 allows switching + the build to any version of GHC currently supported. + + + Furthermore, you can call nix-shell to enter an + interactive development environment in which you can use + cabal configure and + cabal build to develop your code. That + environment will automatically contain a proper GHC derivation + with all the required libraries registered as well as all the + system-level libraries your package might need. + + + If your package does not depend on any system-level libraries, + then it's sufficient to run + + +$ nix-shell --command "cabal configure" + + + once to set up your build. cabal-install + determines the absolute paths to all resources required for the + build and writes them into a config file in the + dist/ directory. Once that's done, you can run + cabal build and any other command for that + project even outside of the nix-shell + environment. This feature is particularly nice for those of us who + like to edit their code with an IDE, like Emacs' + haskell-mode, because it's not necessary to + start Emacs inside of nix-shell just to make it find out the + necessary settings for building the project; + cabal-install has already done that for us. + + + If you want to do some quick-and-dirty hacking and don't want to + bother setting up a default.nix and + shell.nix file manually, then you can use the + --shell flag offered by + cabal2nix to have it generate a stand-alone + nix-shell environment for you. With that + feature, running + + +$ cabal2nix --shell . >shell.nix +$ nix-shell --command "cabal configure" + + + is usually enough to set up a build environment for any given + Haskell package. You can even use that generated file to run + nix-build, too: + + +$ nix-build shell.nix + +
+
+ How to build projects that depend on each other + + If you have multiple private Haskell packages that depend on each + other, then you'll have to register those packages in the Nixpkgs + set to make them visible for the dependency resolution performed + by callPackage. First of all, change into each + of your projects top-level directories and generate a + default.nix file with + cabal2nix: + + +$ cd ~/src/foo && cabal2nix . >default.nix +$ cd ~/src/bar && cabal2nix . >default.nix + + + Then edit your ~/.nixpkgs/config.nix file to + register those builds in the default Haskell package set: + + + { + packageOverrides = super: let self = super.pkgs; in + { + haskellPackages = super.haskellPackages.override { + overrides = self: super: { + foo = self.callPackage ../src/foo {}; + bar = self.callPackage ../src/bar {}; + }; + }; + }; + } + + + Once that's accomplished, + nix-env -f "<nixpkgs>" -qA haskellPackages + will show your packages like any other package from Hackage, and + you can build them + + +$ nix-build "<nixpkgs>" -A haskellPackages.foo + + + or enter an interactive shell environment suitable for building + them: + + +$ nix-shell "<nixpkgs>" -A haskellPackages.bar.env + +
+
+
+ Miscellaneous Topics +
+ How to build with profiling enabled + + Every Haskell package set takes a function called + overrides that you can use to manipulate the + package as much as you please. One useful application of this + feature is to replace the default mkDerivation + function with one that enables library profiling for all packages. + To accomplish that, add configure the following snippet in your + ~/.nixpkgs/config.nix file: + + +{ + packageOverrides = super: let self = super.pkgs; in + { + profiledHaskellPackages = self.haskellPackages.override { + overrides = self: super: { + mkDerivation = args: super.mkDerivation (args // { + enableLibraryProfiling = true; + }); + }; + }; + }; +} + +
+
+ How to override package versions in a compiler-specific + package set + + Nixpkgs provides the latest version of + ghc-events, + which is 0.4.4.0 at the time of this writing. This is fine for + users of GHC 7.10.x, but GHC 7.8.4 cannot compile that binary. + Now, one way to solve that problem is to register an older version + of ghc-events in the 7.8.x-specific package + set. The first step is to generate Nix build instructions with + cabal2nix: + + +$ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + + + Then add the override in ~/.nixpkgs/config.nix: + + +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; + }; + }; + }; + }; +} + + + This code is a little crazy, no doubt, but it's necessary because + the intuitive version + + +haskell.packages.ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; + }; +}; + + + doesn't do what we want it to: that code replaces the + haskell package set in Nixpkgs with one that + contains only one entry,packages, which + contains only one entry ghc784. This override + loses the haskell.compiler set, and it loses + the haskell.packages.ghcXYZ sets for all + compilers but GHC 7.8.4. To avoid that problem, we have to perform + the convoluted little dance from above, iterating over each step + in hierarchy. + + + Once it's accomplished, however, we can install a variant of + ghc-events that's compiled with GHC 7.8.4: + + +nix-env -f "<nixpkgs>" -iA haskell.packages.ghc784.ghc-events + + + Unfortunately, it turns out that this build fails again while + executing the test suite! Apparently, the release archive on + Hackage is missing some data files that the test suite requires, + so we cannot run it. We accomplish that by re-generating the Nix + expression with the --no-check flag: + + +$ cabal2nix --no-check cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix + + + Now the builds succeeds. + + + Of course, in the concrete example of + ghc-events this whole exercise is not an ideal + solution, because ghc-events can analyze the + output emitted by any version of GHC later than 6.12 regardless of + the compiler version that was used to build the `ghc-events' + executable, so strictly speaking there's no reason to prefer one + built with GHC 7.8.x in the first place. However, for users who + cannot use GHC 7.10.x at all for some reason, the approach of + downgrading to an older version might be useful. + +
+
+ How to recover from GHC's infamous non-deterministic library + ID bug + + GHC and distributed build farms don't get along well: + + +https://ghc.haskell.org/trac/ghc/ticket/4012 + + + When you see an error like this one + + +package foo-0.7.1.0 is broken due to missing package +text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 + + + then you have to download and re-install foo + and all its dependents from scratch: + + +# nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ + | nix-store --repair-path --option binary-caches http://hydra.nixos.org + + + If you're using additional Hydra servers other than + hydra.nixos.org, then it might be necessary to + purge the local caches that store data from those machines to + disable these binary channels for the duration of the previous + command, i.e. by running: + + +rm /nix/var/nix/binary-cache-v3.sqlite +rm /nix/var/nix/manifests/* +rm /nix/var/nix/channel-cache/* + +
+
+ Builds on Darwin fail with <literal>math.h</literal> not + found + + Users of GHC on Darwin have occasionally reported that builds + fail, because the compiler complains about a missing include file: + + +fatal error: 'math.h' file not found + + + The issue has been discussed at length in + ticket + 6390, and so far no good solution has been proposed. As a + work-around, users who run into this problem can configure the + environment variables + + +export NIX_CFLAGS_COMPILE="-idirafter /usr/include" +export NIX_CFLAGS_LINK="-L/usr/lib" + + + in their ~/.bashrc file to avoid the compiler + error. + +
+
+ + diff --git a/doc/manual.xml b/doc/manual.xml index 1b713b0c30c..a6400c98d6e 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,5 +18,6 @@ + From 8908471ecc1694fd09fa91bf18e88342986e3707 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 18:45:17 +0200 Subject: [PATCH 187/208] cygwin: add needed patches for boost 1.57.0 to build --- pkgs/development/libraries/boost/1.57.nix | 32 +- .../boost/cygwin-1.40.0-cstdint-cygwin.patch | 20 + .../cygwin-1.40.0-iostreams-cygwin.patch | 24 + .../boost/cygwin-1.40.0-python-cygwin.patch | 35 + .../boost/cygwin-1.40.0-regex-cygwin.patch | 15 + .../boost/cygwin-1.45.0-jam-cygwin.patch | 12 + .../boost/cygwin-1.50.0-jam-pep3149.patch | 11 + .../boost/cygwin-1.55.0-asio-MSG_EOR.patch | 14 + .../cygwin-1.55.0-interlocked-cygwin.patch | 11 + .../boost/cygwin-1.57.0-asio-cygwin.patch | 1835 +++++++++++++++++ .../boost/cygwin-1.57.0-config-cygwin.patch | 76 + .../boost/cygwin-1.57.0-context-cygwin.patch | 600 ++++++ .../cygwin-1.57.0-filesystem-cygwin.patch | 32 + .../boost/cygwin-1.57.0-locale-cygwin.patch | 81 + .../boost/cygwin-1.57.0-log-cygwin.patch | 46 + .../cygwin-1.57.0-smart_ptr-cygwin.patch | 77 + .../boost/cygwin-1.57.0-system-cygwin.patch | 22 + ...dora-boost-1.50.0-fix-non-utf8-files.patch | 22 + .../cygwin-fedora-boost-1.50.0-pool.patch | 122 ++ ...a-boost-1.54.0-locale-unused_typedef.patch | 11 + ...-boost-1.54.0-pool-max_chunks_shadow.patch | 14 + ...a-boost-1.54.0-python-unused_typedef.patch | 15 + ...in-fedora-boost-1.57.0-move-is_class.patch | 20 + ...cygwin-fedora-boost-1.57.0-mpl-print.patch | 31 + ...edora-boost-1.57.0-pool-test_linking.patch | 33 + ...edora-boost-1.57.0-signals2-weak_ptr.patch | 10 + ...a-boost-1.57.0-spirit-unused_typedef.patch | 19 + ...-fedora-boost-1.57.0-uuid-comparison.patch | 11 + 28 files changed, 3250 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix index 6393c6e0d30..906f796b032 100644 --- a/pkgs/development/libraries/boost/1.57.nix +++ b/pkgs/development/libraries/boost/1.57.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.57.0"; @@ -7,4 +7,34 @@ callPackage ./generic.nix (args // rec { url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2"; sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i"; }; + + patches = if stdenv.isCygwin then [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ] else null; }) diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch new file mode 100644 index 00000000000..61791c60d9e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch @@ -0,0 +1,20 @@ +These were fixed in ~1.7.0-46 + +--- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600 ++++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500 +@@ -40,15 +40,6 @@ + # include + # else + # include +- +-// There is a bug in Cygwin two _C macros +-# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) +-# undef INTMAX_C +-# undef UINTMAX_C +-# define INTMAX_C(c) c##LL +-# define UINTMAX_C(c) c##ULL +-# endif +- + # endif + + #ifdef __QNX__ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch new file mode 100644 index 00000000000..6641ba823b1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch @@ -0,0 +1,24 @@ +--- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500 ++++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500 +@@ -44,8 +44,7 @@ + //------------------Locale support--------------------------------------------// + + #ifndef BOOST_IOSTREAMS_NO_LOCALE +-# if defined(BOOST_NO_STD_LOCALE) || \ +- defined(__CYGWIN__) && \ ++# if defined(BOOST_NO_STD_LOCALE) && \ + ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \ + /**/ + # define BOOST_IOSTREAMS_NO_LOCALE +--- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500 ++++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500 +@@ -13,8 +13,7 @@ + + // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use. + #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX ) +-# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ +- !defined(__CYGWIN__) \ ++# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) + /**/ + # define BOOST_IOSTREAMS_WINDOWS + # else diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch new file mode 100644 index 00000000000..7932b0e124b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch @@ -0,0 +1,35 @@ +--- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600 ++++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500 +@@ -83,7 +83,7 @@ + # endif + # define BOOST_PYTHON_DECL_FORWARD + # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) +-# elif (defined(_WIN32) || defined(__CYGWIN__)) ++# elif defined(_WIN32) + # if defined(BOOST_PYTHON_SOURCE) + # define BOOST_PYTHON_DECL __declspec(dllexport) + # define BOOST_PYTHON_BUILD_DLL +--- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500 ++++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500 +@@ -82,8 +82,8 @@ + // Some things we need in order to get Python.h to work with compilers other + // than MSVC on Win32 + // +-#if defined(_WIN32) || defined(__CYGWIN__) +-# if defined(__GNUC__) && defined(__CYGWIN__) ++#if defined(_WIN32) ++# if defined(__GNUC__) + + # define SIZEOF_LONG 4 + +--- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500 ++++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500 +@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char + + }}} + +-# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE) ++# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE) + + # define BOOST_PYTHON_MODULE_INIT(name) \ + void init_module_##name(); \ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch new file mode 100644 index 00000000000..969bb814bd1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch @@ -0,0 +1,15 @@ +--- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600 ++++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500 +@@ -28,11 +28,7 @@ + + #ifndef BOOST_REGEX_NO_FILEITER + +-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32) +-#error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" +-#define BOOST_REGEX_FI_WIN32_MAP +-#define BOOST_REGEX_FI_POSIX_DIR +-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) ++#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) + #define BOOST_REGEX_FI_WIN32_MAP + #define BOOST_REGEX_FI_WIN32_DIR + #else diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch new file mode 100644 index 00000000000..1a00851fa92 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch @@ -0,0 +1,12 @@ +OS_CYGWIN is used to assume cygpath, Win32-isms + +--- boost_1_48_0/tools/build/src/engine/jam.h ++++ boost_1_48_0/tools/build/src/engine/jam.h +@@ -245,7 +245,6 @@ + #endif + #if defined(__cygwin__) || defined(__CYGWIN__) + #define OSMINOR "OS=CYGWIN" +- #define OS_CYGWIN + #endif + #if defined(__FreeBSD__) && !defined(__DragonFly__) + #define OSMINOR "OS=FREEBSD" diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch new file mode 100644 index 00000000000..4bc6ec9d36e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch @@ -0,0 +1,11 @@ +--- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500 ++++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600 +@@ -376,7 +376,7 @@ local rule path-to-native ( paths * ) + # + local rule split-version ( version ) + { +- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ; ++ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ; + if ! $(major-minor[2]) || $(major-minor[3]) + { + ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch new file mode 100644 index 00000000000..46308a59cb0 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch @@ -0,0 +1,14 @@ +--- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500 ++++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500 +@@ -332,7 +332,11 @@ typedef int signed_size_type; + # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB + # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK + # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE ++#ifdef MSG_EOR + # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR ++#else ++# define BOOST_ASIO_OS_DEF_MSG_EOR 0 ++#endif + # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD + # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR + # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch new file mode 100644 index 00000000000..df3edf51e7b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch @@ -0,0 +1,11 @@ +--- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500 ++++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500 +@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc + ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange))) + # endif + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport) + diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch new file mode 100644 index 00000000000..3702d475c8e --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch @@ -0,0 +1,1835 @@ +--- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500 +@@ -42,7 +42,7 @@ protected: + BOOST_ASIO_DECL static void init_native_buffer( + native_buffer_type& buf, + const boost::asio::const_buffer& buffer); +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + // The maximum number of buffers to support in a single operation. + enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; + +@@ -61,7 +61,7 @@ protected: + buf.buf = const_cast(boost::asio::buffer_cast(buffer)); + buf.len = static_cast(boost::asio::buffer_size(buffer)); + } +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + // The maximum number of buffers to support in a single operation. + enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; + +@@ -92,7 +92,7 @@ protected: + boost::asio::buffer_cast(buffer))); + iov.iov_len = boost::asio::buffer_size(buffer); + } +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + }; + + // Helper class to translate buffers into the native buffer representation. +--- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500 +@@ -474,7 +474,7 @@ + #endif // !defined(BOOST_ASIO_WINDOWS) + + // Windows: target OS version. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) + # if defined(_MSC_VER) || defined(__BORLANDC__) + # pragma message( \ +@@ -512,29 +512,29 @@ + # error You must add -D__USE_W32_SOCKETS to your compiler options. + # endif // !defined(__USE_W32_SOCKETS) + # endif // defined(__CYGWIN__) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: minimise header inclusion. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) + # if !defined(WIN32_LEAN_AND_MEAN) + # define WIN32_LEAN_AND_MEAN + # endif // !defined(WIN32_LEAN_AND_MEAN) + # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: suppress definition of "min" and "max" macros. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if !defined(BOOST_ASIO_NO_NOMINMAX) + # if !defined(NOMINMAX) + # define NOMINMAX 1 + # endif // !defined(NOMINMAX) + # endif // !defined(BOOST_ASIO_NO_NOMINMAX) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Windows: IO Completion Ports. + #if !defined(BOOST_ASIO_HAS_IOCP) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) + # if !defined(UNDER_CE) + # if !defined(BOOST_ASIO_DISABLE_IOCP) +@@ -542,7 +542,7 @@ + # endif // !defined(BOOST_ASIO_DISABLE_IOCP) + # endif // !defined(UNDER_CE) + # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + #endif // !defined(BOOST_ASIO_HAS_IOCP) + + // Linux: epoll, eventfd and timerfd. +@@ -599,8 +599,7 @@ + #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) + # if defined(BOOST_ASIO_HAS_IOCP) \ + || !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # if !defined(__SYMBIAN32__) + # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) + # define BOOST_ASIO_HAS_SERIAL_PORT 1 +@@ -609,7 +608,6 @@ + # endif // defined(BOOST_ASIO_HAS_IOCP) + // || !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT) + + // Windows: stream handles. +@@ -633,11 +631,11 @@ + // Windows: object handles. + #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) + # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if !defined(UNDER_CE) + # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 + # endif // !defined(UNDER_CE) +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) + #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) + +@@ -654,12 +652,10 @@ + #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) + # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) + #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) + +@@ -667,12 +663,10 @@ + #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) + # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) + #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) + +@@ -680,12 +674,10 @@ + #if !defined(BOOST_ASIO_HAS_SIGACTION) + # if !defined(BOOST_ASIO_DISABLE_SIGACTION) + # if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + # define BOOST_ASIO_HAS_SIGACTION 1 + # endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION) + #endif // !defined(BOOST_ASIO_HAS_SIGACTION) + +@@ -700,7 +692,7 @@ + + // Can use getaddrinfo() and getnameinfo(). + #if !defined(BOOST_ASIO_HAS_GETADDRINFO) +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) + # define BOOST_ASIO_HAS_GETADDRINFO 1 + # elif defined(UNDER_CE) +--- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d, + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP +--- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -116,6 +116,6 @@ private: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP +--- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -116,6 +116,6 @@ private: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP +--- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500 +@@ -26,7 +26,7 @@ namespace boost { + namespace asio { + namespace detail { + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef win_fd_set_adapter fd_set_adapter; + #else + typedef posix_fd_set_adapter fd_set_adapter; +--- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500 +@@ -21,9 +21,9 @@ + #include + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # include +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( + + (reinterpret_cast(p) >> 3); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + inline std::size_t calculate_hash_value(SOCKET s) + { + return static_cast(s); + } +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Note: assumes K and V are POD types. + template +--- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500 +@@ -21,8 +21,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + +@@ -448,6 +447,5 @@ int poll_write(int d, state_type state, + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP +--- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500 +@@ -19,7 +19,6 @@ + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + #if !defined(BOOST_ASIO_WINDOWS) +-#if !defined(__CYGWIN__) + #if !defined(__SYMBIAN32__) + #if !defined(BOOST_ASIO_HAS_EVENTFD) + +@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset() + + #endif // !defined(BOOST_ASIO_HAS_EVENTFD) + #endif // !defined(__SYMBIAN32__) +-#endif // !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_WINDOWS) + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +--- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_ + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP +--- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500 +@@ -19,7 +19,7 @@ + #include + + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) + + #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP +--- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500 +@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_ + max_fd = fd_sets_[i].max_descriptor(); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Connection operations on Windows use both except and write fd_sets. + have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty(); + fd_sets_[write_op].set(op_queue_[connect_op], ops); +@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_ + fd_sets_[except_op].set(op_queue_[connect_op], ops); + if (fd_sets_[except_op].max_descriptor() > max_fd) + max_fd = fd_sets_[except_op].max_descriptor(); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // We can return immediately if there's no work to do and the reactor is + // not supposed to block. +@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_ + // Dispatch all ready operations. + if (retval > 0) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Connection operations on Windows use both except and write fd_sets. + fd_sets_[except_op].perform(op_queue_[connect_op], ops); + fd_sets_[write_op].perform(op_queue_[connect_op], ops); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Exception operations must be processed first to ensure that any + // out-of-band data is read before normal data. +--- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500 +@@ -60,12 +60,10 @@ signal_state* get_signal_state() + void boost_asio_signal_handler(int signal_number) + { + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) ++ || defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_set_service::deliver_signal(signal_number); + #else // defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + int saved_errno = errno; + signal_state* state = get_signal_state(); + signed_size_type result = ::write(state->write_descriptor_, +@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa + errno = saved_errno; + #endif // defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + + #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) + ::signal(signal_number, boost_asio_signal_handler); +@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa + } + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + class signal_set_service::pipe_read_op : public reactor_op + { + public: +@@ -115,30 +111,25 @@ public: + }; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + signal_set_service::signal_set_service( + boost::asio::io_service& io_service) + : io_service_(boost::asio::use_service(io_service)), + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + reactor_(boost::asio::use_service(io_service)), + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + next_(0), + prev_(0) + { + get_signal_state()->mutex_.init(); + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + reactor_.init_task(); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + for (int i = 0; i < max_signal_number; ++i) + registrations_[i] = 0; +@@ -174,8 +165,7 @@ void signal_set_service::fork_service( + boost::asio::io_service::fork_event fork_ev) + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + static_mutex::scoped_lock lock(state->mutex_); + +@@ -217,11 +207,9 @@ void signal_set_service::fork_service( + } + #else // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + (void)fork_ev; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::construct( +@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser + if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + delete new_registration; + return ec; + } +@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser + if (::signal(signal_number, SIG_DFL) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + return ec; + } + } +@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser + if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) + # endif // defined(BOOST_ASIO_HAS_SIGACTION) + { +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + ec = boost::asio::error::invalid_argument; +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(errno, + boost::asio::error::get_system_category()); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + return ec; + } + } +@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig + signal_state* state = get_signal_state(); + static_mutex::scoped_lock lock(state->mutex_); + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // If this is the first service to be created, open a new pipe. + if (state->service_list_ == 0) + open_descriptors(); +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + // Insert service into linked list of all services. + service->next_ = state->service_list_; +@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig + state->service_list_ = service; + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Register for pipe readiness notifications. + int read_descriptor = state->read_descriptor_; + lock.unlock(); +@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig + read_descriptor, service->reactor_data_, new pipe_read_op); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::remove_service(signal_set_service* service) +@@ -534,8 +520,7 @@ void signal_set_service::remove_service( + if (service->next_ || service->prev_ || state->service_list_ == service) + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Disable the pipe readiness notifications. + int read_descriptor = state->read_descriptor_; + lock.unlock(); +@@ -544,7 +529,6 @@ void signal_set_service::remove_service( + lock.lock(); + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + // Remove service from linked list of all services. + if (state->service_list_ == service) +@@ -556,19 +540,18 @@ void signal_set_service::remove_service( + service->next_ = 0; + service->prev_ = 0; + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // If this is the last service to be removed, close the pipe. + if (state->service_list_ == 0) + close_descriptors(); +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + } + } + + void signal_set_service::open_descriptors() + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + + int pipe_fds[2]; +@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor + } + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::close_descriptors() + { + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + signal_state* state = get_signal_state(); + + if (state->read_descriptor_ != -1) +@@ -612,7 +593,6 @@ void signal_set_service::close_descripto + state->write_descriptor_ = -1; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + } + + void signal_set_service::start_wait_op( +--- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 +@@ -33,12 +33,12 @@ + # include + #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ ++#if defined(BOOST_ASIO_WINDOWS) \ + || defined(__MACH__) && defined(__APPLE__) + # if defined(BOOST_ASIO_HAS_PTHREADS) + # include + # endif // defined(BOOST_ASIO_HAS_PTHREADS) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + // || defined(__MACH__) && defined(__APPLE__) + + #include +@@ -50,9 +50,9 @@ namespace socket_ops { + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + struct msghdr { int msg_namelen; }; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #if defined(__hpux) + // HP-UX doesn't declare these functions extern "C", so they are declared again +@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c + + inline void clear_last_error() + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + WSASetLastError(0); + #else + errno = 0; +@@ -78,7 +78,7 @@ template + inline ReturnType error_wrapper(ReturnType return_value, + boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ec = boost::system::error_code(WSAGetLastError(), + boost::asio::error::get_system_category()); + #else +@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::closesocket(s), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::close(s), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + if (result != 0 + && (ec == boost::asio::error::would_block +@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta + // current OS where this behaviour is seen, Windows, says that the socket + // remains open. Therefore we'll put the descriptor back into blocking + // mode and have another attempt at closing it. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = 0; + ::ioctlsocket(s, FIONBIO, &arg); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + # if defined(__SYMBIAN32__) + int flags = ::fcntl(s, F_GETFL, 0); + if (flags >= 0) +@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta + ioctl_arg_type arg = 0; + ::ioctl(s, FIONBIO, &arg); + # endif // defined(__SYMBIAN32__) +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + state &= ~non_blocking; + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::closesocket(s), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + result = error_wrapper(::close(s), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + } + +@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = (value ? 1 : 0); + int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); + #elif defined(__SYMBIAN32__) +@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + ioctl_arg_type arg = (value ? 1 : 0); + int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); + #elif defined(__SYMBIAN32__) +@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, + // Check if the connect operation has finished. This is required since we may + // get spurious readiness notifications from the reactor. + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set write_fds; + FD_ZERO(&write_fds); +@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, + zero_timeout.tv_usec = 0; + int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, + fds.revents = 0; + int ready = ::poll(&fds, 1, 0); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (ready == 0) + { +@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, + int socketpair(int af, int type, int protocol, + socket_type sv[2], boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(af); + (void)(type); + (void)(protocol); +@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy + + #if defined(SIOCATMARK) + ioctl_arg_type value = 0; +-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); +-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); +-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++# endif // defined(BOOST_ASIO_WINDOWS) + if (result == 0) + ec = boost::system::error_code(); + # if defined(ENOTTY) +@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s + } + + ioctl_arg_type value = 0; +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + if (result == 0) + ec = boost::system::error_code(); + #if defined(ENOTTY) +@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v + base = static_cast(addr); + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef WSABUF buf; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + typedef iovec buf; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + void init_buf(buf& b, void* data, size_t size) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + b.buf = static_cast(data); + b.len = static_cast(size); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + init_buf_iov_base(b.iov_base, data); + b.iov_len = size; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + void init_buf(buf& b, const void* data, size_t size) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + b.buf = static_cast(const_cast(data)); + b.len = static_cast(size); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + init_buf_iov_base(b.iov_base, const_cast(data)); + b.iov_len = size; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) +@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf + int flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Receive some data. + DWORD recv_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = bufs; + msg.msg_iovlen = static_cast(count); +@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recv(socket_type s, state_type state, buf* bufs, +@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Receive some data. + DWORD recv_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + init_msghdr_msg_name(msg.msg_name, addr); + msg.msg_namelen = static_cast(*addrlen); +@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, +@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, + int in_flags, int& out_flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + out_flags = 0; + return socket_ops::recv(s, bufs, count, in_flags, ec); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = bufs; + msg.msg_iovlen = static_cast(count); +@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, + else + out_flags = 0; + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_recvmsg(socket_type s, state_type state, +@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con + int flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Send the data. + DWORD send_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + msg.msg_iov = const_cast(bufs); + msg.msg_iovlen = static_cast(count); +@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_send(socket_type s, state_type state, const buf* bufs, +@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + // Send the data. + DWORD send_buf_count = static_cast(count); + DWORD bytes_transferred = 0; +@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c + return socket_error_retval; + ec = boost::system::error_code(); + return bytes_transferred; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + msghdr msg = msghdr(); + init_msghdr_msg_name(msg.msg_name, addr); + msg.msg_namelen = static_cast(addrlen); +@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c + if (result >= 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + size_t sync_sendto(socket_type s, state_type state, const buf* bufs, +@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int + boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, + WSA_FLAG_OVERLAPPED), ec); + if (s == invalid_socket) +@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type + } + ec = boost::asio::error::fault; + return socket_error_retval; +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + clear_last_error(); + int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, + s, level, optname, optval, optlen), ec); +@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type + if (result == 0) + ec = boost::system::error_code(); + return result; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + clear_last_error(); + int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, + s, level, optname, optval, optlen), ec); +@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type + if (result == 0) + ec = boost::system::error_code(); + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + template +@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad + return socket_error_retval; + } + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (cached) + { + // Check if socket is still connected. +@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad + ec = boost::system::error_code(); + return 0; + } +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + (void)cached; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + clear_last_error(); + int result = error_wrapper(call_getpeername( +@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta + } + + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); + #elif defined(__MACH__) && defined(__APPLE__) \ + || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd + fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (!readfds && !writefds && !exceptfds && timeout) + { + DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; +@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd + if (timeout && timeout->tv_sec == 0 + && timeout->tv_usec > 0 && timeout->tv_usec < 1000) + timeout->tv_usec = 1000; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #if defined(__hpux) && defined(__SELECT) + timespec ts; +@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set fds; + FD_ZERO(&fds); +@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::poll(&fds, 1, timeout), ec); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (result == 0) + ec = (state & user_set_non_blocking) +@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set fds; + FD_ZERO(&fds); +@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type + clear_last_error(); + int result = error_wrapper(::poll(&fds, 1, timeout), ec); + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + if (result == 0) + ec = (state & user_set_non_blocking) +@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s + } + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + fd_set write_fds; + FD_ZERO(&write_fds); +@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s + ec = boost::system::error_code(); + return result; + #else // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + pollfd fds; + fds.fd = s; +@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s + ec = boost::system::error_code(); + return result; + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + } + +@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void + ec = boost::asio::error::address_family_not_supported; + return 0; + } +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + using namespace std; // For memcpy. + + if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) +@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void + ec = boost::asio::error::invalid_argument; + + return result == socket_error_retval ? 0 : dest; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + const char* result = error_wrapper(::inet_ntop( + af, src, dest, static_cast(length)), ec); + if (result == 0 && !ec) +@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void + strcat(dest, if_name); + } + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + int inet_pton(int af, const char* src, void* dest, +@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v + ec = boost::asio::error::address_family_not_supported; + return -1; + } +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + using namespace std; // For memcpy and strcmp. + + if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) +@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v + ec = boost::system::error_code(); + + return result == socket_error_retval ? -1 : 1; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + int result = error_wrapper(::inet_pton(af, src, dest), ec); + if (result <= 0 && !ec) + ec = boost::asio::error::invalid_argument; +@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v + } + } + return result; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + int gethostname(char* name, int namelen, boost::system::error_code& ec) +@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char + hostent* result, char* buffer, int buflength, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(buffer); + (void)(buflength); + hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); +@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char + char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) + { + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + (void)(buffer); + (void)(buflength); + (void)(ai_flags); +@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla + case EAI_SOCKTYPE: + return boost::asio::error::socket_type_not_supported; + default: // Possibly the non-portable EAI_SYSTEM. +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + return boost::system::error_code( + WSAGetLastError(), boost::asio::error::get_system_category()); + #else +@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co + host = (host && *host) ? host : 0; + service = (service && *service) ? service : 0; + clear_last_error(); +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + int error = ::getaddrinfo(host, service, &hints, result); +@@ -3213,7 +3201,7 @@ boost::system::error_code background_get + + void freeaddrinfo(addrinfo_type* ai) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + ::freeaddrinfo(ai); +@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co + std::size_t addrlen, char* host, std::size_t hostlen, + char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # if defined(BOOST_ASIO_HAS_GETADDRINFO) + // Building for Windows XP, Windows Server 2003, or later. + clear_last_error(); +--- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() + #include + + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) +--- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP +--- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -54,6 +54,6 @@ private: + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP +--- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_HAS_THREADS) \ + || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -65,7 +64,6 @@ public: + #endif // !defined(BOOST_ASIO_HAS_THREADS) + // || defined(BOOST_ASIO_WINDOWS) + // || defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP +--- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + // Guess whether we are building against on old Platform SDK. + #if !defined(IN6ADDR_ANY_INIT) +@@ -211,6 +211,6 @@ struct addrinfo_emulation + # define IPPROTO_ICMPV6 58 + #endif + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP +--- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 +@@ -19,7 +19,6 @@ + + #if !defined(BOOST_ASIO_WINDOWS) + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) +-#if !defined(__CYGWIN__) + #if !defined(__SYMBIAN32__) + #if !defined(BOOST_ASIO_HAS_EVENTFD) + +@@ -84,7 +83,6 @@ private: + + #endif // !defined(BOOST_ASIO_HAS_EVENTFD) + #endif // !defined(__SYMBIAN32__) +-#endif // !defined(__CYGWIN__) + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) + #endif // !defined(BOOST_ASIO_WINDOWS) + +--- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 +@@ -18,7 +18,6 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(__CYGWIN__) \ + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include +@@ -114,7 +113,6 @@ private: + #include + + #endif // !defined(BOOST_ASIO_WINDOWS) +- // && !defined(__CYGWIN__) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP +--- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 +@@ -18,8 +18,7 @@ + #include + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #include + #include +@@ -319,6 +318,5 @@ private: + + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP +--- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 +@@ -19,7 +19,7 @@ + #include + + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -230,7 +230,7 @@ private: + # include + #endif // defined(BOOST_ASIO_HEADER_ONLY) + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) + + #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP +--- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 +@@ -19,7 +19,7 @@ + + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) + # include + #elif defined(BOOST_ASIO_HAS_EVENTFD) + # include +@@ -31,7 +31,7 @@ namespace boost { + namespace asio { + namespace detail { + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) + typedef socket_select_interrupter select_interrupter; + #elif defined(BOOST_ASIO_HAS_EVENTFD) + typedef eventfd_select_interrupter select_interrupter; +--- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 +@@ -51,13 +51,13 @@ class select_reactor + : public boost::asio::detail::service_base + { + public: +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + enum op_types { read_op = 0, write_op = 1, except_op = 2, + max_select_ops = 3, connect_op = 3, max_ops = 4 }; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + enum op_types { read_op = 0, write_op = 1, except_op = 2, + max_select_ops = 3, connect_op = 1, max_ops = 3 }; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + // Per-descriptor data. + struct per_descriptor_data +--- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 +@@ -19,7 +19,7 @@ + + #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++ || defined(__SYMBIAN32__) + # include + #elif defined(BOOST_ASIO_HAS_PTHREADS) + # include +@@ -33,7 +33,7 @@ namespace detail { + + #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- || defined(__CYGWIN__) || defined(__SYMBIAN32__) ++ || defined(__SYMBIAN32__) + typedef null_signal_blocker signal_blocker; + #elif defined(BOOST_ASIO_HAS_PTHREADS) + typedef posix_signal_blocker signal_blocker; +--- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -44,6 +44,6 @@ public: + + #include + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP +--- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 +@@ -28,9 +28,9 @@ + #include + #include + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + # include +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -183,8 +183,7 @@ private: + io_service_impl& io_service_; + + #if !defined(BOOST_ASIO_WINDOWS) \ +- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ +- && !defined(__CYGWIN__) ++ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // The type used for registering for pipe reactor notifications. + class pipe_read_op; + +@@ -195,7 +194,6 @@ private: + reactor::per_descriptor_data reactor_data_; + #endif // !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) +- // && !defined(__CYGWIN__) + + // A mapping from signal number to the registered signal sets. + registration* registrations_[max_signal_number]; +--- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 +@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ + BOOST_ASIO_DECL int listen(socket_type s, + int backlog, boost::system::error_code& ec); + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + typedef WSABUF buf; +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + typedef iovec buf; +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); + +--- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 +@@ -20,7 +20,6 @@ + #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) + + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(__SYMBIAN32__) + + #include +@@ -85,7 +84,6 @@ private: + #endif // defined(BOOST_ASIO_HEADER_ONLY) + + #endif // defined(BOOST_ASIO_WINDOWS) +- // || defined(__CYGWIN__) + // || defined(__SYMBIAN32__) + + #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) +--- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 ++++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 +@@ -19,7 +19,7 @@ + + #if defined(BOOST_ASIO_WINDOWS_RUNTIME) + // Empty. +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) + # error WinSock.h has already been included + # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) +@@ -169,7 +169,7 @@ typedef int signed_size_type; + # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 + # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 + # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + typedef SOCKET socket_type; + const SOCKET invalid_socket = INVALID_SOCKET; + const int socket_error_retval = SOCKET_ERROR; +--- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + #include +@@ -146,6 +146,6 @@ private: + + #include + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP +--- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 +@@ -17,7 +17,7 @@ + + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + + #include + +@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini + # include + #endif // defined(BOOST_ASIO_HEADER_ONLY) + +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + + #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP +--- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 +@@ -20,7 +20,6 @@ + #include + #include + #if defined(BOOST_ASIO_WINDOWS) \ +- || defined(__CYGWIN__) \ + || defined(BOOST_ASIO_WINDOWS_RUNTIME) + # include + #else +@@ -45,7 +44,7 @@ + # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) + # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) + # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_NATIVE_ERROR(e) e + # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e + # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e +@@ -225,7 +224,7 @@ inline const boost::system::error_catego + return boost::system::system_category(); + } + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + extern BOOST_ASIO_DECL + const boost::system::error_category& get_netdb_category(); +@@ -233,7 +232,7 @@ const boost::system::error_category& get + extern BOOST_ASIO_DECL + const boost::system::error_category& get_addrinfo_category(); + +-#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#else // !defined(BOOST_ASIO_WINDOWS) + + inline const boost::system::error_category& get_netdb_category() + { +@@ -245,7 +244,7 @@ inline const boost::system::error_catego + return get_system_category(); + } + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + extern BOOST_ASIO_DECL + const boost::system::error_category& get_misc_category(); +--- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 +@@ -25,7 +25,7 @@ namespace boost { + namespace asio { + namespace error { + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + + namespace detail { + +@@ -87,7 +87,7 @@ const boost::system::error_category& get + return instance; + } + +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + namespace detail { + +--- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 +@@ -27,7 +27,7 @@ + + #if defined(GENERATING_DOCUMENTATION) + # define BOOST_ASIO_OPTION_STORAGE implementation_defined +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_OPTION_STORAGE DCB + #else + # define BOOST_ASIO_OPTION_STORAGE termios +@@ -41,7 +41,7 @@ namespace asio { + boost::system::error_code serial_port_base::baud_rate::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.BaudRate = value_; + #else + speed_t baud; +@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::baud_rate::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + value_ = storage.BaudRate; + #else + speed_t baud = ::cfgetospeed(&storage); +@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con + boost::system::error_code serial_port_base::flow_control::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.fOutxCtsFlow = FALSE; + storage.fOutxDsrFlow = FALSE; + storage.fTXContinueOnXoff = TRUE; +@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::flow_control::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.fOutX && storage.fInX) + { + value_ = software; +@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ + boost::system::error_code serial_port_base::parity::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + switch (value_) + { + case none: +@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::parity::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.Parity == EVENPARITY) + { + value_ = even; +@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( + boost::system::error_code serial_port_base::stop_bits::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + switch (value_) + { + case one: +@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::stop_bits::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + if (storage.StopBits == ONESTOPBIT) + { + value_ = one; +@@ -507,7 +507,7 @@ serial_port_base::character_size::charac + boost::system::error_code serial_port_base::character_size::store( + BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + storage.ByteSize = value_; + #else + storage.c_cflag &= ~CSIZE; +@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba + boost::system::error_code serial_port_base::character_size::load( + const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + value_ = storage.ByteSize; + #else + if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } +--- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 +@@ -24,7 +24,7 @@ + #include + #include + +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + # include + #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ + || defined(__osf__) +@@ -600,7 +600,7 @@ public: + friend bool has_service(io_service& ios); + + private: +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + detail::winsock_init<> init_; + #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ + || defined(__osf__) +--- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 +@@ -21,16 +21,16 @@ + #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ + || defined(GENERATING_DOCUMENTATION) + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + # include +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #include + #include + + #if defined(GENERATING_DOCUMENTATION) + # define BOOST_ASIO_OPTION_STORAGE implementation_defined +-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#elif defined(BOOST_ASIO_WINDOWS) + # define BOOST_ASIO_OPTION_STORAGE DCB + #else + # define BOOST_ASIO_OPTION_STORAGE termios +--- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 ++++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 +@@ -85,15 +85,15 @@ public: + private: + static unsigned long openssl_id_func() + { +-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_ASIO_WINDOWS) + return ::GetCurrentThreadId(); +-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#else // defined(BOOST_ASIO_WINDOWS) + void* id = instance()->thread_id_; + if (id == 0) + instance()->thread_id_ = id = &id; // Ugh. + BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); + return reinterpret_cast(id); +-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_ASIO_WINDOWS) + } + + static void openssl_locking_func(int mode, int n, +@@ -109,10 +109,10 @@ private: + std::vector > mutexes_; + +-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#if !defined(BOOST_ASIO_WINDOWS) + // The thread identifiers to be used by openssl. + boost::asio::detail::tss_ptr thread_id_; +-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) ++#endif // !defined(BOOST_ASIO_WINDOWS) + + #if !defined(SSL_OP_NO_COMPRESSION) \ + && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch new file mode 100644 index 00000000000..97acc72689d --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch @@ -0,0 +1,76 @@ +--- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 ++++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 +@@ -39,18 +39,8 @@ + #define BOOST_HAS_STDINT_H + #endif + +-/// Cygwin has no fenv.h +-#define BOOST_NO_FENV_H +- + // boilerplate code: + #include +- +-// +-// Cygwin lies about XSI conformance, there is no nl_types.h: +-// +-#ifdef BOOST_HAS_NL_TYPES_H +-# undef BOOST_HAS_NL_TYPES_H +-#endif + + + +--- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 +@@ -68,7 +68,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 +@@ -41,7 +41,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 +@@ -17,7 +17,7 @@ + #endif + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 ++++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 +@@ -13,7 +13,7 @@ + #define BOOST_NO_STD_MESSAGES + + // Apple doesn't seem to reliably defined a *unix* macro +-#if !defined(CYGWIN) && ( defined(__unix__) \ ++#if ( defined(__unix__) \ + || defined(__unix) \ + || defined(unix) \ + || defined(__APPLE__) \ +--- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 ++++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 +@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) + defined(__CYGWIN__) \ + ) + # undef BOOST_OS_CYGWIN +-# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE ++# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE + #endif + + #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch new file mode 100644 index 00000000000..3d9726179be --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch @@ -0,0 +1,600 @@ +--- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 ++++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 +@@ -29,6 +29,7 @@ local rule default_binary_format ( ) + local tmp = elf ; + if [ os.name ] = "MACOSX" { tmp = mach-o ; } + if [ os.name ] = "NT" { tmp = pe ; } ++ if [ os.name ] = "CYGWIN" { tmp = pe ; } + if [ os.name ] = "AIX" { tmp = xcoff ; } + return $(tmp) ; + } +@@ -581,6 +582,16 @@ alias asm_context_sources + ; + + alias asm_context_sources ++ : asm/make_i386_ms_pe_gas.S ++ asm/jump_i386_ms_pe_gas.S ++ dummy.cpp ++ : 32 ++ x86 ++ pe ++ gcc ++ ; ++ ++alias asm_context_sources + : asm/make_i386_ms_pe_masm.asm + asm/jump_i386_ms_pe_masm.asm + dummy.cpp +@@ -715,6 +726,16 @@ alias asm_context_sources + ; + + alias asm_context_sources ++ : asm/make_x86_64_ms_pe_gas.S ++ asm/jump_x86_64_ms_pe_gas.S ++ dummy.cpp ++ : 64 ++ x86 ++ pe ++ gcc ++ ; ++ ++alias asm_context_sources + : asm/make_x86_64_ms_pe_masm.asm + asm/jump_x86_64_ms_pe_masm.asm + dummy.cpp +--- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 +@@ -0,0 +1,108 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/******************************************************************** ++ * * ++ * -------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | * ++ * -------------------------------------------------------------- * ++ * | 0h | 04h | 08h | 0ch | 010h | 014h | * ++ * -------------------------------------------------------------- * ++ * | EDI | ESI | EBX | EBP | ESP | EIP | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 6 | 7 | 8 | | * ++ * -------------------------------------------------------------- * ++ * | 018h | 01ch | 020h | | * ++ * -------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 9 | | * ++ * -------------------------------------------------------------- * ++ * | 024h | | * ++ * -------------------------------------------------------------- * ++ * |fc_execpt| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 10 | | * ++ * -------------------------------------------------------------- * ++ * | 028h | | * ++ * -------------------------------------------------------------- * ++ * |fc_strage| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 11 | 12 | | * ++ * -------------------------------------------------------------- * ++ * | 02ch | 030h | | * ++ * -------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| | * ++ * -------------------------------------------------------------- * ++ * * ++ * *****************************************************************/ ++ ++.file "jump_i386_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl _jump_fcontext ++.def _jump_fcontext; .scl 2; .type 32; .endef ++_jump_fcontext: ++ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ ++ movl %edi, (%ecx) /* save EDI */ ++ movl %esi, 0x04(%ecx) /* save ESI */ ++ movl %ebx, 0x08(%ecx) /* save EBX */ ++ movl %ebp, 0x0c(%ecx) /* save EBP */ ++ ++ movl %fs:(0x18), %edx /* load NT_TIB */ ++ movl (%edx), %eax /* load current SEH exception list */ ++ movl %eax, 0x24(%ecx) /* save current exception list */ ++ movl 0x04(%edx), %eax /* load current stack base */ ++ movl %eax, 0x18(%ecx) /* save current stack base */ ++ movl 0x08(%edx), %eax /* load current stack limit */ ++ movl %eax, 0x20(%ecx) /* save current stack limit */ ++ movl 0x10(%edx), %eax /* load fiber local storage */ ++ movl %eax, 0x28(%ecx) /* save fiber local storage */ ++ ++ leal 0x04(%esp), %eax /* exclude the return address */ ++ movl %eax, 0x10(%ecx) /* save as stack pointer */ ++ movl (%esp), %eax /* load return address */ ++ movl %eax, 0x14(%ecx) /* save return address */ ++ ++ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ ++ movl (%edx), %edi /* restore EDI */ ++ movl 0x04(%edx), %esi /* restore ESI */ ++ movl 0x08(%edx), %ebx /* restore EBX */ ++ movl 0x0c(%edx), %ebp /* restore EBP */ ++ ++ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ ++ testl %eax, %eax ++ je 1f ++ ++ stmxcsr 0x2c(%ecx) /* save MMX control word */ ++ fnstcw 0x30(%ecx) /* save x87 control word */ ++ ldmxcsr 0x2c(%edx) /* restore MMX control word */ ++ fldcw 0x30(%edx) /* restore x87 control word */ ++1: ++ movl %edx, %ecx ++ movl %fs:(0x18), %edx /* load NT_TIB */ ++ movl 0x24(%ecx), %eax /* load SEH exception list */ ++ movl %eax, (%edx) /* restore next SEH item */ ++ movl 0x18(%ecx), %eax /* load stack base */ ++ movl %eax, 0x04(%edx) /* restore stack base */ ++ movl 0x20(%ecx), %eax /* load stack limit */ ++ movl %eax, 0x08(%edx) /* restore stack limit */ ++ movl 0x28(%ecx), %eax /* load fiber local storage */ ++ movl %eax, 0x10(%edx) /* restore fiber local storage */ ++ ++ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ ++ ++ movl 0x10(%ecx), %esp /* restore ESP */ ++ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ ++ movl 0x14(%ecx), %ecx /* fetch the address to return to */ ++ ++ jmp *%ecx /* indirect jump to context */ +--- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 +@@ -0,0 +1,189 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/**************************************************************************************** ++ * * ++ * ---------------------------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++ * ---------------------------------------------------------------------------------- * ++ * | R12 | R13 | R14 | R15 | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++ * ---------------------------------------------------------------------------------- * ++ * | RDI | RSI | RBX | RBP | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x40 | 0x44 | 0x48 | 0x4c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | RSP | RIP | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 20 | 21 | 22 | 23 | 24 | 25 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 26 | 27 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x68 | 0x6c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | fbr_strg | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * ++ * ---------------------------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * * ++ * *************************************************************************************/ ++ ++.file "jump_x86_64_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl jump_fcontext ++.def jump_fcontext; .scl 2; .type 32; .endef ++.seh_proc jump_fcontext ++jump_fcontext: ++.seh_endprologue ++ movq %r12, (%rcx) /* save R12 */ ++ movq %r13, 0x08(%rcx) /* save R13 */ ++ movq %r14, 0x10(%rcx) /* save R14 */ ++ movq %r15, 0x18(%rcx) /* save R15 */ ++ movq %rdi, 0x20(%rcx) /* save RDI */ ++ movq %rsi, 0x28(%rcx) /* save RSI */ ++ movq %rbx, 0x30(%rcx) /* save RBX */ ++ movq %rbp, 0x38(%rcx) /* save RBP */ ++ ++ movq %gs:(0x30), %r10 /* load NT_TIB */ ++ movq 0x08(%r10), %rax /* load current stack base */ ++ movq %rax, 0x50(%rcx) /* save current stack base */ ++ movq 0x10(%r10), %rax /* load current stack limit */ ++ movq %rax, 0x60(%rcx) /* save current stack limit */ ++ movq 0x18(%r10), %rax /* load fiber local storage */ ++ movq %rax, 0x68(%rcx) /* save fiber local storage */ ++ ++ testq %r9, %r9 ++ je 1f ++ ++ stmxcsr 0x70(%rcx) /* save MMX control and status word */ ++ fnstcw 0x74(%rcx) /* save x87 control word */ ++ /* save XMM storage */ ++ /* save start address of SSE register block in R10 */ ++ leaq 0x90(%rcx), %r10 ++ /* shift address in R10 to lower 16 byte boundary */ ++ /* == pointer to SEE register block */ ++ andq $-16, %r10 ++ ++ movaps %xmm6, (%r10) ++ movaps %xmm7, 0x10(%r10) ++ movaps %xmm8, 0x20(%r10) ++ movaps %xmm9, 0x30(%r10) ++ movaps %xmm10, 0x40(%r10) ++ movaps %xmm11, 0x50(%r10) ++ movaps %xmm12, 0x60(%r10) ++ movaps %xmm13, 0x70(%r10) ++ movaps %xmm14, 0x80(%r10) ++ movaps %xmm15, 0x90(%r10) ++ ++ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ ++ fldcw 0x74(%rdx) /* restore x87 control word */ ++ /* restore XMM storage */ ++ /* save start address of SSE register block in R10 */ ++ leaq 0x90(%rdx), %r10 ++ /* shift address in R10 to lower 16 byte boundary */ ++ /* == pointer to SEE register block */ ++ andq $-16, %r10 ++ ++ movaps (%r10), %xmm6 ++ movaps 0x10(%r10), %xmm7 ++ movaps 0x20(%r10), %xmm8 ++ movaps 0x30(%r10), %xmm9 ++ movaps 0x40(%r10), %xmm10 ++ movaps 0x50(%r10), %xmm11 ++ movaps 0x60(%r10), %xmm12 ++ movaps 0x70(%r10), %xmm13 ++ movaps 0x80(%r10), %xmm14 ++ movaps 0x90(%r10), %xmm15 ++ ++1: ++ leaq 0x08(%rsp), %rax /* exclude the return address */ ++ movq %rax, 0x40(%rcx) /* save as stack pointer */ ++ movq (%rsp), %rax /* load return address */ ++ movq %rax, 0x48(%rcx) /* save return address */ ++ ++ movq (%rdx), %r12 /* restore R12 */ ++ movq 0x08(%rdx), %r13 /* restore R13 */ ++ movq 0x10(%rdx), %r14 /* restore R14 */ ++ movq 0x18(%rdx), %r15 /* restore R15 */ ++ movq 0x20(%rdx), %rdi /* restore RDI */ ++ movq 0x28(%rdx), %rsi /* restore RSI */ ++ movq 0x30(%rdx), %rbx /* restore RBX */ ++ movq 0x38(%rdx), %rbp /* restore RBP */ ++ ++ movq %gs:(0x30), %r10 /* load NT_TIB */ ++ movq 0x50(%rdx), %rax /* load stack base */ ++ movq %rax, 0x08(%r10) /* restore stack base */ ++ movq 0x60(%rdx), %rax /* load stack limit */ ++ movq %rax, 0x10(%r10) /* restore stack limit */ ++ movq 0x68(%rdx), %rax /* load fiber local storage */ ++ movq %rax, 0x18(%r10) /* restore fiber local storage */ ++ ++ movq 0x40(%rdx), %rsp /* restore RSP */ ++ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ ++ ++ movq %r8, %rax /* use third arg as return value after jump */ ++ movq %r8, %rcx /* use third arg as first arg in context function */ ++ ++ jmp *%r10 /* indirect jump to caller */ ++.seh_endproc +--- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 +@@ -0,0 +1,115 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/******************************************************************** ++ * * ++ * -------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | * ++ * -------------------------------------------------------------- * ++ * | 0h | 04h | 08h | 0ch | 010h | 014h | * ++ * -------------------------------------------------------------- * ++ * | EDI | ESI | EBX | EBP | ESP | EIP | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 6 | 7 | 8 | | * ++ * -------------------------------------------------------------- * ++ * | 018h | 01ch | 020h | | * ++ * -------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 9 | | * ++ * -------------------------------------------------------------- * ++ * | 024h | | * ++ * -------------------------------------------------------------- * ++ * |fc_execpt| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 10 | | * ++ * -------------------------------------------------------------- * ++ * | 028h | | * ++ * -------------------------------------------------------------- * ++ * |fc_strage| | * ++ * -------------------------------------------------------------- * ++ * -------------------------------------------------------------- * ++ * | 11 | 12 | | * ++ * -------------------------------------------------------------- * ++ * | 02ch | 030h | | * ++ * -------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| | * ++ * -------------------------------------------------------------- * ++ * * ++ * *****************************************************************/ ++ ++.file "make_i386_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl _make_fcontext ++.def _make_fcontext; .scl 2; .type 32; .endef ++_make_fcontext: ++ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ ++ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ ++ ++ /* shift address in EAX to lower 16 byte boundary */ ++ /* == pointer to fcontext_t and address of context stack */ ++ andl $-16, %eax ++ ++ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ ++ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ ++ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ ++ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ ++ negl %edx /* negate stack size for LEA instruction (== substraction) */ ++ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ ++ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ ++ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ ++ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ ++ ++ stmxcsr 0x02c(%eax) /* save MMX control word */ ++ fnstcw 0x030(%eax) /* save x87 control word */ ++ ++ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ ++ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ ++ ++ movl $finish, %ecx /* abs address of finish */ ++ movl %ecx, (%edx) /* save address of finish as return address for context function */ ++ /* entered after context function returns */ ++ ++ /* traverse current seh chain to get the last exception handler installed by Windows */ ++ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ ++ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ ++ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ ++ /* program is aborted */ ++ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ ++ ++walk: ++ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ ++ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ ++ jz found ++ decl %edx ++ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ ++ jmp walk /* inspect next SEH */ ++ ++found: ++ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ ++ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ ++ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ ++ movl $0xffffffff,%ecx /* set ECX to -1 */ ++ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ ++ leal 0x14(%edx), %ecx /* load address of next SEH item */ ++ movl %ecx, 0x24(%eax) /* save next SEH */ ++ ++ ret ++ ++finish: ++ /* ESP points to same address as ESP on entry of context function + 0x4 */ ++ xorl %eax, %eax ++ movl %eax, (%esp) /* exit code is zero */ ++ call __exit /* exit application */ ++ hlt ++ ++.def __exit; .scl 2; .type 32; .endef /* standard C library function */ +--- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 ++++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 +@@ -0,0 +1,132 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/**************************************************************************************** ++ * * ++ * ---------------------------------------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++ * ---------------------------------------------------------------------------------- * ++ * | R12 | R13 | R14 | R15 | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++ * ---------------------------------------------------------------------------------- * ++ * | RDI | RSI | RBX | RBP | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x40 | 0x44 | 0x48 | 0x4c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | RSP | RIP | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 20 | 21 | 22 | 23 | 24 | 25 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | sp | size | limit | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 26 | 27 | | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x68 | 0x6c | | * ++ * ---------------------------------------------------------------------------------- * ++ * | fbr_strg | | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * ++ * ---------------------------------------------------------------------------------- * ++ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * ---------------------------------------------------------------------------------- * ++ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * ++ * ---------------------------------------------------------------------------------- * ++ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * ++ * ---------------------------------------------------------------------------------- * ++ * | SEE registers (XMM6-XMM15) | * ++ * ---------------------------------------------------------------------------------- * ++ * * ++ * *************************************************************************************/ ++ ++.file "make_x86_64_ms_pe_gas.S" ++.text ++.p2align 4,,15 ++.globl make_fcontext ++.def make_fcontext; .scl 2; .type 32; .endef ++.seh_proc make_fcontext ++make_fcontext: ++.seh_endprologue ++ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ ++ ++ /* shift address in RAX to lower 16 byte boundary */ ++ /* == pointer to fcontext_t and address of context stack */ ++ andq $-16, %rax ++ ++ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ ++ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ ++ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ ++ ++ negq %rdx /* negate stack size for LEA instruction (== substraction) */ ++ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ ++ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ ++ ++ stmxcsr 0x70(%rax) /* save MMX control and status word */ ++ fnstcw 0x74(%rax) /* save x87 control word */ ++ ++ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ ++ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ ++ ++ leaq finish(%rip),%rcx /* compute abs address of label finish */ ++ movq %rcx,(%rdx) /* save address of finish as return address for context function */ ++ /* entered after context function returns */ ++ ++ ret ++ ++finish: ++ /* RSP points to same address as RSP on entry of context function + 0x8 */ ++ xorq %rcx, %rcx /* exit code is zero */ ++ call _exit /* exit application */ ++ hlt ++.seh_endproc ++ ++.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch new file mode 100644 index 00000000000..cbb5757746d --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch @@ -0,0 +1,32 @@ +--- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 ++++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 +@@ -1966,8 +1966,7 @@ namespace + { + errno = 0; + +-# if !defined(__CYGWIN__)\ +- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ ++# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ + && defined(_SC_THREAD_SAFE_FUNCTIONS)\ + && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ + && (!defined(__hpux) || defined(_REENTRANT)) \ +--- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 ++++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 +@@ -36,7 +36,7 @@ + # include "windows_file_codecvt.hpp" + # include + #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ +- || defined(__FreeBSD__) || defined(__OPEN_BSD__) ++ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) + # include + #endif + +@@ -831,7 +831,7 @@ namespace + std::locale global_loc = std::locale(); + return std::locale(global_loc, new windows_file_codecvt); + # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ +- || defined(__FreeBSD__) || defined(__OpenBSD__) ++ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) + // "All BSD system functions expect their string parameters to be in UTF-8 encoding + // and nothing else." See + // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch new file mode 100644 index 00000000000..16208385a9b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch @@ -0,0 +1,81 @@ +--- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 +@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla + + } + +- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) ++ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) + { + ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; + result += no ; +@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla + if ! in $(properties:G) + { + if windows in $(properties) +- || cygwin in $(properties) + { + properties += on ; + } +@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla + } + + if ( ! off in $(properties) || ! off in $(properties) ) +- && ( windows in $(properties) || cygwin in $(properties) ) ++ && windows in $(properties) + { + result += win32/lcid.cpp ; + } +--- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 +@@ -8,7 +8,7 @@ + #define BOOST_LOCALE_SOURCE + #include + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + #define BOOST_LOCALE_WITH_WCONV + #endif + +--- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 +@@ -59,7 +59,7 @@ namespace boost { + return normalize_encoding(l).compare(normalize_encoding(r)); + } + +- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++ #if defined(BOOST_WINDOWS) + int encoding_to_windows_codepage(char const *ccharset); + #endif + +--- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 +@@ -15,7 +15,7 @@ + # pragma warning(disable : 4996) + #endif + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + #ifndef NOMINMAX + #define NOMINMAX + #endif +--- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 ++++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 +@@ -23,7 +23,7 @@ + # include + #endif + +-#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) ++#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) + #ifndef NOMINMAX + # define NOMINMAX + #endif +@@ -395,7 +395,7 @@ int main() + def.push_back("posix"); + #endif + +- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) ++ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) + test_iso_8859_8 = IsValidCodePage(28598)!=0; + #endif + diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch new file mode 100644 index 00000000000..a7748ec58d8 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch @@ -0,0 +1,46 @@ +--- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 +@@ -96,11 +96,6 @@ + # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS + #endif + +-#if defined(__CYGWIN__) +- // Boost.ASIO is broken on Cygwin +-# define BOOST_LOG_NO_ASIO +-#endif +- + #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) + # ifndef BOOST_LOG_WITHOUT_SYSLOG + # define BOOST_LOG_WITHOUT_SYSLOG +--- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 +@@ -170,10 +170,6 @@ project boost/log + windows:ws2_32 + windows:mswsock + +- cygwin:__USE_W32_SOCKETS +- cygwin:ws2_32 +- cygwin:mswsock +- + linux:rt + linux:_XOPEN_SOURCE=600 + linux:_GNU_SOURCE=1 +--- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 ++++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 +@@ -18,7 +18,7 @@ + + #include + +-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#if defined(BOOST_WINDOWS) + + #if defined(BOOST_LOG_USE_WINNT6_API) + +@@ -50,6 +50,6 @@ + #define WIN32_LEAN_AND_MEAN + #endif + +-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) ++#endif // defined(BOOST_WINDOWS) + + #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch new file mode 100644 index 00000000000..35e6905b0f3 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch @@ -0,0 +1,77 @@ +--- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 +@@ -79,7 +79,7 @@ + #elif defined( BOOST_SP_HAS_SYNC ) + # include + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + + #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) +--- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 +@@ -32,7 +32,7 @@ + # include + #elif defined(BOOST_HAS_PTHREADS) + # include +-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + #else + // Use #define BOOST_DISABLE_THREADS to avoid the error +--- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 +@@ -65,7 +65,7 @@ + #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) + # include + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + # include + + #elif defined( _AIX ) +--- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 +@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch + # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange + # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + namespace boost + { +--- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 +@@ -49,7 +49,7 @@ + #elif defined( BOOST_SP_HAS_SYNC ) + # include + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include + + #elif defined(BOOST_HAS_PTHREADS) +--- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 +@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); + + // + +-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #if defined( BOOST_USE_WINDOWS_H ) + # include +--- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 ++++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 +@@ -8,7 +8,7 @@ + // http://www.boost.org/LICENSE_1_0.txt + // + +-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) ++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + #include + #include diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch new file mode 100644 index 00000000000..e241f37f203 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch @@ -0,0 +1,22 @@ +--- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 ++++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 +@@ -33,7 +33,7 @@ + // Standalone MinGW and all other known Windows compilers do predefine _WIN32 + // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. + +-# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin ++# if defined(_WIN32) // Windows default, including MinGW and Cygwin + # define BOOST_WINDOWS_API + # else + # define BOOST_POSIX_API +--- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 ++++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 +@@ -97,7 +97,7 @@ namespace + char buf[64]; + char * bp = buf; + std::size_t sz = sizeof(buf); +- # if defined(__CYGWIN__) || defined(__USE_GNU) ++ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) + // Oddball version of strerror_r + const char * c_str = strerror_r( ev, bp, sz ); + return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch new file mode 100644 index 00000000000..b60a3ac49d3 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch @@ -0,0 +1,22 @@ +diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp +index 8b2bc43..d04f2fe 100644 +--- a/libs/units/example/autoprefixes.cpp ++++ b/libs/units/example/autoprefixes.cpp +@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit + { + static const char* name() { return("EUR"); } +- static const char* symbol() { return("€"); } ++ static const char* symbol() { return("€"); } + }; + + int main() +@@ -140,7 +140,7 @@ int main() + + quantity ce = 2048. * euro_base_unit::unit_type(); + cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR +- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ ++ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ + + + return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch new file mode 100644 index 00000000000..15ce4007675 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch @@ -0,0 +1,122 @@ +Index: boost/pool/pool.hpp +=================================================================== +--- a/boost/pool/pool.hpp (revision 78317) ++++ b/boost/pool/pool.hpp (revision 78326) +@@ -27,4 +27,6 @@ + #include + ++// std::numeric_limits ++#include + // boost::math::static_lcm + #include +@@ -358,4 +360,13 @@ + } + ++ size_type max_chunks() const ++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. ++ size_type partition_size = alloc_size(); ++ size_type POD_size = math::static_lcm::value + sizeof(size_type); ++ size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); ++ ++ return max_chunks; ++ } ++ + static void * & nextof(void * const ptr) + { //! \returns Pointer dereferenced. +@@ -377,5 +388,7 @@ + //! the first time that object needs to allocate system memory. + //! The default is 32. This parameter may not be 0. +- //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ set_next_size(nnext_size); ++ set_max_size(nmax_size); + } + +@@ -400,7 +413,7 @@ + } + void set_next_size(const size_type nnext_size) +- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. +- //! \returns nnext_size. +- next_size = start_size = nnext_size; ++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. ++ BOOST_USING_STD_MIN(); ++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + } + size_type get_max_size() const +@@ -410,5 +423,6 @@ + void set_max_size(const size_type nmax_size) + { //! Set max_size. +- max_size = nmax_size; ++ BOOST_USING_STD_MIN(); ++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + } + size_type get_requested_size() const +@@ -713,7 +727,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -753,7 +767,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -797,4 +811,6 @@ + //! \returns Address of chunk n if allocated ok. + //! \returns 0 if not enough memory for n chunks. ++ if (n > max_chunks()) ++ return 0; + + const size_type partition_size = alloc_size(); +@@ -845,7 +861,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // insert it into the list, +Index: libs/pool/test/test_bug_6701.cpp +=================================================================== +--- a/libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) +@@ -0,0 +1,27 @@ ++/* Copyright (C) 2012 Étienne Dupuis ++* ++* Use, modification and distribution is subject to the ++* Boost Software License, Version 1.0. (See accompanying ++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) ++ ++#include ++#include ++ ++int main() ++{ ++ boost::pool<> p(1024, std::numeric_limits::max() / 768); ++ ++ void *x = p.malloc(); ++ BOOST_ASSERT(!x); ++ ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); ++ ++ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); ++ BOOST_ASSERT(!y); ++ ++ return 0; ++} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch new file mode 100644 index 00000000000..b7c91284d9b --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch @@ -0,0 +1,11 @@ +diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp +--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 ++++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 +@@ -27,7 +27,6 @@ namespace boundary { + int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) + { + typedef LeftIterator left_iterator; +- typedef RightIterator right_iterator; + typedef typename std::iterator_traits::value_type char_type; + typedef std::char_traits traits; + while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch new file mode 100644 index 00000000000..6c1d0a021ed --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch @@ -0,0 +1,14 @@ +diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp +--- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 ++++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 +@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ + { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. + size_type partition_size = alloc_size(); + size_type POD_size = math::static_lcm::value + sizeof(size_type); +- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); +- +- return max_chunks; ++ return (std::numeric_limits::max() - POD_size) / alloc_size(); + } + + static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch new file mode 100644 index 00000000000..8adf8ed2080 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch @@ -0,0 +1,15 @@ +diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp +--- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 ++++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 +@@ -147,8 +147,8 @@ namespace detail + template + inline PyObject* registry_to_python_value::operator()(argument_type x) const + { +- typedef converter::registered r; + # if BOOST_WORKAROUND(__GNUC__, < 3) ++ typedef converter::registered r; + // suppresses an ICE, somehow + (void)r::converters; + # endif + +Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch new file mode 100644 index 00000000000..cf9756e40ea --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch @@ -0,0 +1,20 @@ +diff -up ./move/core.hpp~ ./move/core.hpp +--- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 ++++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 +@@ -43,6 +43,7 @@ + #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + + #include ++ #include + + //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers + #if defined(__GNUC__) && (__GNUC__ >= 4) && \ +@@ -65,7 +66,7 @@ + template + class rv + : public ::boost::move_detail::if_c +- < ::boost::move_detail::is_class_or_union::value ++ < ::boost::is_class::value + , T + , ::boost::move_detail::nat + >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch new file mode 100644 index 00000000000..561cef19eb2 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch @@ -0,0 +1,31 @@ +diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print + enum { n = sizeof(T) + -1 }; + #elif defined(__MWERKS__) + void f(int); +-#else +- enum { +- n = +-# if defined(__EDG_VERSION__) +- aux::dependent_unsigned::value > -1 +-# else +- sizeof(T) > -1 +-# endif +- }; +-#endif ++#elif defined(__EDG_VERSION__) ++ enum { n = aux::dependent_unsigned::value > -1 }; ++#elif defined(BOOST_GCC) ++ enum { n1 }; ++ enum { n2 }; ++ enum { n = n1 != n2 }; ++#else ++ enum { n = sizeof(T) > -1 }; ++#endif + }; + + #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch new file mode 100644 index 00000000000..57e6206bba1 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch @@ -0,0 +1,33 @@ +diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 +--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 ++++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 +@@ -28,17 +28,17 @@ explicit valgrind_config_check ; + local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; + + test-suite pool : +- [ run test_simple_seg_storage.cpp ] +- [ run test_pool_alloc.cpp ] +- [ run pool_msvc_compiler_bug_test.cpp ] +- [ run test_msvc_mem_leak_detect.cpp ] +- [ run test_bug_3349.cpp ] +- [ run test_bug_4960.cpp ] +- [ run test_bug_1252.cpp ] +- [ run test_bug_2696.cpp ] +- [ run test_bug_5526.cpp ] ++ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] ++ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] ++ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] ++ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] + [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] +- [ run ../example/time_pool_alloc.cpp ] ++ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] + [ compile test_poisoned_macros.cpp ] + + # + +Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch new file mode 100644 index 00000000000..eb9ea14011f --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch @@ -0,0 +1,10 @@ +--- a/boost/signals2/trackable.hpp ++++ b/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + namespace boost { + namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch new file mode 100644 index 00000000000..282962987c5 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch @@ -0,0 +1,19 @@ +diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 ++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 +@@ -282,12 +282,12 @@ struct grammar_definition + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base helper_base_t; + typedef grammar_helper_list helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + grammartract_helper_list::do_(self); + + # if defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else + +Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch new file mode 100644 index 00000000000..30ebb981b70 --- /dev/null +++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch @@ -0,0 +1,11 @@ +--- a/boost/uuid/detail/uuid_x86.hpp ++++ b/boost/uuid/detail/uuid_x86.hpp +@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT + cmp = (cmp - 1u) ^ cmp; + rcmp = (rcmp - 1u) ^ rcmp; + +- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); ++ return cmp < rcmp; + } + + } // namespace uuids From 9e99a66c24509c9e4d5078ca6a1b1a222c248ec2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 19:26:30 +0200 Subject: [PATCH 188/208] cygwin: make flex building on cygwin --- pkgs/development/tools/parsing/flex/2.5.39.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/2.5.39.nix index f12f89f6e24..93d54803e7c 100644 --- a/pkgs/development/tools/parsing/flex/2.5.39.nix +++ b/pkgs/development/tools/parsing/flex/2.5.39.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedNativeBuildInputs = [ m4 ]; - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; From a84e6336bd185238d47ea94895660d49149559d5 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jun 2015 20:23:36 +0200 Subject: [PATCH 189/208] cygwin: make coreutils build on cygwin --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index f8dda538fd7..c65ed30dd71 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null -, autoconf, automake114x +, autoconf, automake114x, texinfo }: assert aclSupport -> acl != null; @@ -29,7 +29,7 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl - ++ optionals stdenv.isCygwin [ autoconf automake114x ] # due to patch + ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { From daf0e6500d3adf71b43621eb0d2831facfdc5859 Mon Sep 17 00:00:00 2001 From: desiderius Date: Fri, 5 Jun 2015 09:20:46 +0200 Subject: [PATCH 190/208] python-packages: updates pyinotify 0.9.3 to 0.9.5 --- pkgs/top-level/python-packages.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0a0325d903..5083d4d1032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9697,22 +9697,15 @@ let }; }; - pyinotify = pkgs.stdenv.mkDerivation rec { - name = "python-pyinotify-${version}"; - version = "0.9.3"; + pyinotify = buildPythonPackage rec { + name = "pyinotify"; + version = "0.9.5"; - src = pkgs.fetchgit { - url = "git://github.com/seb-m/pyinotify.git"; - rev = "refs/tags/${version}"; - sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/${name}/${name}-${version}.tar.gz"; + sha256 = "06yblnif9v05xwsbs089n0bj60ndb4lzkv1i15fprqnf6sgjmig7"; }; - buildInputs = with self; [ python ]; - - installPhase = '' - ${python}/bin/${python.executable} setup.py install --prefix=$out - ''; - meta = { homepage = https://github.com/seb-m/pyinotify/wiki; description = "Monitor filesystems events on Linux platforms with inotify"; From 86a511a398d83a2e5374e8e8d6f9c64f38f6e5b3 Mon Sep 17 00:00:00 2001 From: Michael Phillips Date: Thu, 4 Jun 2015 22:57:40 -0500 Subject: [PATCH 191/208] youtube-dl: remove unnecessary pandoc dependency --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a513cdaece..18d6df1e272 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }: +{ manuals ? true +, stdenv, fetchurl, makeWrapper, python, zip, +pandoc ? null +, ffmpeg }: + +assert manuals -> pandoc != null; stdenv.mkDerivation rec { name = "youtube-dl-${version}"; @@ -9,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ ] + ++ stdenv.lib.optional manuals pandoc; buildInputs = [ python makeWrapper zip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b54674cb65..024f9cf7bcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3384,7 +3384,9 @@ let # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; - youtube-dl = callPackage ../tools/misc/youtube-dl { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { + manuals = false; + }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { From c1c4ca08def84f339447e23b0ee4ead3c2568b6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 10:38:35 +0200 Subject: [PATCH 192/208] youtube-dl: clean up the expression and document the pandoc situation This patch resolves https://github.com/NixOS/nixpkgs/pull/8184. --- pkgs/tools/misc/youtube-dl/default.nix | 21 +++++++++------------ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 18d6df1e272..3985f8a0c83 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,9 +1,11 @@ -{ manuals ? true -, stdenv, fetchurl, makeWrapper, python, zip, -pandoc ? null -, ffmpeg }: +{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }: -assert manuals -> pandoc != null; +# Pandoc is required to build the package's man page. Release tarballs +# contain a formatted man page already, though, so it's fine to pass +# "pandoc = null" to this derivation; the man page will still be +# installed. We keep the pandoc argument and build input in place in +# case someone wants to use this derivation to build a Git version of +# the tool that doesn't have the formatted man page included. stdenv.mkDerivation rec { name = "youtube-dl-${version}"; @@ -14,14 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; }; - nativeBuildInputs = [ ] - ++ stdenv.lib.optional manuals pandoc; + buildInputs = [ python makeWrapper zip pandoc ]; - buildInputs = [ python makeWrapper zip ]; - - patchPhase = '' - rm youtube-dl - ''; + patchPhase = "rm youtube-dl"; configurePhase = '' makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024f9cf7bcf..a3262dc7943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3385,8 +3385,10 @@ let yi = callPackage ../applications/editors/yi/wrapper.nix { }; youtube-dl = callPackage ../tools/misc/youtube-dl { - manuals = false; - }; + # Release versions don't need pandoc because the formatted man page + # is included in the tarball. + pandoc = null; + }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { From 7acb77ca2bfd54578ad4a37c05666ea5da967457 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 12:42:34 +0200 Subject: [PATCH 193/208] cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 240353b6e75..3da457bdf76 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildTools = [ gitMinimal makeWrapper ]; preConfigure = '' - sed -i -e 's|, "--dirty"||' generate-cabal-file.hs + git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes. runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal ''; postInstall = '' @@ -41,7 +41,7 @@ mkDerivation rec { rm -rf $out/{bin,lib,share} makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix ''; homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; From a70d0275e27d5a26719cd53fa279a854819caf16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jun 2015 13:53:49 +0200 Subject: [PATCH 194/208] nixUnstable: Bump This should fix the NixOS installer tests. --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index bfa23325b39..f8d4c1fd119 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4132_07c69aa"; + name = "nix-1.9pre4153_b64988b"; src = fetchurl { - url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz"; - sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6"; + url = "http://hydra.nixos.org/build/22838666/download/4/${name}.tar.xz"; + sha256 = "51b4870305724aa7b26c92b43cb22a0e9b6798ac2534db493079bfc383244e31"; }; nativeBuildInputs = [ perl pkgconfig ]; From 45cad45e4dfb3f0652882781f97ff90167cff83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Fri, 5 Jun 2015 15:15:21 +0100 Subject: [PATCH 195/208] wrk: Update from 3.1.2 to 4.0.0 (master) --- pkgs/tools/networking/wrk/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index f4cdb7eaddb..312d4c6fe9b 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchgit, openssl }: let - version = "3.1.2"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "wrk-${version}"; src = fetchgit { url = "https://github.com/wg/wrk.git"; - rev = "a52c770204a732aa63e1bb6eb241a70949e3a2a9"; - sha256 = "0b81lg251ivi94f7kfgz8ws4xns5p7hw5qiwjwwlc3dimjgrg387"; + rev = "7cdede916a53da253c995767a92eec36a245a2cc"; + sha256 = "0m8i5pk2rj40v28bzrskkzw54v9jqdby52dwfcypannhlhgqnhy2"; }; - NIX_CFLAGS_COMPILE = "-I${openssl}/include"; - NIX_CFLAGS_LINK = "-L${openssl}/lib"; - + buildInputs = [ openssl ]; + installPhase = '' mkdir -p $out/bin cp wrk $out/bin From 9176f73ceed438857e8c503a1a34fd0161db6297 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 5 Jun 2015 19:17:50 +0200 Subject: [PATCH 196/208] buildRustPackage: Cosmetic improvement --- pkgs/build-support/rust/fetch-cargo-deps | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index 69eb404e644..ae1ca62050f 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -24,10 +24,12 @@ export CARGO_HOME=$out cd $src if [[ ! -f Cargo.lock ]]; then + echo echo "ERROR: The Cargo.lock file doesn't exist" echo echo "Cargo.lock is needed to make sure that depsSha256 doesn't change" echo "when the registry is updated." + echo exit 1 fi From ffd0539eba473348f752fa8ab1f1f55388634f8f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 5 Jun 2015 13:00:52 -0700 Subject: [PATCH 197/208] cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out --- nixos/modules/security/ca.nix | 4 ++-- pkgs/applications/graphics/shotwell/default.nix | 2 +- pkgs/applications/networking/browsers/vimb/default.nix | 2 +- .../applications/networking/browsers/vimprobable2/default.nix | 2 +- pkgs/applications/networking/cluster/panamax/api/default.nix | 4 ++-- .../networking/instant-messengers/fuze/default.nix | 2 +- .../instant-messengers/telepathy/gabble/default.nix | 2 +- pkgs/applications/networking/irc/weechat/default.nix | 2 +- pkgs/applications/version-management/bazaar/default.nix | 2 +- pkgs/applications/version-management/mercurial/default.nix | 2 +- pkgs/build-support/fetchgit/default.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/data/misc/cacert/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/rest/default.nix | 2 +- pkgs/development/compilers/icedtea/default.nix | 2 +- pkgs/development/compilers/openjdk/default.nix | 2 +- pkgs/development/compilers/openjdk/openjdk8.nix | 2 +- pkgs/development/interpreters/elixir/default.nix | 2 +- pkgs/development/libraries/glib-networking/default.nix | 2 +- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/servers/mail/opensmtpd/default.nix | 2 +- pkgs/tools/networking/aria2/default.nix | 2 +- pkgs/tools/security/prey/default.nix | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 595b9476fa5..31caab97a65 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -22,7 +22,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]"; + example = literalExample "[ \"\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt\" ]"; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -53,7 +53,7 @@ in config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ]; + security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. environment.etc."ssl/certs/ca-certificates.crt".source = caBundle; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 27dde61a08c..94131cbf4ff 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -13,7 +13,7 @@ let sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; }; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; buildInputs = [ pkgconfig glib libsoup ]; }; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 24a43d95ca9..3222e87ac65 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, src/config.def.h ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 7ab5c397abe..ad5f8aa4691 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h + sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, config.h ''; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index dae0315a31b..a212ab5347c 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \ - --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \ + --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 77fe37481d8..6b85e107d06 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let curl_custom = stdenv.lib.overrideDerivation curl (args: { - configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; + configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt"] ; } ); in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index b7cebd47cd7..a74885b2ce3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] ++ stdenv.lib.optional doCheck dbus_daemon; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index bbad1587982..fd200af0a42 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cacert cmake ] ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt"; postInstall = '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index ad6f0c50a37..c3b238eeb0a 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/ca-bundle.crt" + --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt" ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index dee2abd2b1f..2409e8e2240 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/mercurial cat >> $out/etc/mercurial/hgrc << EOF [web] - cacerts = ${cacert}/ca-bundle.crt + cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt EOF # copy hgweb.cgi to allow use in apache diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7259fa8ff4c..8ddb6a85d0c 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { inherit url rev leaveDotGit fetchSubmodules deepClone branchName; - GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ # We borrow these environment variables from the caller to allow diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 1f5166d5c43..5dd80bd4aa5 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - SSL_CERT_FILE = "${cacert}/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; preferLocalBuild = true; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d743fc47b94..7bcb499aab4 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out - cp -v ca-bundle.crt $out + mkdir -pv $out/etc/ssl/certs + cp -v ca-bundle.crt $out/etc/ssl/certs ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix index 7afa2800105..4ed0f6c521b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; configureFlags = [ - "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path + "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index 9dbd46946c0..ee22cd97f6e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index fe7ec585155..8a96d1c380d 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -135,7 +135,7 @@ let # Generate certificates. pushd $jre/lib/icedtea/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/icedtea/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d0ca85af0e0..beab781c88d 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index c2780866161..132f0f31b87 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -136,7 +136,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9d12d42cee8..6bb8c0565d5 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" done ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 79c8ac03183..79b31b1365b 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 32f5928cccd..5e2bdd0cc54 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index ab8ec59ca8c..810012fb60a 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-sock-dir=/run" "--with-privsep-user=smtpd" "--with-queue-user=smtpq" - "--with-ca-file=${cacert}/ca-bundle.crt" + "--with-ca-file=${cacert}/etc/ssl/certs/ca-bundle.crt" ]; installFlags = [ diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index df972a4287b..8d7f4541cad 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cacert ]; - configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ]; + configureFlags = [ "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" ]; meta = with stdenv.lib; { homepage = http://aria2.sourceforge.net/; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index c0951760f4f..d04f48c0f31 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" ''; meta = with stdenv.lib; { From 217506aca14a3d5811d590d54f1b17bd69c78e7f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 5 Jun 2015 07:01:34 -0500 Subject: [PATCH 198/208] Update kde-applications-15.04.1 -> kde-applications-15.04.2 --- pkgs/applications/kde-apps-15.04/manifest.nix | 2043 +++++++++++++++++ pkgs/applications/kde-apps-15.04/manifest.sh | 1 + 2 files changed, 2044 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix index bdf5b3cfc56..d59a3d66966 100644 --- a/pkgs/applications/kde-apps-15.04/manifest.nix +++ b/pkgs/applications/kde-apps-15.04/manifest.nix @@ -2548,6 +2548,15 @@ name = "kde-l10n-id-15.04.1.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca_valencia-15.04.1.tar.xz"; + sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd"; + name = "kde-l10n-ca_valencia-15.04.1.tar.xz"; + }; + } { name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar"; store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz"; @@ -6112,4 +6121,2038 @@ name = "kjumpingcube-15.04.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kajongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8j49syr25zv04wxivlj2r50blfkiih8p-kajongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz"; + sha256 = "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k"; + name = "kajongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-15.04.2.tar.xz" ".tar"; + store = "/nix/store/xbh4flc44pyhmd9wfm14zjr8vz58447c-ksnapshot-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz"; + sha256 = "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57"; + name = "ksnapshot-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8fnj1fgszjbr1cjcds8wd0bzbyw09zll-kfourinline-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz"; + sha256 = "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc"; + name = "kfourinline-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-15.04.2.tar.xz" ".tar"; + store = "/nix/store/a04bnnsv7r4bhnq3pbsv8nk77749d9vn-khangman-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/khangman-15.04.2.tar.xz"; + sha256 = "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf"; + name = "khangman-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nsxh9zscy67b1srj8asi1jc2x9mdwdhh-kdeedu-data-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz"; + sha256 = "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia"; + name = "kdeedu-data-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cj5sh5gsz4hvg7y5rfjw24bbfrgs133m-kde-runtime-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz"; + sha256 = "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn"; + name = "kde-runtime-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x3j7xjkpkd7v61ismj3ids9m4910yv7f-kblocks-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz"; + sha256 = "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv"; + name = "kblocks-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-15.04.2.tar.xz" ".tar"; + store = "/nix/store/76qvy4lfsqyk4qnc1n5cd4wbahfhc6ci-kfloppy-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz"; + sha256 = "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw"; + name = "kfloppy-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bvgf4ym7568ig6mnk4x3jwcfgx1qp51y-kdesdk-thumbnailers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz"; + sha256 = "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7"; + name = "kdesdk-thumbnailers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s6g8walp07ncl0xmkv0lkw5dmykjz49n-libkexiv2-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz"; + sha256 = "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb"; + name = "libkexiv2-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2nnqn0syqqm4j4k3z33vx8mhzcis1rx3-kdf-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdf-15.04.2.tar.xz"; + sha256 = "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck"; + name = "kdf-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/81ca4iky2x83laf1wls5v5mvsfvvj9pz-kde-l10n-pl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz"; + sha256 = "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap"; + name = "kde-l10n-pl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6l77zbzh2rdrrg3y329i1rbii74dd66f-kde-l10n-ia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz"; + sha256 = "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p"; + name = "kde-l10n-ia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1py0dsvx6lr9ww09qskvx0pdlg82rcjd-kde-l10n-he-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz"; + sha256 = "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa"; + name = "kde-l10n-he-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1sjw15pmf6v8fbrmrrxrp3ifafskhgzh-kde-l10n-nn-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz"; + sha256 = "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx"; + name = "kde-l10n-nn-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qg6j8j8gcx7vglnxyr2f3lnzsrdzvadd-kde-l10n-fr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz"; + sha256 = "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr"; + name = "kde-l10n-fr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qawjvxq649zk7lnr3wb8kgw93pm9szfw-kde-l10n-ja-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz"; + sha256 = "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz"; + name = "kde-l10n-ja-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.2.tar.xz" ".tar"; + store = "/nix/store/klmfi9iwf6jzg2aq04bg4l011m46snk4-kde-l10n-el-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz"; + sha256 = "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25"; + name = "kde-l10n-el-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sd55g871lxn0isd486flqhaikaaa00rs-kde-l10n-pa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz"; + sha256 = "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx"; + name = "kde-l10n-pa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cklv18g85z9irf5drphwndjpya812yl1-kde-l10n-pt_BR-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz"; + sha256 = "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4"; + name = "kde-l10n-pt_BR-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.2.tar.xz" ".tar"; + store = "/nix/store/br5h37sf6ynlvspbn03lifqhwmqbiica-kde-l10n-sv-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz"; + sha256 = "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53"; + name = "kde-l10n-sv-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wkxyp7415d8q79wjp8sjkkn9bcf8d5i4-kde-l10n-is-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz"; + sha256 = "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0"; + name = "kde-l10n-is-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/20sv7j17wyswmiwy24p34hgm75wkfiv2-kde-l10n-uk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz"; + sha256 = "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk"; + name = "kde-l10n-uk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kb9xr7rxa8w6lcrm8yc3nqvvyiwjmzcl-kde-l10n-it-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz"; + sha256 = "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0"; + name = "kde-l10n-it-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7arrlm64k6n3fc4f9glgy8synk5mri64-kde-l10n-da-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz"; + sha256 = "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj"; + name = "kde-l10n-da-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7x2sq5fhsb84slfylvsg9ds8rkfln7xb-kde-l10n-zh_CN-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz"; + sha256 = "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y"; + name = "kde-l10n-zh_CN-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s5k7qadd3n5l1zipxylll7qnig20clla-kde-l10n-bs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz"; + sha256 = "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb"; + name = "kde-l10n-bs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.2.tar.xz" ".tar"; + store = "/nix/store/crk06pmaf55p78z6pi4fi8hbp0bkf4qm-kde-l10n-km-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz"; + sha256 = "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18"; + name = "kde-l10n-km-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vldyy2rw01z1qbcd256qapbpxwpqa7ci-kde-l10n-lt-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz"; + sha256 = "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip"; + name = "kde-l10n-lt-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bkr5x2mq2cp5zb950p81hkdjg844zlmw-kde-l10n-lv-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz"; + sha256 = "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng"; + name = "kde-l10n-lv-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zzspql9rdl8v5jxajkzg00zz29v9g0wv-kde-l10n-sk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz"; + sha256 = "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07"; + name = "kde-l10n-sk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/525xf0fhgxxi9hxy3nlp911a65pwk9v2-kde-l10n-kk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz"; + sha256 = "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r"; + name = "kde-l10n-kk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2qq4c0yr5hpfffwqddcxkqkzp2dr6zcb-kde-l10n-ca_valencia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz"; + sha256 = "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6"; + name = "kde-l10n-ca_valencia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gda3hz81ilizglmrc1m03gy40n1rp89f-kde-l10n-nl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz"; + sha256 = "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17"; + name = "kde-l10n-nl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hm8y22jy2dhnpdhyp0g3m8fz8mf7dhjy-kde-l10n-wa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz"; + sha256 = "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8"; + name = "kde-l10n-wa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/193h8asiqnbfnhackzybxbqgwhghsdb2-kde-l10n-sl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz"; + sha256 = "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf"; + name = "kde-l10n-sl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.2.tar.xz" ".tar"; + store = "/nix/store/p6h22zlpyglzksa6rb1xc042lmpn0hds-kde-l10n-ca-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz"; + sha256 = "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b"; + name = "kde-l10n-ca-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mmdpma42n33irvf9hs4frn1y60q0r4mh-kde-l10n-hu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz"; + sha256 = "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f"; + name = "kde-l10n-hu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sgcdmfnga8nmyg1pq19cjn5dzdm14c6g-kde-l10n-hi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz"; + sha256 = "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7"; + name = "kde-l10n-hi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sf5s50gzjamhmzvbdsymscm0y63k1vsk-kde-l10n-ga-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz"; + sha256 = "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk"; + name = "kde-l10n-ga-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5wri2078sl0r7xv1j2b8x182v2ilpny1-kde-l10n-hr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz"; + sha256 = "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn"; + name = "kde-l10n-hr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.2.tar.xz" ".tar"; + store = "/nix/store/970bcajr5cmcq01z4pkglgw9dpwigpz3-kde-l10n-gl-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz"; + sha256 = "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x"; + name = "kde-l10n-gl-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.2.tar.xz" ".tar"; + store = "/nix/store/60k5g06hvgpx407f6zbd1q5jm12rzqwv-kde-l10n-es-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz"; + sha256 = "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399"; + name = "kde-l10n-es-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vrhsyhk9sz6117hgbjgy6498nvcprxdd-kde-l10n-pt-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz"; + sha256 = "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw"; + name = "kde-l10n-pt-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/w9nhhcra2rjpjsc6apgfrlzwqgp7sx77-kde-l10n-bg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz"; + sha256 = "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k"; + name = "kde-l10n-bg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3lqnb375jd1z7ky7y8nrnpgx93ncassv-kde-l10n-fa-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz"; + sha256 = "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj"; + name = "kde-l10n-fa-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2xsadiy29hblc06v6n3ax9y72k2a32vi-kde-l10n-id-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz"; + sha256 = "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf"; + name = "kde-l10n-id-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h7838chap1cxjw66pw6914jpl48n6knf-kde-l10n-ar-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz"; + sha256 = "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski"; + name = "kde-l10n-ar-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qzx5vs924pzqyxj6mxmn3p9wq0q05vw1-kde-l10n-de-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz"; + sha256 = "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh"; + name = "kde-l10n-de-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6rs8knkgfs23qa2cwm5s9yp661z37ws1-kde-l10n-eu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz"; + sha256 = "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws"; + name = "kde-l10n-eu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1kl0887wqmnvhiw9318ihvfwwdkxjhrj-kde-l10n-en_GB-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz"; + sha256 = "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx"; + name = "kde-l10n-en_GB-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h8r3j2113d0h034vbgz0d61ybnicc5g6-kde-l10n-nds-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz"; + sha256 = "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd"; + name = "kde-l10n-nds-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/namy5fby5nck67cdgk4ywb7khd43cacr-kde-l10n-fi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz"; + sha256 = "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8"; + name = "kde-l10n-fi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zyb7zb7w4y79s5kl6d2p5awpbn3912mv-kde-l10n-ro-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz"; + sha256 = "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l"; + name = "kde-l10n-ro-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cy7mih4b17vvbfmw86n6bl103xcixhpv-kde-l10n-mr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz"; + sha256 = "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8"; + name = "kde-l10n-mr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ngffzrfy1r1x9rlx1h6ivfhif79g6fpx-kde-l10n-eo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz"; + sha256 = "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q"; + name = "kde-l10n-eo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l46m8w2hl6wrdns1qwvm5hd4dlbyxpkj-kde-l10n-cs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz"; + sha256 = "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d"; + name = "kde-l10n-cs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7q7ws7qcbnrm5ivxiq1kdfjih1aa44g1-kde-l10n-zh_TW-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz"; + sha256 = "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi"; + name = "kde-l10n-zh_TW-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nzql394zszp4wan26pr336i20ipirh9q-kde-l10n-ru-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz"; + sha256 = "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk"; + name = "kde-l10n-ru-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/z0ncv2c97if41g7qln16vx9kr166zvc5-kde-l10n-tr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz"; + sha256 = "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq"; + name = "kde-l10n-tr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s8sr6jzaydgc64r1dbgqzns682avkd7p-kde-l10n-ko-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz"; + sha256 = "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0"; + name = "kde-l10n-ko-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.2.tar.xz" ".tar"; + store = "/nix/store/rsdm9ds9pn5iqsk6dgbr6mnpliisby3c-kde-l10n-ug-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz"; + sha256 = "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1"; + name = "kde-l10n-ug-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5dhk16y2w9sibzqlv50w5d18js7mjrpf-kde-l10n-nb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz"; + sha256 = "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij"; + name = "kde-l10n-nb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cpfz2g7z1al6p5yadjj6y314ws0fmpg4-kde-l10n-sr-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz"; + sha256 = "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi"; + name = "kde-l10n-sr-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7n1ka8pz70xfznm3q3qvmcbrr74yb6by-kde-l10n-et-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz"; + sha256 = "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn"; + name = "kde-l10n-et-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/lniq3v7dr7wqagi4c7cjwdig0ds5bndp-libkcompactdisc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz"; + sha256 = "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v"; + name = "libkcompactdisc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v1mywghcpyff25izr0iimzyr9vh3pfnj-ksaneplugin-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz"; + sha256 = "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9"; + name = "ksaneplugin-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s9h0gx53bwvg5f8z34drzwkf0ybg602h-kamera-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kamera-15.04.2.tar.xz"; + sha256 = "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy"; + name = "kamera-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-15.04.2.tar.xz" ".tar"; + store = "/nix/store/scjxw225n4i6s702ggd5mnblyfgaf9sh-kubrick-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz"; + sha256 = "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d"; + name = "kubrick-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ja9lwsb9crzqd8q5vnhw66f5ianimzg7-jovie-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/jovie-15.04.2.tar.xz"; + sha256 = "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx"; + name = "jovie-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cbpf87yihk31gjc5glvfbsb1r470n0zy-ark-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ark-15.04.2.tar.xz"; + sha256 = "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq"; + name = "ark-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-15.04.2.tar.xz" ".tar"; + store = "/nix/store/cdw9y1cx7gjfsj6b1hd43mmjjd2k715d-kdiamond-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz"; + sha256 = "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j"; + name = "kdiamond-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x4147vkla2llia02yj1m1rrjs425lm4a-klettres-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klettres-15.04.2.tar.xz"; + sha256 = "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc"; + name = "klettres-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9w7iv272z8lkpp66di0l0f3z79hjvahg-bomber-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/bomber-15.04.2.tar.xz"; + sha256 = "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3"; + name = "bomber-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gsrfn2v5lli7fykmq0864j95mxkdn22r-superkaramba-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz"; + sha256 = "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1"; + name = "superkaramba-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkgeomap-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fsr2vij54z8zwj9rzgfy1x22ivcs2i3s-libkgeomap-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz"; + sha256 = "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh"; + name = "libkgeomap-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fqm7q93457lrg91b5w8jr2lfx3ypa18p-kteatime-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz"; + sha256 = "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp"; + name = "kteatime-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3flm8w829k0ygcs24j5smhsq69r1isdp-granatier-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/granatier-15.04.2.tar.xz"; + sha256 = "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6"; + name = "granatier-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.2.tar.xz" ".tar"; + store = "/nix/store/aj12ls0r62c66f0gv1w0dv37a9wbx0mm-libkeduvocdocument-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz"; + sha256 = "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw"; + name = "libkeduvocdocument-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nh2kasqpz3iwhc2hwv6di51vp7xnnfd3-blinken-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/blinken-15.04.2.tar.xz"; + sha256 = "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg"; + name = "blinken-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hasm2996yj2yljjc6wk50naqm1bal8mh-kpat-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kpat-15.04.2.tar.xz"; + sha256 = "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj"; + name = "kpat-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wfi3wjr0yyn72aqh31hvfinghl73z7ay-kapman-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kapman-15.04.2.tar.xz"; + sha256 = "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a"; + name = "kapman-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vzwm2r7kypa7vmvxldsqmm27gw0a7bl8-kscd-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kscd-15.04.2.tar.xz"; + sha256 = "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j"; + name = "kscd-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.9.tar.xz" ".tar"; + store = "/nix/store/5wy5pdqpd3c3zhwm93dnasw605abglz3-kdelibs-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz"; + sha256 = "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix"; + name = "kdelibs-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.9.tar.xz" ".tar"; + store = "/nix/store/bskv830n49z3ib444qh1vb87d712q0iw-kdepim-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz"; + sha256 = "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf"; + name = "kdepim-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/p0n3h5a2p5wh5l31ldn2cslbvfbvlwl4-kde-wallpapers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz"; + sha256 = "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d"; + name = "kde-wallpapers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sdwpx6s19zjckj3lgzc5isiab0cigy8n-kmix-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmix-15.04.2.tar.xz"; + sha256 = "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9"; + name = "kmix-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3x1axf8f8qcpg3898r90yi35sh06vsh6-krdc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/krdc-15.04.2.tar.xz"; + sha256 = "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg"; + name = "krdc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h70w08hzqsnp9rs11mr5m7yizc8yzdgw-konsole-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/konsole-15.04.2.tar.xz"; + sha256 = "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc"; + name = "konsole-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-15.04.2.tar.xz" ".tar"; + store = "/nix/store/73v4cznbqfpidrdg6gbra0qlpf43hb3q-kanagram-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz"; + sha256 = "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8"; + name = "kanagram-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-15.04.2.tar.xz" ".tar"; + store = "/nix/store/va7y8idm0hjzhfhicl6xlsyz61cp37gz-umbrello-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz"; + sha256 = "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va"; + name = "umbrello-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6rn0kw9p0vxk4hd60l6ksyxrlczksbac-ktux-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktux-15.04.2.tar.xz"; + sha256 = "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf"; + name = "ktux-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/70w7yfkg79g199z7sb5nk3xaknwjirwm-krfb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/krfb-15.04.2.tar.xz"; + sha256 = "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2"; + name = "krfb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-15.04.2.tar.xz" ".tar"; + store = "/nix/store/59i6az9vcq1b9vqx9rwibv7i0iwj2wc5-kwalletmanager-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz"; + sha256 = "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p"; + name = "kwalletmanager-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kigl3wjr17nq1mh6wqfd3kc4sbh8dqfm-palapeli-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz"; + sha256 = "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j"; + name = "palapeli-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3r1ibr6rqz6lmgxxscgbkx7ffkpiad0y-kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + sha256 = "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k"; + name = "kdenetwork-strigi-analyzers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zv987ag77hm9wx1gk7nqrrk629dr1q4m-gwenview-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz"; + sha256 = "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k"; + name = "gwenview-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ps63vs05fy6jk669grmm3ddb5f0hl00m-kruler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kruler-15.04.2.tar.xz"; + sha256 = "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2"; + name = "kruler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ajmnqxshv1vg44acwgyy1k3l5fjiadga-knavalbattle-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz"; + sha256 = "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x"; + name = "knavalbattle-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-15.04.2.tar.xz" ".tar"; + store = "/nix/store/j9gqvnw6d4qaf09vsiinzdnpiy3nrgl4-kgoldrunner-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz"; + sha256 = "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v"; + name = "kgoldrunner-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1cz44lqkfc63qgxap5qi59qviwrszif9-kmag-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmag-15.04.2.tar.xz"; + sha256 = "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3"; + name = "kmag-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-send-file-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x1p55ssi0cx67z1q2pbqkzaxpaps3lv6-ktp-send-file-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz"; + sha256 = "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx"; + name = "ktp-send-file-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jma476qyvnw2qr4fhsx0kdmif55inr4p-kdesdk-strigi-analyzers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz"; + sha256 = "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd"; + name = "kdesdk-strigi-analyzers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1c0qqm7946lgjk4p8am0dd54x9q59jdk-ktp-text-ui-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz"; + sha256 = "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4"; + name = "ktp-text-ui-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5cxhms6vyqxx75cqv6b0899585hq06np-dolphin-plugins-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz"; + sha256 = "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx"; + name = "dolphin-plugins-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-15.04.2.tar.xz" ".tar"; + store = "/nix/store/41gx49qgr229s409f1nfjv0s0xc0rr7w-kjumpingcube-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz"; + sha256 = "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc"; + name = "kjumpingcube-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.2.tar.xz" ".tar"; + store = "/nix/store/676j87fj0mj0aqyz62729l7fwnl3dvnm-ktp-desktop-applets-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz"; + sha256 = "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn"; + name = "ktp-desktop-applets-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nkjk53cfw4lm95jgwxvccsk4ln4dp5yx-libkdcraw-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz"; + sha256 = "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf"; + name = "libkdcraw-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x07k1rddjvi45jdbn6r1bgrc8a6pcbn5-kcharselect-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz"; + sha256 = "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293"; + name = "kcharselect-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/x5w1brmq7c4jkfx2dj335akvc7bqwhkv-kgpg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz"; + sha256 = "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx"; + name = "kgpg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qf4pgkwm97jp6m634xaagz95l371qzrm-signon-kwallet-extension-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz"; + sha256 = "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj"; + name = "signon-kwallet-extension-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l868j4vsnxzdjxx4albmff4532pk5x5y-kshisen-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz"; + sha256 = "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a"; + name = "kshisen-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jxqly6p40ss9aprr12zmabghxphhid17-lokalize-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz"; + sha256 = "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz"; + name = "lokalize-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b7ckd23lzwf8xhrc6qpmyrha6dibk5k2-kaccounts-integration-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz"; + sha256 = "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86"; + name = "kaccounts-integration-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7kn6vi1rmf7nddb0xcy3njyf0fhzgicy-ktp-contact-list-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz"; + sha256 = "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n"; + name = "ktp-contact-list-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-15.04.2.tar.xz" ".tar"; + store = "/nix/store/acyvv1x0q022axz5l6xz65cs54xqpq4q-kremotecontrol-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz"; + sha256 = "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl"; + name = "kremotecontrol-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.20.tar.xz" ".tar"; + store = "/nix/store/kfm7vk5zlq9rpak25j4gkdaw1hsq6ap5-kde-workspace-4.11.20.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz"; + sha256 = "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c"; + name = "kde-workspace-4.11.20.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jvkznsklm87lnyvwkvn06wzp7irzlj80-kalgebra-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz"; + sha256 = "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f"; + name = "kalgebra-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qln1l2y7b5nnwnvgis2ms2cp4iqz7672-kmplot-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz"; + sha256 = "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc"; + name = "kmplot-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vzxl3wf0dr7rnzb2xr9pkbdwirjryrv4-kate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kate-15.04.2.tar.xz"; + sha256 = "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp"; + name = "kate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-15.04.2.tar.xz" ".tar"; + store = "/nix/store/a2rnncjw6jn5si9pjcg4gv3fy0fd9pd8-kwordquiz-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz"; + sha256 = "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch"; + name = "kwordquiz-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-15.04.2.tar.xz" ".tar"; + store = "/nix/store/707rjgg0a9m8bpizypgkzp1g09zyd1hh-kbounce-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz"; + sha256 = "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8"; + name = "kbounce-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3cr2qy4k771c14nfm98zmash1s6p8f0c-marble-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/marble-15.04.2.tar.xz"; + sha256 = "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a"; + name = "marble-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.9.tar.xz" ".tar"; + store = "/nix/store/h1g3dk80b67dqbx33zg1v3wb9141ic2j-kdepim-runtime-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz"; + sha256 = "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0"; + name = "kdepim-runtime-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7sp21hpwl9dbr9h4nqn6xpmqb74zvmcc-kiriki-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz"; + sha256 = "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98"; + name = "kiriki-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-15.04.2.tar.xz" ".tar"; + store = "/nix/store/lzis9waz781v2n789qy6cc5za4xxb6hp-okteta-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/okteta-15.04.2.tar.xz"; + sha256 = "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5"; + name = "okteta-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-15.04.2.tar.xz" ".tar"; + store = "/nix/store/g5a3dbqpf454c7lxi1k1r5d2sgdicl8q-amor-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/amor-15.04.2.tar.xz"; + sha256 = "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr"; + name = "amor-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-approver-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wxfmvnsjxnaiiflbcc7v38h2ax27m5fi-ktp-approver-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz"; + sha256 = "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7"; + name = "ktp-approver-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wdi23i8hk6c4fnvkw6bs75s8jkc0wxc0-kde-base-artwork-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz"; + sha256 = "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy"; + name = "kde-base-artwork-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.9.tar.xz" ".tar"; + store = "/nix/store/75yrqw2cr3b7kv1hsvlz4m9j6gm36akk-kdepimlibs-4.14.9.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz"; + sha256 = "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj"; + name = "kdepimlibs-4.14.9.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mqk73kl61afzbysc7isfli9ashgl29j9-kstars-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kstars-15.04.2.tar.xz"; + sha256 = "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6"; + name = "kstars-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-15.04.2.tar.xz" ".tar"; + store = "/nix/store/yrs4k4mal8rdpy1781jblbapf9xz201v-kaccessible-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz"; + sha256 = "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1"; + name = "kaccessible-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-15.04.2.tar.xz" ".tar"; + store = "/nix/store/0zkd1qcv6k52avkv235108rrqn2fifd8-ksnakeduel-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz"; + sha256 = "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b"; + name = "ksnakeduel-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l50svmrk7acq79f1ab284q61jm1164li-kalzium-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz"; + sha256 = "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x"; + name = "kalzium-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wlna2q3x6crc3xj7a7x09r0fxzsxfl27-oxygen-icons-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz"; + sha256 = "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi"; + name = "oxygen-icons-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-15.04.2.tar.xz" ".tar"; + store = "/nix/store/h9i6iisfnqyz340z2izl02n8nyz2l82b-cervisia-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz"; + sha256 = "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i"; + name = "cervisia-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/yhhpl1hamlamb7kfi1njlp60fg59xiqn-kmahjongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz"; + sha256 = "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq"; + name = "kmahjongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qffj5v8rmrlnqm7y7l68kwhy4cx9hhqa-libkdegames-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz"; + sha256 = "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj"; + name = "libkdegames-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zsrxzn4zp9a4v9xfaqr27d4nnmgycdc2-kspaceduel-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz"; + sha256 = "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy"; + name = "kspaceduel-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-15.04.2.tar.xz" ".tar"; + store = "/nix/store/pybi47055hcdlpliqari9p8gki1yj8iz-kmouth-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz"; + sha256 = "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47"; + name = "kmouth-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2y66l1759ipk2dk46b0imh1r6vwb3yrx-kde-dev-utils-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz"; + sha256 = "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5"; + name = "kde-dev-utils-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3ywzsbp1lvq98ikalwlxs57x9w2zh47x-mplayerthumbs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz"; + sha256 = "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim"; + name = "mplayerthumbs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-15.04.2.tar.xz" ".tar"; + store = "/nix/store/sqjrx2z8pig68sfifdcykksys2kifi2h-konquest-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/konquest-15.04.2.tar.xz"; + sha256 = "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn"; + name = "konquest-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3cz810cqihfw4jyfi8bdg9fi5bzs1rga-kcolorchooser-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz"; + sha256 = "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h"; + name = "kcolorchooser-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fzz2pwgl8jx0flydbv67f494rqs2lrdd-ffmpegthumbs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz"; + sha256 = "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg"; + name = "ffmpegthumbs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zfiqwh08ccppyzvqd8wrlmc0zf7nbj54-print-manager-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz"; + sha256 = "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk"; + name = "print-manager-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b51g9dz39d5raxgvl9fbmdbmsxjpniyg-step-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/step-15.04.2.tar.xz"; + sha256 = "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf"; + name = "step-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s9c62j11m3rc9w3i586hjwk1k29lhxwa-poxml-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/poxml-15.04.2.tar.xz"; + sha256 = "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3"; + name = "poxml-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/dwy5s9x602rr1m5cdjigk7mjvkab7h1c-ktp-filetransfer-handler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz"; + sha256 = "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177"; + name = "ktp-filetransfer-handler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bxd782i7kh5ssxcsvd7b25rx9mwywlpj-zeroconf-ioslave-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz"; + sha256 = "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9"; + name = "zeroconf-ioslave-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-15.04.2.tar.xz" ".tar"; + store = "/nix/store/7fh80id5rynq5wigvx95r5jldyj09f8a-kgeography-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz"; + sha256 = "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd"; + name = "kgeography-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wqlwval30d2jii0cpcnhyr7hvhn18yck-libkcddb-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz"; + sha256 = "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m"; + name = "libkcddb-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-15.04.2.tar.xz" ".tar"; + store = "/nix/store/i1rmk34a0bl0088ypi1vr3zgm22s0qxq-libkmahjongg-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz"; + sha256 = "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1"; + name = "libkmahjongg-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-15.04.2.tar.xz" ".tar"; + store = "/nix/store/091km97cfa95lqa9ll2bmy1j4ayijc94-ksquares-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz"; + sha256 = "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i"; + name = "ksquares-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6056jj6bns8mgr6ss3jqfdrwm1nlmvm2-ksudoku-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz"; + sha256 = "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna"; + name = "ksudoku-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-15.04.2.tar.xz" ".tar"; + store = "/nix/store/47lslszl9rlnpiw1ic2lxkrd5302kswb-kollision-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kollision-15.04.2.tar.xz"; + sha256 = "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi"; + name = "kollision-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ilz3z9pv0axrikakkrl1ibkv496r34ys-kcron-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcron-15.04.2.tar.xz"; + sha256 = "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf"; + name = "kcron-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/4lz289bp3agyw5igfvpdzi123m7qmiy4-bovo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/bovo-15.04.2.tar.xz"; + sha256 = "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2"; + name = "bovo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-15.04.2.tar.xz" ".tar"; + store = "/nix/store/654c7xpn6kvbvglh0sxg5qz75w52nfsi-filelight-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/filelight-15.04.2.tar.xz"; + sha256 = "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv"; + name = "filelight-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1xlxqdznc1w89hvz6ykzpbd4pkrxifmh-picmi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/picmi-15.04.2.tar.xz"; + sha256 = "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv"; + name = "picmi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-15.04.2.tar.xz" ".tar"; + store = "/nix/store/0g5k9zx2d4fxpsa4pifpilrm9xamq40g-kig-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kig-15.04.2.tar.xz"; + sha256 = "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv"; + name = "kig-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/81c1aijibwhrdhn149m3wx2zxv3l2r8f-ksirk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz"; + sha256 = "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w"; + name = "ksirk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okular-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9i3ma5arv1bfij2f92lmrg4z1fz7jr2v-okular-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/okular-15.04.2.tar.xz"; + sha256 = "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7"; + name = "okular-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-15.04.2.tar.xz" ".tar"; + store = "/nix/store/635srb7rlzyzlii3qf1j9p85fn18cdw6-ksystemlog-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz"; + sha256 = "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1"; + name = "ksystemlog-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fchxy0dfggh8hgd1z8yp13qgn1xrhxvl-kmousetool-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz"; + sha256 = "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9"; + name = "kmousetool-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ah5gjm6qdj22i62i1davbd88hwpp7bb0-kdegraphics-mobipocket-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz"; + sha256 = "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc"; + name = "kdegraphics-mobipocket-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.2.tar.xz" ".tar"; + store = "/nix/store/n874w08k1vfkinc01hr4hlvd4qg9ln8r-ktp-kded-module-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz"; + sha256 = "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n"; + name = "ktp-kded-module-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6wl8yszqa313v9w1b8l05qc2ajdxn9vj-klines-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klines-15.04.2.tar.xz"; + sha256 = "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az"; + name = "klines-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hdkpbx4z3d9wx6zmhcdfsj8rmxsyh3ay-kdenetwork-filesharing-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz"; + sha256 = "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy"; + name = "kdenetwork-filesharing-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-15.04.2.tar.xz" ".tar"; + store = "/nix/store/4k68344zgzdb3a11zgjlv4npcc16gxag-klickety-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/klickety-15.04.2.tar.xz"; + sha256 = "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5"; + name = "klickety-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.2.tar.xz" ".tar"; + store = "/nix/store/79xzz7i1yspf2mlzzbzzgaxk8szx0a8p-ktp-contact-runner-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz"; + sha256 = "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf"; + name = "ktp-contact-runner-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenlive-15.04.2.tar.xz" ".tar"; + store = "/nix/store/5q0r2446rj0dkxc3k5m96rjbbcgvyg4a-kdenlive-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz"; + sha256 = "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa"; + name = "kdenlive-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-15.04.2.tar.xz" ".tar"; + store = "/nix/store/6gskfm2ymh6mnv2irgj5v21r3hhypf9s-lskat-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/lskat-15.04.2.tar.xz"; + sha256 = "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4"; + name = "lskat-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-15.04.2.tar.xz" ".tar"; + store = "/nix/store/16pvgzgzp6y44n3cmpnajgw74m92wd9i-kblackbox-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz"; + sha256 = "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3"; + name = "kblackbox-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/33rnc300y683cxcp50mi1awdk4rxpp18-kapptemplate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz"; + sha256 = "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294"; + name = "kapptemplate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-15.04.2.tar.xz" ".tar"; + store = "/nix/store/s3ni25fyw0i7jykk0bdybq4jq60yfgi5-kbreakout-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz"; + sha256 = "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg"; + name = "kbreakout-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-15.04.2.tar.xz" ".tar"; + store = "/nix/store/wr8lj1871w99ffd0dgjyn3rgr2kix9sm-ktimer-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz"; + sha256 = "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0"; + name = "ktimer-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/rcckq4x2wvg7rgm4nbwlmzqhxsasmbd4-juk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/juk-15.04.2.tar.xz"; + sha256 = "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp"; + name = "juk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1b0cd8ahc9841k5f3yp8mnfi43gmca5b-kdewebdev-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz"; + sha256 = "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4"; + name = "kdewebdev-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/8n1ls70j6sp30v5172f8b4pni77h612w-pairs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/pairs-15.04.2.tar.xz"; + sha256 = "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a"; + name = "pairs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qxv3q0s8qvkmw3gv186zb5h8ds9qif9c-kopete-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kopete-15.04.2.tar.xz"; + sha256 = "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3"; + name = "kopete-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1d78nc8bn6q9pya6fmbvpv1j504h2p74-kreversi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz"; + sha256 = "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs"; + name = "kreversi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-15.04.2.tar.xz" ".tar"; + store = "/nix/store/40vin5w140gna791rbdvgiqv6gmdy5a6-knetwalk-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz"; + sha256 = "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn"; + name = "knetwalk-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-15.04.2.tar.xz" ".tar"; + store = "/nix/store/nfikvnas8aa532z85hra7d5lbdcp0sjb-kdeartwork-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz"; + sha256 = "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n"; + name = "kdeartwork-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ch4qds4ksc7bxc7qvnp594bcq15f7lfg-artikulate-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz"; + sha256 = "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v"; + name = "artikulate-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/br9b5cwnam0xgh9pm3sa1gf6r4wmr2pf-kaccounts-providers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz"; + sha256 = "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv"; + name = "kaccounts-providers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kpd3k77yxizdi9x0063m6dwjlw002xmh-kiten-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kiten-15.04.2.tar.xz"; + sha256 = "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3"; + name = "kiten-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3058pvg2jwnd405awd0ajk78qbn3pgr2-libksane-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libksane-15.04.2.tar.xz"; + sha256 = "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s"; + name = "libksane-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jw8kq5lv729dyz48fr0ynck8l1fi5lz9-kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + sha256 = "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8"; + name = "kdegraphics-strigi-analyzer-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-15.04.2.tar.xz" ".tar"; + store = "/nix/store/kay8y3b2yqw6x5n6d0bjh86x76p1pvr3-cantor-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/cantor-15.04.2.tar.xz"; + sha256 = "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm"; + name = "cantor-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v0ig7hdlixwprlrjpirxsj3mqg3mzj34-dragon-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/dragon-15.04.2.tar.xz"; + sha256 = "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s"; + name = "dragon-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.2.tar.xz" ".tar"; + store = "/nix/store/58nbpzqmcw17152bs24lh6h3mj6c6nlf-ktp-auth-handler-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz"; + sha256 = "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h"; + name = "ktp-auth-handler-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-15.04.2.tar.xz" ".tar"; + store = "/nix/store/hxhzw8r4ji2z6m1scybs90q3n4sf0p34-katomic-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/katomic-15.04.2.tar.xz"; + sha256 = "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras"; + name = "katomic-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9kjmy8gy1lybbgv45m3jpi5dg2f0d9xl-svgpart-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz"; + sha256 = "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29"; + name = "svgpart-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.2.tar.xz" ".tar"; + store = "/nix/store/bg5g9qpbzwrp50ipg3x9mi54dmp04hnw-kdegraphics-thumbnailers-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz"; + sha256 = "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3"; + name = "kdegraphics-thumbnailers-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.2.tar.xz" ".tar"; + store = "/nix/store/2ws9qacikk9az2dj6lxmg1swm7kwvyk4-ktp-accounts-kcm-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz"; + sha256 = "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01"; + name = "ktp-accounts-kcm-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qvbh4g988977fqahh0vdy6y2mcsa03sq-ktuberling-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz"; + sha256 = "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my"; + name = "ktuberling-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-15.04.2.tar.xz" ".tar"; + store = "/nix/store/y8fy3h6ypqnzr883hq02c8p0rfilizs5-kde-baseapps-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz"; + sha256 = "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv"; + name = "kde-baseapps-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-15.04.2.tar.xz" ".tar"; + store = "/nix/store/q36zxbwxvwhmccqsqvjp7s0amc56ci9g-kcalc-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz"; + sha256 = "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp"; + name = "kcalc-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ailfyyak31rbjd1syva34lh8ldqa589i-sweeper-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz"; + sha256 = "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3"; + name = "sweeper-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-15.04.2.tar.xz" ".tar"; + store = "/nix/store/841sa28hlcjqbh223vfyhf90xk2v7fwk-kuser-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kuser-15.04.2.tar.xz"; + sha256 = "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4"; + name = "kuser-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-15.04.2.tar.xz" ".tar"; + store = "/nix/store/b7v36hd1nplcfjn9j4sphxh08mw366l8-kturtle-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz"; + sha256 = "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910"; + name = "kturtle-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-15.04.2.tar.xz" ".tar"; + store = "/nix/store/gpvb35d3ri6z7bxvczhhq4d04a59aa32-libkface-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkface-15.04.2.tar.xz"; + sha256 = "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3"; + name = "libkface-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-15.04.2.tar.xz" ".tar"; + store = "/nix/store/92qgv319y1sypkgcgzhr8k2m2ii992kb-audiocd-kio-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz"; + sha256 = "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh"; + name = "audiocd-kio-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-15.04.2.tar.xz" ".tar"; + store = "/nix/store/jw9l8530fgdkkzyxdmf90g1p3s7phhs2-kppp-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kppp-15.04.2.tar.xz"; + sha256 = "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9"; + name = "kppp-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-15.04.2.tar.xz" ".tar"; + store = "/nix/store/57ri311sxq7bq64by12vgjqsgmajrfk7-kget-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kget-15.04.2.tar.xz"; + sha256 = "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0"; + name = "kget-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-15.04.2.tar.xz" ".tar"; + store = "/nix/store/1n2511qxgqb7prz2l85psdq1dypq3qms-kolourpaint-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz"; + sha256 = "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6"; + name = "kolourpaint-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fbf91j6jf0f3ws7sa8spsk2zkm08s5j4-ktouch-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz"; + sha256 = "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf"; + name = "ktouch-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-15.04.2.tar.xz" ".tar"; + store = "/nix/store/zf38d9iax1bnwga069a921zc7156f6sy-kbruch-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz"; + sha256 = "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825"; + name = "kbruch-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-15.04.2.tar.xz" ".tar"; + store = "/nix/store/mbfh9c9jrs8a8xb6srhny9ipjs52nx01-kolf-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kolf-15.04.2.tar.xz"; + sha256 = "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l"; + name = "kolf-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-15.04.2.tar.xz" ".tar"; + store = "/nix/store/i6k8yvh7rf1dqd2kn6aqmyzzcayxp3sy-kgamma-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz"; + sha256 = "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l"; + name = "kgamma-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-15.04.2.tar.xz" ".tar"; + store = "/nix/store/9ca8cpnw78bnlrqi1yyy192qbb93y82q-kigo-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kigo-15.04.2.tar.xz"; + sha256 = "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc"; + name = "kigo-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.2.tar.xz" ".tar"; + store = "/nix/store/vdwv4ww6n28gpc2rkylml28yalihy1q6-kdesdk-kioslaves-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz"; + sha256 = "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8"; + name = "kdesdk-kioslaves-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qc0mhibyrkipf7ryl45d0caaj5xsvmpc-kde-dev-scripts-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz"; + sha256 = "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5"; + name = "kde-dev-scripts-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-15.04.2.tar.xz" ".tar"; + store = "/nix/store/l7vgzgq9zh2q3nm6lvvxg57p86qr6z8a-kcachegrind-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz"; + sha256 = "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13"; + name = "kcachegrind-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ayx65a6hvxxyw4cclvw8f9c79pixbklf-libkomparediff2-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz"; + sha256 = "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99"; + name = "libkomparediff2-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-15.04.2.tar.xz" ".tar"; + store = "/nix/store/v7qcb9dvh0sg031y8s7qlhjj7bfi0hba-killbots-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/killbots-15.04.2.tar.xz"; + sha256 = "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q"; + name = "killbots-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-15.04.2.tar.xz" ".tar"; + store = "/nix/store/llzpz351096v1jq26pnpq38s353rijfk-rocs-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/rocs-15.04.2.tar.xz"; + sha256 = "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw"; + name = "rocs-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-15.04.2.tar.xz" ".tar"; + store = "/nix/store/678x21vwippxpjg2bsv79127s6852clb-kmines-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kmines-15.04.2.tar.xz"; + sha256 = "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s"; + name = "kmines-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-15.04.2.tar.xz" ".tar"; + store = "/nix/store/ykck6cw92ddmlcarb2b5rkqcsshrk54w-libkdeedu-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz"; + sha256 = "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q"; + name = "libkdeedu-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.2.tar.xz" ".tar"; + store = "/nix/store/aifqj9bdnahhjisqbiamcx8mq8fkw234-ktp-common-internals-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz"; + sha256 = "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq"; + name = "ktp-common-internals-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3z0xfsx62crxyp35in81zz5y84dcrfgr-kompare-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kompare-15.04.2.tar.xz"; + sha256 = "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk"; + name = "kompare-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-15.04.2.tar.xz" ".tar"; + store = "/nix/store/qfq2a23wsl1lws544pp5p0hgmprr2kaj-analitza-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/analitza-15.04.2.tar.xz"; + sha256 = "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j"; + name = "analitza-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-15.04.2.tar.xz" ".tar"; + store = "/nix/store/fcj9c30mhz0s2qhlch2sc1bsy52vp1hk-parley-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/parley-15.04.2.tar.xz"; + sha256 = "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc"; + name = "parley-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-15.04.2.tar.xz" ".tar"; + store = "/nix/store/3c6adpvdmw4yvwqa4ivn3mqf0himjf1f-libkipi-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz"; + sha256 = "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72"; + name = "libkipi-15.04.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.2.tar.xz" ".tar"; + store = "/nix/store/q3m5pc6n5f7l2hipmfplsjbswzg8n0vh-kqtquickcharts-15.04.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz"; + sha256 = "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6"; + name = "kqtquickcharts-15.04.2.tar.xz"; + }; + } ] diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh index 2aa3cee8c85..d74d9cbbfbc 100755 --- a/pkgs/applications/kde-apps-15.04/manifest.sh +++ b/pkgs/applications/kde-apps-15.04/manifest.sh @@ -10,6 +10,7 @@ if [ $# -eq 0 ]; then $(nix-build ../../.. -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.0/" \ "${KDE_MIRROR}/stable/applications/15.04.1/" \ + "${KDE_MIRROR}/stable/applications/15.04.2/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else From fbcdb662641395901f43f19f151f5654e9d345da Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 5 Jun 2015 16:35:06 -0500 Subject: [PATCH 199/208] kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency --- pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 661c8c3acb5..91583d75ead 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -350,6 +350,12 @@ let ++ [ pkgs.libotr ]; # needed for ktp-text-ui }; + ktp-text-ui = super.ktp-text-ui // { + buildInputs = + super.ktp-text-ui.buildInputs + ++ (with kf5; [ kdbusaddons ]); + }; + lokalize = super.lokalize // { buildInputs = super.lokalize.buildInputs From 7e04b7319c54bf0a4c0b6b55caca80a3b7434a87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2015 23:55:01 +0200 Subject: [PATCH 200/208] haskell: disable parallel compilation for libraries to mitigate the effects of GHC's non-deterministic library ID bug Further details can be found at and . --- pkgs/development/haskell-modules/generic-builder.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index edff84a0403..c0505d6e3c6 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,7 +72,10 @@ let hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary); + # We cannot enable -j parallelism for libraries because GHC is far more + # likely to generate a non-determistic library ID in that case. Further + # details are at . + enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" From 52184b53c05464fc9ccd3dd8200cb78c41ec8cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 6 Jun 2015 09:21:21 +0200 Subject: [PATCH 201/208] Revert "Revert "Explicitly pass -pthread flag to fix the build after some updates"" This reverts commit 6cfea50ad14b3225226e64bd77925dc05a593689. I think the reason for the revert was because of patch dependencies. We really need this patch to fix heimdal build. Or else: $ nix-build -A heimdal ... /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_getspecific' /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_key_create' /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_setspecific' collect2: error: ld returned 1 exit status Makefile:509: recipe for target 'tc' failed make[2]: *** [tc] Error 1 --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index aeea290bdb2..320e161d3da 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { "--without-x" ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread" + ''; + # We need to build hcrypt for applications like samba postBuild = '' (cd lib/hcrypto; make) From 08c4a192e23681d31cf88c1509ddf29cf802492a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Jun 2015 09:43:15 +0200 Subject: [PATCH 202/208] ghc-7.10.x.nix: remove obsolete re-build hacks from the package set configuration --- .../haskell-modules/configuration-ghc-7.10.x.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ac02bbc8818..335b133f555 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -278,18 +278,4 @@ self: super: { # Won't work with LLVM 3.5. llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; - # Ugly hack to trigger a rebuild to fix the broken package on Hydra. - asn1-encoding = appendConfigureFlag super.asn1-encoding "-fignore-me-1"; - asn1-types = appendConfigureFlag super.asn1-types "-fignore-me-1"; - cmdargs = appendConfigureFlag super.cmdargs "-fignore-me-1"; - crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1"; - crypto-pubkey-types = appendConfigureFlag super.crypto-pubkey-types "-fignore-me-1"; - hourglass = appendConfigureFlag super.hourglass "-fignore-me-1"; - math-functions = appendConfigureFlag super.math-functions "-fignore-me-1"; - tagsoup = appendConfigureFlag super.tagsoup "-fignore-me-1"; - X11 = appendConfigureFlag super.X11 "-fignore-me-1"; - x509 = appendConfigureFlag super.x509 "-fignore-me-1"; - x509-store = appendConfigureFlag super.x509-store "-fignore-me-1"; - x509-system = appendConfigureFlag super.x509-system "-fignore-me-1"; - } From 6aa10201ccbc81b055094a87f3e45aa2aa850f5e Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 6 Jun 2015 18:38:18 +0900 Subject: [PATCH 203/208] flashplayer: Update from 11.2.202.457 -> 11.2.202.460 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 35541b39ee8..79d95571f2f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.457"; + version = "11.2.202.460"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0nkr6p4h5l03ywsj1sbap359cl1x9rq3m12j9gvwvbvn935rmyr2"; + sha256 = "152hhxismgvz6hkh5m8z5x1drpwflymd2zk3v96nszpkb2xxirnr"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0qil5rb61bkn80fij31nv29q2wa7bxiwwxgy5zlkm2hsyrz3y4kc"; + sha256 = "15655c3kzk1mk00737wgc52i4zz5jh9fkjgjs747qwiik5pnh7x1"; } else throw "Flash Player is not supported on this platform"; From e32d6f6b52bef6aa515e3f12740ea5ab8bd8ba80 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jun 2015 14:00:24 +0200 Subject: [PATCH 204/208] ocaml-re: update from 1.3.1 to 1.4.0 --- pkgs/development/ocaml-modules/re/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index b2dd0609a0e..457b45a575e 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.3.1"; + name = "ocaml-re-1.4.0"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz"; - sha256 = "11d4k43pc97kvdbjgjcxpc0gq6yal4galkxlrfdp1iypwdcni92g"; + sha256 = "1xcfmhjgd7prqx2g1addlrk84xpfafmqnpjkqrvg7mw0hn1p7v2m"; }; buildInputs = [ ocaml findlib ]; From 8c0389ac01baddeb16a233e9bde6958eec45bf0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2015 12:28:48 +0200 Subject: [PATCH 205/208] python-packages: prompt_toolkit -> 0.39 Fixes: - Fixed layout.py example. - Fixed eventloop for Python 64bit on Windows. - Fix in history. - Fix in key bindings. --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5083d4d1032..d3ddc879a17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8494,6 +8494,10 @@ let propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + meta = { description = "Command-line interface for PostgreSQL"; longDescription = '' @@ -8792,11 +8796,11 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.38"; + version = "0.39"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc"; + sha256 = "1046fhgqd1171n8xyzcxwzcxgkcwa77r08g7iih8k5x7z59l94lb"; }; buildInputs = with self; [ jedi ipython pygments ]; From 90f4843f45c1a6c75d294a9313b0012d347c8be6 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 6 Jun 2015 15:21:08 +0300 Subject: [PATCH 206/208] f2fs-tools: 1.3.0 -> 1.4.1 --- pkgs/tools/filesystems/f2fs-tools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f52ead32acd..f8fa5cc264d 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.3.0"; + version = "1.4.1"; src = fetchgit { url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git; rev = "refs/tags/v${version}"; - sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i"; + sha256 = "16i74r2656q6x4gg5kgjy2fxipr5czbm10r66s34pi2lfczbwhjr"; }; buildInputs = [ autoconf automake libtool pkgconfig libuuid ]; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { autoreconf --install ''; - meta = { + meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.emery ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ emery jagajaga ]; }; } From 142400b8d5f2d05506df38d9212d91ab0eca8fc5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jun 2015 11:28:45 +0200 Subject: [PATCH 207/208] ocaml-merlin: update from 2.1.2 to 2.2 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 2d02bf054b7..8b93650743d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; -let version = "2.1.2"; in +let version = "2.2"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; - sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n"; + sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz"; }; buildInputs = [ ocaml findlib yojson menhir ] From ee8825935f771d7c9c1a68a089b396995d683cc4 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sat, 6 Jun 2015 20:42:37 +0300 Subject: [PATCH 208/208] google-music: beta_1.0.129.6633 -> beta_1.0.182.3607 --- .../audio/google-musicmanager/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index e7c513febf5..2edc1c00ce6 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -2,10 +2,11 @@ , libvorbis }: assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; - +let + archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; +in stdenv.mkDerivation rec { - debversion = "beta_1.0.129.6633-r0"; - version = "beta_1.0.129.6633-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -16,12 +17,12 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_amd64.deb"; - sha256 = "1fq2p721mzv8nd4dq6i9xiqvvqd5ak3v142vsxchg6yn14a9kbvr"; + url = archUrl name "amd64"; + sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; } else fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_i386.deb"; - sha256 = "7914e3e6e2adb2e952ebaf383db5e04727c29cfa83401007f29977f6c5ff6873"; + url = archUrl name "i386"; + sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; }; unpackPhase = ''