From 29b2aec2338b6375c12d89f63a530ebc5e6406b2 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sat, 2 Nov 2013 14:10:23 +0000 Subject: [PATCH 001/285] wget darwin: disable Test-iri-disabled.px This test fails on MacOS X. The failure has something to do with the tests expecting filesystems to accept/store filenames as bytes. On the HFS+ filesystem, however, filenames are Unicode characters (Normalisation Form D). This wget ticket appears to be relevant http://savannah.gnu.org/bugs/index.php?27541 The maintainer does not seem to think that this test failure represents a problem in practice: http://article.gmane.org/gmane.comp.web.wget.general/8988 But this patch should be revisited/removed if this aspect of wget is ever addressed in the future. NB: I'm also a bit concerned/confused that none of the tests mentioned in that message seem to fail, so I'm not 100% sure if this is the relevant issue. --- pkgs/tools/networking/wget/default.nix | 2 ++ pkgs/tools/networking/wget/iri-test.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/wget/iri-test.patch diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3e3b74dfe902..5ae85adbec7e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch new file mode 100644 index 000000000000..c1f798ce3726 --- /dev/null +++ b/pkgs/tools/networking/wget/iri-test.patch @@ -0,0 +1,12 @@ +diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px +--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 ++++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 +@@ -48,7 +48,7 @@ + 'Test-idn-robots-utf8.px', + 'Test-iri.px', + 'Test-iri-percent.px', +- 'Test-iri-disabled.px', ++ #'Test-iri-disabled.px', + 'Test-iri-forced-remote.px', + 'Test-iri-list.px', + 'Test-k.px', From 67e3258ab5d0c881b704987db85786cdf0676282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 19 Nov 2013 21:33:43 +0100 Subject: [PATCH 002/285] hibernate: upgrade from 1.98.1 to 2.0 --- pkgs/os-specific/linux/hibernate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 91dc90681032..d0e77a3bb700 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gawk }: -let version = "1.98.1"; +let version = "2.0"; in stdenv.mkDerivation rec { name = "hibernate-${version}"; src = fetchurl { - url = "http://www.tuxonice.net/downloads/all/hibernate-script-${version}.tar.gz"; - sha256 = "1xpc2i16jczc3nhvxlkn6fb044srqrh528gnp92cwy4hxf2nzi1z"; + url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; + sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; }; patches = [ ./install.patch ./gen-manpages.patch ./hibernate.patch ]; From d70e11672f7f7f08255b7e30f621e8ac05f7af00 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Thu, 21 Nov 2013 11:19:56 +0100 Subject: [PATCH 003/285] grafx2: new package GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance. Specialized in 256-color drawing. --- pkgs/applications/graphics/grafx2/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/graphics/grafx2/default.nix diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix new file mode 100644 index 000000000000..938f5bb497f2 --- /dev/null +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkgconfig, lua5 }: + +stdenv.mkDerivation rec { + + version = "2.4.2035"; + name = "grafx2-${version}"; + + src = fetchurl { + url = "https://grafx2.googlecode.com/files/${name}-src.tgz"; + sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; + }; + + buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ]; + + buildPhase = '' + cd src + make + ''; + + installPhase = '' + mkdir -p "$out" + make install prefix="$out" + ''; + + meta = { + description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; + homepage = http://code.google.co/p/grafx2/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.zoomulator ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bef1cff60ede..26e0891c0b76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1019,6 +1019,8 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; + grafx2 = callPackage ../applications/graphics/grafx2 {}; + graphviz = callPackage ../tools/graphics/graphviz { }; /* Readded by Michael Raskin. There are programs in the wild From 2fed56b42f094d8a3b2a19fe54b6441802087e3e Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Wed, 30 Oct 2013 22:04:25 +0100 Subject: [PATCH 004/285] autofs: upgrade 5.0.5 -> 5.0.8 * upstream: patches have been moved into the patches-5.0.x directory * disable autofs preparing and then moving mount points "With the introduction of systemd the root filesystem is now usually marked as shared instead of private as part of the systemd sandbox functionality. As a consequence moving a mount from one mount point to another is not allowed." --- pkgs/os-specific/linux/autofs/autofs-v5.nix | 8 ++--- .../linux/autofs/create-patches-v5.sh | 4 +-- pkgs/os-specific/linux/autofs/patches-v5.nix | 31 ++----------------- 3 files changed, 9 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 731b383e7117..81ead8d33d0e 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -4,17 +4,17 @@ let baseURL = mirror://kernel/linux/daemons/autofs/v5; in stdenv.mkDerivation { - name = "autofs-5.0.5"; + name = "autofs-5.0.8"; src = fetchurl { - url = "${baseURL}/autofs-5.0.5.tar.bz2"; - sha256 = "00k0k3jkbr29gn1wnzqjyc9iqq5bwjyip1isc79wf51wph0kxiv8"; + url = "${baseURL}/autofs-5.0.8.tar.bz2"; + sha256 = "0zczihrqdamj43401v2pczf7zi94f8qk20gc6l92nxmpak3443if"; }; patches = import ./patches-v5.nix fetchurl; preConfigure = '' - configureFlags="--with-path=$PATH" + configureFlags="--disable-move-mount --with-path=$PATH" export MOUNT=/var/run/current-system/sw/bin/mount export UMOUNT=/var/run/current-system/sw/bin/umount export MODPROBE=/var/run/current-system/sw/sbin/modprobe diff --git a/pkgs/os-specific/linux/autofs/create-patches-v5.sh b/pkgs/os-specific/linux/autofs/create-patches-v5.sh index 781c59a324a9..1fe6b503288d 100644 --- a/pkgs/os-specific/linux/autofs/create-patches-v5.sh +++ b/pkgs/os-specific/linux/autofs/create-patches-v5.sh @@ -1,10 +1,10 @@ #!/bin/sh # # Use this script with the upstream sorted list of patches -# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patch_order-5.0.5 | +# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patches-5.0.{x+1}/patch_order-5.0.x | # grep -v '^#' | sh create-patches-v5.sh -BASEURL=mirror://kernel/linux/daemons/autofs/v5; +BASEURL=mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9; echo '# File created automatically' > patches-v5.nix echo 'fetchurl :' >> patches-v5.nix diff --git a/pkgs/os-specific/linux/autofs/patches-v5.nix b/pkgs/os-specific/linux/autofs/patches-v5.nix index 0598102fb2ac..a577beefbe7f 100644 --- a/pkgs/os-specific/linux/autofs/patches-v5.nix +++ b/pkgs/os-specific/linux/autofs/patches-v5.nix @@ -1,32 +1,7 @@ # File created automatically fetchurl : [ -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-included-map-read-fail-handling.patch; sha256 = "1a8yhy898zp8hn6ihnz8scannjx74am6ys6dkahds4ga3zjg0k27"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-refactor-ldap-sasl-bind.patch; sha256 = "0c4izyvg4mrn0h4g18vk7d10zyb6b1sh40bjrm0xc6ga7n7z89x1"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-add-mount-wait-parameter.patch; sha256 = "1a8wd8lyx4bh9v6yw0360vbzjwvr1w838k2g3xrg374z6fmj4n3f"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-special-case-cifs-escapes.patch; sha256 = "0cb4kaipdmqlx11nw1l9c6ccssl01q5zg3f9zaarhv6ha91jag63"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-libxml2-workaround-configure.patch; sha256 = "1fb5ksyqc7706j48hwjarsk83047np360kln6lll8plmrg2539rc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-more-code-analysis-corrections.patch; sha256 = "1lhx6iblmi4b8jx5sd94jlj8pwkhfy9f7dxnx45af0c251rcqxi9"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-backwards-ifndef-INET6.patch; sha256 = "0k2cbr2651w6hf720qm68l66d3jr5y6yp80igr7ym60q68pxkwfk"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-stale-init-for-file-map-instance.patch; sha256 = "1h128fj8bgwg8ym0066dl9qp5yfv8jrjnrhsdsmfx2qdq2shyj42"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-ext4-fsck-at-mount.patch; sha256 = "1w92iykwnpvz6sbn98nmc9qa8wwar2qidqln3f14wfic9jrs2x6n"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-use-master_lex_destroy-to-clear-parse-buffer.patch; sha256 = "1rq2xqj3jqibbknnssd3ji0ymdw8jq7fv2a4s15m63rd8q3b2mci"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-make-documentation-for-set-log-priority-clearer.patch; sha256 = "0ly5zkhsx49b98vzrq863ksj9f8024vrzivlhwa45p47kzza9p9b"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-timeout-in-connect_nb.patch; sha256 = "1fhy7rmvk14ikxnavlznx8qya0y5gm73y8gs1v1piwmig0g3y8hf"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-pidof-init-script-usage.patch; sha256 = "1rqpdjn99wqr8j591qsn231chwi3s25jma3raqmpsip3vz75rfy8"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch; sha256 = "17lccz000ajclm29v7cv6i2dxs7lgb0p6dg9xdp84h58h6x94n0l"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-fail-mount-on-access-fail.patch; sha256 = "0sssai921nkin77gi6n62qsxp97f49xa7cwb51dwy8216qcn5fkr"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-rpc-large-export-list.patch; sha256 = "1k4574pkmnp55jkqg83f3pyw3vqf0pv8fyhwb6ndrzfmgrmbcqar"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-memory-leak-on-reload.patch; sha256 = "15qc61akl0gvs33anz6vif2cb4g1v47s9n6v9j0sdw4sw45292gv"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-update-kernel-patches-2.6.18-and-2.6.19.patch; sha256 = "0rlb3k2bq5f18jrwa7xnfq3rxngqv9i07xcpyfq8yv3lj6qrb5qc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-connect-at-ldap-lookup-module-init.patch; sha256 = "0dvfvim2riasa3dcf4ifkjg9bssaq8am4asrxfl9gkxqa3lp0drh"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-random-selection-option.patch; sha256 = "0ignn2m4syk491awkrzjj07vyfmlj4fyigk8fd3larn06vpcy0kx"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-disable-timeout.patch; sha256 = "0d66pm2kmc9pz6k0shsd1gx0m8jhf71ik6wa7nzdijwpzzmbdagc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-strdup-return-value-check.patch; sha256 = "0k0xqs1k12nxiaidf3j2w8iywycpbx14bmxc00ra0nc2i3shd6cz"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-reconnect-get-base-dn.patch; sha256 = "1yn5fcb1xqzycmnbv6l7ghjy34vlacbnr5yz37sfgz7w81qr7xgk"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-sasl-mutex-callbacks.patch; sha256 = "18kkznkg2p5f0gq4hncis37j75pg72h7la9q71xpl0ci875j35r8"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-get-qdn-fail.patch; sha256 = "0sd6k7fcwvql1p3vhhfjiw4rbrqyr36fvjv37dyap7p6sahn84n9"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch; sha256 = "1imsxa4rdbkdy8lx7sibm6g91f05lidhfzwf2k4fbkiz9232872r"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch; sha256 = "1r3azgm8y5i42p9hmp4mn88wz0ks6fyrjb80nj3npv6x3qy8cryv"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch; sha256 = "026gbbffadl4ly5n5z73mzf2ga14m9ya09agbxrpsf24f4h65cw4"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch; sha256 = "11v1a32rx57ylp8scswpk41jl9n4kfx55nvdlzhvfs4rhws18rpx"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-master-map-type-check.patch; sha256 = "1nkq0y6j7dc6214af3q9bxvy7pv9kak0q9chijxcj6zkhfzwrjy3"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-task-manager-not-getting-signaled.patch; sha256 = "17h06wk4x0rqiky6pm9dglbc5ycxxrd3438a9snnlysl4zzgrqhx"; }) ] From fee5929a42e2d8f70bff1b11a3d47af930e65a88 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 23 Nov 2013 02:22:05 +0100 Subject: [PATCH 005/285] First commit. Added Nix expression for Bochs - "the highly portable x86 emulator". --- .../virtualization/bochs/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/virtualization/bochs/default.nix diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix new file mode 100644 index 000000000000..440ac66b6c5f --- /dev/null +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl +, libX11 , mesa +, sdlSupport ? true, SDL ? null +, termSupport ? true , ncurses ? null, readline ? null +, wxSupport ? true , gtk ? null , wxGTK ? null , pkgconfig ? null +, wgetSupport ? false, wget ? null +, curlSupport ? false, curl ? null +}: + + +assert sdlSupport -> (SDL != null); +assert termSupport -> (ncurses != null&& readline != null); +assert wxSupport -> (gtk != null && wxGTK != null && pkgconfig != null); +assert wgetSupport -> (wget != null); +assert curlSupport -> (curl != null); + +stdenv.mkDerivation rec { + + name = "bochs-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; + sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; + }; + + buildInputs = with stdenv.lib; + [ libX11 mesa ] + ++ optionals sdlSupport [ SDL ] + ++ optionals termSupport [ readline ncurses ] + ++ optionals wxSupport [ gtk wxGTK pkgconfig ] + ++ optionals wgetSupport [ wget ] + ++ optionals curlSupport [ curl ]; + + configureFlags = '' + --with-x11 + --with-term=${if termSupport then "yes" else "no"} + --with-sdl=${if sdlSupport then "yes" else "no"} + --with-svga=no + --with-wx=${if wxSupport then "yes" else "no"} + --enable-readline + --enable-plugins=no + --enable-disasm + --enable-debugger + --enable-ne2000 + --enable-e1000 + --enable-sb16 + --enable-voodoo + --enable-usb + --enable-pnic +''; + + meta = { + description = "An open-source IA-32 (x86) PC emulator"; + longDescription = '' + Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. + ''; + homepage = http://bochs.sourceforge.net/; + license = "LGPL"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a6c2cd289f3..0a16cfa61362 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,6 +533,8 @@ let bmon = callPackage ../tools/misc/bmon { }; + bochs = callPackage ../applications/virtualization/bochs { }; + boomerang = callPackage ../development/tools/boomerang { stdenv = overrideGCC stdenv gcc47; }; From cb73e54d984f1e89d915a6287023945bee4ecd86 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 23 Nov 2013 02:34:40 +0100 Subject: [PATCH 006/285] A not so clear README file. --- README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000000..32a0dabd8ff3 --- /dev/null +++ b/README @@ -0,0 +1,3 @@ +This is the AndersonTorres's fork of NixOS tree from Github. + +Here I will develop scripts for my favourite softwares - some of them are Bochs, mpv, and Mate Desktop. From 1e44b5999603153e0c6ca08cf0d661aca559c180 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Sat, 23 Nov 2013 09:44:49 +0100 Subject: [PATCH 007/285] grafx2: Some simplification in the package file. --- pkgs/applications/graphics/grafx2/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 938f5bb497f2..d6b2044bff3c 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -12,10 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ]; - buildPhase = '' - cd src - make - ''; + preBuild = "cd src"; installPhase = '' mkdir -p "$out" From c30651d75f05e37e69b134657d11a9c794b13dbf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 23 Nov 2013 10:28:28 +0100 Subject: [PATCH 008/285] Deleting README to conform to some style standards. --- README | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 32a0dabd8ff3..000000000000 --- a/README +++ /dev/null @@ -1,3 +0,0 @@ -This is the AndersonTorres's fork of NixOS tree from Github. - -Here I will develop scripts for my favourite softwares - some of them are Bochs, mpv, and Mate Desktop. From b97e4a1ac6443cf3a7661615be2766e57c9c95b5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 30 Oct 2013 13:59:38 +0000 Subject: [PATCH 009/285] fish: Update to 2.1.0 (close #1261) --- pkgs/shells/fish/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7beca2109ea6..27f2b032476e 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }: stdenv.mkDerivation rec { - name = "fish-2.0.0"; + name = "fish-2.1.0"; src = fetchurl { - url = http://fishshell.com/files/2.0.0/fish-2.0.0.tar.gz; - sha1 = "2d28553e2ff975f8e5fed6b266f7a940493b6636"; + url = http://fishshell.com/files/2.1.0/fish-2.1.0.tar.gz; + sha1 = "b1764cba540055cb8e2a96a7ea4c844b04a32522"; }; nativeBuildInputs = [ autoconf ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://fishshell.com/; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} \ No newline at end of file +} From 5fd97b7067aee8b9ec835beb340715e2aab8ef5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Nov 2013 14:40:32 +0100 Subject: [PATCH 010/285] wireshark: bugfix+CVE update to current old-stable The old version also didn't build anymore on x-updates. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 599229753b5e..7e5fdc6ccd36 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -4,14 +4,14 @@ , makeDesktopItem }: -let version = "1.8.7"; in +let version = "1.8.11"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "0hm8zisy5dg7sfhh7rvgnpffq2qcw0syd8k5kns8j0j13sf44zjw"; + sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw"; }; buildInputs = From b4aa4810800099a74fbbaf5d3094eaceda78b12c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 14:57:20 +0100 Subject: [PATCH 011/285] notmuch: update to 0.16 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index ebab3a42af67..5797354d33bd 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.15.2"; + name = "notmuch-0.16"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56"; + sha256 = "0i7k85lfp9l0grmq7cvai2f3pw15jcrhcp96mmamr15y2pn2syg7"; }; buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; From 830bcd1850f0cb4759a9c0027ff185c982e1645b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 15:06:07 +0100 Subject: [PATCH 012/285] jmeter: update to 2.10 --- pkgs/applications/networking/jmeter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index c3212f6aa560..ddb7b63fc6f9 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, ant }: stdenv.mkDerivation rec { - name = "jmeter-2.9"; + name = "jmeter-2.10"; src = fetchurl { - url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-jmeter-2.9.tgz"; - sha256 = "14r3zn910m97jqrf6k5c4lwy214snaap2242qg76h65zk9qr20ni"; + url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz"; + sha256 = "1ygm0h02sllh4mfl5imj46v80wnbs1x7n88gfjm523ixmgsa0fvy"; }; installPhase = '' From 6aff4d5ee516d633c34e7c804d07a9cf1d0b208c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 15:19:54 +0100 Subject: [PATCH 013/285] zathuraCollection: update to latest girara -> 0.1.9 zathura-core -> 0.2.5 zathura-djvu -> 0.2.3 zathura-pdf-poppler -> 0.2.4 zathura-ps -> 0.2.2 --- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 8 +++----- pkgs/applications/misc/zathura/default.nix | 12 +++++++++--- pkgs/applications/misc/zathura/djvu/default.nix | 4 ++-- .../misc/zathura/pdf-poppler/default.nix | 4 ++-- pkgs/applications/misc/zathura/ps/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index e112427126ab..7af8cbeccc63 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.5"; + name = "girara-0.1.9"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "1hfi3jmx8ydvrqm3h6p6py2csavh7xx0223vxyca51kjl9mfnbld"; + sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index e5eae771d8b3..f3431f9480fd 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: stdenv.mkDerivation rec { - - version = "0.2.2"; - + version = "0.2.5"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5"; + sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr"; }; - buildInputs = [ pkgconfig gtk girara gettext makeWrapper ]; + buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; # Bug in zathura build system: we should remove empty manfiles in order them # to be compiled properly diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 8bdc7865832d..74288657fb35 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -3,13 +3,19 @@ rec { inherit (pkgs) stdenv; - zathura_core = callPackage ./core { }; + zathura_core = callPackage ./core { + gtk = pkgs.gtk3; + }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; - zathura_djvu = callPackage ./djvu { }; + zathura_djvu = callPackage ./djvu { + gtk = pkgs.gtk3; + }; - zathura_ps = callPackage ./ps { }; + zathura_ps = callPackage ./ps { + gtk = pkgs.gtk3; + }; zathuraWrapper = stdenv.mkDerivation { diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 9486acfef656..1a2347f27277 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.1"; + name = "zathura-djvu-0.2.3"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3"; + sha256 = "12gd8kb0al5mknh4rlvxzgzwz3vhjggqjh8ws27phaq14paq4vn1"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index faf4e49b968b..71c418f168c4 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - version = "0.2.2"; + version = "0.2.4"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "0px59f0bnmb9992n3c9iyzcwd6w7vg8ga069vc8qj4726ljml4c7"; + sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 7c0dd552a66c..eef020016015 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.0"; + name = "zathura-ps-0.2.2"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414"; + sha256 = "1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76"; }; buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea21d94668de..1a04769c8ce4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9199,7 +9199,9 @@ let zathura = zathuraCollection.zathuraWrapper; - girara = callPackage ../applications/misc/girara { }; + girara = callPackage ../applications/misc/girara { + gtk = gtk3; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; From b06462f9ec108fa187aae72c0a433b1406aa70a4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 15:33:43 +0100 Subject: [PATCH 014/285] vifm: update 0.7.6 --- pkgs/applications/misc/vifm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 7230e84601e4..4af565d717aa 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -2,14 +2,14 @@ let name = "vifm-${version}"; - version = "0.7.5"; + version = "0.7.6"; in stdenv.mkDerivation { inherit name; src = fetchurl { url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; - sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01"; + sha256 ="03v50hmgfvrci5fz31zmklmp6ix7qpqnhvm6639wbk3g5mcrh5w6"; }; #phaseNames = ["doConfigure" "doMakeInstall"]; From a8d5881c3eadd13b6ffa0aaff84107b62e66e38d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 15:36:20 +0100 Subject: [PATCH 015/285] varnish: update to 3.0.4 --- pkgs/servers/varnish/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8d0f3b306f26..7c487961438d 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig }: +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - version = "3.0.3"; + version = "3.0.4"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "1cla2igwfwcm07srvk0z9cqdxh74sga0c1rsmh4b4n1gjn6x2drd"; + sha256 = "0y8gml06h3wjiasfqnk7f9wrfrlgx89qz04wz3fjn8knbk5lq12f"; }; - buildInputs = [ pcre libxslt groff ncurses pkgconfig ]; + buildInputs = [ pcre libxslt groff ncurses pkgconfig readline ]; meta = { description = "Web application accelerator also known as a caching HTTP reverse proxy"; From 608bfa50ff72dec8256e23723d0cb85e083fcc9e Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 23 Nov 2013 11:23:07 +0100 Subject: [PATCH 016/285] xmobar: add support for wireless Signed-off-by: Moritz Ulrich --- pkgs/applications/misc/xmobar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 273998dde5d1..03ec9a6d4035 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,5 @@ { cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time -, utf8String, X11, X11Xft +, utf8String, X11, X11Xft, wirelesstools }: cabal.mkDerivation (self: { @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { buildDepends = [ filepath mtl parsec regexCompat stm time utf8String X11 X11Xft ]; - extraLibraries = [ libXrandr ]; - configureFlags = "-fwith_xft"; + extraLibraries = [ libXrandr wirelesstools ]; + configureFlags = "-fwith_xft -fwith_iwlib"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From a34354ef81dc0dca8e671a17b32423497d7a2664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 19 Nov 2013 21:36:55 +0100 Subject: [PATCH 017/285] TuxOnIce: Add a 3.10 linux kernel with the TuxOnIce hibernation patch --- pkgs/os-specific/linux/kernel/patches.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6c812646209c..36f3232838c2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -3,7 +3,7 @@ let makeTuxonicePatch = { version, kernelVersion, sha256, - url ? "http://tuxonice.net/files/tuxonice-${version}-for-${kernelVersion}.patch.bz2" }: + url ? "http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-${kernelVersion}-${version}.patch.bz2" }: { name = "tuxonice-${kernelVersion}"; patch = stdenv.mkDerivation { name = "tuxonice-${version}-for-${kernelVersion}.patch"; @@ -117,6 +117,13 @@ rec { patch = ./mips-ext3-n32.patch; }; + tuxonice_3_10 = makeTuxonicePatch { + version = "2013-11-07"; + kernelVersion = "3.10.18"; + sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; + }; + + grsecurity_2_9_1_3_2_52 = { name = "grsecurity-2.9.1-3.2.52"; patch = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b0aaed6f1f..e2534d3fe98d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6690,6 +6690,15 @@ let ]; }; + linux_3_10_tuxonice = linux_3_10.override (attrs: { + kernelPatches = attrs.kernelPatches ++ [ + kernelPatches.tuxonice_3_10 + ]; + extraConfig = '' + TOI_CORE y + ''; + }); + linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = @@ -6832,6 +6841,7 @@ let linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); + linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); # Update this when adding a new version! From 7f791a6449d5a0f9271b06f1d1ba301c988270ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 23 Nov 2013 18:09:39 +0100 Subject: [PATCH 018/285] MyPaint: fix the mypaint script to use the correct python instead of calling env --- pkgs/applications/graphics/mypaint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index a59498b8f141..e5b711e11f27 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' scons prefix=$out install + sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint wrapProgram $out/bin/mypaint --prefix PYTHONPATH : $PYTHONPATH ''; From 53f05a812f14b0273a24c0aae2b3db357d33cc40 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 17 Nov 2013 22:16:33 -0500 Subject: [PATCH 019/285] Add hdevtools 4 spaces per indent --- .../tools/haskell/hdevtools/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/haskell/hdevtools/default.nix diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix new file mode 100644 index 000000000000..36741f97458f --- /dev/null +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -0,0 +1,16 @@ +{ cabal, cmdargs, ghcPaths, network, syb, time }: + +cabal.mkDerivation (self: { + pname = "hdevtools"; + version = "0.1.0.5"; + sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; + isLibrary = false; + isExecutable = true; + buildDepends = [ cmdargs ghcPaths network syb time ]; + meta = { + homepage = "https://github.com/bitc/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 461e202bd3da..fadba5b0fbc1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2479,6 +2479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hasktags = callPackage ../development/tools/haskell/hasktags {}; + hdevtools = callPackage ../development/tools/haskell/hdevtools {}; + hlint = callPackage ../development/tools/haskell/hlint { haskellSrcExts = self.haskellSrcExts_1_14_0; }; From 7ab7be0cc33ef4b788d6b069a8a709b0d30ed8c4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 23 Nov 2013 21:18:37 -0500 Subject: [PATCH 020/285] Add automake 1.14 Signed-off-by: Shea Levy --- .../tools/misc/automake/automake-1.14.x.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.14.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix new file mode 100644 index 000000000000..d6f8117f9b82 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: + +stdenv.mkDerivation rec { + name = "automake-1.14"; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0nc0zqq8j336kamizzd86wb19vhbwywv5avcjh3cyx230xfqy671"; + }; + + buildInputs = [ perl autoconf ]; + + setupHook = ./setup-hook.sh; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + homepage = "http://www.gnu.org/software/automake/"; + description = "GNU standard-compliant makefile generator"; + license = "GPLv2+"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44ae2f2cc870..00cfd381a13a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3435,6 +3435,8 @@ let automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; + automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { }; From a07171260631aecc08866db25aa4adaa715c03d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 12:47:58 +0100 Subject: [PATCH 021/285] python-pyodbc: bump 3.0.6 -> 3.0.7 Changes: * Added context manager support to Cursor * Added padding for driver bugs writing an extra byte * Cursor.executemany now accepts an iterator or generator. * Compilation improvements for FreeBSD, Cygwin, and OS/X * Use SQL_DATA_AT_EXEC instead of SQL_DATA_LEN_AT_EXEC when possible for driver compatibility. * Row objects can now be pickled. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcba77e3e53b..e99bcc2d1f64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4882,11 +4882,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyodbc = buildPythonPackage rec { - name = "pyodbc-3.0.6"; + name = "pyodbc-3.0.7"; src = fetchurl { url = "https://pyodbc.googlecode.com/files/${name}.zip"; - sha256 = "0v9nymllw5zq5294rqp8ip3l0g6l3l3mljwhxn5jajyzxlnz39z5"; + sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; }; buildInputs = [ pkgs.unzip pkgs.libiodbc ]; From 36612c761446aa6fae2456dbe6e524830fa70343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 12:58:21 +0100 Subject: [PATCH 022/285] python-blockdiag: bump 1.2.4 -> 1.3.2 Changes: 1.3.2 (2013-11-19) Fix bugs 1.3.1 (2013-10-22) Fix bugs 1.3.0 (2013-10-05) Support python 3.2 and 3.3 (thanks to @masayuko) Drop supports for python 2.4 and 2.5 Replace dependency: PIL -> Pillow (The test phase still fails for one test, so continue having it disabled.) --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e99bcc2d1f64..a98ec45ccb7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -573,16 +573,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { blockdiag = buildPythonPackage rec { - name = "blockdiag-1.2.4"; + name = "blockdiag-1.3.2"; src = fetchurl { url = "https://pypi.python.org/packages/source/b/blockdiag/${name}.tar.gz"; - md5 = "244334f60cc10b0cb73b5df5279bcdd1"; + md5 = "602a8750f312eeee84d6d138055dfae7"; }; buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ pil webcolors funcparserlib ]; + propagatedBuildInputs = [ pillow webcolors funcparserlib ]; # One test fails: # ... From 6b2a7d0aa4633714650c807adc1fa62e7396277d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 13:04:06 +0100 Subject: [PATCH 023/285] python-actdiag: bump 0.4.3 -> 0.5.1 Changes: 0.5.1 (2013-10-22) Fix bugs 0.5.0 (2013-10-05) Support python 3.2 and 3.3 (thanks to @masayuko) Drop supports for python 2.4 and 2.5 Replace dependency: PIL -> Pillow (The test phase still fails for one test, so continue having it disabled.) --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a98ec45ccb7c..7df88a31b6bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -159,18 +159,19 @@ pythonPackages = modules // import ./python-packages-generated.nix { actdiag = buildPythonPackage rec { - name = "actdiag-0.4.3"; + name = "actdiag-0.5.1"; src = fetchurl { url = "https://pypi.python.org/packages/source/a/actdiag/${name}.tar.gz"; - md5 = "428aaab849f04668fa12388b964a56ea"; + md5 = "171c47bc1f70e5fadfffd9df0c3157be"; }; buildInputs = [ pep8 nose unittest2 docutils ]; propagatedBuildInputs = [ blockdiag ]; - # One test fails, because of missing simple.diag input file + # One test fails: + # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) doCheck = false; meta = with stdenv.lib; { From be0a7c12388d5c1774632ca977afbaaf1ca8b44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 13:07:02 +0100 Subject: [PATCH 024/285] python-nwdiag: bump 0.9.4 -> 1.0.0 Changes: 1.0.0 (2013-10-05) Support python 3.2 and 3.3 (thanks to @masayuko) Drop supports for python 2.4 and 2.5 Replace dependency: PIL -> Pillow (The test phase still fails, so continue having it disabled.) --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7df88a31b6bd..d4e565ddfdf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3968,11 +3968,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { nwdiag = buildPythonPackage rec { - name = "nwdiag-0.9.4"; + name = "nwdiag-1.0.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/n/nwdiag/${name}.tar.gz"; - md5 = "199b22f66ec3012c3999177d376a3842"; + md5 = "d81581a028840f8f7362ab21bf73e941"; }; buildInputs = [ pep8 nose unittest2 docutils ]; From 3f21d7c33450463330ea58c13d2ce738d7044ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 13:11:34 +0100 Subject: [PATCH 025/285] python-seqdiag: bump 0.8.2 -> 0.9.0 Changes: 0.9.0 (2013-10-05) Support python 3.2 and 3.3 (thanks to @masayuko) Drop supports for python 2.4 and 2.5 Replace dependency: PIL -> Pillow (The test phase still fails, so continue having it disabled.) --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d4e565ddfdf6..c29c0268b006 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5684,20 +5684,20 @@ pythonPackages = modules // import ./python-packages-generated.nix { seqdiag = buildPythonPackage rec { - name = "seqdiag-0.8.2"; + name = "seqdiag-0.9.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/seqdiag/${name}.tar.gz"; - md5 = "61b3da29b5efaa89701b4db6d2d4d5fa"; + md5 = "92946555ce219df18002e6c88b4055d3"; }; buildInputs = [ pep8 nose unittest2 docutils ]; propagatedBuildInputs = [ blockdiag ]; - # Some tests fail (because of missing input files?): + # Tests fail: # ... - # IOError: [Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.8.2.drv-0/seqdiag-0.8.2/src/seqdiag/tests/diagrams/separators.diag' + # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') doCheck = false; meta = with stdenv.lib; { From 2a78fadf337bf3e7b4ea07be135e7b238a591cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 13:23:50 +0100 Subject: [PATCH 026/285] solfege: update 3.22 -> 3.22.2 (latest stable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: Solfege 3.22.2, October 6, 2013 * Updated Esperanto, Portugese and Turkish translations to the users manual * Updated Spannish and Turkish messages * distribute solfege/tests/lesson-files/* * help/C/scales/modes.html are never translated. So we must link to the C-locale file in every translation. * gettext tweaks to make the test suite work both when run as "test.py" and "test.py test_lessonfile". There is still something wrong because we have to disable the test to run debuild * distribute solfege/tests/lib/* and solfege/test/include/* Solfege 3.22.1, September 16, 2013 * Adjust some of the short interval names used when selecting intervals to practise: u->P1 4->P4, 5->P5, tt->TT, p11->P11, p12->P12, tt8->d12. Added long name for intervals from Eleventh to Double Octave. * Fix the bug where we could not select the Default profile * Updated Esperanto, Spannish, Polish, Turkish, Vietnamese, Norwegian bokmål, Brazilian Portugese and Vietnamese translations. --- pkgs/misc/solfege/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 0449f72c9972..bc20759db5ea 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "solfege-3.22.0"; + name = "solfege-3.22.2"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "10klrhdb1n67xd4bndk6z6idyf0pvwz7hcdg9ibalms7ywl3b23x"; + sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; buildInputs = [ pkgconfig python pygtk gettext texinfo From 8347ff8a2152b80df1923b4c1a54e2197dc10046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Nov 2013 13:27:24 +0100 Subject: [PATCH 027/285] solfege: refactor meta attributes --- pkgs/misc/solfege/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index bc20759db5ea..b40ebe84bcb1 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders" ''; - meta = { + meta = with stdenv.lib; { description = "Ear training program"; homepage = http://www.solfege.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } From e9963296b15355ad12b89288f6abec26a718e569 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:43:54 +0000 Subject: [PATCH 028/285] pythonPackages.goobook: add expression --- pkgs/top-level/python-packages.nix | 92 ++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c29c0268b006..21ff841f29ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2627,6 +2627,26 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + fs = buildPythonPackage rec { + name = "fs-0.4.0"; + + src = fetchurl { + url = "https://pyfilesystem.googlecode.com/files/fs-0.4.0.tar.gz"; + sha256 = "1fk7ilwd01qgj4anw9k1vjp0amxswzzxbp6bk4nncp7210cxp3vz"; + }; + + meta = with stdenv.lib; { + description = "Filesystem abstraction"; + homepage = http://pypi.python.org/pypi/fs; + license = licenses.bsd3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + # Fails: "error: invalid command 'test'" + doCheck = false; + }; + fuse = buildPythonPackage (rec { baseName = "fuse"; version = "0.2.1"; @@ -2787,6 +2807,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + goobook = buildPythonPackage rec { + name = "goobook-1.5"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz"; + sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z"; + }; + + meta = with stdenv.lib; { + description = "Search your google contacts from the command-line or mutt."; + homepage = "https://pypi.python.org/pypi/goobook"; + license = licenses.gpl3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + propagatedBuildInputs = [ distribute gdata hcs_utils keyring simplejson ]; + }; greenlet = buildPythonPackage rec { name = "greenlet-0.3.1"; @@ -2825,6 +2863,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + hcs_utils = buildPythonPackage rec { + name = "hcs_utils-1.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/h/hcs_utils/hcs_utils-1.3.tar.gz"; + sha256 = "0mcjfc0ssil86i74dg323z7mikkw1xazqyr92347x1y33zyffgxh"; + }; + + meta = with stdenv.lib; { + description = "Library collecting some useful snippets"; + homepage = https://pypi.python.org/pypi/hcs_utils/1.3; + license = licenses.isc; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + hetzner = buildPythonPackage rec { name = "hetzner-${version}"; @@ -3055,6 +3110,25 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + keyring = buildPythonPackage rec { + name = "keyring-3.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/k/keyring/${name}.zip"; + sha256 = "1flccphpyrb8y8dra2fq2s2v3fg615d77kjjmzl0gmiidabkkdqf"; + }; + + meta = with stdenv.lib; { + description = "Store and access your passwords safely"; + homepage = "https://pypi.python.org/pypi/keyring"; + license = licenses.psfl; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = + [ pkgs.unzip fs gdata python_keyczar mock pyasn1 pycrypto pytest ]; + }; pylast = buildPythonPackage rec { name = "pylast-${version}"; @@ -4990,6 +5064,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + python_keyczar = buildPythonPackage rec { + name = "python-keyczar-0.71c"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-keyczar/${name}.tar.gz"; + sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p"; + }; + + meta = with stdenv.lib; { + description = "Toolkit for safe and simple cryptography"; + homepage = https://pypi.python.org/pypi/python-keyczar; + license = licenses.asl20; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ pyasn1 pycrypto ]; + }; pyudev = buildPythonPackage rec { name = "pyudev-${version}"; From 49b36a3a777295e7d6f872ad0ce48789455e9598 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 17 Nov 2013 23:54:40 -0600 Subject: [PATCH 029/285] Fix nix-prefetch-git The nix-prefect git script was broken when trying to parse certain groups of submodules. This patch fixes the url detection for submodule repositories to use the more reliable `git config` commands. --- pkgs/build-support/fetchgit/nix-prefetch-git | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 00cd7d3129b3..0afae009dc57 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -142,10 +142,12 @@ init_submodules(){ git submodule status | while read l; do # checkout each submodule - local hash=$(echo $l | sed 's,^-\([0-9a-f]*\) \(.*\)$,\1,'); - local dir=$(echo $l | sed 's,^-\([0-9a-f]*\) \(.*\)$,\2,'); - local url=$(sed -n "\,$dir, { :loop; n; s,^.*url = ,,; T loop; p; q }" .git/config); - + local hash=$(echo $l | awk '{print substr($1,2)}'); + local dir=$(echo $l | awk '{print $2}'); + local name=$( + git config -f .gitmodules --get-regexp submodule\.[^.]*\.path | + sed -n "s,^\(.*\)\.path $dir\$,\\1,p") + local url=$(git config -f .gitmodules --get ${name}.url); clone "$dir" "$url" "$hash" ""; done; } From 6c7ca091fd141d25d530008958160d10619070a1 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 18 Nov 2013 04:02:31 +0000 Subject: [PATCH 030/285] newsbeuter-dev: update to latest master --- .../networking/feedreaders/newsbeuter/dev.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index df98e7568684..17e97d92b897 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses +{ stdenv, fetchgit, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-dev-20131103"; + name = "newsbeuter-dev-20131118"; - src = fetchurl { - url = "https://github.com/akrennmair/newsbeuter/archive/8abefa3efb5e6d70c32bac9e068248e98616d6ec.tar.gz"; - sha256 = "1pfkr4adm7rxwq44hpxwblw6gg8vd0frsi6szvhmzkpn5qmnpwpg"; + src = fetchgit { + url = "https://github.com/akrennmair/newsbeuter.git"; + rev = "18b73f7d44a99a698d4878fe7d226f55842132c2"; }; buildInputs From bf48a6f3d6ac6bf570311520dbf52bd3102772c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 24 Nov 2013 14:57:13 +0100 Subject: [PATCH 031/285] Adding freetype to ffmpeg. To use the drawtext filter. --- pkgs/development/libraries/ffmpeg/1.x.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index be9f1c56d97b..8d1092e9c048 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -13,6 +13,7 @@ , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null , playSupport ? true, SDL ? null +, freetypeSupport ? true, freetype ? null }: assert speexSupport -> speex != null; @@ -27,6 +28,7 @@ assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; assert playSupport -> SDL != null; +assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { name = "ffmpeg-1.2.3"; @@ -59,7 +61,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay"; + ++ stdenv.lib.optional playSupport "--enable-ffplay" + ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] ++ stdenv.lib.optional mp3Support lame @@ -75,7 +78,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL; + ++ stdenv.lib.optional playSupport SDL + ++ stdenv.lib.optional freetypeSupport freetype; enableParallelBuilding = true; From 370dec91cc9cbfc728a8924f4d9ce231050e53e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 24 Nov 2013 14:57:28 +0100 Subject: [PATCH 032/285] Updating amrnb to the latest version. --- pkgs/development/libraries/amrnb/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index a2ed73934931..7790f8e124b2 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "amrnb-7.0.0.2"; + name = "amrnb-11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26104-700.zip; - sha256 = "0hgm8dddrqiinjdjxnsw0x899czjlvplq69z4kv8y4zqnrjlwzni"; + url = http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip; + sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; }; src = fetchurl { - url = http://ftp.penguin.cz/pub/users/utx/amr/amrnb-7.0.0.2.tar.bz2; - sha256 = "0z4wjr0jml973vd0dvxlmy34daiswy5axlmpvc85k8qcr08i8zaa"; + url = http://ftp.penguin.cz/pub/users/utx/amr/amrnb-11.0.0.0.tar.bz2; + sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; }; buildInputs = [ unzip ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; postConfigure = '' - cp $srcAmr 26104-700.zip + cp $srcAmr 26104-b00.zip ''; meta = { From f2581d2894a2bb7d9065fb2f67d849ca67b8ab63 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Wed, 20 Nov 2013 23:36:57 -0500 Subject: [PATCH 033/285] Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/alienfx/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/alienfx/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ad110389f7a5..0418337b217b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -55,6 +55,7 @@ smironov = "Sergey Mironov "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; + tomberek = "Thomas Bereknyei "; urkud = "Yury G. Kudryashov "; vcunat = "Vladimír Čunát "; viric = "Lluís Batlle i Rossell "; diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix new file mode 100644 index 000000000000..2cb1c483958e --- /dev/null +++ b/pkgs/os-specific/linux/alienfx/default.nix @@ -0,0 +1,39 @@ +{ stdenv, libusb1, fetchgit}: + + +let + rev = "85ee5eeaca59a1c92659c3f49b148b0447d78f16"; +in + +stdenv.mkDerivation { + name = "alienfx-1.0.0"; + src = fetchgit { + inherit rev; + url = https://github.com/tibz/alienfx.git; + + sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1"; + }; + + patchPhase = '' + substituteInPlace Makefile --replace /usr/ $out/ + substituteInPlace Makefile --replace "install -o root -g root" "install" + ''; + + buildInputs = [ libusb1 ]; + makeFlags = "build"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + installTargets = "install"; + postInstall = ''cp alienfx.1 $out/man/man1''; + + meta = { + description = "Controls AlienFX lighting"; + homepage = "https://github.com/tibz/alienfx"; + maintainers = [stdenv.lib.maintainers.tomberek]; + # Has only been tested on M11x + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00cfd381a13a..2ab96b48057e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6460,6 +6460,8 @@ let acpitool = callPackage ../os-specific/linux/acpitool { }; + alienfx = callPackage ../os-specific/linux/alienfx { }; + alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { From 4f199ef7bb490bc6dedb82360e37519cfa56e24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Nov 2013 15:20:38 +0100 Subject: [PATCH 034/285] alienfx: also build on i686 --- pkgs/os-specific/linux/alienfx/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix index 2cb1c483958e..9924779d92ab 100644 --- a/pkgs/os-specific/linux/alienfx/default.nix +++ b/pkgs/os-specific/linux/alienfx/default.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation { description = "Controls AlienFX lighting"; homepage = "https://github.com/tibz/alienfx"; maintainers = [stdenv.lib.maintainers.tomberek]; - # Has only been tested on M11x - platforms = [ "x86_64-linux" ]; + platforms = stdenv.lib.platforms.linux; }; } From 81d7906e1908c2cc6302432cb1d591a0877430cc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 24 Nov 2013 16:30:16 +0100 Subject: [PATCH 035/285] Minor changes to Bochs expression. --- pkgs/applications/virtualization/bochs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 440ac66b6c5f..6b8cf5dc0356 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { ''; homepage = http://bochs.sourceforge.net/; license = "LGPL"; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} From 18685b7d449e25750fa924142ca192445b18dd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Nov 2013 16:33:50 +0100 Subject: [PATCH 036/285] MyPaint, fix impurity: add hicolor_icon_theme wrapper to ensure MyPaint can start MyPaint fails to find its own icons and refuses to start if another icon theme is not available on the system. Running gtk-update-icon-cache on MyPaint's share/icons/hicolor folder did not help, and setting the XDG_DATA_DIRS to point to MyPaint's icons also didn't work. https://gna.org/bugs/?18460 Thanks to Kim Simmons for reporting this and helping to debug. --- pkgs/applications/graphics/mypaint/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index e5b711e11f27..be8df8ef16dc 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, gettext, glib, gtk, json_c, lcms2, libpng -, makeWrapper, pkgconfig, pygtk, python, pythonPackages, scons, swig +{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c +, lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages +, scons, swig }: stdenv.mkDerivation rec { @@ -11,19 +12,21 @@ stdenv.mkDerivation rec { sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq"; }; - buildInputs = [ + buildInputs = [ gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk python scons swig ]; - - propagatedBuildInputs = [ pythonPackages.numpy ]; + + propagatedBuildInputs = [ hicolor_icon_theme pythonPackages.numpy ]; buildPhase = "scons prefix=$out"; installPhase = '' scons prefix=$out install sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint - wrapProgram $out/bin/mypaint --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/bin/mypaint \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ''; meta = with stdenv.lib; { From 1009ab8d68d73ac06429d5d84d6815e82aaabf7c Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Sun, 24 Nov 2013 16:59:23 +0100 Subject: [PATCH 037/285] Edit that was left out from the last commit. --- pkgs/applications/graphics/grafx2/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index d6b2044bff3c..53f49c59b9ad 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -14,10 +14,7 @@ stdenv.mkDerivation rec { preBuild = "cd src"; - installPhase = '' - mkdir -p "$out" - make install prefix="$out" - ''; + preInstall = '' mkdir -p "$out" ''; meta = { description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; From fb596303cfa5af437a8ccb996721194ca444d9f5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 22:26:56 +0000 Subject: [PATCH 038/285] Adds beanstalkd v1.9 --- pkgs/servers/beanstalkd/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/beanstalkd/default.nix diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix new file mode 100644 index 000000000000..717ea6306cff --- /dev/null +++ b/pkgs/servers/beanstalkd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + version = "1.9"; + name = "beanstalkd-${version}"; + + installPhase=''make install "PREFIX=$out"''; + + src = fetchurl { + url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; + sha256 = "158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb"; + }; + + meta = with stdenv.lib; { + homepage = http://kr.github.io/beanstalkd/; + description = "Beanstalk is a simple, fast work queue."; + license = licenses.mit; + maintainers = [ maintainers.zimbatm ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab96b48057e..954aa173361b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -588,6 +588,8 @@ let bacula = callPackage ../tools/backup/bacula { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + bgs = callPackage ../tools/X11/bgs { }; bibtextools = callPackage ../tools/typesetting/bibtex-tools { From 2186207b82f882e781e4994f3835ca0fe77e2f57 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 25 Nov 2013 00:08:09 -0500 Subject: [PATCH 039/285] node: Bump Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f82fedb72267..47c5178cc791 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.21"; + version = "0.10.22"; # !!! Should we also do shared libuv? deps = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "038l4j0ilrsmc6m2z2qprqs82z7p4940scb8597hcmhp5kr5n4kw"; + sha1 = "d7c6a39dfa714eae1f8da7a00c9a07efd74a03b3"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); From 76d77960ec2ba242221159393a935330a4cb1f95 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 25 Nov 2013 00:12:03 -0500 Subject: [PATCH 040/285] Update node packages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 590 +++++++++++++-------- 1 file changed, 364 insertions(+), 226 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 6ebf0ecfafc6..5c53e83cf1d8 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -365,25 +365,25 @@ passthru.names = [ "asn1" ]; }; by-spec."assert"."*" = - self.by-version."assert"."0.4.9"; - by-version."assert"."0.4.9" = lib.makeOverridable self.buildNodePackage { - name = "assert-0.4.9"; + self.by-version."assert"."1.0.0"; + by-version."assert"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "assert-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert/-/assert-0.4.9.tgz"; - sha1 = "45faff1a58f718508118873dead940c8b51db939"; + url = "http://registry.npmjs.org/assert/-/assert-1.0.0.tgz"; + sha1 = "11e0629e3bbc13e293bf79570c9febe98b2d7997"; }) ]; buildInputs = (self.nativeDeps."assert" or []); deps = [ - self.by-version."util"."0.4.9" + self.by-version."util"."0.10.0" ]; peerDependencies = [ ]; passthru.names = [ "assert" ]; }; - "assert" = self.by-version."assert"."0.4.9"; + "assert" = self.by-version."assert"."1.0.0"; by-spec."assert-plus"."0.1.2" = self.by-version."assert-plus"."0.1.2"; by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -800,7 +800,7 @@ self.by-version."cardinal"."0.4.2" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" @@ -1047,6 +1047,25 @@ ]; passthru.names = [ "bson" ]; }; + by-spec."bson"."0.2.3" = + self.by-version."bson"."0.2.3"; + by-version."bson"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bson/-/bson-0.2.3.tgz"; + sha1 = "d9f6c343fd9f146e27da03b60f2e13e1406a1aea"; + }) + ]; + buildInputs = + (self.nativeDeps."bson" or []); + deps = [ + self.by-version."nan"."0.4.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bson" ]; + }; by-spec."buffer-crc32"."0.1.1" = self.by-version."buffer-crc32"."0.1.1"; by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1789,6 +1808,8 @@ self.by-version."colors"."0.6.2"; by-spec."colors"."~0.6.0-1" = self.by-version."colors"."0.6.2"; + by-spec."colors"."~0.6.2" = + self.by-version."colors"."0.6.2"; by-spec."combined-stream"."~0.0.4" = self.by-version."combined-stream"."0.0.4"; by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -1809,13 +1830,13 @@ passthru.names = [ "combined-stream" ]; }; by-spec."commander"."*" = - self.by-version."commander"."2.0.0"; - by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.0.0"; + self.by-version."commander"."2.1.0"; + by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }) ]; buildInputs = @@ -1865,6 +1886,22 @@ }; by-spec."commander"."2.0.0" = self.by-version."commander"."2.0.0"; + by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; by-spec."commander"."2.0.x" = self.by-version."commander"."2.0.0"; by-spec."commander"."~0.6.1" = @@ -2171,7 +2208,7 @@ buildInputs = (self.nativeDeps."connect-mongo" or []); deps = [ - self.by-version."mongodb"."1.3.19" + self.by-version."mongodb"."1.3.20" ]; peerDependencies = [ ]; @@ -2396,13 +2433,13 @@ passthru.names = [ "core-util-is" ]; }; by-spec."couch-login"."~0.1.15" = - self.by-version."couch-login"."0.1.18"; - by-version."couch-login"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "couch-login-0.1.18"; + self.by-version."couch-login"."0.1.19"; + by-version."couch-login"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "couch-login-0.1.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz"; - sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056"; + url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.19.tgz"; + sha1 = "5c472f64670dfb43fc381d290629b223edb64afa"; }) ]; buildInputs = @@ -2415,15 +2452,15 @@ passthru.names = [ "couch-login" ]; }; by-spec."couch-login"."~0.1.18" = - self.by-version."couch-login"."0.1.18"; + self.by-version."couch-login"."0.1.19"; by-spec."coveralls"."*" = - self.by-version."coveralls"."2.3.0"; - by-version."coveralls"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.3.0"; + self.by-version."coveralls"."2.5.0"; + by-version."coveralls"."2.5.0" = lib.makeOverridable self.buildNodePackage { + name = "coveralls-2.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.3.0.tgz"; - sha1 = "9eda569c115214acb7f58ca3a28401e866485144"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.5.0.tgz"; + sha1 = "96d9bdb844438cd98ee9cdcb435a4d6d6aea326f"; }) ]; buildInputs = @@ -2438,7 +2475,7 @@ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.by-version."coveralls"."2.3.0"; + "coveralls" = self.by-version."coveralls"."2.5.0"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -3358,7 +3395,7 @@ ]; passthru.names = [ "eventemitter2" ]; }; - by-spec."eventemitter2"."~0.4.9" = + by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.13"; by-spec."events.node".">= 0.4.0" = self.by-version."events.node"."0.4.9"; @@ -3395,7 +3432,7 @@ self.by-version."request"."2.9.203" self.by-version."connect"."2.3.9" self.by-version."openid"."0.5.5" - self.by-version."xml2js"."0.2.8" + self.by-version."xml2js"."0.4.0" self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" @@ -3405,6 +3442,24 @@ ]; passthru.names = [ "everyauth" ]; }; + by-spec."exit"."~0.1.1" = + self.by-version."exit"."0.1.1"; + by-version."exit"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "exit-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/exit/-/exit-0.1.1.tgz"; + sha1 = "8bf4af1e41fdb092476006764db9f750dfcddc4e"; + }) + ]; + buildInputs = + (self.nativeDeps."exit" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "exit" ]; + }; by-spec."express"."*" = self.by-version."express"."3.4.4"; by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage { @@ -4180,13 +4235,13 @@ passthru.names = [ "fs.extra" ]; }; by-spec."fstream"."0" = - self.by-version."fstream"."0.1.24"; - by-version."fstream"."0.1.24" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; + self.by-version."fstream"."0.1.25"; + by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage { + name = "fstream-0.1.25"; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz"; + sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732"; }) ]; buildInputs = @@ -4202,15 +4257,15 @@ passthru.names = [ "fstream" ]; }; by-spec."fstream"."~0.1.17" = - self.by-version."fstream"."0.1.24"; + self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.21" = - self.by-version."fstream"."0.1.24"; + self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.22" = - self.by-version."fstream"."0.1.24"; + self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.23" = - self.by-version."fstream"."0.1.24"; + self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.8" = - self.by-version."fstream"."0.1.24"; + self.by-version."fstream"."0.1.25"; by-spec."fstream-ignore"."~0.0.5" = self.by-version."fstream-ignore"."0.0.7"; by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { @@ -4225,7 +4280,7 @@ (self.nativeDeps."fstream-ignore" or []); deps = [ self.by-version."minimatch"."0.2.12" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" self.by-version."inherits"."2.0.1" ]; peerDependencies = [ @@ -4255,13 +4310,13 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.6.0-rc.1"; - by-version."generator-angular"."0.6.0-rc.1" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.6.0-rc.1"; + self.by-version."generator-angular"."0.6.0-rc.2"; + by-version."generator-angular"."0.6.0-rc.2" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.6.0-rc.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.1.tgz"; - sha1 = "fe6852e9051934276f4c4f38325deb17db954205"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.2.tgz"; + sha1 = "775a858e5dd9dc9f0a85730274d02c6af5d232b1"; }) ]; buildInputs = @@ -4275,7 +4330,7 @@ ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.1"; + "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.2"; by-spec."generator-karma"."~0.6.0" = self.by-version."generator-karma"."0.6.0"; by-version."generator-karma"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -4357,6 +4412,24 @@ ]; passthru.names = [ "getmac" ]; }; + by-spec."getobject"."~0.1.0" = + self.by-version."getobject"."0.1.0"; + by-version."getobject"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "getobject-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"; + sha1 = "047a449789fa160d018f5486ed91320b6ec7885c"; + }) + ]; + buildInputs = + (self.nativeDeps."getobject" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "getobject" ]; + }; by-spec."github-url-from-git"."1.1.1" = self.by-version."github-url-from-git"."1.1.1"; by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -4402,7 +4475,7 @@ src = [ (fetchurl { url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz"; - sha1 = "cd75d5541dc625bd05be4f5a41c8524672533c7d"; + sha1 = "275f39a0eee805694790924f36eac38e1db6d802"; }) ]; buildInputs = @@ -4467,6 +4540,8 @@ self.by-version."glob"."3.2.7"; by-spec."glob"."~3.2.6" = self.by-version."glob"."3.2.7"; + by-spec."glob"."~3.2.7" = + self.by-version."glob"."3.2.7"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.1"; by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4567,13 +4642,13 @@ passthru.names = [ "growl" ]; }; by-spec."grunt"."0.4.x" = - self.by-version."grunt"."0.4.1"; - by-version."grunt"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-0.4.1"; + self.by-version."grunt"."0.4.2"; + by-version."grunt"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "grunt-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz"; - sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729"; + url = "http://registry.npmjs.org/grunt/-/grunt-0.4.2.tgz"; + sha1 = "895b4f28a6102bffd41d365a65e8be2d6a293d93"; }) ]; buildInputs = @@ -4595,17 +4670,19 @@ self.by-version."underscore.string"."2.2.1" self.by-version."which"."1.0.5" self.by-version."js-yaml"."2.0.5" + self.by-version."exit"."0.1.1" + self.by-version."getobject"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "grunt" ]; }; by-spec."grunt"."~0.4" = - self.by-version."grunt"."0.4.1"; + self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4.0" = - self.by-version."grunt"."0.4.1"; + self.by-version."grunt"."0.4.2"; by-spec."grunt"."~0.4.1" = - self.by-version."grunt"."0.4.1"; + self.by-version."grunt"."0.4.2"; by-spec."grunt-bower-task"."*" = self.by-version."grunt-bower-task"."0.3.4"; by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage { @@ -4672,7 +4749,7 @@ self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; @@ -4693,7 +4770,7 @@ self.by-version."jshint"."2.3.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; @@ -4715,7 +4792,7 @@ self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-less" ]; }; @@ -4736,7 +4813,7 @@ self.by-version."requirejs"."2.1.9" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; @@ -4758,7 +4835,7 @@ self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; @@ -4779,8 +4856,8 @@ self.by-version."optimist"."0.6.0" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" - self.by-version."karma"."0.10.4" + self.by-version."grunt"."0.4.2" + self.by-version."karma"."0.10.5" ]; passthru.names = [ "grunt-karma" ]; }; @@ -4822,7 +4899,7 @@ self.by-version."replace"."0.2.7" ]; peerDependencies = [ - self.by-version."grunt"."0.4.1" + self.by-version."grunt"."0.4.2" ]; passthru.names = [ "grunt-sed" ]; }; @@ -4843,7 +4920,7 @@ self.by-version."coffee-script"."1.6.3" self.by-version."jade"."0.35.0" self.by-version."q"."0.9.7" - self.by-version."xml2js"."0.2.8" + self.by-version."xml2js"."0.4.0" self.by-version."msgpack"."0.2.1" ]; peerDependencies = [ @@ -5339,8 +5416,6 @@ }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; - by-spec."iconv-lite"."~0.2.5" = - self.by-version."iconv-lite"."0.2.11"; by-spec."inherits"."1" = self.by-version."inherits"."1.0.0"; by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5405,14 +5480,14 @@ self.by-version."ini"."1.1.0"; by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; - by-spec."init-package-json"."0.0.11" = - self.by-version."init-package-json"."0.0.11"; - by-version."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.11"; + by-spec."init-package-json"."0.0.13" = + self.by-version."init-package-json"."0.0.13"; + by-version."init-package-json"."0.0.13" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz"; - sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.13.tgz"; + sha1 = "ce58dd49dc54b4ce516775ab8f9a43066d685bcb"; }) ]; buildInputs = @@ -5422,6 +5497,7 @@ self.by-version."read"."1.0.5" self.by-version."read-package-json"."1.1.4" self.by-version."semver"."2.2.1" + self.by-version."glob"."3.2.7" ]; peerDependencies = [ ]; @@ -5538,11 +5614,11 @@ self.by-version."passport"."0.1.17" self.by-version."passport-http"."0.2.2" self.by-version."js-yaml"."2.1.3" - self.by-version."mongoose"."3.8.0" + self.by-version."mongoose"."3.8.1" self.by-version."gridfs-stream"."0.4.0" self.by-version."temp"."0.6.0" self.by-version."kue"."0.6.2" - self.by-version."redis"."0.9.0" + self.by-version."redis"."0.9.1" self.by-version."hiredis"."0.1.15" ]; peerDependencies = [ @@ -5765,7 +5841,7 @@ ]; passthru.names = [ "js-yaml" ]; }; - by-spec."js-yaml"."~2.0.2" = + by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-2.0.5"; @@ -5922,13 +5998,13 @@ passthru.names = [ "jsonfile" ]; }; by-spec."jsontool"."*" = - self.by-version."jsontool"."7.0.0"; - by-version."jsontool"."7.0.0" = lib.makeOverridable self.buildNodePackage { - name = "jsontool-7.0.0"; + self.by-version."jsontool"."7.0.1"; + by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage { + name = "jsontool-7.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.0.tgz"; - sha1 = "eff1516e2bad7d2e251a073a415077410f434038"; + url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.1.tgz"; + sha1 = "d5a705e46e305d7377ede769707c072e6d957977"; }) ]; buildInputs = @@ -5939,7 +6015,7 @@ ]; passthru.names = [ "jsontool" ]; }; - "jsontool" = self.by-version."jsontool"."7.0.0"; + "jsontool" = self.by-version."jsontool"."7.0.1"; by-spec."jsprim"."0.3.0" = self.by-version."jsprim"."0.3.0"; by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -5980,20 +6056,20 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.2"; - "karma" = self.by-version."karma"."0.11.2"; + self.by-version."karma"."0.11.4"; + "karma" = self.by-version."karma"."0.11.4"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.2"; + self.by-version."karma"."0.11.4"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.2"; + self.by-version."karma"."0.11.4"; by-spec."karma"."~0.10.0" = - self.by-version."karma"."0.10.4"; - by-version."karma"."0.10.4" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.4"; + self.by-version."karma"."0.10.5"; + by-version."karma"."0.10.5" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.10.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.4.tgz"; - sha1 = "b53eda54b8a5f61296a8bd9bb95801652e75b659"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.5.tgz"; + sha1 = "0ff8a68ef8bbcd26a64737e9c0e580468879a23e"; }) ]; buildInputs = @@ -6019,7 +6095,7 @@ ]; peerDependencies = [ self.by-version."karma-jasmine"."0.1.3" - self.by-version."karma-requirejs"."0.1.0" + self.by-version."karma-requirejs"."0.2.0" self.by-version."karma-coffee-preprocessor"."0.1.0" self.by-version."karma-html2js-preprocessor"."0.1.0" self.by-version."karma-chrome-launcher"."0.1.0" @@ -6051,7 +6127,7 @@ self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.2" + self.by-version."karma"."0.11.4" ]; passthru.names = [ "karma-coverage" ]; }; @@ -6062,8 +6138,8 @@ self.by-version."karma-html2js-preprocessor"."0.1.0"; by-spec."karma-jasmine"."*" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma"."0.11.2" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-requirejs"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma"."0.11.4" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-coffee-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-chrome-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; @@ -6078,12 +6154,12 @@ sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; }) (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.2.tgz"; - sha1 = "cb9d7ff974f3f0c8834980ebf8e689a88091008e"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.4.tgz"; + sha1 = "75c2f3f7292e138b27fbe8056148170091d875ee"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; - sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; + sha1 = "62facf19e1f4be956b90b67c4bebba7bb84fb054"; }) (fetchurl { url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; @@ -6138,9 +6214,10 @@ self.by-version."useragent"."2.0.7" self.by-version."graceful-fs"."1.2.3" self.by-version."connect"."2.8.8" - self.by-version."phantomjs"."1.9.2-3" + self.by-version."phantomjs"."1.9.2-4" ]; peerDependencies = [ + self.by-version."requirejs"."2.1.9" ]; passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; }; @@ -6160,7 +6237,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.2" + self.by-version."karma"."0.11.4" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6180,7 +6257,7 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.2" + self.by-version."karma"."0.11.4" self.by-version."mocha"."1.14.0" ]; passthru.names = [ "karma-mocha" ]; @@ -6189,8 +6266,8 @@ by-spec."karma-phantomjs-launcher"."*" = self.by-version."karma-phantomjs-launcher"."0.1.0"; by-spec."karma-requirejs"."*" = - self.by-version."karma-requirejs"."0.1.0"; - "karma-requirejs" = self.by-version."karma-requirejs"."0.1.0"; + self.by-version."karma-requirejs"."0.2.0"; + "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0"; by-spec."karma-sauce-launcher"."*" = self.by-version."karma-sauce-launcher"."0.1.1"; by-version."karma-sauce-launcher"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -6209,7 +6286,7 @@ self.by-version."q"."0.9.7" ]; peerDependencies = [ - self.by-version."karma"."0.11.2" + self.by-version."karma"."0.11.4" ]; passthru.names = [ "karma-sauce-launcher" ]; }; @@ -6309,13 +6386,13 @@ passthru.names = [ "keypress" ]; }; by-spec."knox"."*" = - self.by-version."knox"."0.8.6"; - by-version."knox"."0.8.6" = lib.makeOverridable self.buildNodePackage { - name = "knox-0.8.6"; + self.by-version."knox"."0.8.7"; + by-version."knox"."0.8.7" = lib.makeOverridable self.buildNodePackage { + name = "knox-0.8.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz"; - sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a"; + url = "http://registry.npmjs.org/knox/-/knox-0.8.7.tgz"; + sha1 = "a7d1360edb2eec129bfee95d49d302665760a448"; }) ]; buildInputs = @@ -6330,7 +6407,7 @@ ]; passthru.names = [ "knox" ]; }; - "knox" = self.by-version."knox"."0.8.6"; + "knox" = self.by-version."knox"."0.8.7"; by-spec."kue"."*" = self.by-version."kue"."0.6.2"; by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -6509,7 +6586,7 @@ ]; passthru.names = [ "lodash" ]; }; - by-spec."lodash"."~0.9.0" = + by-spec."lodash"."~0.9.2" = self.by-version."lodash"."0.9.2"; by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage { name = "lodash-0.9.2"; @@ -6661,13 +6738,13 @@ passthru.names = [ "log4js" ]; }; by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.3.1"; - by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.3.1"; + self.by-version."lru-cache"."2.5.0"; + by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { + name = "lru-cache-2.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; }) ]; buildInputs = @@ -6752,6 +6829,22 @@ }; by-spec."lru-cache"."~2.3.0" = self.by-version."lru-cache"."2.3.1"; + by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage { + name = "lru-cache-2.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-cache" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; by-spec."lru-cache"."~2.3.1" = self.by-version."lru-cache"."2.3.1"; by-spec."mailcomposer".">= 0.1.27" = @@ -7014,7 +7107,7 @@ buildInputs = (self.nativeDeps."minimatch" or []); deps = [ - self.by-version."lru-cache"."2.3.1" + self.by-version."lru-cache"."2.5.0" self.by-version."sigmund"."1.0.0" ]; peerDependencies = [ @@ -7056,8 +7149,6 @@ self.by-version."minimatch"."0.2.12"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.12"; - by-spec."minimatch"."~0.2.6" = - self.by-version."minimatch"."0.2.12"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.12"; by-spec."minimist"."~0.0.1" = @@ -7215,26 +7306,26 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."1.3.19"; - by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.19"; + self.by-version."mongodb"."1.3.20"; + by-version."mongodb"."1.3.20" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.3.20"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; - sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.20.tgz"; + sha1 = "257f1570295fe020248ea8329b58d47ec9ceac62"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = [ - self.by-version."bson"."0.2.2" + self.by-version."bson"."0.2.3" self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."1.3.19"; + "mongodb" = self.by-version."mongodb"."1.3.20"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -7256,16 +7347,34 @@ }; by-spec."mongodb"."1.3.19" = self.by-version."mongodb"."1.3.19"; - by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.19"; - by-spec."mongoose"."*" = - self.by-version."mongoose"."3.8.0"; - by-version."mongoose"."3.8.0" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.0"; + by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.3.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.0.tgz"; - sha1 = "0e7b34fe90ad996c72ce7cfec6822176ea137e48"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; + sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; + }) + ]; + buildInputs = + (self.nativeDeps."mongodb" or []); + deps = [ + self.by-version."bson"."0.2.2" + self.by-version."kerberos"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mongodb" ]; + }; + by-spec."mongodb"."1.3.x" = + self.by-version."mongodb"."1.3.20"; + by-spec."mongoose"."*" = + self.by-version."mongoose"."3.8.1"; + by-version."mongoose"."3.8.1" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.1.tgz"; + sha1 = "1efe17d259ae2905330a3b2d91ba4085a090f6b8"; }) ]; buildInputs = @@ -7356,13 +7465,13 @@ passthru.names = [ "mongoose-lifecycle" ]; }; by-spec."mongoose-schema-extend"."*" = - self.by-version."mongoose-schema-extend"."0.1.5"; - by-version."mongoose-schema-extend"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-schema-extend-0.1.5"; + self.by-version."mongoose-schema-extend"."0.1.7"; + by-version."mongoose-schema-extend"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-schema-extend-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.5.tgz"; - sha1 = "d2ab3d2005033daaa215a806bbd3f6637c9c96c3"; + url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz"; + sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910"; }) ]; buildInputs = @@ -7374,7 +7483,7 @@ ]; passthru.names = [ "mongoose-schema-extend" ]; }; - "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.5"; + "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.7"; by-spec."monocle"."1.1.50" = self.by-version."monocle"."1.1.50"; by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage { @@ -7653,6 +7762,24 @@ ]; passthru.names = [ "nan" ]; }; + by-spec."nan"."~0.4.1" = + self.by-version."nan"."0.4.4"; + by-version."nan"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.4.4.tgz"; + sha1 = "9db58eae63cee119807a0d01afd0655d956bea75"; + }) + ]; + buildInputs = + (self.nativeDeps."nan" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; by-spec."natural"."0.0.69" = self.by-version."natural"."0.0.69"; by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { @@ -7902,7 +8029,7 @@ deps = [ self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" self.by-version."minimatch"."0.2.12" self.by-version."mkdirp"."0.3.5" self.by-version."nopt"."2.1.2" @@ -7919,37 +8046,8 @@ passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.by-version."node-gyp"."0.12.1"; - by-spec."node-gyp"."~0.11.0" = - self.by-version."node-gyp"."0.11.0"; - by-version."node-gyp"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.11.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.11.0.tgz"; - sha1 = "ee61d3f9a2cf4e9e2c00293d86620096e0184411"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp" or []); - deps = [ - self.by-version."glob"."3.2.7" - self.by-version."graceful-fs"."2.0.1" - self.by-version."fstream"."0.1.24" - self.by-version."minimatch"."0.2.12" - self.by-version."mkdirp"."0.3.5" - self.by-version."nopt"."2.1.2" - self.by-version."npmlog"."0.0.6" - self.by-version."osenv"."0.0.3" - self.by-version."request"."2.27.0" - self.by-version."rimraf"."2.2.2" - self.by-version."semver"."2.2.1" - self.by-version."tar"."0.1.18" - self.by-version."which"."1.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; + by-spec."node-gyp"."~0.12.0" = + self.by-version."node-gyp"."0.12.1"; by-spec."node-inspector"."*" = self.by-version."node-inspector"."0.6.1"; by-version."node-inspector"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -8117,7 +8215,7 @@ buildInputs = (self.nativeDeps."node-wsfederation" or []); deps = [ - self.by-version."xml2js"."0.2.8" + self.by-version."xml2js"."0.4.0" ]; peerDependencies = [ ]; @@ -8287,13 +8385,13 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.14"; - by-version."npm"."1.3.14" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.14"; + self.by-version."npm"."1.3.15"; + by-version."npm"."1.3.15" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.14.tgz"; - sha1 = "9359a79309dbfef0d5443e0cd46129b9bbc88eab"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.15.tgz"; + sha1 = "25987c35a87d01379ddacb9d5db58e3697369dc6"; }) ]; buildInputs = @@ -8310,12 +8408,12 @@ self.by-version."request"."2.27.0" self.by-version."which"."1.0.5" self.by-version."tar"."0.1.18" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" self.by-version."block-stream"."0.0.7" self.by-version."mkdirp"."0.3.5" self.by-version."read"."1.0.5" self.by-version."lru-cache"."2.3.1" - self.by-version."node-gyp"."0.11.0" + self.by-version."node-gyp"."0.12.1" self.by-version."fstream-npm"."0.1.6" self.by-version."uid-number"."0.0.3" self.by-version."archy"."0.0.2" @@ -8326,12 +8424,12 @@ self.by-version."read-package-json"."1.1.4" self.by-version."read-installed"."0.2.4" self.by-version."glob"."3.2.7" - self.by-version."init-package-json"."0.0.11" + self.by-version."init-package-json"."0.0.13" self.by-version."osenv"."0.0.3" self.by-version."lockfile"."0.4.2" self.by-version."retry"."0.6.0" self.by-version."once"."1.3.0" - self.by-version."npmconf"."0.1.5" + self.by-version."npmconf"."0.1.6" self.by-version."opener"."1.3.0" self.by-version."chmodr"."0.1.0" self.by-version."cmd-shim"."1.1.1" @@ -8346,9 +8444,9 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.14"; + "npm" = self.by-version."npm"."1.3.15"; by-spec."npm"."~1.3.14" = - self.by-version."npm"."1.3.14"; + self.by-version."npm"."1.3.15"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -8370,7 +8468,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."rimraf"."2.2.2" self.by-version."retry"."0.6.0" - self.by-version."couch-login"."0.1.18" + self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ @@ -8398,7 +8496,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."rimraf"."2.2.2" self.by-version."retry"."0.6.0" - self.by-version."couch-login"."0.1.18" + self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ @@ -8503,13 +8601,13 @@ passthru.names = [ "npmconf" ]; }; by-spec."npmconf"."~0.1.2" = - self.by-version."npmconf"."0.1.5"; - by-version."npmconf"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.5"; + self.by-version."npmconf"."0.1.6"; + by-version."npmconf"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.5.tgz"; - sha1 = "4201814e155df33a042a7f5405decb53447ae8cf"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.6.tgz"; + sha1 = "e23b5c028758877d31ef6daf8a566059442459b6"; }) ]; buildInputs = @@ -8528,8 +8626,8 @@ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."~0.1.5" = - self.by-version."npmconf"."0.1.5"; + by-spec."npmconf"."~0.1.6" = + self.by-version."npmconf"."0.1.6"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.0.6"; by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -9052,13 +9150,13 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."~1.9" = - self.by-version."phantomjs"."1.9.2-3"; - by-version."phantomjs"."1.9.2-3" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-3"; + self.by-version."phantomjs"."1.9.2-4"; + by-version."phantomjs"."1.9.2-4" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.2-4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-3.tgz"; - sha1 = "621d95c8888234b76b2a626940b0d7c4462a5780"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-4.tgz"; + sha1 = "fbf6c8df9dc963f9a4020764495152e0099d6d42"; }) ]; buildInputs = @@ -9077,7 +9175,7 @@ passthru.names = [ "phantomjs" ]; }; by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-3"; + self.by-version."phantomjs"."1.9.2-4"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -9479,13 +9577,13 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.5"; by-spec."rai"."~0.1" = - self.by-version."rai"."0.1.7"; - by-version."rai"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "rai-0.1.7"; + self.by-version."rai"."0.1.8"; + by-version."rai"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "rai-0.1.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.7.tgz"; - sha1 = "1b50f1dcb4a493a67ef7a0a8c72167d789df52a0"; + url = "http://registry.npmjs.org/rai/-/rai-0.1.8.tgz"; + sha1 = "f4ac41063cfe544a1eb3735441f096908219654b"; }) ]; buildInputs = @@ -9715,7 +9813,7 @@ (self.nativeDeps."read-package-json" or []); deps = [ self.by-version."glob"."3.2.7" - self.by-version."lru-cache"."2.3.1" + self.by-version."lru-cache"."2.5.0" self.by-version."normalize-package-data"."0.2.7" self.by-version."graceful-fs"."2.0.1" ]; @@ -9808,13 +9906,13 @@ passthru.names = [ "redeyed" ]; }; by-spec."redis"."*" = - self.by-version."redis"."0.9.0"; - by-version."redis"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.9.0"; + self.by-version."redis"."0.9.1"; + by-version."redis"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "redis-0.9.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.9.0.tgz"; - sha1 = "b0f5b9c5619b4f1784837718677212c1af33ee67"; + url = "http://registry.npmjs.org/redis/-/redis-0.9.1.tgz"; + sha1 = "eb7ad2355a2ea52c4c0bae043103fee96400439b"; }) ]; buildInputs = @@ -9825,7 +9923,7 @@ ]; passthru.names = [ "redis" ]; }; - "redis" = self.by-version."redis"."0.9.0"; + "redis" = self.by-version."redis"."0.9.1"; by-spec."redis"."0.7.2" = self.by-version."redis"."0.7.2"; by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { @@ -9882,7 +9980,7 @@ passthru.names = [ "redis" ]; }; by-spec."redis".">= 0.6.6" = - self.by-version."redis"."0.9.0"; + self.by-version."redis"."0.9.1"; by-spec."reds"."0.1.4" = self.by-version."reds"."0.1.4"; by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -9897,7 +9995,7 @@ (self.nativeDeps."reds" or []); deps = [ self.by-version."natural"."0.0.69" - self.by-version."redis"."0.9.0" + self.by-version."redis"."0.9.1" ]; peerDependencies = [ ]; @@ -10176,7 +10274,7 @@ ]; passthru.names = [ "request-replay" ]; }; - by-spec."requirejs"."~2.1.0" = + by-spec."requirejs"."~2.1" = self.by-version."requirejs"."2.1.9"; by-version."requirejs"."2.1.9" = lib.makeOverridable self.buildNodePackage { name = "requirejs-2.1.9"; @@ -10194,6 +10292,8 @@ ]; passthru.names = [ "requirejs" ]; }; + by-spec."requirejs"."~2.1.0" = + self.by-version."requirejs"."2.1.9"; by-spec."resolve"."0.5.x" = self.by-version."resolve"."0.5.1"; by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -10363,6 +10463,8 @@ ]; passthru.names = [ "rimraf" ]; }; + by-spec."rimraf"."~2.0.3" = + self.by-version."rimraf"."2.0.3"; by-spec."rimraf"."~2.1" = self.by-version."rimraf"."2.1.4"; by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { @@ -10798,7 +10900,7 @@ buildInputs = (self.nativeDeps."simplesmtp" or []); deps = [ - self.by-version."rai"."0.1.7" + self.by-version."rai"."0.1.8" self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ @@ -11566,7 +11668,7 @@ deps = [ self.by-version."inherits"."2.0.1" self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" ]; peerDependencies = [ ]; @@ -11590,7 +11692,7 @@ deps = [ self.by-version."inherits"."1.0.0" self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" ]; peerDependencies = [ ]; @@ -12103,7 +12205,7 @@ self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.5.2" = self.by-version."underscore"."1.5.2"; - by-spec."underscore.string"."~2.2.0rc" = + by-spec."underscore.string"."~2.2.1" = self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "underscore.string-2.2.1"; @@ -12165,7 +12267,7 @@ self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.14" + self.by-version."npm"."1.3.15" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -12198,7 +12300,7 @@ buildInputs = (self.nativeDeps."unzip" or []); deps = [ - self.by-version."fstream"."0.1.24" + self.by-version."fstream"."0.1.25" self.by-version."pullstream"."0.4.0" self.by-version."binary"."0.3.0" self.by-version."readable-stream"."1.0.17" @@ -12252,6 +12354,24 @@ ]; passthru.names = [ "useragent" ]; }; + by-spec."util"."0.10.0" = + self.by-version."util"."0.10.0"; + by-version."util"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "util-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.0.tgz"; + sha1 = "b11c0823c74c077ea6911ad334394055b680fb5e"; + }) + ]; + buildInputs = + (self.nativeDeps."util" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "util" ]; + }; by-spec."util"."0.4.9" = self.by-version."util"."0.4.9"; by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage { @@ -12271,8 +12391,6 @@ ]; passthru.names = [ "util" ]; }; - by-spec."util".">= 0.4.9" = - self.by-version."util"."0.4.9"; by-spec."utile"."0.1.7" = self.by-version."utile"."0.1.7"; by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -12593,8 +12711,8 @@ self.by-version."adm-zip"."0.4.3" self.by-version."kew"."0.1.7" self.by-version."mkdirp"."0.3.5" - self.by-version."npmconf"."0.1.5" - self.by-version."phantomjs"."1.9.2-3" + self.by-version."npmconf"."0.1.6" + self.by-version."phantomjs"."1.9.2-4" self.by-version."tmp"."0.0.21" self.by-version."follow-redirects"."0.0.3" ]; @@ -12675,7 +12793,7 @@ (self.nativeDeps."winser" or []); deps = [ self.by-version."sequence"."2.2.1" - self.by-version."commander"."2.0.0" + self.by-version."commander"."2.1.0" ]; peerDependencies = [ ]; @@ -12919,9 +13037,27 @@ passthru.names = [ "xml2js" ]; }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.2.8"; + self.by-version."xml2js"."0.4.0"; + by-version."xml2js"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "xml2js-0.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.0.tgz"; + sha1 = "124fc4114b4129c810800ecb2ac86cf25462cb9a"; + }) + ]; + buildInputs = + (self.nativeDeps."xml2js" or []); + deps = [ + self.by-version."sax"."0.5.5" + self.by-version."xmlbuilder"."0.4.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "xml2js" ]; + }; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.2.8"; + self.by-version."xml2js"."0.4.0"; by-spec."xmlbuilder"."*" = self.by-version."xmlbuilder"."0.4.3"; by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage { @@ -12958,6 +13094,8 @@ ]; passthru.names = [ "xmlbuilder" ]; }; + by-spec."xmlbuilder".">=0.4.2" = + self.by-version."xmlbuilder"."0.4.3"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { From 4140dc2628434c3db4d6c6499c5d63d9855ea7c5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:42:51 +0400 Subject: [PATCH 041/285] Updating EKRHuper --- pkgs/applications/science/logic/ekrhyper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index c90099f495a2..3a50d3e1ed05 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="ekrhyper"; - version="1_4_30072013"; + version="1_4_20112013"; name="${baseName}-${version}"; - hash="0ashsblm477r7dmq9f33wajkbr29rbyyc919mifdgrrdy6zlc663"; - url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_30072013.tar.gz"; - sha256="0ashsblm477r7dmq9f33wajkbr29rbyyc919mifdgrrdy6zlc663"; + hash="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm"; + url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_20112013.tar.gz"; + sha256="08qrsahlgqq29zyrcc8435bymj3jvxaailbgjy47jzj1ki2i0vgm"; }; buildInputs = [ ocaml perl From a4701db302a23b31966a5afc5dc4f8645b368ea0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:43:09 +0400 Subject: [PATCH 042/285] Updating SBCL to 1.1.13 --- pkgs/development/compilers/sbcl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 288fdb33454a..34848795d4a5 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.12"; + version="1.1.13"; name="${baseName}-${version}"; - hash="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.12/sbcl-1.1.12-source.tar.bz2"; - sha256="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c"; + hash="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.13/sbcl-1.1.13-source.tar.bz2"; + sha256="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0"; }; buildInputs = with a; [ clisp makeWrapper From c89df12be910e91b07116f723dcba32caad6c1b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:43:26 +0400 Subject: [PATCH 043/285] Updating Sodium crypto library --- pkgs/development/libraries/sodium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 13248753105f..027f9e2f2fc9 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="0.4.3"; + version="0.4.5"; name="${baseName}-${version}"; - hash="0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.4.3.tar.gz"; - sha256="0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; + hash="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.4.5.tar.gz"; + sha256="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; }; buildInputs = [ ]; From b7dc2c78de09225f4b8a323b8ca0f75dcb5a92a3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:44:06 +0400 Subject: [PATCH 044/285] Updating ASDF --- pkgs/development/lisp-modules/asdf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 48b49ee3583b..c0602e2c0284 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.0.2.4"; + version="3.0.3"; name="${baseName}-${version}"; - hash="0b6rkpghw2vndvmgyacijdn3d76ykbjfwpxwv8m0jl7ynrf6l5ag"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.0.2.4.tar.gz"; - sha256="0b6rkpghw2vndvmgyacijdn3d76ykbjfwpxwv8m0jl7ynrf6l5ag"; + hash="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.0.3.tar.gz"; + sha256="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85"; }; buildInputs = [ texinfo texLive From 940c52f4c3d7d26b8b91f897e172fbb355c12a98 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:47:46 +0400 Subject: [PATCH 045/285] Update SlimerJS - there is still no fresh release for xulrunner 25 --- pkgs/development/tools/slimerjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 0fe10a0003ab..f045d786896b 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,12 +3,12 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="git-2013-10-31"; + version="git-2013-11-25"; name="${baseName}-${version}"; - hash="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; + hash="8c9c518085760a681e3d112ef638473861c1ab2abf9d31043fe365c5d96d3c40"; url="https://github.com/laurentj/slimerjs"; - rev="fdeb7364d3e29b47391ed0651176c1aedcb5277f"; - sha256="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; + rev="fab60f799eb24a8ba1cad42841d4148181acb72e"; + sha256="8c9c518085760a681e3d112ef638473861c1ab2abf9d31043fe365c5d96d3c40"; }; buildInputs = [ unzip zip From a8048382e5727f218c4e49f5e43ecde3136d6f1b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:48:14 +0400 Subject: [PATCH 046/285] Update GNU Chess --- pkgs/games/gnuchess/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 8a4bfe5f6ecf..72270cc312a2 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.0.3"; + version="6.1.1"; name="${baseName}-${version}"; - hash="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; - url="mirror://gnu/chess/gnuchess-6.0.3.tar.gz"; - sha256="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; + hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; + url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz"; + sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; }; buildInputs = [ flex From 435cffee5bbd4643d6b9c875da3852949f7d260c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:48:43 +0400 Subject: [PATCH 047/285] Update unstable Wine to 1.7.7 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 02ce076ce0fd..2c6499000348 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.4"; + version = "1.7.7"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0sb9zfrvlrjx1icfb94clgac239i9yfhyv48zv9iddgmvdjk8ysi"; + sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi"; }; gecko = fetchurl { From 5c90e785b2fb3e015e014306b295c45f309854c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:49:20 +0400 Subject: [PATCH 048/285] Updating LuaRocks to 2.1.1 --- pkgs/development/tools/misc/luarocks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index d905d078d40b..356b004aa4e5 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.1.0"; + version="2.1.1"; name="${baseName}-${version}"; - hash="12aqwchzn77yin2ahpxnc3lam5w0xhksrnhf31n3r7cxdsfh446c"; - url="http://luarocks.org/releases/luarocks-2.1.0-rc3.tar.gz"; - sha256="12aqwchzn77yin2ahpxnc3lam5w0xhksrnhf31n3r7cxdsfh446c"; + hash="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr"; + url="http://luarocks.org/releases/luarocks-2.1.1.tar.gz"; + sha256="1b0qscmzdn80kxnn31v5q0rpafkwq1fr0766dzyh7dc2r6ws2nwr"; }; buildInputs = [ lua curl From 980c7929ab5544c345b11ff8ef0de2c47c0b0ece Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:49:34 +0400 Subject: [PATCH 049/285] Updating Nginx to 1.4.4 --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index f6f4415e806d..a67ffe7e905a 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -13,7 +13,7 @@ let dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; - sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; }; syslog-ext = fetchgit { @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { description = "A reverse proxy and lightweight webserver"; maintainers = [ stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; - version = "1.4.3"; + version = "1.4.4"; }; } From 2f53f6c82d65f1699690976d7fe6162294a15b3a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:58:34 +0400 Subject: [PATCH 050/285] Fixing automatic update of Nginx --- pkgs/servers/http/nginx/default.nix | 18 ++++++++++-------- pkgs/servers/http/nginx/default.upstream | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index a67ffe7e905a..86b22ab5a18c 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -4,6 +4,12 @@ , syslog ? false}: let + version = "1.4.4"; + mainSrc = fetchurl { + url = "http://nginx.org/download/nginx-${version}.tar.gz"; + sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; + }; + rtmp-ext = fetchgit { url = git://github.com/arut/nginx-rtmp-module.git; rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; @@ -13,7 +19,7 @@ let dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; - sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; + sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; }; syslog-ext = fetchgit { @@ -24,12 +30,8 @@ let in stdenv.mkDerivation rec { - name = "nginx-${meta.version}"; - - src = fetchurl { - url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf"; - }; + name = "nginx-${version}"; + src = mainSrc; buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; @@ -61,6 +63,6 @@ stdenv.mkDerivation rec { description = "A reverse proxy and lightweight webserver"; maintainers = [ stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; - version = "1.4.4"; + inherit version; }; } diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream index f6a12eedda42..c20139017436 100644 --- a/pkgs/servers/http/nginx/default.upstream +++ b/pkgs/servers/http/nginx/default.upstream @@ -4,5 +4,5 @@ version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' do_overwrite() { ensure_hash set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" 2 + set_var_value sha256 "$CURRENT_HASH" } From fe32d12ef7704b9b797948c1fe5fbd10e5b59257 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Sun, 24 Nov 2013 21:05:59 +0100 Subject: [PATCH 051/285] glibc-locales: don't depend on /nix/store location previously, $TMPDIR/nix/store is hard-coded so that only building and installing is correct with /nix/store See #1273. --- pkgs/development/libraries/glibc/2.17/locales.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix index b7eae50ca385..680a1ced3dee 100644 --- a/pkgs/development/libraries/glibc/2.17/locales.nix +++ b/pkgs/development/libraries/glibc/2.17/locales.nix @@ -40,7 +40,7 @@ in installPhase = '' mkdir -p "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + cp -v $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale/locale-archive" "$out/lib/locale" ''; meta.description = "Locale information for the GNU C Library"; From d809fd135f56f9eabbe2d8d7bd08ddabd88ba7a5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 24 Nov 2013 07:29:48 +0100 Subject: [PATCH 052/285] protobuf: Update to new upstream version 2.5.0. Starting from version 32, Chromium now relies on protobuf version 2.5.0, so let's update it, especially because it doesn't have backwards compatible changes in the release notes. Signed-off-by: aszlig --- pkgs/development/libraries/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 57dc58bdfa17..bba8481780a5 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.4.1"; + name = "protobuf-2.5.0"; src = fetchurl { url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; buildInputs = [ zlib ]; From da62e513e7645a42b9c7a3ed58004f3aba46dc54 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Nov 2013 16:28:30 +0100 Subject: [PATCH 053/285] chromium: Update all channels to latest versions. This introduces version 31.0.1650.57 as the new version for the stable channel. Overview of the updated channels: stable: 30.0.1599.114 -> 31.0.1650.57 beta: 31.0.1650.34 -> 32.0.1700.19 dev: 32.0.1671.3 -> 33.0.1712.4 This drops the sandbox_userns_30.patch as version 30 is no longer stable. In addition, we had to patch out some references to /usr/bin/gcc in the bundled WebKit sources. Builds are passing and running fine. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 13 +- .../browsers/chromium/sandbox_userns_30.patch | 293 ------------------ .../networking/browsers/chromium/sources.nix | 18 +- 3 files changed, 16 insertions(+), 308 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fa91a877fdc0..87cdf673041a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -46,16 +46,17 @@ let prePatch = "patchShebangs ."; - patches = singleton ( - if versionOlder version "31.0.0.0" - then ./sandbox_userns_30.patch - else ./sandbox_userns_31.patch - ); + patches = singleton ./sandbox_userns_31.patch; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi + '' + (if versionOlder version "32.0.0.0" then '' sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi - '' + optionalString useOpenSSL '' + '' else '' + sed -i -e 's|/usr/bin/gcc|gcc|' \ + third_party/WebKit/Source/build/scripts/scripts.gypi \ + third_party/WebKit/Source/build/scripts/preprocessor.pm + '') + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch deleted file mode 100644 index 9a412352c521..000000000000 --- a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch +++ /dev/null @@ -1,293 +0,0 @@ -commit 41510de6ae32e6161073992bd1243f7f33148a06 -Author: aszlig -Date: Thu May 16 14:17:56 2013 +0200 - - zygote: Add support for user namespaces on Linux. - - The implementation is done by patching the Zygote host to execute the sandbox - binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child - process is using uid 0 and gid 0 which map to the current user of the parent. - Afterwards, the sandbox will continue as if it was called as a setuid binary. - - In addition, this adds new_user_namespace as an option in process_util in order - to set the UID and GID mapping correctly. The reason for this is that just - passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because - without setting the mappings exec*() will clear the process's capability sets. - - If the kernel doesn't support unprivileged user namespaces and the sandbox - binary doesn't have the setuid flag, the Zygote main process will run without a - sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. - - Signed-off-by: aszlig - -diff --git a/base/process/launch.h b/base/process/launch.h -index 45b1053..ce71418 100644 ---- a/base/process/launch.h -+++ b/base/process/launch.h -@@ -51,6 +51,7 @@ struct LaunchOptions { - new_process_group(false) - #if defined(OS_LINUX) - , clone_flags(0) -+ , new_user_namespace(false) - #endif // OS_LINUX - #if defined(OS_CHROMEOS) - , ctrl_terminal_fd(-1) -@@ -125,6 +126,9 @@ struct LaunchOptions { - #if defined(OS_LINUX) - // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; -+ -+ // If true, start the process in a new user namespace. -+ bool new_user_namespace; - #endif // defined(OS_LINUX) - - #if defined(OS_CHROMEOS) -diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index 52e149c..312f835 100644 ---- a/base/process/launch_posix.cc -+++ b/base/process/launch_posix.cc -@@ -37,6 +37,13 @@ - #include "base/threading/platform_thread.h" - #include "base/threading/thread_restrictions.h" - -+#if defined(OS_LINUX) -+#include -+#if !defined(CLONE_NEWUSER) -+#define CLONE_NEWUSER 0x10000000 -+#endif -+#endif -+ - #if defined(OS_CHROMEOS) - #include - #endif -@@ -416,13 +423,23 @@ bool LaunchProcess(const std::vector& argv, - - pid_t pid; - #if defined(OS_LINUX) -- if (options.clone_flags) { -+ int map_pipe_fd[2]; -+ int flags = options.clone_flags; -+ -+ if (options.new_user_namespace) { -+ flags |= CLONE_NEWUSER; -+ if (pipe(map_pipe_fd) < 0) { -+ DPLOG(ERROR) << "user namespace pipe"; -+ return false; -+ } -+ } -+ -+ if (options.clone_flags || options.new_user_namespace) { - // Signal handling in this function assumes the creation of a new - // process, so we check that a thread is not being created by mistake - // and that signal handling follows the process-creation rules. -- RAW_CHECK( -- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); -+ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -+ pid = syscall(__NR_clone, flags, 0, 0, 0); - } else - #endif - { -@@ -440,6 +457,21 @@ bool LaunchProcess(const std::vector& argv, - } else if (pid == 0) { - // Child process - -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // Close the write end of the pipe so we get an EOF when the parent closes -+ // the FD. This is to avoid race conditions when the UID/GID mappings are -+ // written _after_ execvp(). -+ close(map_pipe_fd[1]); -+ -+ char dummy; -+ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { -+ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); -+ _exit(127); -+ } -+ } -+#endif -+ - // DANGER: fork() rule: in the child, if you don't end up doing exec*(), - // you call _exit() instead of exit(). This is because _exit() does not - // call any previously-registered (in the parent) exit handlers, which -@@ -555,6 +587,40 @@ bool LaunchProcess(const std::vector& argv, - _exit(127); - } else { - // Parent process -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // We need to write UID/GID mapping here to map the current user outside -+ // the namespace to the root user inside the namespace in order to -+ // correctly "fool" the child process. -+ char buf[256]; -+ int map_fd, map_len; -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to uid_map."); -+ } -+ close(map_fd); -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to gid_map."); -+ } -+ close(map_fd); -+ -+ // Close the pipe on the parent, so the child can continue doing the -+ // execvp() call. -+ close(map_pipe_fd[1]); -+ } -+#endif -+ - if (options.wait) { - // While this isn't strictly disk IO, waiting for another process to - // finish is the sort of thing ThreadRestrictions is trying to prevent. -diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index bb84e62..bce0d18 100644 ---- a/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -119,25 +119,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - - sandbox_binary_ = sandbox_cmd.c_str(); - -- // A non empty sandbox_cmd means we want a SUID sandbox. -- using_suid_sandbox_ = !sandbox_cmd.empty(); -+ bool userns_sandbox = false; -+ const std::vector cmd_line_unwrapped(cmd_line.argv()); - -- if (using_suid_sandbox_) { -+ if (!sandbox_cmd.empty()) { - struct stat st; - if (stat(sandbox_binary_.c_str(), &st) != 0) { - LOG(FATAL) << "The SUID sandbox helper binary is missing: " - << sandbox_binary_ << " Aborting now."; - } - -- if (access(sandbox_binary_.c_str(), X_OK) == 0 && -- (st.st_uid == 0) && -- (st.st_mode & S_ISUID) && -- (st.st_mode & S_IXOTH)) { -+ if (access(sandbox_binary_.c_str(), X_OK) == 0) { -+ using_suid_sandbox_ = true; -+ - cmd_line.PrependWrapper(sandbox_binary_); - - scoped_ptr - sandbox_client(sandbox::SetuidSandboxClient::Create()); - sandbox_client->SetupLaunchEnvironment(); -+ -+ if (!((st.st_uid == 0) && -+ (st.st_mode & S_ISUID) && -+ (st.st_mode & S_IXOTH))) { -+ userns_sandbox = true; -+ sandbox_client->SetNoSuid(); -+ } - } else { - LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " - "configured correctly. Rather than run without sandboxing " -@@ -161,7 +167,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - base::ProcessHandle process = -1; - base::LaunchOptions options; - options.fds_to_remap = &fds_to_map; -+ if (userns_sandbox) -+ options.new_user_namespace = true; - base::LaunchProcess(cmd_line.argv(), options, &process); -+ -+ if (process == -1 && userns_sandbox) { -+ LOG(ERROR) << "User namespace sandbox failed to start, running without " -+ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " -+ << "enabled in order to use the sandbox without setuid bit."; -+ using_suid_sandbox_ = false; -+ options.new_user_namespace = false; -+ base::LaunchProcess(cmd_line_unwrapped, options, &process); -+ } -+ - CHECK(process != -1) << "Failed to launch zygote process"; - - if (using_suid_sandbox_) { -diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index 1f0e9f5..ade5aab 100644 ---- a/content/zygote/zygote_main_linux.cc -+++ b/content/zygote/zygote_main_linux.cc -@@ -420,6 +420,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, - *has_started_new_init = true; - } - -+ // Don't set non-dumpable, as it causes trouble when the host tries to find -+ // the zygote process (XXX: Not quite sure why this happens with user -+ // namespaces). Fortunately, we also have the seccomp filter sandbox which -+ // should disallow the use of ptrace. -+ if (setuid_sandbox->IsNoSuid()) -+ return true; -+ - #if !defined(OS_OPENBSD) - // Previously, we required that the binary be non-readable. This causes the - // kernel to mark the process as non-dumpable at startup. The thinking was -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 34231d4..36e3201 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { - return env_->HasVar(kSandboxNETNSEnvironmentVarName); - } - -+bool SetuidSandboxClient::IsNoSuid() const { -+ return env_->HasVar(kSandboxNoSuidVarName); -+} -+ - bool SetuidSandboxClient::IsSandboxed() const { - return sandboxed_; - } -@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { - SetSandboxAPIEnvironmentVariable(env_); - } - -+void SetuidSandboxClient::SetNoSuid() { -+ env_->SetVar(kSandboxNoSuidVarName, "1"); -+} -+ - } // namespace sandbox - -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index a9f6536..2e8113a 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.h -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -39,6 +39,8 @@ class SetuidSandboxClient { - bool IsInNewPIDNamespace() const; - // Did the setuid helper create a new network namespace ? - bool IsInNewNETNamespace() const; -+ // Is sandboxed without SUID binary ? -+ bool IsNoSuid() const; - // Are we done and fully sandboxed ? - bool IsSandboxed() const; - -@@ -46,6 +48,8 @@ class SetuidSandboxClient { - // helper. - void SetupLaunchEnvironment(); - -+ void SetNoSuid(); -+ - private: - // Holds the environment. Will never be NULL. - base::Environment* env_; -diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h -index aad4ff8..bd710d5 100644 ---- a/sandbox/linux/suid/common/sandbox.h -+++ b/sandbox/linux/suid/common/sandbox.h -@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; - - static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; - static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; -+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; - - static const long kSUIDSandboxApiNumber = 1; - static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index aae71e8dfb60..8ee5752f4aca 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "32.0.1671.3"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1671.3.tar.xz"; - sha256 = "0bv86ig3mrd95zh78880bcyh9b8w46s7slxq3mwwmrmqp0s8qaq0"; + version = "33.0.1712.4"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1712.4.tar.xz"; + sha256 = "1c1m0y3nnz2lclqi21j6hgqmb46p1hv7c22zz9fn7dax7jkimydk"; }; beta = { - version = "31.0.1650.34"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.34.tar.xz"; - sha256 = "0c73kvp09cmq4x42rcf45v0mnbyb8rcyi5i4pj0pvfn451vbngdq"; + version = "32.0.1700.19"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.19.tar.xz"; + sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425"; }; stable = { - version = "30.0.1599.114"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.114.tar.xz"; - sha256 = "0q5pq8bj4y0c7hd121db1fa9g3apkpkhb6cf14ag7abgrda2pzw2"; + version = "31.0.1650.57"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz"; + sha256 = "1xv7frf47hhvqm6f3n2l308yfrs4d8ri70q6pndx7hslhyiixzl9"; }; } From 139c5b5069acee8f89b0f7b7065baff382b5a337 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Nov 2013 11:46:41 +0100 Subject: [PATCH 054/285] linux: Update to 3.4.70 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e6f801d67e2d..0c0e41570aab 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.69"; + version = "3.4.70"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kwln802cxv8dg45r5kw8fi4npjczg5xf98hx7i9xwa33f57iv7g"; + sha256 = "0l0ln1jmrknvg9ibv13s8b9rzn3ck789y13hpdv04as5wp738v20"; }; features.iwlwifi = true; From 49db8a524cc18068564309b181f7d0f3f675f5be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 16:10:04 +0100 Subject: [PATCH 055/285] xmlto: remove misleading meta.platforms attribute that prevents this package from being built on Darwin --- pkgs/tools/typesetting/xmlto/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index c72192317b77..c5ebb9d971b3 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -43,8 +43,5 @@ stdenv.mkDerivation rec { license = "GPLv2+"; homepage = https://fedorahosted.org/xmlto/; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From d34e1ac42c716ffbcd5e5f07eed620e73dfe6c6f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 26 Nov 2013 10:18:42 -0500 Subject: [PATCH 056/285] fix build-node-package Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 716bda30f0d1..b7cd7f328933 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -20,6 +20,8 @@ in stdenv.mkDerivation ({ unpackPhase = "true"; + inherit src; + configurePhase = '' runHook preConfigure mkdir node_modules @@ -35,7 +37,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - npm --registry http://www.example.com --nodedir=${sources} install ${concatStringsSep " " src} ${npmFlags} + npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags} runHook postBuild ''; From 3ff6197e90690fcf905d29f261a31768be7a2e62 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 26 Nov 2013 16:38:13 +0100 Subject: [PATCH 057/285] python-protobuf: Fix generating *_pb2.py files. This only happens during setup.py build and generates the corresponding _pb2.py files from the .proto files, as they're no longer included in the source distribution starting from 2.5.0. Thanks to @iElectric for reporting this build failure: http://hydra.nixos.org/build/6897112 Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21ff841f29ba..e3d81baf39bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4524,6 +4524,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; + buildPhase = '' + python setup.py build + ''; + propagatedBuildInputs = [pkgs.protobuf]; sourceRoot = "${name}/python"; From da093461a2ff09d6ea1071ff886866a1f85480c2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 26 Nov 2013 10:49:34 -0500 Subject: [PATCH 058/285] Update node packages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 5c53e83cf1d8..e90418b16cfe 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -513,13 +513,13 @@ }; "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.12.0"; - by-version."aws-sdk"."1.12.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.12.0"; + self.by-version."aws-sdk"."1.13.0"; + by-version."aws-sdk"."1.13.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.12.0.tgz"; - sha1 = "635b42637d743b62cc795935714d955c12765eb4"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.13.0.tgz"; + sha1 = "575b56296006d555bc0d14c1109174d44c194545"; }) ]; buildInputs = @@ -6056,12 +6056,12 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.4"; - "karma" = self.by-version."karma"."0.11.4"; + self.by-version."karma"."0.11.5"; + "karma" = self.by-version."karma"."0.11.5"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.4"; + self.by-version."karma"."0.11.5"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.4"; + self.by-version."karma"."0.11.5"; by-spec."karma"."~0.10.0" = self.by-version."karma"."0.10.5"; by-version."karma"."0.10.5" = lib.makeOverridable self.buildNodePackage { @@ -6127,7 +6127,7 @@ self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.4" + self.by-version."karma"."0.11.5" ]; passthru.names = [ "karma-coverage" ]; }; @@ -6138,7 +6138,7 @@ self.by-version."karma-html2js-preprocessor"."0.1.0"; by-spec."karma-jasmine"."*" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma"."0.11.4" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma"."0.11.5" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-coffee-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; @@ -6154,8 +6154,8 @@ sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; }) (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.4.tgz"; - sha1 = "75c2f3f7292e138b27fbe8056148170091d875ee"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.5.tgz"; + sha1 = "c0c0d3ea1f2f7fe3d399a902c2aa96a79d553c62"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; @@ -6237,7 +6237,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.4" + self.by-version."karma"."0.11.5" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6257,7 +6257,7 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.4" + self.by-version."karma"."0.11.5" self.by-version."mocha"."1.14.0" ]; passthru.names = [ "karma-mocha" ]; @@ -6286,7 +6286,7 @@ self.by-version."q"."0.9.7" ]; peerDependencies = [ - self.by-version."karma"."0.11.4" + self.by-version."karma"."0.11.5" ]; passthru.names = [ "karma-sauce-launcher" ]; }; @@ -7249,13 +7249,13 @@ }; "mocha" = self.by-version."mocha"."1.14.0"; by-spec."mocha-unfunk-reporter"."*" = - self.by-version."mocha-unfunk-reporter"."0.3.5"; - by-version."mocha-unfunk-reporter"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.3.5"; + self.by-version."mocha-unfunk-reporter"."0.3.6"; + by-version."mocha-unfunk-reporter"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.3.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.5.tgz"; - sha1 = "64bd69891fae638d013ac1e03806c573a27e4ff1"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.6.tgz"; + sha1 = "5dd07ee02a813c12eabaca8a062ae7a419cac718"; }) ]; buildInputs = @@ -7268,7 +7268,7 @@ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.5"; + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.6"; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -8065,7 +8065,7 @@ self.by-version."express"."3.4.4" self.by-version."async"."0.2.9" self.by-version."glob"."3.2.7" - self.by-version."rc"."0.3.1" + self.by-version."rc"."0.3.2" self.by-version."strong-data-uri"."0.1.0" self.by-version."debug"."0.7.4" ]; @@ -8522,13 +8522,13 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.3.1"; - by-version."npm2nix"."5.3.1" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.3.1"; + self.by-version."npm2nix"."5.4.0"; + by-version."npm2nix"."5.4.0" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.3.1.tgz"; - sha1 = "f1a334e794e4faba821629d84c4d3d3555b6a15d"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.4.0.tgz"; + sha1 = "6185ed1261856a09f2a935eec733ccf1c1843726"; }) ]; buildInputs = @@ -8547,7 +8547,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.3.1"; + "npm2nix" = self.by-version."npm2nix"."5.4.0"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -9708,13 +9708,13 @@ }; "rbytes" = self.by-version."rbytes"."1.0.0"; by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.1"; - by-version."rc"."0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.1"; + self.by-version."rc"."0.3.2"; + by-version."rc"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.1.tgz"; - sha1 = "1da1bef8cf8201cafd3725bd82b31d1cf7321248"; + url = "http://registry.npmjs.org/rc/-/rc-0.3.2.tgz"; + sha1 = "cd8f895690f764621ccec110516b225286e8f69f"; }) ]; buildInputs = @@ -9729,7 +9729,7 @@ passthru.names = [ "rc" ]; }; by-spec."rc"."~0.3.1" = - self.by-version."rc"."0.3.1"; + self.by-version."rc"."0.3.2"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -10503,7 +10503,7 @@ buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.12.0" + self.by-version."aws-sdk"."1.13.0" self.by-version."commander"."2.0.0" self.by-version."http-auth"."2.0.7" self.by-version."express"."3.4.4" @@ -12262,7 +12262,7 @@ self.by-version."moment"."2.4.0" self.by-version."async"."0.2.9" self.by-version."ssh2"."0.2.14" - self.by-version."rc"."0.3.1" + self.by-version."rc"."0.3.2" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" From 2b1f21249445991940c9d3ebbc54ce41b1eaf9c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Nov 2013 18:17:12 +0100 Subject: [PATCH 059/285] Disable various services when running inside a container --- nixos/modules/config/sysctl.nix | 5 +++- nixos/modules/services/audio/alsa.nix | 1 + nixos/modules/services/hardware/acpid.nix | 1 + nixos/modules/services/logging/klogd.nix | 2 ++ nixos/modules/services/misc/nix-daemon.nix | 3 +++ nixos/modules/services/networking/dhcpcd.nix | 2 ++ nixos/modules/system/boot/kernel.nix | 5 +++- nixos/modules/system/boot/shutdown.nix | 24 +++++++++---------- nixos/modules/tasks/cpu-freq.nix | 2 ++ nixos/modules/tasks/network-interfaces.nix | 2 ++ .../tasks/scsi-link-power-management.nix | 2 ++ 11 files changed, 35 insertions(+), 14 deletions(-) diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index f987c9c9e944..8f9b31dccff3 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -46,7 +46,10 @@ in before = [ "sysinit.target" "shutdown.target" ]; wantedBy = [ "sysinit.target" "multi-user.target" ]; restartTriggers = [ config.environment.etc."sysctl.d/nixos.conf".source ]; - unitConfig.DefaultDependencies = false; # needed to prevent a cycle + unitConfig = { + DefaultDependencies = false; # needed to prevent a cycle + ConditionPathIsReadWrite = "/proc/sys/"; # prevent systemd-sysctl in containers + }; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index d021b8bd3ba9..c9a2ef4589bd 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -55,6 +55,7 @@ in { description = "Store Sound Card State"; wantedBy = [ "multi-user.target" ]; unitConfig.RequiresMountsFor = "/var/lib/alsa"; + unitConfig.ConditionVirtualization = "!systemd-nspawn"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index adba6394dcf5..2329f38dfc25 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -110,6 +110,7 @@ in exec = "acpid --confdir ${acpiConfDir}"; + unitConfig.ConditionVirtualization = "!systemd-nspawn"; unitConfig.ConditionPathExists = [ "/proc/acpi" ]; }; diff --git a/nixos/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix index d7d0bbf89a54..36b530d0077e 100644 --- a/nixos/modules/services/logging/klogd.nix +++ b/nixos/modules/services/logging/klogd.nix @@ -32,6 +32,8 @@ with pkgs.lib; path = [ pkgs.sysklogd ]; + unitConfig.ConditionVirtualization = "!systemd-nspawn"; + exec = "klogd -c 1 -2 -n " + "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1707828d0db6..1aefe75931b1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -279,6 +279,7 @@ in { description = "Nix Daemon Socket"; wantedBy = [ "sockets.target" ]; before = [ "multi-user.target" ]; + unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket/"; socketConfig.ListenStream = "/nix/var/nix/daemon-socket/socket"; }; @@ -290,6 +291,8 @@ in environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }; + unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket/"; + serviceConfig = { ExecStart = "@${nix}/bin/nix-daemon nix-daemon --daemon"; KillMode = "process"; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 07b5606eacaa..ea263b3c89de 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -114,6 +114,8 @@ in path = [ dhcpcd pkgs.nettools pkgs.openresolv ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + serviceConfig = { Type = "forking"; PIDFile = "/run/dhcpcd.pid"; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 64d4c33c9655..c3c38b186bdd 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -231,7 +231,10 @@ in wantedBy = [ "sysinit.target" "multi-user.target" ]; before = [ "sysinit.target" "shutdown.target" ]; conflicts = [ "shutdown.target" ]; - unitConfig.DefaultDependencies = "no"; + unitConfig = + { DefaultDependencies = false; + ConditionCapability = "CAP_SYS_MODULE"; + }; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix index ad71a2e816e3..44cadcd64a76 100644 --- a/nixos/modules/system/boot/shutdown.nix +++ b/nixos/modules/system/boot/shutdown.nix @@ -6,20 +6,20 @@ with pkgs.lib; # This unit saves the value of the system clock to the hardware # clock on shutdown. - systemd.units."save-hwclock.service" = - { wantedBy = [ "shutdown.target" ]; + systemd.services.save-hwclock = + { description = "Save Hardware Clock"; - text = - '' - [Unit] - Description=Save Hardware Clock - DefaultDependencies=no - Before=shutdown.target + wantedBy = [ "shutdown.target" ]; - [Service] - Type=oneshot - ExecStart=${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"} - ''; + unitConfig = { + DefaultDependencies = false; + ConditionVirtualization = "!systemd-nspawn"; + }; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}"; + }; }; boot.kernel.sysctl."kernel.poweroff_cmd" = "${config.systemd.package}/sbin/poweroff"; diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix index ce36a8bab096..705ec93a1360 100644 --- a/nixos/modules/tasks/cpu-freq.nix +++ b/nixos/modules/tasks/cpu-freq.nix @@ -33,6 +33,8 @@ with pkgs.lib; after = [ "systemd-modules-load.service" ]; wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathIsReadWrite = "/sys/devices/"; + path = [ pkgs.cpufrequtils ]; preStart = '' diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index d8522b6abba0..b1ab989f130f 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -270,6 +270,8 @@ in before = [ "network.target" ]; wantedBy = [ "network.target" ]; + unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + path = [ pkgs.iproute ]; serviceConfig.Type = "oneshot"; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 4927952080f6..071a80865983 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -31,6 +31,8 @@ with pkgs.lib; task = true; + unitConfig.ConditionPathIsReadWrite = "/sys/class/scsi_host"; + script = '' shopt -s nullglob for x in /sys/class/scsi_host/host*/link_power_management_policy; do From 14cd8bc24874b33e87ec08ddb6d47502e76f17b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Nov 2013 18:24:55 +0100 Subject: [PATCH 060/285] Allow services to specify a pre-stop script --- nixos/modules/system/boot/systemd-unit-options.nix | 8 ++++++++ nixos/modules/system/boot/systemd.nix | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 4eb3f1a43a65..c0518599f17a 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -210,6 +210,14 @@ in rec { ''; }; + preStop = mkOption { + type = types.lines; + default = ""; + description = '' + Shell commands executed to stop the service. + ''; + }; + postStop = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 31e795ea2d04..51c71c7a5af2 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -190,6 +190,12 @@ let ${config.postStart} ''; }) + (mkIf (config.preStop != "") + { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' + #! ${pkgs.stdenv.shell} -e + ${config.preStop} + ''; + }) (mkIf (config.postStop != "") { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' #! ${pkgs.stdenv.shell} -e From 953f12995be933fb2c1efe314299556e4178e26e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Nov 2013 18:37:16 +0100 Subject: [PATCH 061/285] nscd: Fix LD_LIBRARY_PATH This ensures that nscd can find the NSS modules. Fixes #1248. --- nixos/modules/system/boot/systemd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 51c71c7a5af2..143f923813da 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -170,7 +170,6 @@ let systemd ]; environment.PATH = config.path; - environment.LD_LIBRARY_PATH = ""; } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' From e8baaba044689b75ef4f36ebc5a93b7462c23cb2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Nov 2013 18:52:34 +0100 Subject: [PATCH 062/285] Add a regression test for hostname / nss_myhostname Issue #1248. --- nixos/lib/build-vms.nix | 4 ++-- nixos/tests/misc.nix | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index d20fbc1cc663..498c0a377836 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -68,8 +68,8 @@ rec { # the first interface (i.e. the first network in its # virtualisation.vlans option). networking.extraHosts = flip concatMapStrings machines - (m: let config = (getAttr m nodes).config; in - optionalString (config.networking.primaryIPAddress != "") + (m': let config = (getAttr m' nodes).config; in + optionalString (m.first != m' && config.networking.primaryIPAddress != "") ("${config.networking.primaryIPAddress} " + "${config.networking.hostName}\n")); diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 12ac6f6f9a67..d355d705a24c 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -59,6 +59,12 @@ subtest "override-env-var", sub { $machine->succeed('[ "$EDITOR" = emacs ]'); }; + + # Test whether hostname (and by extension nss_myhostname) works. + subtest "hostname", sub { + $machine->succeed('[ "`hostname`" = machine ]'); + $machine->succeed('[ "`hostname -s`" = machine ]'); + }; ''; } From 411535365db1bcd31d7b5b5db03c2a17abe1dbfb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 26 Nov 2013 22:41:29 +0400 Subject: [PATCH 063/285] Give up and use Oracle JRE for VUE --- 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 954aa173361b..fe4f83ccb04f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9015,7 +9015,9 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; - vue = callPackage ../applications/misc/vue {}; + vue = callPackage ../applications/misc/vue { + jre = oraclejre; + }; vwm = callPackage ../applications/window-managers/vwm { }; From 09c50d6f9cf13621407ba566ca5368488f79dbc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:24:19 +0100 Subject: [PATCH 064/285] alex: update to version 3.1.2 --- .../development/tools/parsing/alex/{3.1.0.nix => 3.1.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/tools/parsing/alex/{3.1.0.nix => 3.1.2.nix} (84%) diff --git a/pkgs/development/tools/parsing/alex/3.1.0.nix b/pkgs/development/tools/parsing/alex/3.1.2.nix similarity index 84% rename from pkgs/development/tools/parsing/alex/3.1.0.nix rename to pkgs/development/tools/parsing/alex/3.1.2.nix index b6d46bea58e7..f969f9b65912 100644 --- a/pkgs/development/tools/parsing/alex/3.1.0.nix +++ b/pkgs/development/tools/parsing/alex/3.1.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "alex"; - version = "3.1.0"; - sha256 = "1d2kdn4g3zyc3ijiscbqayzg1apy0iih603dv90pr9w2f36djrkh"; + version = "3.1.2"; + sha256 = "0v8y6s9gwfk3cda6cpdl0n6vljmjbpnrdi3n93q41x24bhjyn50x"; isLibrary = false; isExecutable = true; buildDepends = [ QuickCheck ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fadba5b0fbc1..51cabc4315da 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_2; - alex = self.alex_3_1_0; + alex = self.alex_3_1_2; haddock = self.haddock_2_13_2; happy = self.happy_1_19_0; primitive = self.primitive_0_5_1_0; # semi-official, but specified @@ -2437,8 +2437,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; - alex_3_1_0 = callPackage ../development/tools/parsing/alex/3.1.0.nix {}; - alex = self.alex_3_1_0; + alex_3_1_2 = callPackage ../development/tools/parsing/alex/3.1.2.nix {}; + alex = self.alex_3_1_2; alexMeta = callPackage ../development/tools/haskell/alex-meta {}; From 2cfc208f26863553013435612cf6bb4831ba4f91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:24:41 +0100 Subject: [PATCH 065/285] haskell-ekg: add version 0.3.1.3 --- .../libraries/haskell/ekg/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ekg/default.nix diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix new file mode 100644 index 000000000000..dd3c40a7d2c6 --- /dev/null +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -0,0 +1,19 @@ +{ cabal, aeson, filepath, network, snapCore, snapServer, text, time +, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "ekg"; + version = "0.3.1.3"; + sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc"; + buildDepends = [ + aeson filepath network snapCore snapServer text time transformers + unorderedContainers + ]; + meta = { + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51cabc4315da..478108717e58 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -945,6 +945,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {}; editline = self.editline_0_2_1_1; + ekg = callPackage ../development/libraries/haskell/ekg {}; + elerea = callPackage ../development/libraries/haskell/elerea {}; Elm = callPackage ../development/compilers/elm/elm.nix {}; From ed9a255951cb4c77d791a4adb524552248995933 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:25:37 +0100 Subject: [PATCH 066/285] haskell-gloss-accelerate: add version 1.8.0.0 --- .../libraries/haskell/gloss-accelerate/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/gloss-accelerate/default.nix diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix new file mode 100644 index 000000000000..c4a31d541b58 --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -0,0 +1,13 @@ +{ cabal, accelerate, accelerateCuda, gloss }: + +cabal.mkDerivation (self: { + pname = "gloss-accelerate"; + version = "1.8.0.0"; + sha256 = "1hcqgsdk5pjqdr2j4i5614a1r56zfxqx5nc3xpnc4yw6hssan280"; + buildDepends = [ accelerate accelerateCuda gloss ]; + meta = { + description = "Extras to interface Gloss and Accelerate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 478108717e58..b650d1165e89 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1096,6 +1096,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x gloss = callPackage ../development/libraries/haskell/gloss {}; + glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {}; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {}; From 0d811d4a10409c1fe6b0bdf746e3c5502ba5adfa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:26:03 +0100 Subject: [PATCH 067/285] haskell-gloss-raster-accelerate: add version 1.8.0.0 --- .../haskell/gloss-raster-accelerate/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix new file mode 100644 index 000000000000..7ed70bc092cf --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -0,0 +1,13 @@ +{ cabal, accelerate, accelerateCuda, gloss, glossAccelerate }: + +cabal.mkDerivation (self: { + pname = "gloss-raster-accelerate"; + version = "1.8.0.0"; + sha256 = "17545lb99iszhmx8f8fan0dm76ps6bc977zs2ramycnybzbb3kyc"; + buildDepends = [ accelerate accelerateCuda gloss glossAccelerate ]; + meta = { + description = "Parallel rendering of raster images using Accelerate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b650d1165e89..2b00a7e38880 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1098,6 +1098,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {}; + glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {}; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {}; From b20b8b9844937c8e58c7d6017d88fc25de6f754c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:27:06 +0100 Subject: [PATCH 068/285] happy: update to version 1.19.1 --- .../tools/parsing/happy/{1.19.0.nix => 1.19.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/tools/parsing/happy/{1.19.0.nix => 1.19.1.nix} (83%) diff --git a/pkgs/development/tools/parsing/happy/1.19.0.nix b/pkgs/development/tools/parsing/happy/1.19.1.nix similarity index 83% rename from pkgs/development/tools/parsing/happy/1.19.0.nix rename to pkgs/development/tools/parsing/happy/1.19.1.nix index 2ff2950591ec..3ca5add9e6b8 100644 --- a/pkgs/development/tools/parsing/happy/1.19.0.nix +++ b/pkgs/development/tools/parsing/happy/1.19.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happy"; - version = "1.19.0"; - sha256 = "1phk44crr1zi4sd3slxj1ik5ll799zl48k69z1miws3mxq6w076z"; + version = "1.19.1"; + sha256 = "0vhyv8pgj3cc31xx1vbdlhc01sfpl6xpzya79bvssnkian2n6yy2"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2b00a7e38880..7bd52e8b119e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_2; haddock = self.haddock_2_13_2; - happy = self.happy_1_19_0; + happy = self.happy_1_19_1; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; @@ -2474,8 +2474,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; - happy_1_19_0 = callPackage ../development/tools/parsing/happy/1.19.0.nix {}; - happy = self.happy_1_19_0; + happy_1_19_1 = callPackage ../development/tools/parsing/happy/1.19.1.nix {}; + happy = self.happy_1_19_1; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From d019c243f3bcecd38bf69cf81fbc85219ea437f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:27:39 +0100 Subject: [PATCH 069/285] haskell-HTTP: add version 4000.2.9 --- .../libraries/haskell/HTTP/4000.2.9.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.9.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix new file mode 100644 index 000000000000..4ab03112189c --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix @@ -0,0 +1,24 @@ +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.9"; + sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; + buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7bd52e8b119e..3cd85de9f9ee 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_8; + HTTP = self.HTTP_4000_2_9; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_0; @@ -1208,7 +1208,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP = self.HTTP_4000_2_8; + HTTP_4000_2_9 = callPackage ../development/libraries/haskell/HTTP/4000.2.9.nix {}; + HTTP = self.HTTP_4000_2_9; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From 5644003632ded3c4f0f5f5bcd09d4612425427d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 070/285] haskell-git-annex: update to version 5.20131120 --- .../git-and-tools/git-annex/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 2506de8d14e4..01eda5002952 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -2,32 +2,33 @@ , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet -, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit -, IfElse, json, lsof, MissingH, MonadCatchIOTransformers -, monadControl, mtl, network, networkInfo, networkMulticast -, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa -, rsync, SafeSemaphore, SHA, stm, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiLogger, warp, which -, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse +, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl +, network, networkInfo, networkMulticast, networkProtocolXmpp +, openssh, perl, QuickCheck, random, regexTdfa, rsync +, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text +, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger +, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault +, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131106"; - sha256 = "019k3zhbc3wjg8isndw6hkgrr3h3qxrbfydv7m6zpgv2khjyhfh0"; + version = "5.20131120"; + sha256 = "0l046dx10z59k5xqp8vjnqx6r7aiqr4v71cviy9gxdy05y0873j5"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter caseInsensitive clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns editDistance extensibleExceptions feed filepath gnutls hamlet - hinotify hS3 hslogger HTTP httpConduit httpTypes HUnit IfElse json + hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json MissingH MonadCatchIOTransformers monadControl mtl network networkInfo networkMulticast networkProtocolXmpp QuickCheck random - regexTdfa SafeSemaphore SHA stm text time transformers unixCompat - utf8String uuid wai waiLogger warp xmlConduit xmlTypes yesod - yesodCore yesodDefault yesodForm yesodStatic + regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck + text time transformers unixCompat utf8String uuid wai waiLogger + warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm + yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 From f871ee09ca1b9ec2273bd6e77bb0dbc2113b80c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 071/285] haskell-MonadCatchIO-transformers: update to version 0.3.1.0 --- .../haskell/MonadCatchIO-transformers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 4edd801d08d8..838c92fff3f8 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, transformers }: +{ cabal, extensibleExceptions, monadsTf, transformers }: cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.3.0.0"; - sha256 = "0v7k6npfr1x9s4bk409y6sc1vhzs5pm4mwpky356z7kdvz2z274c"; - buildDepends = [ extensibleExceptions transformers ]; + version = "0.3.1.0"; + sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn"; + buildDepends = [ extensibleExceptions monadsTf transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; From 3565daeb02ad19b574773399e56f78426e138990 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 072/285] haskell-accelerate-cuda: update to version 0.14.0.0 --- .../development/libraries/haskell/accelerate-cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index d7e11f11ef04..de4a47b1d7e5 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.13.0.4"; - sha256 = "0zdb02mj9sbkj51a1q7sl6kmjx51gvps52dwc70qpm3rk71qnp1k"; + version = "0.14.0.0"; + sha256 = "1qms1w5rjjd77lldds2ljj9zr15dybnsaq8vxfyb5a4diq12bmi5"; buildDepends = [ accelerate binary cryptohash cuda fclabels filepath hashable hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc From fe96c6bc11ccf1e3571c3d1fafeb619ff2efb3bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 073/285] haskell-accelerate-examples: update to version 0.14.0.0 --- .../haskell/accelerate-examples/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index e48abc543f8d..761f890d7e47 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -1,22 +1,23 @@ { cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo -, attoparsec, bmp, bytestringLexing, cereal, cmdargs, criterion -, cuda, deepseq, fclabels, filepath, gloss, hashtables, mtl -, mwcRandom, pgm, QuickCheck, random, repa, repaIo, testFramework -, testFrameworkQuickcheck2, vector, vectorAlgorithms +, attoparsec, bmp, bytestringLexing, cereal, criterion, ekg +, fclabels, filepath, gloss, glossAccelerate, glossRasterAccelerate +, HUnit, mwcRandom, primitive, QuickCheck, random, repa, repaIo +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "accelerate-examples"; - version = "0.13.0.0"; - sha256 = "18f8p47sf10zn678540qzzf5pl18w9f068s83lpz4lk0r5gf4lzx"; + version = "0.14.0.0"; + sha256 = "01hxww3ypjlcfimkvf7gxl2g7msad2yw1d6m0h4kkfqvpx84nfwr"; isLibrary = false; isExecutable = true; buildDepends = [ accelerate accelerateCuda accelerateFft accelerateIo attoparsec bmp - bytestringLexing cereal cmdargs criterion cuda deepseq fclabels - filepath gloss hashtables mtl mwcRandom pgm QuickCheck random repa - repaIo testFramework testFrameworkQuickcheck2 vector - vectorAlgorithms + bytestringLexing cereal criterion ekg fclabels filepath gloss + glossAccelerate glossRasterAccelerate HUnit mwcRandom primitive + QuickCheck random repa repaIo testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector vectorAlgorithms ]; configureFlags = "-f-opencl"; meta = { From 318da895c35fa592d832ce547329ef6cbc076e93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 074/285] haskell-accelerate-fft: update to version 0.14.0.0 --- pkgs/development/libraries/haskell/accelerate-fft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index 523e5ae1504c..cf041dd5e4a9 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate-fft"; - version = "0.13.0.0"; - sha256 = "0gqdb7m0qf8wvccqnz9pafbvas3viwhr9i422cmfvjpxsmnzlcp7"; + version = "0.14.0.0"; + sha256 = "1rsrgrqn1gdds2wvv1mgzd3yg2mvbkgnj63ygjyzsk9j00wavd1g"; buildDepends = [ accelerate accelerateCuda cuda cufft ]; meta = { homepage = "https://github.com/AccelerateHS/accelerate-fft"; From e7e6f40081968c20e612167f7529fb7ab68893a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 075/285] haskell-accelerate-io: update to version 0.14.0.0 --- pkgs/development/libraries/haskell/accelerate-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index 48c2ea71e178..457a2313f6f0 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate-io"; - version = "0.13.0.2"; - sha256 = "0lm1kkjs5gbd70k554vi9977v4bxxcxaw39r9wmwxf8nx2qxvshh"; + version = "0.14.0.0"; + sha256 = "1vvjmsfaz5xbvvb4x2fym43xvcjv41baxlfhlycgizaca4yw8w9h"; buildDepends = [ accelerate bmp repa vector ]; meta = { homepage = "https://github.com/AccelerateHS/accelerate-io"; From e7327b989ca06706393f3843d0495d58644d3687 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 076/285] haskell-accelerate: update to version 0.14.0.0 --- .../libraries/haskell/accelerate/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index b7979f6f5f2a..3d60cfddb6c6 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -1,10 +1,12 @@ -{ cabal, fclabels, hashable, hashtables }: +{ cabal, fclabels, hashable, hashtables, unorderedContainers }: cabal.mkDerivation (self: { pname = "accelerate"; - version = "0.13.0.5"; - sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j"; - buildDepends = [ fclabels hashable hashtables ]; + version = "0.14.0.0"; + sha256 = "0b6mnv5l2vrbljak2yx9akpsyqc0qg1il54w0rlfm29fgqknlhjh"; + buildDepends = [ + fclabels hashable hashtables unorderedContainers + ]; jailbreak = true; meta = { homepage = "https://github.com/AccelerateHS/accelerate/"; From f7e5bf4e799c0f0824657e7eca9e2338e382725d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 077/285] haskell-blaze-builder: update to version 0.3.3.0 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 7c2ee140c1ab..36b8f57cc400 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.2.0"; - sha256 = "169q318jxhk7rmb8r679zhcdcmcca87d55341cnzajmc0580n6ih"; + version = "0.3.3.0"; + sha256 = "0j6nrwcnpcr7c17cxw3v85m19q8z91wb6jir8c6kls5m321hwd63"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From 05fcd91c57cfcdd7382628cd81a67b1ccdda699a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 078/285] haskell-conduit: update to version 1.0.9.1 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index ffe52d0f9c77..96d203d2709d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.9"; - sha256 = "00xzy6iq98p0b8bqncj2xl1gzba1kr58xmfbc3s29bqg1sisvjsz"; + version = "1.0.9.1"; + sha256 = "178g7sf54h63kn6z4k69s13phi73ijdqam72s4dzprdhwnfar517"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From e377575a688f1438fcb71ce70d7316dcc56eade2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:10 +0100 Subject: [PATCH 079/285] haskell-cuda: update to version 0.5.1.1 --- pkgs/development/libraries/haskell/cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index fbe0ec0a20cf..a53a1bda6a48 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.5.1.0"; - sha256 = "1zsfsz8i05iq54wxj1maj6qqzv4ibr459h47knc7ds1qv4giwzhl"; + version = "0.5.1.1"; + sha256 = "0bz1pfcxxvq1s47nrwgj9cqmr20p9n3hh2hilih8083hnjjwh40x"; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; From c1301780bd8315291733742715e9da15ae3c829f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 080/285] haskell-doctest: update to version 0.9.10 --- .../libraries/haskell/doctest/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 08118ac4e1bf..687314266839 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,17 +1,17 @@ -{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit -, QuickCheck, setenv, silently, stringbuilder, syb, transformers +{ cabal, deepseq, filepath, ghcPaths, hspec, HUnit, QuickCheck +, setenv, silently, stringbuilder, syb, transformers }: cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.9"; - sha256 = "1r1jdmch6sb4cdygh60pv42p4nr03shabrpd18hjnxs40dgc6pgy"; + version = "0.9.10"; + sha256 = "1xislgmg62i2bngq8ghg31r4ip4qdbqzr6rqhm5wac7nchjv0j83"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; testDepends = [ - baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv - silently stringbuilder syb transformers + deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently + stringbuilder syb transformers ]; doCheck = false; meta = { From c89a375a40318095f8a6742a74e6d2f35b82b500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 081/285] haskell-ghc-mod: update to version 3.1.4 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index accce6f5c86a..fb3ccb8e50ec 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "3.1.3"; - sha256 = "0g12cj8yn2znhqi7wiz5jayzh4g5jdcj1qwy5g3pz456hcpb0jig"; + version = "3.1.4"; + sha256 = "1sm8wj6vcgbm91z762h6rbq68njj5384a69w4k3q0qzdyix0cxym"; isLibrary = true; isExecutable = true; buildDepends = [ From f37f2f17915bc94f55d49b3575f1762cf710e2bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 082/285] haskell-ghc-syb-utils: update to version 0.2.1.2 --- pkgs/development/libraries/haskell/ghc-syb-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index 6f5f14585074..8032e8b6afde 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-syb-utils"; - version = "0.2.1.1"; - sha256 = "1fwlzqbkjn592jh01nccn99iii6047fg9f3hh255586nzngihh1l"; + version = "0.2.1.2"; + sha256 = "12k6a782gv06gmi6dvskzv4ihz54izhqslwa9cgilhsihw557i9p"; buildDepends = [ syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; From 94f85d42c7d4133a014663e1e163bbd12e7d250d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 083/285] haskell-haskeline: update to version 0.7.1.1 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index a283f229b762..2799b732292f 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.7.0.3"; - sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg"; + version = "0.7.1.1"; + sha256 = "1xwbjrak0jicbckk609sqwdlizpkn5zab0kqzrcw9swg1fxpwx5m"; buildDepends = [ filepath terminfo transformers utf8String ]; configureFlags = "-fterminfo"; meta = { From efd82cdc2b1ce97103865be59bf9d8b9db06dbc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 084/285] haskell-hmatrix: update to version 0.15.2.0 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 0ccdb3c529ed..51670f639735 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.15.0.1"; - sha256 = "0hm3jnh7lds74zyk2m8i3zcdmsv1jlvplrzlxxr68j1cqwfdxilg"; + version = "0.15.2.0"; + sha256 = "0rlgyqgl9x08f38nznbv50asbph0zp9dqk0l156hxz792590payl"; buildDepends = [ binary deepseq random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; meta = { From a3cf9f562bef4a14dd5455a57d1a71bd04604264 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 085/285] haskell-language-ecmascript: update to version 0.15.3 --- .../libraries/haskell/language-ecmascript/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 7e78800a7f5f..458916df9d1b 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -1,18 +1,19 @@ { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec , QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, uniplate +, testFrameworkQuickcheck2, uniplate, wlPprint }: cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.2"; - sha256 = "1iszs9f2jryddcz36a6anfyfxpwjhzn49xjqvnd5m6rjdq6y403w"; + version = "0.15.3"; + sha256 = "0ircm20nf321awl0gvy0vh3jplfwpd700br67f0i97rifxx2v40c"; buildDepends = [ - dataDefaultClass Diff mtl parsec QuickCheck uniplate + dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint ]; testDepends = [ dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 + testFramework testFrameworkHunit testFrameworkQuickcheck2 uniplate + wlPprint ]; jailbreak = true; doCheck = false; From 1387beca0de60451207c7c0a1dae46e9b5681451 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 086/285] haskell-netwire: update to version 5.0.0 --- .../libraries/haskell/netwire/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix index d7ab9539e0c8..a2b2810f6f95 100644 --- a/pkgs/development/libraries/haskell/netwire/default.nix +++ b/pkgs/development/libraries/haskell/netwire/default.nix @@ -1,17 +1,17 @@ -{ cabal, bifunctors, deepseq, liftedBase, monadControl, mtl -, profunctors, random, semigroups, tagged, time, vectorSpace +{ cabal, deepseq, parallel, random, semigroups, time, transformers }: cabal.mkDerivation (self: { pname = "netwire"; - version = "4.0.7"; - sha256 = "035jz7j19c7n4za9xi8vj6yl9m2b2v6d53mp711gf8609wv0cx0c"; + version = "5.0.0"; + sha256 = "1wxrckc8i86xiiyk8msa6qrhfjx4h34ry1nxh9rdcd5cy03kalks"; + isLibrary = true; + isExecutable = true; buildDepends = [ - bifunctors deepseq liftedBase monadControl mtl profunctors random - semigroups tagged time vectorSpace + deepseq parallel random semigroups time transformers ]; meta = { - description = "Flexible wire arrows for FRP"; + description = "Functional reactive programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From dca56f235212c05ce5ad50f7092b7797e44e90ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 087/285] haskell-pipes-bytestring: update to version 1.0.2 --- .../libraries/haskell/pipes-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 715fcaa93383..83f08ecf148b 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "1.0.1"; - sha256 = "0zk2n9mly1mjh1zb3z33gab362abgh8c0mw88mmwnlfszq97hcz7"; + version = "1.0.2"; + sha256 = "09wzmi3xh9n69xsxw0ik4qf2ld1vksca88ggknqbzbnjxq82jjrr"; buildDepends = [ pipes pipesParse transformers ]; meta = { description = "ByteString support for pipes"; From 3543da4eb4f4a02dab3ded0021886348e74bdefc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 088/285] haskell-pipes-safe: update to version 2.0.1 --- pkgs/development/libraries/haskell/pipes-safe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index fd722c0fb05a..029bbd158b84 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-safe"; - version = "2.0.0"; - sha256 = "1g7ha6x87qyk3f9vrl0djzdvaq80q4q6hh7lya4kgm3cbz00a0yv"; + version = "2.0.1"; + sha256 = "11516rixqdym5rf5z5f5gwbfk689dl3ka3dj44c7a2qy7xl4sqzr"; buildDepends = [ exceptions pipes transformers ]; meta = { description = "Safety for the pipes ecosystem"; From 5f52272550974ac73d86ae0b972f451814e8ee4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 089/285] haskell-pipes: update to version 4.0.1 --- pkgs/development/libraries/haskell/pipes/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index a78028416076..d9d923987090 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,10 +1,15 @@ -{ cabal, mmorph, mtl, transformers, void }: +{ cabal, mmorph, mtl, QuickCheck, testFramework +, testFrameworkQuickcheck2, transformers, void +}: cabal.mkDerivation (self: { pname = "pipes"; - version = "4.0.0"; - sha256 = "0zsz739hjmfirwv9sacibpikwz48l006g95m8da1rqk5p1yyr2lm"; + version = "4.0.1"; + sha256 = "0q2i58w4nlf23di6rjrv543nmj5d5nkz29q9aciw89zx5x5m22h9"; buildDepends = [ mmorph mtl transformers void ]; + testDepends = [ + mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers + ]; meta = { description = "Compositional pipelines"; license = self.stdenv.lib.licenses.bsd3; From 59308137562a96a2bd2dc453da4cd9082a251aac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 090/285] haskell-shake: update to version 0.10.10 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 5f7640320f65..91897bd5a66f 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.9"; - sha256 = "08czcf0pkchq558kjkfpz7vf5pn1dbqk8mb9fnivnphy963sf6sr"; + version = "0.10.10"; + sha256 = "0xj5r0rj0ybhll9zymipkj338axv11klbpxirdbpdqjh1iaa9yl7"; isLibrary = true; isExecutable = true; buildDepends = [ From 491c52a39008facef76fd0b81d10fd9755cbdb75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 091/285] haskell-statistics: update to version 0.10.5.1 --- pkgs/development/libraries/haskell/statistics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 5db264d3c7b3..6c677f85890e 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.5.0"; - sha256 = "0yn0bqvh922zi0cg2nyb9vn5jk9k4j4vz96fl0h3ayxhfds08m6v"; + version = "0.10.5.1"; + sha256 = "1ld7cf83asia8dbq7kbn2s6f7la01scafk2wra2c85pmkql77kvc"; buildDepends = [ binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances From e2fb1c3c54f9f14cb804b351c3875b56d4f49f92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 092/285] haskell-tasty-hunit: update to version 0.4.1 --- pkgs/development/libraries/haskell/tasty-hunit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 92ab3cd99b24..dfcc5a4bdae9 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.2"; - sha256 = "1476ac3rsaag9rfgglzs65wqlkzm09xzdz47ksyj3a4c6ajba1kw"; + version = "0.4.1"; + sha256 = "1ns4lbqjkgfgl00jg4sw2jz3r189z4k5fzwbii3g1bnskn28fapa"; buildDepends = [ HUnit mtl tasty ]; meta = { description = "HUnit support for the Tasty test framework"; From dfc2345559b8f70313e61b621eeabda24e034329 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:11 +0100 Subject: [PATCH 093/285] haskell-wai-handler-launch: update to version 1.3.1.5 --- .../libraries/haskell/wai-handler-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index a3d02329dfdf..c4d22a66e006 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "1.3.1.4"; - sha256 = "0ii74p2400a4w0pcswk8j57wbasi17alifs4xgwv79b235wnn317"; + version = "1.3.1.5"; + sha256 = "1iz36j7lzl5c9b2hacxv4v5gfzkfvgj7hlb5xz4r14ca4w5fzzfj"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai warp zlibConduit From 1ab18e5281e7cd227eb882759c97c5c36274064f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:12 +0100 Subject: [PATCH 094/285] haskell-wai: update to version 1.4.1 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 425d5237a713..0fff9096cb07 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.0.2"; - sha256 = "0mmnl2zn3jsa5yan58kf2d7cvc343cld0l8mydb9qnq4if2kq94q"; + version = "1.4.1"; + sha256 = "1m8z1jc4fvq8rw9vk1x5sy73dbmiifa41973x84i51vsibyaqhgb"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 1767a37a98db8df29bf324d396389959ccf6bfca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:12 +0100 Subject: [PATCH 095/285] haskell-xml-conduit: update to version 1.1.0.8 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 4e965c2ebaa9..3f97a028729e 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.7"; - sha256 = "04yg2mif9s3hsm5c18mf6rmw22j8prs8a1272fz25vzxzljfs2r9"; + version = "1.1.0.8"; + sha256 = "06if4mbrbcsjhk7hj3616fhgfh0rlsj95jblsbxq2drb4bn56r39"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault deepseq failure From 55fcd713b8cc1be738e4862673ed42b2a3e367db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Nov 2013 16:28:12 +0100 Subject: [PATCH 096/285] haskell-yesod-bin: update to version 1.2.4.1 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 54dcf4dd19d1..c93c76ee3fab 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.4"; - sha256 = "1n4lkhwy9kvllvfma951lwx6k731jfm4ajkpjim37k38swmmcb70"; + version = "1.2.4.1"; + sha256 = "18wzxalgiffdjz6x5vxmhksscy5531plgyjkv705kf5vaw6v6rlr"; isLibrary = false; isExecutable = true; buildDepends = [ From a9986874c0822c5290aee9ece71d633cbe61474f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:34:47 +0100 Subject: [PATCH 097/285] xmobar: re-generate expression with cabal2nix --- pkgs/applications/misc/xmobar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 03ec9a6d4035..7d4d2715d04a 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,5 @@ { cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time -, utf8String, X11, X11Xft, wirelesstools +, utf8String, wirelesstools, X11, X11Xft }: cabal.mkDerivation (self: { From 70b50fe963be4fad74b3c558ca1ed546da01942f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:48 +0100 Subject: [PATCH 098/285] haskell-ListLike: update to version 4.0.1 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index b24e81300b62..d8e1e0c6f429 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.0"; - sha256 = "13dw8pkj8dwxb81gbcm7gn221zyr3ck9s9s1iv7v1b69chv0zyxk"; + version = "4.0.1"; + sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; meta = { From 704f8b7fbc2c6371973f48f53156ed9e6d6e897d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:53 +0100 Subject: [PATCH 099/285] haskell-cereal-conduit: update to version 0.7.2 --- pkgs/development/libraries/haskell/cereal-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index fc76f85cebc4..4021b15df9cf 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal-conduit"; - version = "0.7.1"; - sha256 = "0ry6vc3nkb1lj0p103b8pyd3472hx62s3c7yw3fk8mbjlygxyv43"; + version = "0.7.2"; + sha256 = "03jlhpz82a7j7n0351db0h7pkxihik3fv0wgjny7i0vlq7gyqdpl"; buildDepends = [ cereal conduit transformers ]; testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; meta = { From 06b3ee931f66c3c990a74c7ab614e367165535be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:53 +0100 Subject: [PATCH 100/285] haskell-conduit: update to version 1.0.9.2 --- pkgs/development/libraries/haskell/conduit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 96d203d2709d..c0c98ba7e479 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,17 +1,17 @@ -{ cabal, doctest, hspec, liftedBase, mmorph, monadControl, mtl -, QuickCheck, resourcet, text, transformers, transformersBase, void +{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck +, resourcet, text, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.9.1"; - sha256 = "178g7sf54h63kn6z4k69s13phi73ijdqam72s4dzprdhwnfar517"; + version = "1.0.9.2"; + sha256 = "1w00fjbq3fbzvf77yvm50vkif8hw6ay5s3i39csimhd4hfgv1ss8"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void ]; testDepends = [ - doctest hspec mtl QuickCheck resourcet text transformers void + hspec mtl QuickCheck resourcet text transformers void ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 7428b4c6f70a38c48f23ec79c49757fa20010208 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:54 +0100 Subject: [PATCH 101/285] haskell-digestive-functors-heist: update to version 0.8.1.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 3773192a5dc6..91d1bf0bcbcd 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.0.0"; - sha256 = "1zy2fy30q51q8pqw78f8gxc1x52vw49w3mnqc2hfqw190v5r9dgh"; + version = "0.8.1.0"; + sha256 = "0f9nhfy8rc1w9nnhq1yf9y2kwxlb9b6v8y1jz5q3lrpb1cnq31j0"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; From 94be3f6ea1197861fd026c8823301cab45a8cfa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:57 +0100 Subject: [PATCH 102/285] haskell-highlighting-kate: update to version 0.5.5.1 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index e0cab3852862..9049664f3048 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.5"; - sha256 = "0ypxlsfh9xdpnxp6j7wy7q7ymhmxfgwrqi4c08zwf8xy5sfvahs9"; + version = "0.5.5.1"; + sha256 = "173g7dss3v3acbn6b5ajmc1n1v4wx2395cckw8n61myl7mzzbrry"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From 2fb6ec7033e587797d87a4b6ae11686ca3ad432f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:58 +0100 Subject: [PATCH 103/285] haskell-http-conduit: update to version 1.9.5.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 4d639909d8e3..f0c559839e05 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.5.1"; - sha256 = "1a53s5f9p0xnd33midi4pfj6i3nvckb9khn0p3l3v3xvqn5rrgf2"; + version = "1.9.5.2"; + sha256 = "0andx8ggcwcd39z10yh5j0rmn7ypypgfzaaibbbh2rhp5v28932b"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From e7fd532cd8828d6b87695b82b5380ccd9d8f8cd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:46:59 +0100 Subject: [PATCH 104/285] haskell-language-java: update to version 0.2.6 --- pkgs/development/libraries/haskell/language-java/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index e665f5aadde9..8486841a5f6a 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-java"; - version = "0.2.5"; - sha256 = "1ai6mvzasi8fji4b81nrpy48icf5h25g3kakhpfbzckwf20c9dkd"; + version = "0.2.6"; + sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27"; buildDepends = [ cpphs parsec syb ]; testDepends = [ filepath HUnit mtl QuickCheck testFramework testFrameworkHunit From df3a1cd6919d976a7b4d07d5714ecb9cc81aff91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:00 +0100 Subject: [PATCH 105/285] haskell-mersenne-random-pure64: update to version 0.2.0.4 --- .../libraries/haskell/mersenne-random-pure64/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 590290e76c34..97f163f5735f 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mersenne-random-pure64"; - version = "0.2.0.3"; - sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz"; + version = "0.2.0.4"; + sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h"; buildDepends = [ random ]; meta = { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; From ed1225b0d99787eeb64274dc102ebf1d63724c3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:01 +0100 Subject: [PATCH 106/285] haskell-pipes-network: update to version 0.6.1 --- pkgs/development/libraries/haskell/pipes-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index 89c67fb79ca2..7a6c21db997a 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-network"; - version = "0.6.0"; - sha256 = "1jfj5bmpvf9vvq86jz8hbhzzjawchri90vx11fxcbz2ckks673k9"; + version = "0.6.1"; + sha256 = "0ds6v98jamda8p72rnrwnj3x77mfx3kss57hj9ns97gga5jq88kl"; buildDepends = [ network networkSimple pipes pipesSafe transformers ]; From 15a805b114630a93618e91b9a8aa2986aa6e0067 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:01 +0100 Subject: [PATCH 107/285] haskell-shelly: update to version 1.3.2 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 4272afd61a24..6f73537e8b67 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.1"; - sha256 = "1psgb1jqw6hqbrp7f217ayabchsn9q4fn2z77lc52r4mlvys13mh"; + version = "1.3.2"; + sha256 = "1n6kj9sw6d1nwg7lz1pgmjn8pjxxr76m5sxybv4hacakid3glddh"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 58ebe9eae3ae57e33625698575584ab644c3e5d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:03 +0100 Subject: [PATCH 108/285] haskell-tabular: update to version 0.2.2.5 --- pkgs/development/libraries/haskell/tabular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index 32ede2f660b3..f90c56871932 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tabular"; - version = "0.2.2.4"; - sha256 = "103fqbypsgykv6z29jp1s75pd99vra9sfa70krcnlhbk9kbvdyjk"; + version = "0.2.2.5"; + sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740"; buildDepends = [ csv html mtl ]; meta = { homepage = "http://hub.darcs.net/kowey/tabular"; From 50a2395bdf2da4895f7d519623c8ba7e226139ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:04 +0100 Subject: [PATCH 109/285] haskell-yaml: update to version 0.8.5.2 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 8d06099b77e5..8b7b69cb7fd4 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.5.1"; - sha256 = "0vbampykc5a027q5fh5w6i1bxblyxx7s3nzhpzaa4c1yz8nz3k57"; + version = "0.8.5.2"; + sha256 = "1x285bd57ifp50afgx5i9chwmnlb0l716dsh691fjqj0xsr9kjgv"; isLibrary = true; isExecutable = true; buildDepends = [ From 6cd81e146a9527989da56d248e2d0e5d90d9b007 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Nov 2013 12:47:04 +0100 Subject: [PATCH 110/285] haskell-yesod-static: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index f9193ee971d0..c1f3c4ea8734 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.1"; - sha256 = "0vsmsdyi0nx111mkyf1wkkl2i07l40gcjzrm9dbks7k4pfajxqjx"; + version = "1.2.1.1"; + sha256 = "009p6hq6hwmvji40yqv97v1sfwdfh44pasp68cxw05czhcwwcacv"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes From 6385ac407ab00ca60b2e1651093d2acb3316dbc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 111/285] haskell-asn1-types: update to version 0.2.2 --- pkgs/development/libraries/haskell/asn1-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index c28885b38edb..dfa5ef4c8036 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.2.1"; - sha256 = "1gnyvinimxb9vw3gwvsdvja8ascm07v9f5grxh42fzqkx6fm5xvr"; + version = "0.2.2"; + sha256 = "0h3ww7iyf1xzl88mzmi03h6ws942953dr56v896vrkj3mj01hayx"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; From bd73c33b2793da0bf6286562d765d6085217c95d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 112/285] haskell-bert: update to version 1.2.2 --- pkgs/development/libraries/haskell/bert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index 0ae519dde580..2857a21a8d98 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "bert"; - version = "1.2.1.1"; - sha256 = "1g5sm23cxlzc7lqdlrjn4f89g65ia2bhr25yfh286awxf23z8pyh"; + version = "1.2.2"; + sha256 = "1dlq9fl5d2adprcybs4d4cyhj9q2c1l4kcc6vnnyhbyn201gxgpn"; buildDepends = [ binary binaryConduit conduit mtl network networkConduit parsec time void From 144872c9b4e2d481453096df3fd45f1e61318a99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 113/285] haskell-conduit: update to version 1.0.9.3 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index c0c98ba7e479..8da3a25e3c17 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.9.2"; - sha256 = "1w00fjbq3fbzvf77yvm50vkif8hw6ay5s3i39csimhd4hfgv1ss8"; + version = "1.0.9.3"; + sha256 = "162lf83v0cip48y7a5mgvxrxnpr1vpc4lpcr8rbh0w981wkaxk4h"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From 1bd3d139b7b90629fc051269cdcc6d94b73b7983 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 114/285] haskell-diagrams-cairo: update to version 1.0 --- .../development/libraries/haskell/diagrams/cairo.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index a73b6d9fba85..ee9b0907347e 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -1,14 +1,14 @@ -{ cabal, cairo, cmdargs, colour, diagramsCore, diagramsLib -, filepath, mtl, split, time +{ cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib +, filepath, lens, mtl, split, statestack, time }: cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "0.7"; - sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy"; + version = "1.0"; + sha256 = "1m549ryfyfjc6sg3xi0wlcpi4c0xj6yfrpjmxgiyl76rwaqns989"; buildDepends = [ - cairo cmdargs colour diagramsCore diagramsLib filepath mtl split - time + cairo colour dataDefaultClass diagramsCore diagramsLib filepath + lens mtl split statestack time ]; meta = { homepage = "http://projects.haskell.org/diagrams"; From 1f802fb2f5edd8b9923b6f715aa4e5df0dc89d59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 115/285] haskell-diagrams-contrib: update to version 1.0 --- .../libraries/haskell/diagrams/contrib.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 023ac0906814..c446d5de4d8c 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -1,16 +1,18 @@ -{ cabal, arithmoi, circlePacking, colour, dataDefault, diagramsCore -, diagramsLib, forceLayout, HUnit, lens, MonadRandom, mtl -, QuickCheck, split, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, vectorSpace +{ cabal, arithmoi, circlePacking, colour, dataDefault +, dataDefaultClass, diagramsCore, diagramsLib, forceLayout, HUnit +, lens, MonadRandom, mtl, parsec, QuickCheck, semigroups, split +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.7"; - sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac"; + version = "1.0"; + sha256 = "1jmv8z1xz0vqv8hjhymh2za265897fl3m0p6y5s2gy0mqy6d5z25"; buildDepends = [ - arithmoi circlePacking colour dataDefault diagramsCore diagramsLib - forceLayout lens MonadRandom mtl split vectorSpace + arithmoi circlePacking colour dataDefault dataDefaultClass + diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec + semigroups split text vectorSpace vectorSpacePoints ]; testDepends = [ diagramsLib HUnit QuickCheck testFramework testFrameworkHunit From 35380a75913d493278591fbc0e1ec2190ee0afb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 116/285] haskell-diagrams-core: update to version 1.0 --- pkgs/development/libraries/haskell/diagrams/core.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 33fa353628bb..0469139f9901 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -1,13 +1,13 @@ -{ cabal, dualTree, MemoTrie, monoidExtras, newtype, semigroups -, vectorSpace, vectorSpacePoints +{ cabal, dualTree, lens, MemoTrie, monoidExtras, newtype +, semigroups, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.7.0.1"; - sha256 = "1826f6yrb0ch07y4bjb1cnqi8giphn2i6g45484qr6bfbb8wj5dg"; + version = "1.0"; + sha256 = "0my82q2lm8crlrdlgd48gblvjbqpf4g2cjharz0nhyny06mcgpgz"; buildDepends = [ - dualTree MemoTrie monoidExtras newtype semigroups vectorSpace + dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; jailbreak = true; From ba110165555e92a4623af3d4365ffab392fb3953 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 117/285] haskell-diagrams: update to version 1.0 --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 2b000724f122..e6590ecc2dda 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "0.7.1.1"; - sha256 = "1fkrdds3p7ghjjscw5fmsjk8s5l31bz9a9z2qf3xwa1kp8p4d16d"; + version = "1.0"; + sha256 = "0l7d8l06g6nn6bkkwdn8ra9ir1dnqj6qsgdzd9jk78dqq5ihp7bg"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; From 9b89e3a47a7ac43bb96605e43e44d3dbb1e205db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 118/285] haskell-diagrams-lib: update to version 1.0 --- .../libraries/haskell/diagrams/lib.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 43ada20aecc4..52af7b25a3c3 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,15 +1,18 @@ -{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree -, intervals, monoidExtras, newtype, NumInstances, semigroups -, vectorSpace +{ cabal, active, colour, dataDefaultClass, diagramsCore, filepath +, fingertree, intervals, lens, MemoTrie, monoidExtras, NumInstances +, optparseApplicative, safe, semigroups, tagged, vectorSpace +, vectorSpacePoints }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.7.1.1"; - sha256 = "14d557y22dqyjr026vbawa2a2yjh7alh3rpavyidfdlrg48lqgrc"; + version = "1.0"; + sha256 = "0afrk9y7h5g9cqds9b7b0jvz4xylaxyj3q9aj5415ldwwzdf6cc8"; buildDepends = [ - active colour dataDefaultClass diagramsCore fingertree intervals - monoidExtras newtype NumInstances semigroups vectorSpace + active colour dataDefaultClass diagramsCore filepath fingertree + intervals lens MemoTrie monoidExtras NumInstances + optparseApplicative safe semigroups tagged vectorSpace + vectorSpacePoints ]; jailbreak = true; meta = { From 7abb8e4bcd2bafbc8ce7498f1fdc0fe33e858760 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 119/285] haskell-diagrams-svg: update to version 1.0 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 062cee83e416..dea68b93e6d1 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -1,14 +1,14 @@ -{ cabal, blazeSvg, cmdargs, colour, diagramsCore, diagramsLib -, filepath, monoidExtras, mtl, split, time, vectorSpace +{ cabal, blazeSvg, colour, diagramsCore, diagramsLib, filepath +, lens, monoidExtras, mtl, split, time, vectorSpace }: cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "0.8.0.2"; - sha256 = "0ahapj040qy74kcj9f786ddd28xysq1wch087wsh8sdfp57z5dbz"; + version = "1.0"; + sha256 = "13v1q9d2004k4324b0yxlmwrsanb0mk9pz0gqfxvx9v27sry12sl"; buildDepends = [ - blazeSvg cmdargs colour diagramsCore diagramsLib filepath - monoidExtras mtl split time vectorSpace + blazeSvg colour diagramsCore diagramsLib filepath lens monoidExtras + mtl split time vectorSpace ]; meta = { homepage = "http://projects.haskell.org/diagrams/"; From a5e6f9c09e94309ee01dca4668b89a2cb5c93b80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:55 +0100 Subject: [PATCH 120/285] haskell-hslua: update to version 0.3.9 --- pkgs/development/libraries/haskell/hslua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index 0cdd309d81bf..3d1505a7e805 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "hslua"; - version = "0.3.8"; - sha256 = "1yb23cyb3wj70z8lvk6w2sn13kc17v53fd8m587kb4fpqzpdz44d"; + version = "0.3.9"; + sha256 = "0rs9hfc1k7wihgvp6vizccwppv5nd9mszp7a2y7pwjrprapwj07c"; buildDepends = [ mtl ]; pkgconfigDepends = [ lua ]; configureFlags = "-fsystem-lua"; meta = { description = "A Lua language interpreter embedding in Haskell"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; }) From 99a4fcfc1b9a2dd996a96d65bed821cbbc89e41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:39:56 +0100 Subject: [PATCH 121/285] haskell-hdevtools: re-generate expression with cabal2nix --- .../tools/haskell/hdevtools/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix index 36741f97458f..da5eb778803b 100644 --- a/pkgs/development/tools/haskell/hdevtools/default.nix +++ b/pkgs/development/tools/haskell/hdevtools/default.nix @@ -1,16 +1,16 @@ { cabal, cmdargs, ghcPaths, network, syb, time }: cabal.mkDerivation (self: { - pname = "hdevtools"; - version = "0.1.0.5"; - sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; - isLibrary = false; - isExecutable = true; - buildDepends = [ cmdargs ghcPaths network syb time ]; - meta = { - homepage = "https://github.com/bitc/hdevtools/"; - description = "Persistent GHC powered background server for FAST haskell development tools"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; + pname = "hdevtools"; + version = "0.1.0.5"; + sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7"; + isLibrary = false; + isExecutable = true; + buildDepends = [ cmdargs ghcPaths network syb time ]; + meta = { + homepage = "https://github.com/bitc/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; }) From 25116b7b63614858f684a4d037817d867441e23d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Nov 2013 11:50:34 +0100 Subject: [PATCH 122/285] haskell-statestack: add version 0.2 --- .../libraries/haskell/statestack/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/statestack/default.nix diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix new file mode 100644 index 000000000000..4275c5fc4576 --- /dev/null +++ b/pkgs/development/libraries/haskell/statestack/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "statestack"; + version = "0.2"; + sha256 = "0j1axjwlh270qy6nlvm0hbc8nbd1ggm7klkjv553qf1rprz4zc2d"; + buildDepends = [ mtl transformers ]; + meta = { + description = "Simple State-like monad transformer with saveable and restorable state"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3cd85de9f9ee..371cbb7a8801 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1950,6 +1950,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stateref = callPackage ../development/libraries/haskell/stateref {}; + statestack = callPackage ../development/libraries/haskell/statestack {}; + StateVar = callPackage ../development/libraries/haskell/StateVar {}; statistics = callPackage ../development/libraries/haskell/statistics {}; From a14eaaa9f009db606c916b4b34c420d655097119 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 26 Nov 2013 23:55:31 +0100 Subject: [PATCH 123/285] ino: update to 0.3.6 Signed-off-by: Moritz Ulrich --- pkgs/development/arduino/ino/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 89501f11269c..3e74c143c61b 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -2,12 +2,12 @@ , avrdude, arduino_core, avrgcclibc }: buildPythonPackage rec { - name = "ino-0.3.5"; + name = "ino-0.3.6"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz"; - sha256 = "1j2qzcjp6r2an1v431whq9l47s81d5af6ni8j87gv294f53sl1ab"; + sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv"; }; # TODO: add avrgcclibc, it must be rebuild with C++ support From 36955aa721f0d96d5685d544a173366e5565a639 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 2 Nov 2013 12:43:11 +0100 Subject: [PATCH 124/285] grsecurity: Update to 3.0-3.2.52-201311261307 and add patch for 3.12 --- pkgs/os-specific/linux/kernel/patches.nix | 21 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 21 ++++++++++++++------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 36f3232838c2..3316911d3ede 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -124,14 +124,25 @@ rec { }; - grsecurity_2_9_1_3_2_52 = - { name = "grsecurity-2.9.1-3.2.52"; + grsecurity_3_0_3_2_52 = + { name = "grsecurity-3.0-3.2.52"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.52-201310271550.patch; - sha256 = "08y4y323y2lfvdj67gmg3ca8gaf3snhr3pyrmgvj877avaz0475m"; + url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch; + sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw"; }; - # The grsec kernel patch seems to include the apparmor patches as of 2.9.1-3.2.52 + features.grsecurity = true; + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52 features.apparmor = true; }; + grsecurity_3_0_3_12_1 = + { name = "grsecurity-3.0-3.12.1"; + patch = fetchurl { + url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch; + sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz"; + }; + features.grsecurity = true; + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1 + features.apparmor = true; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 954aa173361b..ea4faf7369b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6665,12 +6665,7 @@ let ]; }; - # Note: grsec is not enabled automatically, you need to specify which kernel - # config options you need (e.g. by overriding extraConfig). See list of options here: - # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options - linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_52 ]; - })) (args: { + grsecurityOverrider = args: { # Install gcc plugins. These are needed for compiling dependant packages. postInstall = '' ${args.postInstall or ""} @@ -6685,7 +6680,18 @@ let sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${gmp}/include|' tools/gcc/Makefile sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${gmp}/include|' tools/gcc/Makefile ''; - })); + }; + + # Note: grsec is not enabled automatically, you need to specify which kernel + # config options you need (e.g. by overriding extraConfig). See list of options here: + # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options + linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 ]; + })) (args: grsecurityOverrider args)); + + linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 ]; + })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; @@ -6890,6 +6896,7 @@ let linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); + linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity; # Update this when adding a new version! linuxPackages_latest = pkgs.linuxPackages_3_12; From 2106191003dd549e1c4cfc95e26e658f9c5babbe Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 26 Nov 2013 23:08:51 +0100 Subject: [PATCH 125/285] grsecurity: Fix module loading during boot due to path restrictions --- pkgs/os-specific/linux/kernel/grsec-path.patch | 15 +++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/grsec-path.patch diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch new file mode 100644 index 000000000000..be242779548f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/grsec-path.patch @@ -0,0 +1,15 @@ +diff --git a/kernel/kmod.c b/kernel/kmod.c +index 3227c2c..f32c944 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -246,8 +246,8 @@ static int ____call_usermodehelper(void *data) + out the path to be used prior to this point and are now operating + on that copy + */ +- if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && +- strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) { ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && ++ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path); + retval = -EPERM; + goto fail; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3316911d3ede..128c42533c63 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -145,4 +145,9 @@ rec { # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1 features.apparmor = true; }; + + grsec_path = + { name = "grsec-path"; + patch = ./grsec-path.patch; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea4faf7369b9..f3f31964b7d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6686,11 +6686,11 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { From 9b609beec17b1dbc106cbe376e5315290c449595 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 27 Nov 2013 01:53:06 +0100 Subject: [PATCH 126/285] Ledger3: Update to latest git. Works good here. Signed-off-by: Moritz Ulrich --- pkgs/applications/office/ledger/3.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 8b74dbad6f8e..8a29d9356df5 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "0ec4291"; + rev = "0e5867bc5c"; in stdenv.mkDerivation { - name = "ledger3-2013.08.${rev}"; + name = "ledger3-2013.11.${rev}"; src = fetchgit { url = "https://github.com/ledger/ledger.git"; inherit rev; - sha256 = "1y4rcbx8y2fxkdc7i06n1i5jf3cq05bvzpb8498mis2gwfmkw470"; + sha256 = "16aa63z24rp5vin7al8b6nzdi4kqpawbzvh148wfr2wj60vdb1n5"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; From 46445a3295aee3f49329fe4ac35c268603daba28 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 26 Nov 2013 15:28:03 +0000 Subject: [PATCH 127/285] haskellPackages.indexedFree: New expression --- .../libraries/haskell/indexed-free/default.nix | 15 +++++++++++++++ .../libraries/haskell/indexed/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/haskell/indexed-free/default.nix create mode 100644 pkgs/development/libraries/haskell/indexed/default.nix diff --git a/pkgs/development/libraries/haskell/indexed-free/default.nix b/pkgs/development/libraries/haskell/indexed-free/default.nix new file mode 100644 index 000000000000..557154d391ac --- /dev/null +++ b/pkgs/development/libraries/haskell/indexed-free/default.nix @@ -0,0 +1,15 @@ +{ cabal, indexed }: + +cabal.mkDerivation (self: { + pname = "indexed-free"; + version = "0.3.1"; + sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx"; + buildDepends = [ indexed ]; + meta = { + homepage = "https://github.com/fumieval/indexed-free"; + description = "indexed monads for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/indexed/default.nix b/pkgs/development/libraries/haskell/indexed/default.nix new file mode 100644 index 000000000000..c31fa6691d8f --- /dev/null +++ b/pkgs/development/libraries/haskell/indexed/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "indexed"; + version = "0.1"; + sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12"; + meta = { + homepage = "https://github.com/reinerp/indexed"; + description = "Haskell98 indexed functors, monads, comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 371cbb7a8801..a6439cb88312 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1352,6 +1352,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; indents = callPackage ../development/libraries/haskell/indents {}; + + indexed = callPackage ../development/libraries/haskell/indexed {}; + + indexedFree = callPackage ../development/libraries/haskell/indexed-free {}; instantGenerics = callPackage ../development/libraries/haskell/instant-generics {}; From 6f4c08b0b78ed4e7564cb1c282a27f8267954541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 27 Nov 2013 12:37:24 +0100 Subject: [PATCH 128/285] Adding fontconfig support to ffmpeg. --- pkgs/development/libraries/ffmpeg/1.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 8d1092e9c048..a2e01fdd41f8 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -13,7 +13,7 @@ , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null , playSupport ? true, SDL ? null -, freetypeSupport ? true, freetype ? null +, freetypeSupport ? true, freetype ? null, fontconfig ? null }: assert speexSupport -> speex != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" ++ stdenv.lib.optional playSupport "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype"; + ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] ++ stdenv.lib.optional mp3Support lame @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] ++ stdenv.lib.optional playSupport SDL - ++ stdenv.lib.optional freetypeSupport freetype; + ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; enableParallelBuilding = true; From 6bf6769ae451d18bdb8fe48c800bee727217871b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 27 Nov 2013 12:22:21 +0000 Subject: [PATCH 129/285] haskellPackages.foldl: New expression --- .../development/libraries/haskell/foldl/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/foldl/default.nix diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix new file mode 100644 index 000000000000..44312abb35be --- /dev/null +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "foldl"; + version = "1.0.0"; + sha256 = "0r9lkyw33231nfl9ly25hk2i7k3c8ssmng473xvk76zkcrksj131"; + meta = { + description = "Composable, streaming, and efficient left folds"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6439cb88312..e775ce4c0f98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1029,6 +1029,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fingertree = callPackage ../development/libraries/haskell/fingertree {}; + foldl = callPackage ../development/libraries/haskell/foldl {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout {}; free = callPackage ../development/libraries/haskell/free {}; From 51b633bcf6f1e16da1cf2c5eeca9710c184b2e47 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Nov 2013 11:37:43 +0100 Subject: [PATCH 130/285] haskell-semigroups: update to version 0.12 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 16e6eb60fcf6..f1bc7259b799 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.11"; - sha256 = "0w81ap41j28pbppqs33hz7b9n5ghyj2hnny0kgxgcg8iv2qg9czy"; + version = "0.12"; + sha256 = "0wk8hxak4dl8nbdif4f8z9gvr5bqm95inrvrcrb6ryaxichrn432"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From 76a25e937ec52ab27353d2f570e5250dc0b34d9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Nov 2013 11:37:43 +0100 Subject: [PATCH 131/285] haskell-stringsearch: update to version 0.3.6.5 --- pkgs/development/libraries/haskell/stringsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index f8032f8cde41..12f19c836f3d 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "stringsearch"; - version = "0.3.6.4"; - sha256 = "16g0x0n8x3bg3mij7w3r5m3h2i2dn3bd298n14iccdwhfnlzm91b"; + version = "0.3.6.5"; + sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq"; meta = { homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; From 45f78c667d7e784dc74de1acafd596c2c030a6ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Nov 2013 11:37:43 +0100 Subject: [PATCH 132/285] haskell-wai-logger: update to version 0.3.2 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index f6035269112e..fc958c2576b9 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,15 +1,16 @@ { cabal, blazeBuilder, byteorder, caseInsensitive, dateCache -, fastLogger, httpTypes, network, wai +, doctest, fastLogger, httpTypes, network, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.1"; - sha256 = "0x1d67fcfpjrgyjr7hipifqrzk13x8z8xmlj7h999r8mswijhgii"; + version = "0.3.2"; + sha256 = "0las9jb8cxdsyh1mnrhx48yfbjw5f2x4hhmivhmhzb6qgxnbvma9"; buildDepends = [ blazeBuilder byteorder caseInsensitive dateCache fastLogger httpTypes network wai ]; + testDepends = [ doctest waiTest ]; meta = { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; From e15f6bcecb9fe01e8ad04827ca98db18e03374c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Nov 2013 12:35:05 +0100 Subject: [PATCH 133/285] haskell-diagrams-contrib: jailbreak to support semigroups 0.12 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index c446d5de4d8c..24b880303166 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { diagramsLib HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; From 82265ee89d7a83d4ad53b2bffc12d2216e44b6fc Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 27 Nov 2013 12:37:21 +0000 Subject: [PATCH 134/285] haskellPackages.HDBCodbc: Do not build Haddocks The Haddocks currently fail to build, which means that HDBC-ODBC cannot be install. --- pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 50994384c966..ae08eb8940b1 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -8,11 +8,15 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; + noHaddock = true; # Haddocks currently fail to build meta = { homepage = "https://github.com/hdbc/hdbc-odbc"; description = "ODBC driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.ocharles + ]; }; }) From ce2732f2f2b8e304e325ad05a2cf988f9f75edca Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 27 Nov 2013 13:46:57 +0100 Subject: [PATCH 135/285] New Haskell package: CodecImageDevIL, bindings to libdevil --- .../haskell/codec-image-devil/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/codec-image-devil/default.nix diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix new file mode 100644 index 000000000000..fc8631f07a6e --- /dev/null +++ b/pkgs/development/libraries/haskell/codec-image-devil/default.nix @@ -0,0 +1,14 @@ +{ cabal, libdevil }: + +cabal.mkDerivation (self: { + pname = "Codec-Image-DevIL"; + version = "0.2.3"; + sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz"; + buildDepends = [ libdevil ]; + meta = { + homepage = "http://hackage.haskell.org/package/Codec-Image-DevIL"; + description = "Simple FFI interface to the DevIL image library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e775ce4c0f98..daba9950319c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -742,6 +742,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cmdtheline = callPackage ../development/libraries/haskell/cmdtheline {}; + CodecImageDevIL = callPackage ../development/libraries/haskell/codec-image-devil {}; + colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; colour = callPackage ../development/libraries/haskell/colour {}; From 77c26d3f9fb57427e3405fa693b90a5d23ebc3ce Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Nov 2013 09:04:08 -0500 Subject: [PATCH 136/285] Add posix nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 231 ++++++++++----------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index e90418b16cfe..33827fed3c09 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -505,7 +505,7 @@ (self.nativeDeps."aws-sdk" or []); deps = [ self.by-version."xml2js"."0.2.4" - self.by-version."xmlbuilder"."0.4.3" + self.by-version."xmlbuilder"."1.0.2" ]; peerDependencies = [ ]; @@ -2246,7 +2246,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.3" + self.by-version."uglify-js"."2.4.4" ]; peerDependencies = [ ]; @@ -2397,13 +2397,13 @@ passthru.names = [ "cookiejar" ]; }; by-spec."cookies".">= 0.2.2" = - self.by-version."cookies"."0.3.7"; - by-version."cookies"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "cookies-0.3.7"; + self.by-version."cookies"."0.3.8"; + by-version."cookies"."0.3.8" = lib.makeOverridable self.buildNodePackage { + name = "cookies-0.3.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.3.7.tgz"; - sha1 = "89ff5ecd74a2d4e1224bdb775db83c407fb6774f"; + url = "http://registry.npmjs.org/cookies/-/cookies-0.3.8.tgz"; + sha1 = "92fe50918f3d55aec4ae9d978bcddda2ada28ce9"; }) ]; buildInputs = @@ -3443,13 +3443,13 @@ passthru.names = [ "everyauth" ]; }; by-spec."exit"."~0.1.1" = - self.by-version."exit"."0.1.1"; - by-version."exit"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "exit-0.1.1"; + self.by-version."exit"."0.1.2"; + by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "exit-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/exit/-/exit-0.1.1.tgz"; - sha1 = "8bf4af1e41fdb092476006764db9f750dfcddc4e"; + url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }) ]; buildInputs = @@ -4670,7 +4670,7 @@ self.by-version."underscore.string"."2.2.1" self.by-version."which"."1.0.5" self.by-version."js-yaml"."2.0.5" - self.by-version."exit"."0.1.1" + self.by-version."exit"."0.1.2" self.by-version."getobject"."0.1.0" ]; peerDependencies = [ @@ -4831,7 +4831,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.3" + self.by-version."uglify-js"."2.4.4" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4857,7 +4857,7 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.10.5" + self.by-version."karma"."0.10.6" ]; passthru.names = [ "grunt-karma" ]; }; @@ -5389,7 +5389,7 @@ buildInputs = (self.nativeDeps."i18next" or []); deps = [ - self.by-version."cookies"."0.3.7" + self.by-version."cookies"."0.3.8" ]; peerDependencies = [ ]; @@ -6063,13 +6063,13 @@ by-spec."karma".">=0.9.3" = self.by-version."karma"."0.11.5"; by-spec."karma"."~0.10.0" = - self.by-version."karma"."0.10.5"; - by-version."karma"."0.10.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.5"; + self.by-version."karma"."0.10.6"; + by-version."karma"."0.10.6" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.10.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.5.tgz"; - sha1 = "0ff8a68ef8bbcd26a64737e9c0e580468879a23e"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.6.tgz"; + sha1 = "6a1bcaa3317ae240564606ba6b9b22077fb50135"; }) ]; buildInputs = @@ -6096,20 +6096,20 @@ peerDependencies = [ self.by-version."karma-jasmine"."0.1.3" self.by-version."karma-requirejs"."0.2.0" - self.by-version."karma-coffee-preprocessor"."0.1.0" + self.by-version."karma-coffee-preprocessor"."0.1.1" self.by-version."karma-html2js-preprocessor"."0.1.0" - self.by-version."karma-chrome-launcher"."0.1.0" - self.by-version."karma-firefox-launcher"."0.1.0" - self.by-version."karma-phantomjs-launcher"."0.1.0" + self.by-version."karma-chrome-launcher"."0.1.1" + self.by-version."karma-firefox-launcher"."0.1.1" + self.by-version."karma-phantomjs-launcher"."0.1.1" self.by-version."karma-script-launcher"."0.1.0" ]; passthru.names = [ "karma" ]; }; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.0"; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.0"; + self.by-version."karma-chrome-launcher"."0.1.1"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.1"; by-spec."karma-coffee-preprocessor"."*" = - self.by-version."karma-coffee-preprocessor"."0.1.0"; + self.by-version."karma-coffee-preprocessor"."0.1.1"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.1.2"; by-version."karma-coverage"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -6133,18 +6133,18 @@ }; "karma-coverage" = self.by-version."karma-coverage"."0.1.2"; by-spec."karma-firefox-launcher"."*" = - self.by-version."karma-firefox-launcher"."0.1.0"; + self.by-version."karma-firefox-launcher"."0.1.1"; by-spec."karma-html2js-preprocessor"."*" = self.by-version."karma-html2js-preprocessor"."0.1.0"; by-spec."karma-jasmine"."*" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma"."0.11.5" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-coffee-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-chrome-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-firefox-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-phantomjs-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-firefox-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "karma-jasmine-0.1.3"; @@ -6162,24 +6162,24 @@ sha1 = "62facf19e1f4be956b90b67c4bebba7bb84fb054"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; - sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; + url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.1.tgz"; + sha1 = "32285f28a5f6c97ceeeae3b8a48e0d087c1a952a"; }) (fetchurl { url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; - sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.1.tgz"; + sha1 = "9fc3410063cefc88e06043d233f839651a16a98c"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; - sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; + url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.1.tgz"; + sha1 = "fa6a9a87279b85c7fe48cda3717cafefb7b9fb4d"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; - sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; + url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.1.tgz"; + sha1 = "e3c9511177f45f9dfe65b404be0ddd7190887c95"; }) (fetchurl { url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; @@ -6222,13 +6222,13 @@ passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; }; by-spec."karma-junit-reporter"."*" = - self.by-version."karma-junit-reporter"."0.1.0"; - by-version."karma-junit-reporter"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "karma-junit-reporter-0.1.0"; + self.by-version."karma-junit-reporter"."0.2.1"; + by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "karma-junit-reporter-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.1.0.tgz"; - sha1 = "7af72b64d7e9f192d1a40f4ef063ffbcf9e7bba5"; + url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz"; + sha1 = "ae125962683a0d1286dc7768fbf66a8f02e448fc"; }) ]; buildInputs = @@ -6241,15 +6241,15 @@ ]; passthru.names = [ "karma-junit-reporter" ]; }; - "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.1.0"; + "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.1"; by-spec."karma-mocha"."*" = - self.by-version."karma-mocha"."0.1.0"; - by-version."karma-mocha"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "karma-mocha-0.1.0"; + self.by-version."karma-mocha"."0.1.1"; + by-version."karma-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "karma-mocha-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.0.tgz"; - sha1 = "451cfef48c51850e45db9d119927502e6a2feb40"; + url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.1.tgz"; + sha1 = "5edddb3e2d2c6fd47e9ad26f0af1595fe852c756"; }) ]; buildInputs = @@ -6262,20 +6262,20 @@ ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.by-version."karma-mocha"."0.1.0"; + "karma-mocha" = self.by-version."karma-mocha"."0.1.1"; by-spec."karma-phantomjs-launcher"."*" = - self.by-version."karma-phantomjs-launcher"."0.1.0"; + self.by-version."karma-phantomjs-launcher"."0.1.1"; by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.0"; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.1.1"; - by-version."karma-sauce-launcher"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.1.1"; + self.by-version."karma-sauce-launcher"."0.1.2"; + by-version."karma-sauce-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "karma-sauce-launcher-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.1.tgz"; - sha1 = "34b82b8cb285c239b0fede1a8363488cc02f429b"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.2.tgz"; + sha1 = "ee5949489ef42f4da60d3c1101d9b727465b8612"; }) ]; buildInputs = @@ -6290,7 +6290,7 @@ ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.1"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.2"; by-spec."karma-script-launcher"."*" = self.by-version."karma-script-launcher"."0.1.0"; by-spec."keen.io"."0.0.3" = @@ -8422,7 +8422,7 @@ self.by-version."ansi"."0.2.1" self.by-version."npm-registry-client"."0.2.30" self.by-version."read-package-json"."1.1.4" - self.by-version."read-installed"."0.2.4" + self.by-version."read-installed"."0.2.5" self.by-version."glob"."3.2.7" self.by-version."init-package-json"."0.0.13" self.by-version."osenv"."0.0.3" @@ -9254,6 +9254,25 @@ ]; passthru.names = [ "policyfile" ]; }; + by-spec."posix"."*" = + self.by-version."posix"."1.0.3"; + by-version."posix"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "posix-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/posix/-/posix-1.0.3.tgz"; + sha1 = "f0efae90d59c56c4509c8f0ed222b421caa8188a"; + }) + ]; + buildInputs = + (self.nativeDeps."posix" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "posix" ]; + }; + "posix" = self.by-version."posix"."1.0.3"; by-spec."posix-getopt"."1.0.0" = self.by-version."posix-getopt"."1.0.0"; by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9778,13 +9797,13 @@ passthru.names = [ "read-installed" ]; }; by-spec."read-installed"."~0.2.2" = - self.by-version."read-installed"."0.2.4"; - by-version."read-installed"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "read-installed-0.2.4"; + self.by-version."read-installed"."0.2.5"; + by-version."read-installed"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "read-installed-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.4.tgz"; - sha1 = "9a45ca0a8ae1ecdb05972f362b63bc59450b572d"; + url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz"; + sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86"; }) ]; buildInputs = @@ -11517,26 +11536,27 @@ ]; passthru.names = [ "sudo-block" ]; }; - by-spec."superagent"."0.15.1" = - self.by-version."superagent"."0.15.1"; - by-version."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.15.1"; + by-spec."superagent"."0.15.7" = + self.by-version."superagent"."0.15.7"; + by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { + name = "superagent-0.15.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.15.1.tgz"; - sha1 = "f0df9954c2b90f29e4ae54ad308e4a2b432cc56a"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; + sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; }) ]; buildInputs = (self.nativeDeps."superagent" or []); deps = [ self.by-version."qs"."0.6.5" - self.by-version."formidable"."1.0.9" + self.by-version."formidable"."1.0.14" self.by-version."mime"."1.2.5" self.by-version."emitter-component"."1.0.0" self.by-version."methods"."0.0.1" self.by-version."cookiejar"."1.3.0" self.by-version."debug"."0.7.4" + self.by-version."reduce-component"."1.0.1" ]; peerDependencies = [ ]; @@ -11568,51 +11588,27 @@ }; by-spec."superagent"."~0.15.7" = self.by-version."superagent"."0.15.7"; - by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.15.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; - sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; - }) - ]; - buildInputs = - (self.nativeDeps."superagent" or []); - deps = [ - self.by-version."qs"."0.6.5" - self.by-version."formidable"."1.0.14" - self.by-version."mime"."1.2.5" - self.by-version."emitter-component"."1.0.0" - self.by-version."methods"."0.0.1" - self.by-version."cookiejar"."1.3.0" - self.by-version."debug"."0.7.4" - self.by-version."reduce-component"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "superagent" ]; - }; by-spec."supertest"."*" = - self.by-version."supertest"."0.8.1"; - by-version."supertest"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.8.1"; + self.by-version."supertest"."0.8.2"; + by-version."supertest"."0.8.2" = lib.makeOverridable self.buildNodePackage { + name = "supertest-0.8.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.8.1.tgz"; - sha1 = "be792b92481d8e33a4ebe8907495c5192387d101"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.8.2.tgz"; + sha1 = "2da3519f7c9dcfa8759e2de9c794f1d4acc0333b"; }) ]; buildInputs = (self.nativeDeps."supertest" or []); deps = [ - self.by-version."superagent"."0.15.1" + self.by-version."superagent"."0.15.7" self.by-version."methods"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.by-version."supertest"."0.8.1"; + "supertest" = self.by-version."supertest"."0.8.2"; by-spec."swig"."0.14.x" = self.by-version."swig"."0.14.0"; by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { @@ -12063,13 +12059,13 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.3"; - by-version."uglify-js"."2.4.3" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.3"; + self.by-version."uglify-js"."2.4.4"; + by-version."uglify-js"."2.4.4" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.3.tgz"; - sha1 = "6883cd4b837a4d004191c9ea05394cfa596c3748"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.4.tgz"; + sha1 = "f629e1e46bbe0bf4cf7232c7919e66b25a8fc529"; }) ]; buildInputs = @@ -12197,6 +12193,8 @@ self.by-version."underscore"."1.5.2"; by-spec."underscore".">=1.4.3" = self.by-version."underscore"."1.5.2"; + by-spec."underscore".">=1.5.x" = + self.by-version."underscore"."1.5.2"; by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; by-spec."underscore"."~1.4.3" = @@ -13050,7 +13048,7 @@ (self.nativeDeps."xml2js" or []); deps = [ self.by-version."sax"."0.5.5" - self.by-version."xmlbuilder"."0.4.3" + self.by-version."xmlbuilder"."1.0.2" ]; peerDependencies = [ ]; @@ -13059,18 +13057,19 @@ by-spec."xml2js".">=0.1.7" = self.by-version."xml2js"."0.4.0"; by-spec."xmlbuilder"."*" = - self.by-version."xmlbuilder"."0.4.3"; - by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-0.4.3"; + self.by-version."xmlbuilder"."1.0.2"; + by-version."xmlbuilder"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-1.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; - sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-1.0.2.tgz"; + sha1 = "f3939d049e91c8c8af6165411944380798ed8e82"; }) ]; buildInputs = (self.nativeDeps."xmlbuilder" or []); deps = [ + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; @@ -13095,7 +13094,7 @@ passthru.names = [ "xmlbuilder" ]; }; by-spec."xmlbuilder".">=0.4.2" = - self.by-version."xmlbuilder"."0.4.3"; + self.by-version."xmlbuilder"."1.0.2"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index dbbc28469524..6e525d7bd4f5 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -109,4 +109,5 @@ , "owl-deepcopy" , "meat" , "hipache" +, "posix" ] From c6529ac9eb03145449d0d8af4aa1123935a88a1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Nov 2013 12:36:32 +0100 Subject: [PATCH 137/285] postgresql: Fix the port option Also clarify the description of the enableTCPIP option. --- nixos/modules/services/databases/postgresql.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index a1ab1c92b8f9..d99ad2c9c7c2 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -30,6 +30,7 @@ let hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}' ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' log_destination = 'stderr' + port = ${toString cfg.port} ${cfg.extraConfig} ''; @@ -63,9 +64,9 @@ in port = mkOption { type = types.int; - default = "5432"; + default = 5432; description = '' - Port for PostgreSQL. + The port on which PostgreSQL listens. ''; }; @@ -105,7 +106,9 @@ in type = types.bool; default = false; description = '' - Whether to run PostgreSQL with -i flag to enable TCP/IP connections. + Whether PostgreSQL should listen on all network interfaces. + If disabled, the database can only be accessed via its Unix + domain socket or via TCP connections to localhost. ''; }; From 57f145a7f8c3bd01e5ac1927cb0e1b14658fa7aa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Nov 2013 12:41:43 +0100 Subject: [PATCH 138/285] When setting $NIX_REMOTE, check whether /nix/var/nix/db is writable In NixOS containers, root doesn't have write permission to /nix/var/nix/db, so it has to use the daemon. --- nixos/modules/services/misc/nix-daemon.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1aefe75931b1..cca42aa11009 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -334,10 +334,8 @@ in '' # Set up secure multi-user builds: non-root users build through the # Nix daemon. - if test "$USER" != root; then + if [ "$USER" != root -o ! -w /nix/var/nix/db ]; then export NIX_REMOTE=daemon - else - export NIX_REMOTE= fi ''; From 9ee30cd9b51c46cea7193993d006bb4301588001 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Nov 2013 16:54:20 +0100 Subject: [PATCH 139/285] Add support for lightweight NixOS containers You can now say: systemd.containers.foo.config = { services.openssh.enable = true; services.openssh.ports = [ 2022 ]; users.extraUsers.root.openssh.authorizedKeys.keys = [ "ssh-dss ..." ]; }; which defines a NixOS instance with the given configuration running inside a lightweight container. You can also manage the configuration of the container independently from the host: systemd.containers.foo.path = "/nix/var/nix/profiles/containers/foo"; where "path" is a NixOS system profile. It can be created/updated by doing: $ nix-env --set -p /nix/var/nix/profiles/containers/foo \ -f '' -A system -I nixos-config=foo.nix The container configuration (foo.nix) should define boot.isContainer = true; to optimise away the building of a kernel and initrd. This is done automatically when using the "config" route. On the host, a lightweight container appears as the service "container-.service". The container is like a regular NixOS (virtual) machine, except that it doesn't have its own kernel. It has its own root file system (by default /var/lib/containers/), but shares the Nix store of the host (as a read-only bind mount). It also has access to the network devices of the host. Currently, if the configuration of the container changes, running "nixos-rebuild switch" on the host will cause the container to be rebooted. In the future we may want to send some message to the container so that it can activate the new container configuration without rebooting. Containers are not perfectly isolated yet. In particular, the host's /sys/fs/cgroup is mounted (writable!) in the guest. --- nixos/lib/eval-config.nix | 4 +- nixos/modules/module-list.nix | 5 +- nixos/modules/services/hardware/udev.nix | 11 +- nixos/modules/system/activation/top-level.nix | 27 ++-- nixos/modules/system/boot/kernel.nix | 2 +- .../modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/system/boot/modprobe.nix | 2 +- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/modules/system/boot/systemd.nix | 7 - nixos/modules/virtualisation/containers.nix | 137 ++++++++++++++++++ 10 files changed, 172 insertions(+), 27 deletions(-) create mode 100644 nixos/modules/virtualisation/containers.nix diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 5e1ce69158fd..4b8c7354a7ec 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -8,6 +8,7 @@ , extraArgs ? {} , modules , check ? true +, prefix ? [] }: let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in @@ -17,6 +18,7 @@ rec { # Merge the option definitions in all modules, forming the full # system configuration. inherit (pkgs.lib.evalModules { + inherit prefix; modules = modules ++ baseModules; args = extraArgs; check = check && options.environment.checkConfigurationOptions.value; @@ -48,7 +50,7 @@ rec { let system = if nixpkgsOptions.system != "" then nixpkgsOptions.system else system_; nixpkgsOptions = (import ./eval-config.nix { - inherit system extraArgs modules; + inherit system extraArgs modules prefix; # For efficiency, leave out most NixOS modules; they don't # define nixpkgs.config, so it's pointless to evaluate them. baseModules = [ ../modules/misc/nixpkgs.nix ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2189d0358dab..078ea225e167 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -247,11 +247,11 @@ ./system/boot/kexec.nix ./system/boot/loader/efi.nix ./system/boot/loader/generations-dir/generations-dir.nix - ./system/boot/loader/gummiboot/gummiboot.nix - ./system/boot/loader/raspberrypi/raspberrypi.nix ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/memtest.nix + ./system/boot/loader/gummiboot/gummiboot.nix ./system/boot/loader/init-script/init-script.nix + ./system/boot/loader/raspberrypi/raspberrypi.nix ./system/boot/luksroot.nix ./system/boot/modprobe.nix ./system/boot/shutdown.nix @@ -276,6 +276,7 @@ ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix ./testing/service-runner.nix + ./virtualisation/containers.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 516569c02808..52b3ad435797 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -209,7 +209,7 @@ in ###### implementation - config = { + config = mkIf (!config.boot.isContainer) { services.udev.extraRules = nixosRules; @@ -231,9 +231,16 @@ in boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}"; - system.activationScripts.clearHotplug = + system.activationScripts.udevd = '' echo "" > /proc/sys/kernel/hotplug + + # Regenerate the hardware database /var/lib/udev/hwdb.bin + # whenever systemd changes. + if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then + echo "regenerating udev hardware database..." + ${config.systemd.package}/bin/udevadm hwdb --update && ln -sfn ${config.systemd.package} /var/lib/udev/prev-systemd + fi ''; }; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index ada961316755..4146cd8394a5 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -34,16 +34,24 @@ let in '' mkdir $out - if [ ! -f ${kernelPath} ]; then - echo "The bootloader cannot find the proper kernel image." - echo "(Expecting ${kernelPath})" - false - fi + # Containers don't have their own kernel or initrd. They boot + # directly into stage 2. + ${optionalString (!config.boot.isContainer) '' + if [ ! -f ${kernelPath} ]; then + echo "The bootloader cannot find the proper kernel image." + echo "(Expecting ${kernelPath})" + false + fi - ln -s ${kernelPath} $out/kernel - ln -s ${config.system.modulesTree} $out/kernel-modules + ln -s ${kernelPath} $out/kernel + ln -s ${config.system.modulesTree} $out/kernel-modules - ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd + echo -n "$kernelParams" > $out/kernel-params + + ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd + + ln -s ${config.hardware.firmware} $out/firmware + ''} echo "$activationScript" > $out/activate substituteInPlace $out/activate --subst-var out @@ -56,9 +64,7 @@ let ln -s ${config.system.build.etc}/etc $out/etc ln -s ${config.system.path} $out/sw ln -s "$systemd" $out/systemd - ln -s ${config.hardware.firmware} $out/firmware - echo -n "$kernelParams" > $out/kernel-params echo -n "$configurationName" > $out/configuration-name echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version echo -n "$nixosVersion" > $out/nixos-version @@ -92,7 +98,6 @@ let systemd = config.systemd.package; inherit children; - kernelParams = config.boot.kernelParams; installBootLoader = config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index c3c38b186bdd..ee2f5e9b4f61 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -145,7 +145,7 @@ in ###### implementation - config = { + config = mkIf (!config.boot.isContainer) { system.build = { inherit kernel; }; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 8b3923e30a05..ef6ff71ed778 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -44,7 +44,7 @@ in boot.loader.grub = { enable = mkOption { - default = true; + default = !config.boot.isContainer; type = types.bool; description = '' Whether to enable the GNU GRUB boot loader. diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 39928da8d190..027a7ac99d51 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -66,7 +66,7 @@ with pkgs.lib; ###### implementation - config = { + config = mkIf (!config.boot.isContainer) { environment.etc = singleton { source = pkgs.writeText "modprobe.conf" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7f7184b1e453..8ed3aecb6911 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -328,7 +328,7 @@ in }; - config = { + config = mkIf (!config.boot.isContainer) { assertions = singleton { assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems); diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 143f923813da..9f5a7678c855 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -604,13 +604,6 @@ in mkdir -p /var/log/journal chmod 0755 /var/log/journal - # Regenerate the hardware database /var/lib/udev/hwdb.bin - # whenever systemd changes. - if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${systemd} ]; then - echo "regenerating udev hardware database..." - ${systemd}/bin/udevadm hwdb --update && ln -sfn ${systemd} /var/lib/udev/prev-systemd - fi - # Make all journals readable to users in the wheel and adm # groups, in addition to those in the systemd-journal group. # Users can always read their own journals. diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix new file mode 100644 index 000000000000..bcbfaacd703f --- /dev/null +++ b/nixos/modules/virtualisation/containers.nix @@ -0,0 +1,137 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +{ + options = { + + boot.isContainer = mkOption { + type = types.bool; + default = false; + description = '' + Whether this NixOS machine is a lightweight container running + in another NixOS system. + ''; + }; + + systemd.containers = mkOption { + type = types.attrsOf (types.submodule ( + { config, options, name, ... }: + { + options = { + + root = mkOption { + type = types.path; + description = '' + The root directory of the container. + ''; + }; + + config = mkOption { + description = '' + A specification of the desired configuration of this + container, as a NixOS module. + ''; + }; + + path = mkOption { + type = types.path; + example = "/nix/var/nix/profiles/containers/webserver"; + description = '' + As an alternative to specifying + , you can specify the path to + the evaluated NixOS system configuration, typically a + symlink to a system profile. + ''; + }; + + }; + + config = mkMerge + [ { root = mkDefault "/var/lib/containers/${name}"; + } + (mkIf options.config.isDefined { + path = (import ../../lib/eval-config.nix { + modules = + let extraConfig = + { boot.isContainer = true; + security.initialRootPassword = "!"; + networking.hostName = mkDefault name; + }; + in [ extraConfig config.config ]; + prefix = [ "systemd" "containers" name ]; + }).config.system.build.toplevel; + }) + ]; + })); + + default = {}; + example = literalExample + '' + { webserver = + { root = "/containers/webserver"; + path = "/nix/var/nix/profiles/webserver"; + }; + database = + { root = "/containers/database"; + config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql92; + }; + }; + } + ''; + description = '' + A set of NixOS system configurations to be run as lightweight + containers. Each container appears as a service + container-name + on the host system, allowing it to be started and stopped via + systemctl . + ''; + }; + + }; + + + config = { + + systemd.services = mapAttrs' (name: container: nameValuePair "container-${name}" + { description = "Container '${name}'"; + + wantedBy = [ "multi-user.target" ]; + + unitConfig.RequiresMountsFor = [ container.root ]; + + preStart = + '' + mkdir -p -m 0755 ${container.root}/etc + if ! [ -e ${container.root}/etc/os-release ]; then + touch ${container.root}/etc/os-release + fi + ''; + + serviceConfig.ExecStart = + "${config.systemd.package}/bin/systemd-nspawn -M ${name} -D ${container.root} --bind-ro=/nix ${container.path}/init"; + + preStop = + '' + pid="$(cat /sys/fs/cgroup/systemd/machine/${name}.nspawn/system/tasks 2> /dev/null)" + if [ -n "$pid" ]; then + # Send the RTMIN+3 signal, which causes the container + # systemd to start halt.target. + echo "killing container systemd, PID = $pid" + kill -RTMIN+3 $pid + # Wait for the container to exit. We can't let systemd + # do this because it will send a signal to the entire + # cgroup. + for ((n = 0; n < 180; n++)); do + if ! kill -0 $pid 2> /dev/null; then break; fi + sleep 1 + done + fi + ''; + }) config.systemd.containers; + + }; +} \ No newline at end of file From f21e9f0a075c3b3944339c1e3a0cfbc52ff35b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 14:18:22 +0100 Subject: [PATCH 140/285] dnsmasq: bump 2.63 -> 2.67 See changelog at http://www.thekelleys.org.uk/dnsmasq/CHANGELOG --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 20964213d539..7217d9871864 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.63"; + name = "dnsmasq-2.67"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "043p8qjd1zx8bklcli9qnk3vzfz7j2kvl82abvipcg56qsyf71px"; + sha256 = "0jkbn5j3jc96mw7w3nf9zfkl9l3183r4ls4ryi6mnd94c5xlrv4j"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; From 16e85b4275c7ef19f733fb699b6d2c949a915ba8 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sun, 24 Nov 2013 17:02:27 -0500 Subject: [PATCH 141/285] Perl requirement for ddclient to be used as a service (Might only be the FreeDNS protocol that needs it.) --- pkgs/tools/networking/ddclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 22539657b1f1..0d50b1b2c0f3 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -8,7 +8,7 @@ buildPerlPackage { sha256 = "f22ac7b0ec78e310d7b88a1cf636e5c00360b2ed9c087f231b3522ef3e6295f2"; }; - buildInputs = [ perlPackages.IOSocketSSL ]; + buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; patches = [ ./ddclient-foreground.patch ]; From aaaeaf6f3a84eaf46d29bd6f64bb9bd447bb653e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 25 Nov 2013 23:28:09 +0100 Subject: [PATCH 142/285] dejavu_fonts: minor update 2.33 -> .34 --- pkgs/data/fonts/dejavu-fonts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index eb0451195d41..88596bb4fd9b 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}: -let version = "2.33" ; in +let version = "2.34" ; in stdenv.mkDerivation rec { name = "dejavu-fonts-${version}"; @@ -8,17 +8,17 @@ stdenv.mkDerivation rec { buildInputs = [fontforge perl FontTTF]; unicodeData = fetchurl { - url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ; + url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ; sha256 = "1bd6zkzvxfnifrn5nh171ywk7q56sgk8gdvdn43z9i53hljjcrih"; }; blocks = fetchurl { - url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt; + url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt; sha256 = "0w0vkb09nrlc6mrhqyl9npszdi828afgvhvlb1vs5smjv3h8y3dz"; }; src = fetchurl { url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2"; - sha256 = "10m0rds36yyaznfqaa9msayv6f0v1h50zbikja6qdy5dwwxi8q5w"; + sha256 = "09wh9c9kk82i4kwy73fcqa0779bvf0ncikciqw2gxa9m2rkrxjmm"; }; buildFlags = "full-ttf"; preBuild = '' From 8c1a49bf7a072e7686fb8f2b0baa8a73888ee7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 27 Nov 2013 21:32:42 +0100 Subject: [PATCH 143/285] glibcLocales: refactoring fe32d12 according to comments --- pkgs/development/libraries/glibc/2.17/locales.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix index 680a1ced3dee..e818b84bc628 100644 --- a/pkgs/development/libraries/glibc/2.17/locales.nix +++ b/pkgs/development/libraries/glibc/2.17/locales.nix @@ -40,7 +40,7 @@ in installPhase = '' mkdir -p "$out/lib/locale" - cp -v $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale/locale-archive" "$out/lib/locale" + cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; meta.description = "Locale information for the GNU C Library"; From 89789e47199b4ff22dfd5d684d70c58bc5d6b20f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 26 Nov 2013 18:19:23 +0100 Subject: [PATCH 144/285] linux: Update to 3.12.1 (close #1281) --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index dd61d8242642..d6581a9978be 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12"; - - modDirVersion = "3.12.0"; + version = "3.12.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "00jshh7abn8fj6zsbmfaxxfpg83033413k5nqqfsb7z1zp3hw4if"; + sha256 = "0r3smv7dgpimp7fabfll413byibhmscnnsd9npawpqa4q6bzapwx"; }; features.iwlwifi = true; From f52f9bf7cd922b54c874e5500a2c64277e57d417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 27 Nov 2013 21:31:15 +0100 Subject: [PATCH 145/285] nixos/libvirtd-service: fix for garbage collected emulator paths libvirtd puts the full path of the emulator binary in the machine config file. But this path can unfortunately be garbage collected while still being used by the virtual machine. Then this happens: Error starting domain: Cannot check QEMU binary /nix/store/z5c2xzk9x0pj6x511w0w4gy9xl5wljxy-qemu-1.5.2-x86-only/bin/qemu-kvm: No such file or directory Fix by updating the emulator path on each service startup to something valid (re-scan $PATH). --- nixos/modules/virtualisation/libvirtd.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 552441f6a62d..d8668eb16072 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -101,6 +101,19 @@ in mkdir -p /etc/$(dirname $i) -m 755 cp -fpd ${pkgs.libvirt}/etc/$i /etc/$i done + + # libvirtd puts the full path of the emulator binary in the machine + # config file. But this path can unfortunately be garbage collected + # while still being used by the virtual machine. So update the + # emulator path on each startup to something valid (re-scan $PATH). + for file in /etc/libvirt/qemu/*.xml; do + # get (old) emulator path from config file + emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') + # get a (definitely) working emulator path by re-scanning $PATH + new_emulator=$(command -v $(basename "$emulator")) + # write back + sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file" + done ''; # */ serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose''; From 72214690f409450c7afb869d03238b8cac289b9a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:25:59 +0000 Subject: [PATCH 146/285] rubyLibs.celluloid: add expression --- .../interpreters/ruby/generated.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 761aeb921cc3..ddb7f4d8d314 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -21,6 +21,7 @@ g: # Get dependencies from patched gems builder = g.builder_3_2_2; buildr = g.buildr_1_4_12; bundler = g.bundler_1_3_5; + celluloid = g.celluloid_0_15_2; childprocess = g.childprocess_0_3_9; chronic = g.chronic_0_10_1; coderay = g.coderay_1_0_9; @@ -132,6 +133,7 @@ g: # Get dependencies from patched gems thor = g.thor_0_18_1; thread_safe = g.thread_safe_0_1_3; tilt = g.tilt_1_4_1; + timers = g.timers_1_1_0; tins = g.tins_0_9_0; travis = g.travis_1_5_3; treetop = g.treetop_1_4_15; @@ -447,6 +449,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08''; }; + celluloid_0_15_2 = { + basename = ''celluloid''; + meta = { + description = ''Actor-based concurrent object framework for Ruby''; + homepage = ''https://github.com/celluloid/celluloid''; + longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects''; + }; + name = ''celluloid-0.15.2''; + requiredGems = [ g.timers_1_1_0 ]; + sha256 = ''0lpa97m7f4p5hgzaaa47y1d5c78n8pp4xd8qb0sn5llqd0klkd9b''; + }; childprocess_0_3_9 = { basename = ''childprocess''; meta = { @@ -2164,6 +2177,17 @@ management. requiredGems = [ ]; sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; + timers_1_1_0 = { + basename = ''timers''; + meta = { + description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout''; + homepage = ''https://github.com/tarcieri/timers''; + longDescription = ''Pure Ruby one-shot and periodic timers''; + }; + name = ''timers-1.1.0''; + requiredGems = [ ]; + sha256 = ''0x3vnkxy3bg9f6v1nhkfqkajr19glrzkmqd5a1wy8hrylx8rdfrv''; + }; tins_0_9_0 = { basename = ''tins''; meta = { From a54e4d39667cf3e4e7668172fe01fcd4345a7a61 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:27:57 +0000 Subject: [PATCH 147/285] rubyLibs.coderay: add expression --- pkgs/development/interpreters/ruby/generated.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index ddb7f4d8d314..b370e6aac095 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -24,6 +24,7 @@ g: # Get dependencies from patched gems celluloid = g.celluloid_0_15_2; childprocess = g.childprocess_0_3_9; chronic = g.chronic_0_10_1; + classifier = g.classifier_1_3_3; coderay = g.coderay_1_0_9; coffee_rails = g.coffee_rails_4_0_1; coffee_script = g.coffee_script_2_2_0; @@ -482,6 +483,18 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk''; }; + classifier_1_3_3 = { + basename = ''classifier''; + meta = { + description = ''A general classifier module to allow Bayesian and other types of classifications.''; + homepage = ''http://classifier.rufy.com/''; + longDescription = '' A general classifier module to allow Bayesian and other types of classifications. +''; + }; + name = ''classifier-1.3.3''; + requiredGems = [ g.fast_stemmer_1_0_2 ]; + sha256 = ''1kq1cd8fq6wvyxbjy3r6ya3d3sk3rcp1b560xlqvflpsirm47r9g''; + }; chronic_0_10_1 = { basename = ''chronic''; meta = { From 55e698467ff6ab293b11ee6bc09f555b0bdea660 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:29:03 +0000 Subject: [PATCH 148/285] rubyLibs.colorator: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index b370e6aac095..d8445dda455b 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -29,6 +29,7 @@ g: # Get dependencies from patched gems coffee_rails = g.coffee_rails_4_0_1; coffee_script = g.coffee_script_2_2_0; coffee_script_source = g.coffee_script_source_1_6_3; + colorator = g.colorator_0_1; cucumber = g.cucumber_1_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; @@ -556,6 +557,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4''; }; + colorator_0_1 = { + basename = ''colorator''; + meta = { + description = ''String core extensions for terminal coloring.''; + homepage = ''https://github.com/octopress/colorator''; + longDescription = ''Colorize your text in the terminal.''; + }; + name = ''colorator-0.1''; + requiredGems = [ ]; + sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs''; + }; cucumber_1_3_8 = { basename = ''cucumber''; meta = { From 49213d5b4cbeafb70fbf940e34d203a953b44172 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:32:52 +0000 Subject: [PATCH 149/285] rubyLibs.excon: add expression --- .../interpreters/ruby/generated.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index d8445dda455b..67b2152e628f 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -30,6 +30,7 @@ g: # Get dependencies from patched gems coffee_script = g.coffee_script_2_2_0; coffee_script_source = g.coffee_script_source_1_6_3; colorator = g.colorator_0_1; + commander = g.commander_4_1_5; cucumber = g.cucumber_1_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; @@ -41,6 +42,7 @@ g: # Get dependencies from patched gems ethon = g.ethon_0_6_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; + excon = g.excon_0_25_3; execjs = g.execjs_2_0_2; fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_8; @@ -568,6 +570,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs''; }; + commander_4_1_5 = { + basename = ''commander''; + meta = { + description = ''The complete solution for Ruby command-line executables''; + homepage = ''http://visionmedia.github.com/commander''; + longDescription = ''The complete solution for Ruby command-line executables. Commander bridges the gap between other terminal related libraries you know and love (OptionParser, HighLine), while providing many new features, and an elegant API.''; + }; + name = ''commander-4.1.5''; + requiredGems = [ g.highline_1_6_20 ]; + sha256 = ''040x2gjpl55g64kh5f9nby0870hnzx8cd7clxg771z0wjs7nzalc''; + }; cucumber_1_3_8 = { basename = ''cucumber''; meta = { @@ -749,6 +762,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; + excon_0_25_3 = { + basename = ''excon''; + meta = { + description = ''speed, persistence, http(s)''; + homepage = ''https://github.com/geemus/excon''; + longDescription = ''EXtended http(s) CONnections''; + }; + name = ''excon-0.25.3''; + requiredGems = [ ]; + sha256 = ''1d552jhvrpmnzrg3di88397l07ngrz04s2al17klpam6crxqw2b2''; + }; execjs_2_0_2 = { basename = ''execjs''; meta = { @@ -886,6 +910,21 @@ minutes of work. requiredGems = [ ]; sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd''; }; + highline_1_6_20 = { + basename = ''highline''; + meta = { + description = ''HighLine is a high-level command-line IO library.''; + homepage = ''http://highline.rubyforge.org''; + longDescription = ''A high-level IO library that provides validation, type conversion, and more for +command-line interfaces. HighLine also includes a complete menu system that can +crank out anything from simple list selection to complete shells with just +minutes of work. +''; + }; + name = ''highline-1.6.20''; + requiredGems = [ ]; + sha256 = ''0gk7mpw2r5lv60vr4hb0090wbnqh0fsbyrrcvxiqk7hyhxdz08iv''; + }; highline_1_6_2 = { basename = ''highline''; meta = { From 18013d4a76dc188d2c282160ae3b1792f4897605 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:34:00 +0000 Subject: [PATCH 150/285] rubyLibs.fast_steamer: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 67b2152e628f..d2fea0812411 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -47,6 +47,7 @@ g: # Get dependencies from patched gems fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_8; faraday_middleware = g.faraday_middleware_0_9_0; + fast_stemmer = g.fast_stemmer_1_0_2; ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_63_0; @@ -826,6 +827,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.faraday_0_8_8 ]; sha256 = ''1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2''; }; + fast_stemmer_1_0_2 = { + basename = ''fast_stemmer''; + meta = { + description = ''Fast Porter stemmer based on a C version of algorithm''; + homepage = ''http://github.com/romanbsd/fast-stemmer''; + longDescription = ''Fast Porter stemmer based on a C version of algorithm''; + }; + name = ''fast-stemmer-1.0.2''; + requiredGems = [ ]; + sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh''; + }; ffi_1_9_0 = { basename = ''ffi''; meta = { From e7659105cfd755a2b7e005b2882db9ca46ce4c2b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:34:51 +0000 Subject: [PATCH 151/285] rubyLibs.formatador: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index d2fea0812411..7c65d456fe7c 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -51,6 +51,7 @@ g: # Get dependencies from patched gems ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_63_0; + formatador = g.formatador_0_2_4; gettext = g.gettext_3_0_0; gh = g.gh_0_12_0; gherkin = g.gherkin_2_12_1; @@ -871,6 +872,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_18_1 g.dotenv_0_9_0 ]; sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk''; }; + formatador_0_2_4 = { + basename = ''formatador''; + meta = { + description = ''Ruby STDOUT text formatting''; + homepage = ''http://github.com/geemus/formatador''; + longDescription = ''STDOUT text formatting''; + }; + name = ''formatador-0.2.4''; + requiredGems = [ ]; + sha256 = ''0pgmk1h6i6m3cslnfyjqld06a4c2xbbvmngxg2axddf39xwz6f12''; + }; gettext_3_0_0 = { basename = ''gettext''; meta = { From 9dbd599a62fa629f3bd9397e9177b84950fde2f8 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:38:49 +0000 Subject: [PATCH 152/285] rubyLibs.guard: add expression --- .../interpreters/ruby/generated.nix | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 7c65d456fe7c..0809c0e02a14 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -55,6 +55,7 @@ g: # Get dependencies from patched gems gettext = g.gettext_3_0_0; gh = g.gh_0_12_0; gherkin = g.gherkin_2_12_1; + guard = g.guard_2_2_4; highline = g.highline_1_6_19; hike = g.hike_1_2_3; hoe = g.hoe_3_1_0; @@ -67,9 +68,11 @@ g: # Get dependencies from patched gems json = g.json_1_8_0; json_pure = g.json_pure_1_8_0; launchy = g.launchy_2_3_0; + liquid = g.liquid_2_5_4; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; + maruku = g.maruku_0_6_1; mail = g.mail_2_5_4; mechanize = g.mechanize_2_7_2; method_source = g.method_source_0_8_2; @@ -103,6 +106,7 @@ g: # Get dependencies from patched gems rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_1_6; + redcarpet = g.redcarpet_2_3_0; redis = g.redis_3_0_5; redis_namespace = g.redis_namespace_1_3_1; remote_syslog = g.remote_syslog_1_6_14; @@ -121,6 +125,7 @@ g: # Get dependencies from patched gems ruby_hmac = g.ruby_hmac_0_4_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; + safe_yaml = g.safe_yaml_0_9_7; sass = g.sass_3_2_12; sass_rails = g.sass_rails_4_0_1; selenium_webdriver = g.selenium_webdriver_2_35_1; @@ -919,6 +924,17 @@ So you can use GNU gettext tools for maintaining. requiredGems = [ g.multi_json_1_7_9 ]; sha256 = ''07nzchdvkkd35m9k7d9k8j72jm3imv56ccn734mxa5klv1xx2d45''; }; + guard_2_2_4 = { + basename = ''guard''; + meta = { + description = ''Guard keeps an eye on your file modifications''; + homepage = ''http://guardgem.org''; + longDescription = ''Guard is a command line tool to easily handle events on file system modifications.''; + }; + name = ''guard-2.2.4''; + requiredGems = [ g.thor_0_18_1 g.listen_2_2_0 g.pry_0_9_12_3 g.lumberjack_1_0_4 g.formatador_0_2_4 ]; + sha256 = ''0z427rkcpzy82g21cgq7i5sn1vxn8hm8j4d78kj9vlaqgilcybhq''; + }; highline_1_6_19 = { basename = ''highline''; meta = { @@ -1105,6 +1121,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.addressable_2_3_5 ]; sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; }; + liquid_2_5_4 = { + basename = ''liquid''; + meta = { + description = ''A secure, non-evaling end user template engine with aesthetic markup.''; + homepage = ''http://www.liquidmarkup.org''; + }; + name = ''liquid-2.5.4''; + requiredGems = [ ]; + sha256 = ''0adb1fz20jwcyx1ia133426i59mrrz9iq9lpcmzq6jx0dlaa4amv''; + }; + listen_1_3_1 = { + basename = ''listen''; + meta = { + description = ''Listen to file modifications''; + homepage = ''https://github.com/guard/listen''; + longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; + }; + name = ''listen-1.3.1''; + requiredGems = [ g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 g.rb_kqueue_0_2_0 ]; + sha256 = ''1p1rqz26ixx0fzc0hy3psq2bb3pwkv9awixv76zkaaqj1czabzbs''; + }; locale_2_0_8 = { basename = ''locale''; meta = { @@ -1150,6 +1187,20 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.mime_types_1_25 g.treetop_1_4_15 ]; sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4''; }; + maruku_0_6_1 = { + basename = ''maruku''; + meta = { + description = ''Maruku is a Markdown-superset interpreter written in Ruby.''; + homepage = ''http://github.com/bhollis/maruku''; + longDescription = ''Maruku is a Markdown interpreter in Ruby. + It features native export to HTML and PDF (via Latex). The + output is really beautiful! + ''; + }; + name = ''maruku-0.6.1''; + requiredGems = [ g.syntax_1_0_0 ]; + sha256 = ''01xc4l480k79jbicr0j37d9bmd4dsnrjh5hwdrh2djvy06l77ngz''; + }; mechanize_2_7_2 = { basename = ''mechanize''; meta = { @@ -1587,6 +1638,17 @@ augments 'require' to find and load matching files.''; requiredGems = [ g.websocket_1_0_7 g.ruby_hmac_0_4_0 ]; sha256 = ''1mxqy960iln065fypk1ww3xgv7q396fpl6v0rp7ipls6aj86j970''; }; + pygments_rb_0_5_4 = { + basename = ''pygments_rb''; + meta = { + description = ''pygments wrapper for ruby''; + homepage = ''http://github.com/tmm1/pygments.rb''; + longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby''; + }; + name = ''pygments.rb-0.5.4''; + requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_6 ]; + sha256 = ''0ryl0f0zp0rffaggd978cmrkzsmf83x452fcinw6p705xdk4zbvl''; + }; rack_1_5_2 = { basename = ''rack''; meta = { @@ -1717,6 +1779,17 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; + redcarpet_2_3_0 = { + basename = ''redcarpet''; + meta = { + description = ''Markdown that smells nice''; + homepage = ''http://github.com/vmg/redcarpet''; + longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser''; + }; + name = ''redcarpet-2.3.0''; + requiredGems = [ ]; + sha256 = ''1fghh7n9kz6n6bdhgix5s8lyj5sw6q44zizf4mdgz5xsgwqcr6sw''; + }; redis_3_0_5 = { basename = ''redis''; meta = { @@ -2006,6 +2079,17 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; + safe_yaml_0_9_7 = { + basename = ''safe_yaml''; + meta = { + description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.''; + homepage = ''http://dtao.github.com/safe_yaml/''; + longDescription = ''Parse YAML safely, without that pesky arbitrary object deserialization vulnerability''; + }; + name = ''safe_yaml-0.9.7''; + requiredGems = [ ]; + sha256 = ''0y34vpak8gim18rq02rgd144jsvk5is4xni16wm3shbhivzqb4hk''; + }; sass_3_2_10 = { basename = ''sass''; meta = { From 718f643b1cc0c192d601149696ec3d8c32ffb753 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:40:14 +0000 Subject: [PATCH 153/285] rubyLibs.jekyll: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 0809c0e02a14..51b2f32a35eb 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -62,6 +62,7 @@ g: # Get dependencies from patched gems http_cookie = g.http_cookie_1_0_1; i18n = g.i18n_0_6_5; iconv = g.iconv_1_0_3; + jekyll = g.jekyll_1_3_0; jquery_rails = g.jquery_rails_3_0_4; jruby_pageant = g.jruby_pageant_1_1_1; jsduck = g.jsduck_5_1_0; @@ -1044,6 +1045,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; }; + jekyll_1_3_0 = { + basename = ''jekyll''; + meta = { + description = ''A simple, blog aware, static site generator.''; + homepage = ''http://github.com/mojombo/jekyll''; + longDescription = ''Jekyll is a simple, blog aware, static site generator.''; + }; + name = ''jekyll-1.3.0''; + requiredGems = [ g.liquid_2_5_4 g.classifier_1_3_3 g.listen_1_3_1 g.maruku_0_6_1 g.pygments_rb_0_5_4 g.commander_4_1_5 g.safe_yaml_0_9_7 g.colorator_0_1 g.redcarpet_2_3_0 ]; + sha256 = ''0hq9sdyivfifba0d4d7g113jbd3jwm8jpdc9i09mv0nfhdcbc3k4''; + }; jquery_rails_3_0_4 = { basename = ''jquery_rails''; meta = { From 0110cea196df6850de337131e9adb488f54bf0fc Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:42:44 +0000 Subject: [PATCH 154/285] rubyLibs.listen: add expression --- .../interpreters/ruby/generated.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 51b2f32a35eb..55c7982f4831 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -70,6 +70,7 @@ g: # Get dependencies from patched gems json_pure = g.json_pure_1_8_0; launchy = g.launchy_2_3_0; liquid = g.liquid_2_5_4; + listen = g.listen_2_2_0; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; @@ -106,6 +107,7 @@ g: # Get dependencies from patched gems railties = g.railties_4_0_0; rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; + rb_inotify = g.rb_inotify_0_9_2; rdiscount = g.rdiscount_2_1_6; redcarpet = g.redcarpet_2_3_0; redis = g.redis_3_0_5; @@ -1154,6 +1156,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 g.rb_kqueue_0_2_0 ]; sha256 = ''1p1rqz26ixx0fzc0hy3psq2bb3pwkv9awixv76zkaaqj1czabzbs''; }; + listen_2_2_0 = { + basename = ''listen''; + meta = { + description = ''Listen to file modifications''; + homepage = ''https://github.com/guard/listen''; + longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; + }; + name = ''listen-2.2.0''; + requiredGems = [ g.celluloid_0_15_2 g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 ]; + sha256 = ''1fm6cp5d4xbd5wdd0d804m3p2cc5rjrr5yzqzzh1ndzgbs94sv5c''; + }; locale_2_0_8 = { basename = ''locale''; meta = { @@ -1781,6 +1794,17 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; + rb_inotify_0_9_2 = { + basename = ''rb_inotify''; + meta = { + description = ''A Ruby wrapper for Linux's inotify, using FFI''; + homepage = ''http://github.com/nex3/rb-inotify''; + longDescription = ''A Ruby wrapper for Linux's inotify, using FFI''; + }; + name = ''rb-inotify-0.9.2''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv''; + }; rdiscount_2_1_6 = { basename = ''rdiscount''; meta = { From c1b8edcf2d622322d76552319dae279bd6417ca4 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:43:13 +0000 Subject: [PATCH 155/285] rubyLibs.lumberjack: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 55c7982f4831..6edf5c0e68cc 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -73,6 +73,7 @@ g: # Get dependencies from patched gems listen = g.listen_2_2_0; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; + lumberjack = g.lumberjack_1_0_4; macaddr = g.macaddr_1_6_1; maruku = g.maruku_0_6_1; mail = g.mail_2_5_4; @@ -1190,6 +1191,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; }; + lumberjack_1_0_4 = { + basename = ''lumberjack''; + meta = { + description = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger.''; + homepage = ''http://github.com/bdurand/lumberjack''; + longDescription = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger. Provides support for automatically rolling log files even with multiple processes writing the same log file.''; + }; + name = ''lumberjack-1.0.4''; + requiredGems = [ ]; + sha256 = ''1mj6m12hnmkvzl4w2yh04ak3z45pwksj6ra7v30za8snw9kg919d''; + }; macaddr_1_6_1 = { basename = ''macaddr''; meta = { From de1aa7a358ef282ac3ee090d09809534ca1c8521 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:43:43 +0000 Subject: [PATCH 156/285] rubyLibs.posix_spawn: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 6edf5c0e68cc..24dbbba4a69e 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -100,6 +100,7 @@ g: # Get dependencies from patched gems papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_7_1; polyglot = g.polyglot_0_3_3; + posix_spawn = g.posix_spawn_0_3_6; pry = g.pry_0_9_12_2; pusher_client = g.pusher_client_0_3_1; rack = g.rack_1_5_2; @@ -1653,6 +1654,17 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; + posix_spawn_0_3_6 = { + basename = ''posix_spawn''; + meta = { + description = ''posix_spawnp(2) for ruby''; + homepage = ''http://github.com/rtomayko/posix-spawn''; + longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning''; + }; + name = ''posix-spawn-0.3.6''; + requiredGems = [ ]; + sha256 = ''0f2mqka8024yz55iw8wbihvmakwqnbrdr4a1ffl3x2zi104yvb43''; + }; pry_0_9_12_2 = { basename = ''pry''; meta = { From 426d78edacaf5b5e78e3384bd3c0db0a0a1663b5 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:44:41 +0000 Subject: [PATCH 157/285] rubyLibs.rb_kqueue: add expression --- .../interpreters/ruby/generated.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 24dbbba4a69e..59b53c218450 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -110,6 +110,7 @@ g: # Get dependencies from patched gems rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rb_inotify = g.rb_inotify_0_9_2; + rb_kqueue = g.rb_kqueue_0_2_0; rdiscount = g.rdiscount_2_1_6; redcarpet = g.redcarpet_2_3_0; redis = g.redis_3_0_5; @@ -860,6 +861,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ ]; sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy''; }; + ffi_1_9_3 = { + basename = ''ffi''; + meta = { + description = ''Ruby FFI''; + homepage = ''http://wiki.github.com/ffi/ffi''; + longDescription = ''Ruby FFI library''; + }; + name = ''ffi-1.9.3''; + requiredGems = [ ]; + sha256 = ''0873h6jp3v65mll7av9bxlzp9m9l1cc66j0krg0llchwbh4pv5sp''; + }; file_tail_1_0_12 = { basename = ''file_tail''; meta = { @@ -1829,6 +1841,17 @@ request helpers feature.''; requiredGems = [ g.ffi_1_9_3 ]; sha256 = ''0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv''; }; + rb_kqueue_0_2_0 = { + basename = ''rb_kqueue''; + meta = { + description = ''A Ruby wrapper for BSD's kqueue, using FFI''; + homepage = ''http://github.com/mat813/rb-kqueue''; + longDescription = ''A Ruby wrapper for BSD's kqueue, using FFI''; + }; + name = ''rb-kqueue-0.2.0''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''1f2wimhq93a1zy2fbyj7iyh7hvzmzwn3pzhkwb3npy4mj1df83n3''; + }; rdiscount_2_1_6 = { basename = ''rdiscount''; meta = { From bc1c117e85cf98349d312ffd9e932df9c0c9ca2c Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:45:23 +0000 Subject: [PATCH 158/285] rubyLibs.rest_client: add expression --- .../interpreters/ruby/generated.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 59b53c218450..8f84b414dbb2 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -118,6 +118,7 @@ g: # Get dependencies from patched gems remote_syslog = g.remote_syslog_1_6_14; resque = g.resque_1_25_1; resque_web = g.resque_web_0_0_3; + rest_client = g.rest_client_1_6_7; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; @@ -1334,6 +1335,43 @@ and added by the users of MIME::Types.''; requiredGems = [ ]; sha256 = ''0hd6hpl05jyx3siznk70z46bmrzwmcyrr24yfaqg6nar35zw8bgf''; }; + mime_types_2_0 = { + basename = ''mime_types''; + meta = { + description = ''The mime-types library provides a library and registry for information about MIME content type definitions''; + homepage = ''http://mime-types.rubyforge.org/''; + longDescription = ''The mime-types library provides a library and registry for information about +MIME content type definitions. It can be used to determine defined filename +extensions for MIME types, or to use filename extensions to look up the likely +MIME type definitions. + +MIME content types are used in MIME-compliant communications, as in e-mail or +HTTP traffic, to indicate the type of content which is transmitted. The +mime-types library provides the ability for detailed information about MIME +entities (provided as an enumerable collection of MIME::Type objects) to be +determined and used programmatically. There are many types defined by RFCs and +vendors, so the list is long but by definition incomplete; don't hesitate to to +add additional type definitions (see Contributing.rdoc). The primary sources +for MIME type definitions found in mime-types is the IANA collection of +registrations (see below for the link), RFCs, and W3C recommendations. + +The mime-types library uses semantic versioning. This is release 2.0; there are +incompatible changes in the API provided by mime-types, mostly around registry +initialization (see History.rdoc for full details), and the removal of support +for Ruby 1.8 interpreters. + +mime-types (previously called MIME::Types for Ruby) was originally based on +MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to +conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA +registry}[http://www.iana.org/assignments/media-types/] +({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types +added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp] +and added by the users of mime-types.''; + }; + name = ''mime-types-2.0''; + requiredGems = [ ]; + sha256 = ''1q1s22l3mm0am2f7n9qjqp8zl0smr9zlqr2ywwyfjkid2sj3prfk''; + }; mini_portile_0_5_1 = { basename = ''mini_portile''; meta = { @@ -1948,6 +1986,17 @@ multiple, different applications. requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ]; sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2''; }; + rest_client_1_6_7 = { + basename = ''rest_client''; + meta = { + description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.''; + homepage = ''http://github.com/archiloque/rest-client''; + longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; + }; + name = ''rest-client-1.6.7''; + requiredGems = [ g.mime_types_2_0 ]; + sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; + }; right_aws_3_1_0 = { basename = ''right_aws''; meta = { From e5387aeef3dd6cb8293022c32c1002928cc4ff8b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:46:02 +0000 Subject: [PATCH 159/285] rubyLibs.rmagick: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ pkgs/development/interpreters/ruby/patches.nix | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 8f84b414dbb2..c106b6cbfaa4 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -123,6 +123,7 @@ g: # Get dependencies from patched gems right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; rkelly_remix = g.rkelly_remix_0_0_4; + rmagick = g.rmagick_2_13_2; rmail = g.rmail_1_0_0; rmail_sup = g.rmail_sup_1_0_1; rspec = g.rspec_2_11_0; @@ -2101,6 +2102,17 @@ in JSDuck. requiredGems = [ ]; sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; }; + rmagick_2_13_2 = { + basename = ''rmagick''; + meta = { + description = ''Ruby binding to ImageMagick''; + homepage = ''http://rubyforge.org/projects/rmagick''; + longDescription = ''RMagick is an interface between Ruby and ImageMagick.''; + }; + name = ''rmagick-2.13.2''; + requiredGems = [ ]; + sha256 = ''1fw5rs5yqi5ayh44d18gjq68chiz14byx01h33c8jvkdxz3b9wz4''; + }; rmail_1_0_0 = { basename = ''rmail''; meta = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 7c80cdfe0653..c5ab0f5e5e20 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,6 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty }: +, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick +, pkgconfig }: let @@ -76,6 +77,12 @@ in NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; + rmagick = { + buildInputs = [ imagemagick pkgconfig ]; + + NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6"; + }; + xrefresh_server = let patch = fetchurl { From f52a0d11105375ce0bdd7d3860dcf57c01130304 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:47:06 +0000 Subject: [PATCH 160/285] rubyLibs.syntax: add expression --- pkgs/development/interpreters/ruby/generated.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index c106b6cbfaa4..374b679e43db 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -142,6 +142,7 @@ g: # Get dependencies from patched gems slop = g.slop_3_4_6; sprockets = g.sprockets_2_10_0; sprockets_rails = g.sprockets_rails_2_0_1; + syntax = g.syntax_1_0_0; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; taskjuggler = g.taskjuggler_3_5_0; @@ -2364,6 +2365,15 @@ interpreters.''; requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy''; }; + syntax_1_0_0 = { + basename = ''syntax''; + meta = { + description = ''Syntax is Ruby library for performing simple syntax highlighting.''; + }; + name = ''syntax-1.0.0''; + requiredGems = [ ]; + sha256 = ''1z93kkhdq55vq3fg9wljhm591cj59qis58dk97l09b8bfxi2ypk0''; + }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; meta = { From b323b561ec459d95f2b16537ed108a7532c499b4 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:47:22 +0000 Subject: [PATCH 161/285] rubyLibs.coderay: add expression --- pkgs/development/interpreters/ruby/generated.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 374b679e43db..fe2ec936ddea 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -536,6 +536,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8''; }; + coderay_1_1_0 = { + basename = ''coderay''; + meta = { + description = ''Fast syntax highlighting for selected languages.''; + homepage = ''http://coderay.rubychan.de''; + longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.''; + }; + name = ''coderay-1.1.0''; + requiredGems = [ ]; + sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s''; + }; coffee_rails_4_0_1 = { basename = ''coffee_rails''; meta = { From 8cdea678f0e473775dabb097f65da7fea728c3ea Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:47:57 +0000 Subject: [PATCH 162/285] rubyLibs.launchy: add expression --- pkgs/development/interpreters/ruby/generated.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index fe2ec936ddea..1b0cee8e02f1 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -1163,6 +1163,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.addressable_2_3_5 ]; sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; }; + launchy_2_4_0 = { + basename = ''launchy''; + meta = { + description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; + homepage = ''http://github.com/copiousfreetime/launchy''; + longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; + }; + name = ''launchy-2.4.0''; + requiredGems = [ g.addressable_2_3_5 ]; + sha256 = ''0vxc3m4sjxyjjzw2rmsginf9nbxfyv7hhxshmn6kxkvcpjxx5di0''; + }; liquid_2_5_4 = { basename = ''liquid''; meta = { From 9f6353cc2b383a621c94e4929d39d3d00b8d9c01 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:48:36 +0000 Subject: [PATCH 163/285] rubyLibs.pry: add expression --- .../interpreters/ruby/generated.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 1b0cee8e02f1..532a7edd5328 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -1750,6 +1750,17 @@ augments 'require' to find and load matching files.''; requiredGems = [ g.coderay_1_0_9 g.slop_3_4_6 g.method_source_0_8_2 ]; sha256 = ''141slzb62zfzdhrygqjmrzh68s3vzrb4mwyipy2lhps5q4b46y9s''; }; + pry_0_9_12_3 = { + basename = ''pry''; + meta = { + description = ''An IRB alternative and runtime developer console''; + homepage = ''http://pry.github.com''; + longDescription = ''An IRB alternative and runtime developer console''; + }; + name = ''pry-0.9.12.3''; + requiredGems = [ g.coderay_1_1_0 g.slop_3_4_7 g.method_source_0_8_2 ]; + sha256 = ''1dn80vnyq1l6192sg3p29d0yz6rswnsl8rn3lkf75c86a2qqxpy3''; + }; pusher_client_0_3_1 = { basename = ''pusher_client''; meta = { @@ -2356,6 +2367,17 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0fdp3nkljjs2d5yhgjzcqi0f6xq67byfbrayg5aj7r76rsw0hmal''; }; + slop_3_4_7 = { + basename = ''slop''; + meta = { + description = ''Simple Lightweight Option Parsing''; + homepage = ''http://github.com/leejarvis/slop''; + longDescription = ''A simple DSL for gathering options and parsing the command line''; + }; + name = ''slop-3.4.7''; + requiredGems = [ ]; + sha256 = ''1x3dwljqvkzj314rwn2bxgim9xvgwnfipzg5g0kwwxfn90fpv2sn''; + }; sprockets_2_10_0 = { basename = ''sprockets''; meta = { From e4d0b4384e81ad90490442f1452c468adc47f138 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:48:50 +0000 Subject: [PATCH 164/285] rubyLibs.rubyzip: add expression --- pkgs/development/interpreters/ruby/generated.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 532a7edd5328..84492e093861 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -2257,6 +2257,16 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; + rubyzip_1_1_0 = { + basename = ''rubyzip''; + meta = { + description = ''rubyzip is a ruby module for reading and writing zip files''; + homepage = ''http://github.com/rubyzip/rubyzip''; + }; + name = ''rubyzip-1.1.0''; + requiredGems = [ ]; + sha256 = ''0kxpcs047fb52lz0imp6vl3hr5khqpk0jfbr2knfbp612ynzyzcl''; + }; safe_yaml_0_9_7 = { basename = ''safe_yaml''; meta = { From 65e61d858898599c1c77399ea8eac739143b3760 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Wed, 20 Nov 2013 16:46:55 +1100 Subject: [PATCH 165/285] teamspeak_client: Updated to 3.0.13.1 * Updated ancient teamspeak client. From 3.0.0-beta35 to 3.0.13.1. * Added support for i686-linux. * Added support for pulseaudio. * Teamspeak now uses nixos qt4 libraries. --- .../instant-messengers/teamspeak/client.nix | 47 +++++++++++++------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 108e549d01f6..f3a88dee2cf4 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,23 +1,34 @@ -{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib }: +{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, + qt4, pulseaudio ? null }: let + version = "3.0.13.1"; + + arch = if stdenv.is64bit then "amd64" else "x86"; + libDir = if stdenv.is64bit then "lib64" else "lib"; deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - fontconfig xorg.libXext xorg.libX11 alsaLib + fontconfig xorg.libXext xorg.libX11 alsaLib qt4 pulseaudio ]; in stdenv.mkDerivation { - name = "teamspeak-client-3.0.0-beta35"; + name = "teamspeak-client-${version}"; src = fetchurl { - url = http://ftp.4players.de/pub/hosted/ts3/releases/beta-35/TeamSpeak3-Client-linux_amd64-3.0.0-beta35.run; - sha256 = "0vygsvjs11lr5lv4x7awv7hvkycvmm9qs2vklfjs91w3f434cmrx"; + urls = [ + "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" + "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" + "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" + ]; + sha256 = if stdenv.is64bit + then "0mj8vpsnv906n3wgjwhiby5gk26jr5jbd94swmsf0s9kqwhsj6i1" + else "1hlw7lc0nl1mrsyd052s6ws64q5aabnw6qpv8mrdxb3hyp7g2qh1"; }; unpackPhase = @@ -28,22 +39,27 @@ stdenv.mkDerivation { buildPhase = '' - ls -l - for i in ts3client_linux_*; do - echo "patching $i..." - patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ - --force-rpath \ - $i - done + mv ts3client_linux_${arch} ts3client + echo "patching ts3client..." + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --force-rpath \ + ts3client ''; - installPhase = '' + # Delete unecessary libraries - these are provided by nixos. + rm *.so.* + + # Install files. mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ + + # Make a symlink to the binary from bin. + mkdir -p $out/bin/ + ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client ''; dontStrip = true; @@ -53,6 +69,7 @@ stdenv.mkDerivation { description = "The TeamSpeak voice communication tool"; homepage = http://teamspeak.com/; license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest"; + platforms = stdenv.lib.platforms.linux; }; } From 945bcfad300c88f2d19626d224cbe5e817cb3ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 28 Nov 2013 00:15:14 +0100 Subject: [PATCH 166/285] add ldapvi: interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. --- pkgs/tools/misc/ldapvi/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/ldapvi/default.nix diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix new file mode 100644 index 000000000000..28d9b4863d4b --- /dev/null +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "ldapvi-${version}"; + version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; + + # use latest git, it includes some important patches since 2007 release + src = fetchgit { + url = "http://www.lichteblau.com/git/ldapvi.git"; + sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; + }; + + buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; + + setSourceRoot = '' + sourceRoot=git-export/ldapvi + ''; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor"; + homepage = http://www.lichteblau.com/ldapvi/; + license = licenses.gpl2; + maintainers = with maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe4f83ccb04f..55d82790b8cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1214,6 +1214,8 @@ let self = pkgs.nodePackages; }); + ldapvi = callPackage ../tools/misc/ldapvi { }; + ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; From 0d18b8169ed873a3eaab39009662478f2cd547d3 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 28 Nov 2013 10:37:45 +0800 Subject: [PATCH 167/285] terminus-font: update to 4.38 --- pkgs/data/fonts/terminus-font/default.nix | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 039e046ed55f..3487a8012dc0 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,26 +1,27 @@ -{ fetchurl, stdenv, perl, bdftopcf, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }: + stdenv.mkDerivation rec { - name = "terminus-font-4.30"; + name = "terminus-font-4.38"; + src = fetchurl { -# urls = "http://www.is-vn.bg/hamster/${name}.tar.gz" -# sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a"; - url = "http://ftp.de.debian.org/debian/pool/main/x/xfonts-terminus/xfonts-terminus_4.30.orig.tar.gz"; - sha256 = "d7f1253d75f0aa278b0bbf457d15927ed3bbf2565b9f6b829c2b2560fedc1712"; + url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz"; + sha256 = "1dwpxmg0wiyhp7hh18mvw18gnf0y2jgbn80c4xya7rmb9mm8gx7n"; }; + buildInputs = [ perl bdftopcf mkfontdir mkfontscale ]; + patchPhase = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' ''; + configurePhase = '' - ./configure --prefix=$out + sh ./configure --prefix=$out ''; - buildPhase = '' - make pcf - ''; - installPhase = '' - make install-pcf - make fontdir + + installPhase = '' + make install fontdir ''; + meta = { description = "A clean fixed width font"; longDescription = '' From 07b7c179bca9425e8a11ed23431ff1f87876ca87 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 12:46:07 -0600 Subject: [PATCH 168/285] Update acpi from 1.6 -> 1.7 --- pkgs/os-specific/linux/acpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index d694a9e5ed24..2a774949530d 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpi-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; - sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; + sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; meta = { From 21b3591136e188b8446b8d04eb7c591b3b90f293 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 12:50:57 -0600 Subject: [PATCH 169/285] Update acpid from 2.0.17 -> 2.0.20 --- pkgs/os-specific/linux/acpid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 7f3440d8f59e..c1f92476b879 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-2.0.17"; + name = "acpid-2.0.20"; src = fetchurl { - url = "http://tedfelix.com/linux/${name}.tar.xz"; - sha256 = "0gksl6z3sb6yyk7bdmldxsrncvprd3rny0i8ggl4m95nvv3x5drn"; + url = "mirror://sourceforge/acpid2/${name}.tar.xz"; + sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka"; }; preBuild = '' From 19478d83e412eb0d2c68986d438f17d4948451a1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 14:36:22 -0600 Subject: [PATCH 170/285] Upgrade busybox from 1.20.2 -> 1.21.1 --- pkgs/os-specific/linux/busybox/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a24e0fd2307b..fd1e83100ed5 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -37,16 +37,13 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.20.2"; + name = "busybox-1.21.1"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb"; + sha256 = "00qk938q90jv14mxmadm8pgs3jymkknc6xicw4512mn85s8y0nyd"; }; - # Remove this patch after the next busybox update. - patches = [ ./include-missing-sys-resource-header.patch ]; - configurePhase = '' make defconfig ${configParser} From 0e4937ce4cf5647311743c0e3f7ddd8f1ff7cb33 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 14:40:45 -0600 Subject: [PATCH 171/285] Upgrade cifs-utils from 5.7 -> 6.2 Additonally remove the systemd-ask-password patch since this was fixed upstream. --- pkgs/os-specific/linux/cifs-utils/default.nix | 6 ++--- .../find-systemd-ask-password-via-path.patch | 22 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 0f8801ef58eb..bef8de495ad3 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cifs-utils-5.6"; + name = "cifs-utils-6.2"; src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; + sha256 = "0cydya7l7xwxk2j1g1659kbvb4jzql11ivb6cldwwfg19qvnwrrl"; }; - patches = [ ./find-systemd-ask-password-via-path.patch ]; - makeFlags = "root_sbindir=$(out)/sbin"; meta = { diff --git a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch b/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch deleted file mode 100644 index 428cb75edadf..000000000000 --- a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c ---- cifs-utils-5.9-orig/mount.cifs.c 2013-03-05 10:53:19.375464790 +0100 -+++ cifs-utils-5.9/mount.cifs.c 2013-03-05 11:41:40.704946110 +0100 -@@ -1634,7 +1634,7 @@ - } - - /* -- * If systemd is running and /bin/systemd-ask-password -- -+ * If systemd is running and systemd-ask-password -- - * is available, then use that else fallback on getpass(..) - * - * Returns: @input or NULL on error -@@ -1657,7 +1657,7 @@ - FILE *ask_pass_fp = NULL; - - cmd = ret = NULL; -- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) { -+ if (asprintf(&cmd, "/run/current-system/sw/bin/systemd-ask-password \"%s\"", prompt) >= 0) { - ask_pass_fp = popen (cmd, "re"); - free (cmd); - } -Only in cifs-utils-5.9/: mount.cifs.c.orig From 43594f121b2ea7b4e09b1b765e207dc98034744c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 15:06:48 -0600 Subject: [PATCH 172/285] Update consoletools from 1.4.3 -> 1.4.6 --- pkgs/os-specific/linux/consoletools/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 537cc386402b..f8be37edfe2e 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, SDL }: +{ stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { name = "linuxconsoletools-${version}"; - version = "1.4.3"; + version = "1.4.6"; - src = fetchgit { - url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole"; - rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e"; - sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d"; + src = fetchurl { + url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; + sha256 = "0035yhjbjdis5wqmbdz67xq61065x7vrx5mb7kb1rhrx3ag43wcf"; }; buildInputs = [ SDL ]; From 5d713a5fb9f4a067789e91199bc70027db5ec494 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 15:10:47 -0600 Subject: [PATCH 173/285] Update cpufrequtils hash to sha256 --- pkgs/os-specific/linux/cpufrequtils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 85907ff0212a..e9fe99011155 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { name = "cpufrequtils-008"; src = fetchurl { - url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; - md5 = "52d3e09e47ffef634833f7fab168eccf"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; + sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; }; patchPhase = '' From 8e7ece3742984ee6a99750a1e9a19a0b1f28a4dc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 15:13:11 -0600 Subject: [PATCH 174/285] Upgrade cryptodev from 1.5 -> 1.6 --- pkgs/os-specific/linux/cryptodev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index e80256f7299f..7a818530ca2d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, kernelDev, onlyHeaders ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.5"; + pname = "cryptodev-linux-1.6"; name = "${pname}-${kernelDev.version}"; src = fetchurl { url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"; - sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0"; + sha256 = "0bryzdb4xz3fp2q00a0mlqkj629md825lnlh4gjwmy51irf45wbm"; }; buildPhase = if !onlyHeaders then '' From 9ce566e9a47ef310e0319a5e2faca4df1f7d4472 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 15:13:55 -0600 Subject: [PATCH 175/285] Upgrade cryptsetup from 1.5.1 -> 1.6.2 --- pkgs/os-specific/linux/cryptsetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0eb4be302841..93f62ab7e0a9 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.5.1"; + name = "cryptsetup-1.6.2"; src = fetchurl { url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn"; + sha256 = "16hh7v8bsqy0i1wlaj03kwqjv3liffkvg06lk75lng9hk00kywhm"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" ] From 1426f4b72b9db8687dedc8182c13ba8fe050e9eb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 15:16:50 -0600 Subject: [PATCH 176/285] Upgrade dmidecode from 2.11 -> 2.12 --- pkgs/os-specific/linux/dmidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index e6b5035bd8ed..40564f9f95a7 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dmidecode-2.11"; + name = "dmidecode-2.12"; src = fetchurl { url = "mirror://savannah/dmidecode/${name}.tar.bz2"; - sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd"; + sha256 = "122hgaw8mpqdfra159lfl6pyk3837giqx6vq42j64fjnbl2z6gwi"; }; makeFlags = "prefix=$(out)"; From 5c8029e0a1eebc69d1e306bdb4416a3e7aa07771 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 20:23:40 -0600 Subject: [PATCH 177/285] Upgrade drbd from 8.4.0 -> 8.4.4 --- pkgs/os-specific/linux/drbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 7129b685eb90..068e49d01905 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "drbd-8.4.0"; + name = "drbd-8.4.4"; src = fetchurl { url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; - sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg"; + sha256 = "0hm1cnd7vsccyc22sg85f9aj48nijl2f1kgbvl5crv414ihv5giq"; }; patches = [ ./pass-force.patch ]; From 98f5b253dcf9f14cc056ec3d1086e0dfdeb14547 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 12:33:26 -0600 Subject: [PATCH 178/285] Update IPTables from 1.4.16.2 -> 1.4.20 --- pkgs/os-specific/linux/iptables/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 78d8ee52fb18..0e022e0c4a11 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,24 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.16.2"; + name = "iptables-1.4.21"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - md5 = "57220bb26866a713073e5614f88071fc"; + sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j"; }; - # Install header files required by miniupnpd. - postInstall = - '' - cp include/iptables.h $out/include - cp include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h $out/include/libiptc - mkdir $out/include/iptables - cp include/iptables/internal.h $out/include/iptables - mkdir $out/include/net - cp -prd include/net/netfilter $out/include/net/netfilter - mkdir $out/include/linux - ''; + configureFlags = '' + --enable-devel + --enable-shared + ''; meta = { description = "A program to configure the Linux IP packet filtering ruleset"; From cb8842e526fc582edd985d22ea2beb8df20493a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 12:29:21 -0600 Subject: [PATCH 179/285] Update iw 3.10 -> 3.11 --- pkgs/os-specific/linux/iw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index ac8d4824c62d..2609e1880b42 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-3.10"; + name = "iw-3.11"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "1sagsrl2s0d3ar3q2yc5qxk2d47zgn551akwcs9f4a5prw9f4vj5"; + sha256 = "1zrh0pjcy0kg6n8wlr34cg3bmi3nj28rhqn5pad23a1170r2f0z9"; }; buildInputs = [ libnl pkgconfig ]; From fb7421db64532ac23c8dfd5ebddd05ac1de3cf14 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 23:48:44 -0600 Subject: [PATCH 180/285] Upgrade lvm from 2.02.100 -> 2.02.104 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 53127e4458ce..bd748dadf616 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.100"; + v = "2.02.104"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; - md5 = "9629cf5728544d7e637cafde1f73d777"; + sha256 = "1xa7hvp8bsx96nncgksxrqxaqcgipfmmpr8aysayb8aisyjvas0d"; }; configureFlags = From 47c3272b1f3e8d32409842a282d2210da0bdb6a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 12:39:17 -0600 Subject: [PATCH 181/285] Update MDadm from 3.1.2 -> 3.3 Additionally, remove the old udev patch since this version has a rule for enabling mdraid arrays --- pkgs/os-specific/linux/mdadm/default.nix | 9 +++------ pkgs/os-specific/linux/mdadm/udev.patch | 20 -------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 pkgs/os-specific/linux/mdadm/udev.patch diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 1653c018ce14..48e1c1784900 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.1.2"; + name = "mdadm-3.3"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; + sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; }; - # Enable incremental activation of swraid arrays from udev. - patches = [ ./udev.patch ]; - nativeBuildInputs = [ groff ]; preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; @@ -19,7 +16,7 @@ stdenv.mkDerivation rec { # /dev/.mdadm/map as a fallback). preBuild = '' - makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man VAR_RUN=/var/run/mdadm ALT_RUN=/dev/.mdadm) + makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm) if [[ -n "$crossConfig" ]]; then makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) fi diff --git a/pkgs/os-specific/linux/mdadm/udev.patch b/pkgs/os-specific/linux/mdadm/udev.patch deleted file mode 100644 index 5eb35f0c584c..000000000000 --- a/pkgs/os-specific/linux/mdadm/udev.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --exclude '*~' -rc mdadm-3.1.2-orig/udev-md-raid.rules mdadm-3.1.2/udev-md-raid.rules -*** mdadm-3.1.2-orig/udev-md-raid.rules 2010-02-22 21:14:58.000000000 +0100 ---- mdadm-3.1.2/udev-md-raid.rules 2010-05-16 20:45:22.000000000 +0200 -*************** -*** 5,11 **** - ACTION=="change", GOTO="md_no_incr" - - # import data from a raid member and activate it -! #ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" - # import data from a raid set - LABEL="md_no_incr" - KERNEL!="md*", GOTO="md_end" ---- 5,11 ---- - ACTION=="change", GOTO="md_no_incr" - - # import data from a raid member and activate it -! ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" - # import data from a raid set - LABEL="md_no_incr" - KERNEL!="md*", GOTO="md_end" From f6503e5e35efe7e4ed3c467f1eb1859c7030db68 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 27 Nov 2013 23:24:18 -0600 Subject: [PATCH 182/285] Upgrade util-linux from 2.22 -> 2.24 --- pkgs/os-specific/linux/util-linux/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index d42424e6fc86..3f676d37dd87 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: - +let + ver = "2.24"; +in stdenv.mkDerivation rec { - name = "util-linux-2.22.2"; + name = "util-linux-${ver}"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.22/${name}.tar.bz2"; - sha256 = "0vf3ifb45gr4cd27pmmxk8y5b3r0920mv16fv0vfwz5705xa2qvl"; + url = "http://www.kernel.org/pub/linux/utils/util-linux/v${ver}/${name}.tar.bz2"; + sha256 = "1nfnymj03rdcxjb677a9qq1zirppr8csh32cb85qm23x5xndi6v3"; }; crossAttrs = { From 95dfbcdade597ce49a1390db6f43f4812b5809f6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 01:07:34 -0600 Subject: [PATCH 183/285] Upgrade fuse from 2.9.2 -> 2.9.3 --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index bd2507ec1bc1..183d2d86d4c6 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, utillinux }: stdenv.mkDerivation rec { - name = "fuse-2.9.2"; + name = "fuse-2.9.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "1z6fg593hy1j7mynhckx43gqkkg2nwpmwwv860337nl77zxji9w1"; + sha256 = "071r6xjgssy8vwdn6m28qq1bqxsd2bphcd2mzhq0grf5ybm87sqb"; }; configureFlags = "--disable-kernel-module"; From 07f125a5dac58ad297b38afaa8b25c0ce2c82eda Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 01:10:33 -0600 Subject: [PATCH 184/285] Upgrade hdparm from 9.39 -> 9.43 --- pkgs/os-specific/linux/hdparm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index b627d664aef1..bc83738acc8e 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.39"; + name = "hdparm-9.43"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1siw9c2hrsck47jr9wpip9n677g31qd34y8whkq9dai68npm1mbj"; + sha256 = "0amm2s67vzfgs0jv59jgj9pqkr6j9glj1chsj292263i94kr5gib"; }; preBuild = '' From e5f631883e860c7871b6cb2216bf9afc3bff1c91 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 28 Nov 2013 12:52:32 +0100 Subject: [PATCH 185/285] keychain: Add missing binaries to PATH --- pkgs/tools/misc/keychain/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 881c65ef74b6..2c2a547f2fdc 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, coreutils, openssh, gnupg +, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation { name = "keychain-2.7.1"; @@ -8,13 +9,23 @@ stdenv.mkDerivation { sha256 = "14ai6wjwnj09xnl81ar2dlr5kwb8y1k5ck6nc549shpng0zzw1qi"; }; - phases = "unpackPhase buildPhase"; + phases = [ "unpackPhase" "buildPhase" ]; - buildPhase = - '' - mkdir -p $out/bin - cp keychain $out/bin - ''; + buildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir -p $out/bin + cp keychain $out/bin + wrapProgram $out/bin/keychain \ + --prefix PATH ":" "${coreutils}/bin" \ + --prefix PATH ":" "${openssh}/bin" \ + --prefix PATH ":" "${gnupg}/bin" \ + --prefix PATH ":" "${gnugrep}/bin" \ + --prefix PATH ":" "${gnused}/bin" \ + --prefix PATH ":" "${findutils}/bin" \ + --prefix PATH ":" "${gawk}/bin" \ + --prefix PATH ":" "${procps}/bin" + ''; meta = { description = "Keychain management tool"; From 7daf1b9487a52153967b2e97c2e5b074c453bd9a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 28 Nov 2013 16:22:38 +0400 Subject: [PATCH 186/285] Fix src for cpufrequtils --- pkgs/os-specific/linux/cpufrequtils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index e9fe99011155..c94e22adb381 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cpufrequtils-008"; src = fetchurl { From 95b104dec9ca13ef6b0011d0db3116233c4230b1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 28 Nov 2013 14:25:37 +0100 Subject: [PATCH 187/285] update brach of outdated python packages tnx to https://vdmvtkitqc3grub6.onion.to/outdated?m=Rok+Garbas report pythonPackage.colander -> 1.0b1 pythonPackage.deform -> 0.9.9 pythonPackage.pyramid -> 1.4.5 pythonPackage.pyramid_exclog -> 0.7 pythonPackage.repoze_lru -> 0.6 pythonPackage.zope_deprecation -> 3.5.1 pythonPackage.flake8 -> 2.1.0 pythonPackage.jedi -> 0.7.0 pythonPackage.turses -> 0.2.19 pythonPackage.tweepy -> 2.1 pythonPackage.waitress -> 0.8.7 pythonPackage.zope_sqlalchemy -> 0.7.3 pythonPackage.tissue -> 0.9.2 --- pkgs/top-level/python-packages.nix | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3d81baf39bd..baf5003ccda3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -944,11 +944,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { colander = buildPythonPackage rec { - name = "colander-1.0a5"; + name = "colander-1.0b1"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; - md5 = "569dea523561f5d94338ef9d9a98d249"; + md5 = "89f2cf4b5c87d43f7917d6a0d4872e6a"; }; propagatedBuildInputs = [ pythonPackages.translationstring ]; @@ -1281,11 +1281,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { deform = buildPythonPackage rec { - name = "deform-0.9.8"; + name = "deform-0.9.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; - sha256 = "15500rm33n6kxsdpqyn3ih25y3rvab4nxy2yzsj2754kdlhlyjpx"; + sha256 = "0ympsjhxz5v8h4hi1mv811h064221bh26d68l9hv1x6m7sxbxpd0"; }; buildInputs = [] ++ optional isPy26 unittest2; @@ -1607,11 +1607,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyramid = buildPythonPackage rec { - name = "pyramid-1.4.3"; + name = "pyramid-1.4.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "28fabf42cf585ecec7a57b5acc1174e3"; + md5 = "321731aad69e9788b7819e257a50be1a"; }; buildInputs = [ @@ -1681,11 +1681,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyramid_exclog = buildPythonPackage rec { - name = "pyramid_exclog-0.6"; + name = "pyramid_exclog-0.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz"; - md5 = "5c18706f5500605416afff311120c933"; + md5 = "05df86758b0d30ee6f8339ff36cef7a0"; }; propagatedBuildInputs = [ pyramid ]; @@ -1909,11 +1909,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { repoze_lru = buildPythonPackage rec { - name = "repoze.lru-0.4"; + name = "repoze.lru-0.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz"; - md5 = "9f6ab7a4ff871ba795cadf56c20fb0f0"; + md5 = "2c3b64b17a8e18b405f55d46173e14dd"; }; meta = { @@ -1967,11 +1967,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { zope_deprecation = buildPythonPackage rec { - name = "zope.deprecation-3.5.0"; + name = "zope.deprecation-3.5.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz"; - md5 = "1e7db82583013127aab3e7e790b1f2b6"; + md5 = "836cfea5fad548cd5a0d9af1300ec05e"; }; buildInputs = [ zope_testing ]; @@ -2479,14 +2479,14 @@ pythonPackages = modules // import ./python-packages-generated.nix { flake8 = buildPythonPackage (rec { - name = "flake8-2.0"; + name = "flake8-2.1.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "176c6b3613777122721db181560aa1e3"; + md5 = "cf326cfb88a1db6c5b29a3a6d9efb257"; }; - buildInputs = [ nose ]; + buildInputs = [ nose mock ]; propagatedBuildInputs = [ pyflakes pep8 mccabe ]; # 3 failing tests @@ -3055,11 +3055,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { jedi = buildPythonPackage (rec { - name = "jedi-0.6.0"; + name = "jedi-0.7.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz"; - sha256 = "0k27nai69ypi9whipg45s1myqr477wj7jaryqv37bqqij4jc85hg"; + sha256 = "1afs06k1j6raasdps1fvdqywyk3if1qchdpl4mivnliqzxqd1w01"; }; meta = { @@ -6622,11 +6622,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { turses = buildPythonPackage (rec { - name = "turses-0.2.13"; + name = "turses-0.2.19"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "0sygm40z04zifcfqwby8wwwnj3i1bpl41r7xgnjcipxwirjmnp2k"; + sha256 = "1g58ahxpaf0wqn6gg5a2n3fkvc3vbx6jpylwqncxnl16qcczmjxn"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; @@ -6645,11 +6645,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); tweepy = buildPythonPackage (rec { - name = "tweepy-2.0"; + name = "tweepy-2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; - sha256 = "1b95xcw11b5871gd4br78hxbvcq8y9f0i0sqga85dgg9hnmvdcx0"; + sha256 = "1irzwfva7g1k7db708mlxy2qribd6938zwn5xzjzn6i43j5mjysm"; }; meta = { @@ -6783,11 +6783,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; waitress = buildPythonPackage rec { - name = "waitress-0.8.5"; + name = "waitress-0.8.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz"; - md5 = "7a3094d812c0dffb948d1334ef5fd56f"; + md5 = "714f3d458d82a47f12fb168460de8366"; }; doCheck = false; @@ -7481,11 +7481,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { zope_sqlalchemy = buildPythonPackage rec { - name = "zope.sqlalchemy-0.7.2"; + name = "zope.sqlalchemy-0.7.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip"; - md5 = "b654e5d144ed141e13b42591a21a4868"; + md5 = "8b317b41244fc2e67f2f286890ba59a0"; }; buildInputs = [ pkgs.unzip sqlalchemy zope_testing zope_interface setuptools ]; @@ -7674,10 +7674,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { tissue = buildPythonPackage rec { - name = "tissue-0.7"; + name = "tissue-0.9.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tissue/${name}.tar.gz"; - md5 = "c9f3772407eb7499a949daaa9b859fdf"; + md5 = "87dbcdafff41bfa1b424413f79aa9153"; }; buildInputs = [ nose ]; From b921a787a067028c2342176e6ef7afaa542e4c3a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 28 Nov 2013 21:00:24 +0400 Subject: [PATCH 188/285] Update gtk-vnc dependency on Firefox --- pkgs/tools/admin/gtk-vnc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 1fda870d5fbb..44a421e2ba3d 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,17 +1,17 @@ x@{builderDefsPackage , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefox36Pkgs + , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt , ...}: builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs"]; + ["perlPackages" "firefoxPkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefox36Pkgs.xulrunner ]; + ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; sourceInfo = rec { baseName="gtk-vnc"; majorVersion="0.4"; From 075883c218f9bf7ae60d7d69cc7cdad024c06847 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 28 Nov 2013 23:01:05 +0400 Subject: [PATCH 189/285] Support LuaJIT usage when building love2d --- .../development/interpreters/love/default.nix | 23 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index 318a336faa66..8e7914afb616 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua5 +, SDL, mesa, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -12,10 +12,29 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig SDL mesa openal lua5 + pkgconfig SDL mesa openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; + preConfigure = '' + luaoptions="${"''"} lua luajit " + for i in lua luajit-; do + for j in 5 5.0 5.1 5.2 5.3 5.4; do + luaoptions="$luaoptions $i$j " + done + done + luaso="$(echo "${lua}/lib/"lib*.so.*)" + luaso="''${luaso##*/lib}" + luaso="''${luaso%%.so*}" + luaoptions="$luaoptions $luaso" + sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure + + luaincdir="$(echo "${lua}/include"/*/ )" + test -d "$luaincdir" && { + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir" + } || true + ''; + NIX_CFLAGS_COMPILE = '' -I${SDL}/include/SDL -I${freetype}include/freetype2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e13d73060c5c..c55655966317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3192,7 +3192,8 @@ let kona = callPackage ../development/interpreters/kona {}; - love = callPackage ../development/interpreters/love {}; + love = callPackage ../development/interpreters/love {lua=lua5;}; + love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; lua4 = callPackage ../development/interpreters/lua-4 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; From 32fbf27bc364ae3e7e233f5adbc142658e5a1346 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 28 Nov 2013 22:08:19 +0100 Subject: [PATCH 190/285] Chicken: Downgrade to latest stable release & add pkgs.chicken-dev. Signed-off-by: Moritz Ulrich --- .../development/compilers/chicken/default.nix | 44 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index deb93257df73..6032c7602cf7 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, devSnapshot ? false }: +let + version = if devSnapshot + then "4.8.2" + else "4.8.0.5"; + srcRelease = fetchurl { + url = "http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz"; + sha256 = "1yrhqirqj3l535zr5mv8d1mz9gq876wwwg4nsjfw27663far54av"; + }; + srcDev = fetchurl { + url = "http://code.call-cc.org/dev-snapshots/2013/08/08/chicken-4.8.2.tar.gz"; + sha256 = "01g7h0664342nl536mnri4c72kwj4z40vmv1250xfndlr218qdqg"; + }; +in stdenv.mkDerivation { - name = "chicken-4.8.1"; + name = "chicken-${version}"; - meta = { - homepage = http://www.call-cc.org/; - description = "Chicken Scheme"; - }; - - src = fetchurl { - url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz; - md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7"; - }; + src = if devSnapshot + then srcDev + else srcRelease; buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; + + meta = { + homepage = http://www.call-cc.org/; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.all; + description = "A portable compiler for the Scheme programming language"; + longDescription = '' + CHICKEN is a compiler for the Scheme programming language. + CHICKEN produces portable and efficient C, supports almost all + of the R5RS Scheme language standard, and includes many + enhancements and extensions. CHICKEN runs on Linux, MacOS X, + Windows, and many Unix flavours. + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c55655966317..4754567e0089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2233,6 +2233,10 @@ let chicken = callPackage ../development/compilers/chicken { }; + chicken-dev = chicken.override { + devSnapshot = true; + }; + ccl = builderDefsPackage ../development/compilers/ccl {}; clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { From cb691265b65bd207741dc2798ff3cc911ff01437 Mon Sep 17 00:00:00 2001 From: Jozko Skrablin Date: Thu, 28 Nov 2013 22:21:50 +0100 Subject: [PATCH 191/285] Added openldap user, group and configure service so its not running as root. --- nixos/modules/misc/ids.nix | 2 ++ nixos/modules/services/databases/openldap.nix | 27 +++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0b4274b13e64..ccd75d5b9158 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -107,6 +107,7 @@ redis = 96; haproxy = 97; mongodb = 98; + openldap = 99; # When adding a uid, make sure it doesn't match an existing gid. @@ -194,6 +195,7 @@ amule = 90; minidlna = 91; haproxy = 92; + openldap = 93; # When adding a gid, make sure it doesn't match an existing uid. diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a4dd30be1fb7..0fc8b88c6526 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -26,6 +26,16 @@ in "; }; + user = mkOption { + default = "openldap"; + description = "User account under which slapd runs."; + }; + + group = mkOption { + default = "openldap"; + description = "Group account under which slapd runs."; + }; + extraConfig = mkOption { default = ""; description = " @@ -49,10 +59,23 @@ in after = [ "network.target" ]; preStart = '' mkdir -p /var/run/slapd + chown -R ${cfg.user}:${cfg.group} /var/run/slapd + mkdir -p /var/db/openldap + chown -R ${cfg.user}:${cfg.group} /var/db/openldap ''; - serviceConfig.ExecStart = "${openldap}/libexec/slapd -d 0 -f ${configFile}"; + serviceConfig.ExecStart = "${openldap}/libexec/slapd -u openldap -g openldap -d 0 -f ${configFile}"; }; - }; + users.extraUsers = optionalAttrs (cfg.user == "openldap") (singleton + { name = "openldap"; + group = "openldap"; + uid = config.ids.uids.openldap; + }); + users.extraGroups = optionalAttrs (cfg.group == "openldap") (singleton + { name = "openldap"; + gid = config.ids.gids.openldap; + }); + + }; } From 78cb479f73cff37ddd6a214d6a8d726f703fd2d1 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 28 Nov 2013 23:23:40 +0100 Subject: [PATCH 192/285] Chicken: Set PLATFORM for all supported platforms. Signed-off-by: Moritz Ulrich --- pkgs/development/compilers/chicken/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 6032c7602cf7..8343dbc3fef5 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -12,6 +12,12 @@ let url = "http://code.call-cc.org/dev-snapshots/2013/08/08/chicken-4.8.2.tar.gz"; sha256 = "01g7h0664342nl536mnri4c72kwj4z40vmv1250xfndlr218qdqg"; }; + platform = with stdenv; + if isDarwin then "osx" + else if isCygwin then "cygwin" + else if isBSD then "bsd" + else if isSunOS then "solaris" + else "linux"; # Should be a sane default in stdenv.mkDerivation { name = "chicken-${version}"; @@ -20,8 +26,8 @@ stdenv.mkDerivation { then srcDev else srcRelease; - buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; meta = { homepage = http://www.call-cc.org/; From b3504c7bf5ac1694531f964eaa41931f7c1dc817 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 28 Nov 2013 23:52:49 +0000 Subject: [PATCH 193/285] complexity: fix build --- pkgs/development/tools/misc/complexity/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 076a68b81374..cfdc35f1b346 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -19,6 +19,13 @@ stdenv.mkDerivation rec { doCheck = true; + preBuild = '' + sed -i -e '/gets is a security/d' lib/stdio.in.h + sed -i '42 i\ + #undef false\ + #undef true' src/complexity.h + ''; + meta = { description = "GNU Complexity, C code complexity measurement tool"; From 7f6b5a04727aea2563784c175d2b0db6c9c213b2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 29 Nov 2013 00:10:23 +0000 Subject: [PATCH 194/285] dico: fix build --- pkgs/servers/dico/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index d711d8a75ca5..ca4980f5a6c4 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl -, guile, python, pcre }: +, guile, python, pcre, libffi }: stdenv.mkDerivation rec { name = "dico-2.2"; @@ -10,12 +10,22 @@ stdenv.mkDerivation rec { }; # XXX: Add support for GNU SASL. - buildInputs = [ libtool gettext zlib readline gsasl guile python pcre ]; + buildInputs = + [ libtool gettext zlib readline gsasl guile python pcre libffi ]; - doCheck = true; + # dicod fails to load modules, so the tests fail + doCheck = false; - meta = { + preBuild = '' + sed -i -e '/gets is a security/d' gnu/stdio.in.h + ''; + + meta = with stdenv.lib; { description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229"; + homepage = http://www.gnu.org/software/dico/; + license = "GPLv3+"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; longDescription = '' GNU Dico is a flexible modular implementation of DICT server @@ -36,9 +46,5 @@ stdenv.mkDerivation rec { The package also includes a console client program for querying remote dictionary servers. ''; - - homepage = http://www.gnu.org/software/dico/; - - license = "GPLv3+"; }; } From 2e55d2c1ef961c3ff27975cdeca516049fcacb12 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 29 Nov 2013 02:40:35 +0000 Subject: [PATCH 195/285] guile_ncurses: fix build --- pkgs/development/guile-modules/guile-ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index b138a537809d..674b35f441e9 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, ncurses }: +{ fetchurl, stdenv, guile, ncurses, libffi }: stdenv.mkDerivation rec { name = "guile-ncurses-1.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0chvfjrlmg99db98ra9vzwjmbypqx7d4ssm8q0kvzi0n0p9irszi"; }; - buildInputs = [ guile ncurses ]; + buildInputs = [ guile ncurses libffi ]; preConfigure = '' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" ''; From c7ae9e39d9064a098787e9fa43d4e2bff8da3027 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 01:15:47 -0600 Subject: [PATCH 196/285] Upgrade hwdata from 0.172 -> 0.249 --- pkgs/os-specific/linux/hwdata/builder.sh | 5 ----- pkgs/os-specific/linux/hwdata/default.nix | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 pkgs/os-specific/linux/hwdata/builder.sh diff --git a/pkgs/os-specific/linux/hwdata/builder.sh b/pkgs/os-specific/linux/hwdata/builder.sh deleted file mode 100644 index 50d114773240..000000000000 --- a/pkgs/os-specific/linux/hwdata/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -export DESTDIR=$out - -genericBuild diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 4c0a46f460cb..e701c91019df 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,10 +1,21 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "hwdata-0.172"; - builder = ./builder.sh; + name = "hwdata-0.249"; + src = fetchurl { - url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.172.orig.tar.gz; - md5 = "1c6b7f4dfe489f881702176c5f8e5a2e"; + url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.249-1.tar.bz2"; + sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; + }; + + preConfigure = "patchShebangs ./configure"; + + configureFlags = "--datadir=$(prefix)/data"; + + meta = { + homepage = "https://fedorahosted.org/hwdata/"; + description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; } From f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 01:37:30 -0600 Subject: [PATCH 197/285] Upgrade iproute2 from 3.8.0 -> 3.12.0 Additionally rmeove the werror patch as it is not needed for the build anymore. --- pkgs/os-specific/linux/iproute/default.nix | 8 +++----- pkgs/os-specific/linux/iproute/no-werror.patch | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 pkgs/os-specific/linux/iproute/no-werror.patch diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4ea4152e30d4..9e8faa6a02e3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.8.0"; + name = "iproute2-3.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap"; + sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4"; }; - patches = [ ./vpnc.patch ./no-werror.patch ]; + patch = [ "vpnc.patch" ]; preConfigure = '' @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sed -e '/ARPDDIR/d' -i Makefile ''; - postConfigure = "cat Config"; - makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + " MANDIR=$(out)/share/man"; diff --git a/pkgs/os-specific/linux/iproute/no-werror.patch b/pkgs/os-specific/linux/iproute/no-werror.patch deleted file mode 100644 index 593b56b8de09..000000000000 --- a/pkgs/os-specific/linux/iproute/no-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile ---- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200 -+++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200 -@@ -30,7 +30,7 @@ - HOSTCC = gcc - DEFINES += -D_GNU_SOURCE - CCOPTS = -O2 --WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes -+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition - - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) From f35381595cd9f85e95a11a3d0c9e72665feaa1f8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 02:01:12 -0600 Subject: [PATCH 198/285] Upgrade keyutils from 1.2 -> 1.5.8 --- pkgs/os-specific/linux/keyutils/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 43c580c2528f..8673981ecd50 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, gnumake, file }: stdenv.mkDerivation rec { - name = "keyutils-1.2"; + name = "keyutils-1.5.8"; src = fetchurl { - url = http://people.redhat.com/dhowells/keyutils/keyutils-1.2.tar.bz2; - sha256 = "0gcv47crbaw6crgn02j1w75mknhnwgkhmfcmwq2qi9iwiwprnv9h"; + url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + sha256 = "17419fr7mph8wlhxpqb1bdrghz0db15bmjdgxg1anfgbf9ra6zbc"; }; + buildInputs = [ file ]; + patchPhase = '' - sed -i -e "s, /etc, $out/etc," \ + sed -i -e "s,/usr/bin/make,${gnumake}/bin/make," \ + -e "s, /etc, $out/etc," \ -e "s, /bin, $out/bin," \ -e "s, /sbin, $out/sbin," \ -e "s, /lib, $out/lib," \ + -e "s, /lib64, $out/lib64," \ -e "s,/usr,$out," \ Makefile ''; From 06f92d07e78b641089e2020c16b17bce996b3c3f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 02:20:28 -0600 Subject: [PATCH 199/285] Upgrade kmod from 12 -> 15 --- pkgs/os-specific/linux/kmod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 96d756bc7d2a..acea2e4435cc 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "kmod-12"; + name = "kmod-15"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f"; + sha256 = "17nasn7kpbmbcgyfn9lh50k00bg6qmccxrhzd2m4d6wjw6khxvz8"; }; # Disable xz/zlib support to prevent needing them in the initrd. From c1b2ce2f703cd2af1989ea97e9792578b31769d1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 02:31:40 -0600 Subject: [PATCH 200/285] Upgrade libatasmart from 0.17 -> 0.19 --- pkgs/os-specific/linux/libatasmart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 86dffde4b557..7fe0a2be10f5 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "libatasmart-0.17"; + name = "libatasmart-0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.gz"; - sha256 = "1zazxnqsirlv9gkzij6z31b21gv2nv7gkpja0wpxwb7kfh9a2qid"; + url = "http://0pointer.de/public/${name}.tar.xz"; + sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; buildInputs = [ pkgconfig udev ]; From 16dce6f28af57c509820d8faf77f21c616e7446a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 02:49:24 -0600 Subject: [PATCH 201/285] Upgrade libnl from 3.2.13 -> 3.2.23 --- pkgs/os-specific/linux/libnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 6fe31c631788..093a00ed9a5c 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "libnl-3.2.13"; + name = "libnl-3.2.23"; src = fetchurl { url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd"; + sha256 = "1czj2bpb799bih6ighqwbvv9pvbpcw7vmccv9cwavfwcmalwvhlc"; }; buildInputs = [ bison flex ]; From 3f449b8ae67e3098fb42ad58f1cd038c8a7220c9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 03:09:28 -0600 Subject: [PATCH 202/285] Add audit 2.3.2 for the new libsemanage --- pkgs/os-specific/linux/audit/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/audit/default.nix diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix new file mode 100644 index 000000000000..a7ff782d69ed --- /dev/null +++ b/pkgs/os-specific/linux/audit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, openldap +, enablePython ? false, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + name = "audit-2.3.2"; + + src = fetchurl { + url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + sha256 = "0a8x10wz0xfj0iq1wgjl6hdhxvq58cb3906vc687i21876sy0wl8"; + }; + + buildInputs = [ openldap ] + ++ stdenv.lib.optional enablePython python; + + configureFlags = '' + ${if enablePython then "--with-python" else "--without-python"} + ''; + + meta = { + description = "Audit Library"; + homepage = "http://people.redhat.com/sgrubb/audit/"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe4f83ccb04f..2bdb9858bd84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6485,6 +6485,8 @@ let atop = callPackage ../os-specific/linux/atop { }; + audit = callPackage ../os-specific/linux/audit { }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; From 96dc58db9c6a6c25b164b6d0888deddc57bc7216 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 02:58:06 -0600 Subject: [PATCH 203/285] Upgrade selinux from 20100904 -> 20131030 --- .../os-specific/linux/checkpolicy/default.nix | 4 +-- pkgs/os-specific/linux/libselinux/default.nix | 24 +++++--------- .../os-specific/linux/libsemanage/default.nix | 8 ++--- pkgs/os-specific/linux/libsepol/default.nix | 12 +++++-- .../linux/policycoreutils/default.nix | 14 ++++++--- pkgs/os-specific/linux/sepolgen/default.nix | 4 +-- pkgs/os-specific/linux/setools/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 8 files changed, 68 insertions(+), 31 deletions(-) create mode 100644 pkgs/os-specific/linux/setools/default.nix diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 9125c84bd7a1..a718b3656c44 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "checkpolicy-${version}"; - version = "2.1.11"; + version = "2.2"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "1wahs32l4jjlg0s3lyihdhvwmsy7yyvq5pk96q9lsiilc5vvrb06"; + sha256 = "1y5dx4s5k404fgpm7hlhgw8a9b9ksn3q2d3fj6f9rdac9n7nkxlz"; }; buildInputs = [ libsepol libselinux bison flex ]; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 01935e766324..2dd5bdfb24ce 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.1.12"; + version = "2.2.1"; inherit (libsepol) se_release se_url; src = fetchurl { @@ -16,30 +16,22 @@ stdenv.mkDerivation rec { sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd"; }; - patch_src = fetchurl { - url = "http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-${name}-r2.tar.gz"; - sha256 = "08zaas8iwyf4w9ll1ylyv4gril1nfarckd5h1l53563sxzyf7dqh"; - }; - - patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere - buildInputs = [ pkgconfig libsepol pcre ] ++ optionals enablePython [ swig python ]; - prePatch = '' - tar xvf ${patch_src} - for p in gentoo-patches/*.patch; do - patch -p1 < "$p" - done - ''; - postPatch = optionalString enablePython '' sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile ''; - installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" "LIBSEPOLDIR=${libsepol}" ]; + installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" ]; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + # TODO: Figure out why the build incorrectly links libselinux.so + postInstall = '' + rm $out/lib/libselinux.so + ln -s libselinux.so.1 $out/lib/libselinux.so + ''; + meta = { inherit (libsepol.meta) homepage platforms maintainers; }; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 28908189cf32..afd83f730806 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex }: +{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }: stdenv.mkDerivation rec { name = "libsemanage-${version}"; - version = "2.1.9"; + version = "2.2"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "1k1my3n1pj30c5887spykcdk1brgxfpxmrz6frxjyhaijxzx20bg"; + sha256 = "0xdx0dwcsyw4kv9l6xwdkfg6v7fc9b5y176rkg6n6q0w1zx0pxhi"; }; makeFlags = "PREFIX=$(out) DESTDIR=$(out)"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_LINK = "-lsepol"; - buildInputs = [ libsepol libselinux ustr bzip2 bison flex ]; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ]; meta = with stdenv.lib; { inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index d41d1cbe7522..793137aa21a4 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,17 +2,23 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.1.8"; - se_release = "20120924"; + version = "2.2"; + se_release = "20131030"; se_url = "${meta.homepage}/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1w38q3lmha5m9aps9w844i51yw4b8q1vhpng2kdywn2n8cpdvvk3"; + sha256 = "03zw6clp00cmi49x8iq8svhrp91jrcw0093zpnyhan190rqb593p"; }; preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + # TODO: Figure out why the build incorrectly links libsepol.so + postInstall = '' + rm $out/lib/libsepol.so + ln -s libsepol.so.1 $out/lib/libsepol.so + ''; + passthru = { inherit se_release se_url meta; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index e49525a42bfc..5c7e704390b5 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, intltool, pcre, libcap_ng, libcgroup -, libsepol, libselinux, libsemanage +, libsepol, libselinux, libsemanage, setools , python, sepolgen }: stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.1.13"; + version = "2.2.4"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "1145nbpwndmhma08vvj1j75bjd8xhjal0vjpazlrw78iyc30y11l"; + sha256 = "08zpd2a2j45j1qkmq9sz084r2xr0fky1cnld45sn8w5xgdw8k81n"; }; patchPhase = '' substituteInPlace po/Makefile --replace /usr/bin/install install + find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \; ''; buildInputs = [ intltool pcre libcap_ng libcgroup - libsepol libselinux libsemanage + libsepol libselinux libsemanage setools python sepolgen # ToDo? these are optional ]; @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" && cp -s "${libsepol}/lib/libsepol.a" "$out/lib" ''; + # Creation of the system-config-selinux directory is broken + preInstall = '' + mkdir -p $out/share/system-config-selinux + ''; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_LDFLAGS = "-lsepol -lpcre"; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix index 7139ec98c285..812b100699f7 100644 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "sepolgen-${version}"; - version = "1.1.8"; + version = "1.2.1"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz"; - sha256 = "1sssc9d4wz7l23yczlzplsmdr891sqr9w34ccn1bfwlnc4q63xdm"; + sha256 = "1c41hz4a64mjvbfhgc7c7plydahsc161z0qn46qz2g3bvimj9323"; }; makeFlags = "PREFIX=$(out) DESTDIR=$(out) PYTHONLIBDIR=lib/${python.libPrefix}/site-packages"; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix new file mode 100644 index 000000000000..c95d27005efb --- /dev/null +++ b/pkgs/os-specific/linux/setools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, bison, flex +, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }: + +stdenv.mkDerivation rec { + name = "setools-3.3.8"; + + src = fetchurl { + url = "http://oss.tresys.com/projects/setools/chrome/site/dists/${name}/${name}.tar.bz2"; + sha256 = "16g987ijaxabc30zyjzia4nafq49rm038y1pm4vca7i3kb67wf24"; + }; + + # SWIG-TCL is broken in 3.3.8 + configureFlags = '' + --with-tcl=${tcl}/lib + --with-sepol-devel=${libsepol} + --with-selinux-devel=${libselinux} + --disable-gui + --disable-swig-tcl + ''; + + buildInputs = [ autoreconfHook pkgconfig bison flex python swig2 ]; + + nativeBuildInputs = [ tcl libsepol libselinux libxml2 sqlite bzip2 ]; + + meta = { + description = "SELinux Tools"; + homepage = "http://oss.tresys.com/projects/setools/"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdb9858bd84..d0684a9e6928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7044,6 +7044,8 @@ let sepolgen = callPackage ../os-specific/linux/sepolgen { }; + setools = callPackage ../os-specific/linux/setools { }; + shadow = callPackage ../os-specific/linux/shadow { }; statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; From d4789829fac366e24871ab2a620a50371c92ac94 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 28 Nov 2013 23:36:30 +0000 Subject: [PATCH 204/285] tintin: add expression --- pkgs/games/tintin/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/tintin/default.nix diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix new file mode 100644 index 000000000000..c2bc9d37b4f6 --- /dev/null +++ b/pkgs/games/tintin/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, zlib, pcre }: + +stdenv.mkDerivation rec { + name = "tintin-2.00.9"; + + src = fetchurl { + url = "mirror://sourceforge/tintin/${name}.tar.gz"; + sha256 = "0x8jakxx7hh7b0z6vjcxyrda0afbz2s2yy7mvrbxjffyc2dyxzna"; + }; + + buildInputs = [ zlib pcre ]; + + preConfigure = '' + cd src + ''; + + meta = with stdenv.lib; { + description = "A free MUD client for Mac OS X, Linux and Windows"; + homepage = http://tintin.sourceforge.net; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4754567e0089..0789976bd682 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9476,6 +9476,8 @@ let tennix = callPackage ../games/tennix { }; + tintin = callPackage ../games/tintin { }; + tpm = callPackage ../games/thePenguinMachine { }; tremulous = callPackage ../games/tremulous { }; From c71d6f3b1a5a33bdc09842e2f29d2a9e43818574 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 29 Nov 2013 01:10:01 +0100 Subject: [PATCH 205/285] g500-control: Add myself as maintainer Signed-off-by: Moritz Ulrich --- pkgs/tools/misc/g500-control/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix index adccde71c46d..9d42c7d68d53 100644 --- a/pkgs/tools/misc/g500-control/default.nix +++ b/pkgs/tools/misc/g500-control/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, coreutils}: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "g500-control-0.0.1"; src = fetchurl { @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb"; }; - buildInputs = [ coreutils ]; - unpackPhase = '' - mkdir -pv g500-control + mkdir -p g500-control tar -C g500-control/ -xf $src ''; @@ -21,15 +19,16 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out/bin/ + mkdir -p $out/bin/ cp g500-control $out/bin/ ''; - + meta = { homepage = http://code.google.com/p/g500-control/; description = "Configure Logitech G500's internal profile under Linux"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } From 31cdbe4a312065a625e5e42471a4af475bc63a45 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 29 Nov 2013 11:46:57 +0100 Subject: [PATCH 206/285] Chicken: Fix build on OS X. Signed-off-by: Moritz Ulrich --- pkgs/development/compilers/chicken/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 8343dbc3fef5..6ad87982d522 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -13,7 +13,7 @@ let sha256 = "01g7h0664342nl536mnri4c72kwj4z40vmv1250xfndlr218qdqg"; }; platform = with stdenv; - if isDarwin then "osx" + if isDarwin then "macosx" else if isCygwin then "cygwin" else if isBSD then "bsd" else if isSunOS then "solaris" From 486246c6826ada87106c2995b08fa587a77e6274 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 29 Nov 2013 17:00:04 +0100 Subject: [PATCH 207/285] elixir: Update to 11.2. Signed-off-by: Moritz Ulrich --- .../interpreters/elixir/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9eba4275dd31..6bdf31bf6c96 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: +let + version = "0.11.2"; +in stdenv.mkDerivation { - name = "elixir-0.10.1"; + name = "elixir-${version}"; src = fetchurl { - url = "https://github.com/elixir-lang/elixir/archive/v0.10.1.tar.gz"; - sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w"; + url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; + sha256 = "0rgx33q013c5y2jjwd4l93pzd3v3fha8xdsrhpl9c9wb7yprjc5x"; }; buildInputs = [ erlang rebar makeWrapper ]; @@ -34,11 +37,11 @@ stdenv.mkDerivation { description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' - Elixir is a functional, meta-programming - aware language built on top of the Erlang VM. It is a dynamic - language with flexible syntax and macro support that leverages - Erlang's abilities to build concurrent, distributed and - fault-tolerant applications with hot code upgrades.p + Elixir is a functional, meta-programming aware language built on + top of the Erlang VM. It is a dynamic language with flexible + syntax and macro support that leverages Erlang's abilities to + build concurrent, distributed and fault-tolerant applications + with hot code upgrades. ''; license = licenses.epl10; From 95f43b9e8e38e51bb0118910e03d6cccf9e17d99 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sat, 30 Nov 2013 03:04:44 +0100 Subject: [PATCH 208/285] calibre: upgrade 1.11.0 -> 1.13.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f4134cd7f251..41f4b4f09042 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.11.0"; + name = "calibre-1.13.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "17jp93wzq11yb89yg2x42f65yyx6v0hy6nhvrd42ig0vhk7sdh2n"; + sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj"; }; inherit python; From 1b5422d611686ade43ed88cbd6520fa5173f20b6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 30 Nov 2013 10:34:06 +0100 Subject: [PATCH 209/285] rxvt_unicode: stop creation of unnecessary symlink rxvt will depend on the terminfo output automatically and knows where to find the terminfo files. --- pkgs/applications/misc/rxvt_unicode/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index c05dd028eb34..640ace40277d 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -38,13 +38,6 @@ stdenv.mkDerivation (rec { ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; - # we link the separate terminfo output to the main output - # as I don't think there's a usecase for wanting urxvt without its terminfo files - # and we don't want users to install them separately - postInstall = '' - ln -s $terminfo/share/terminfo $out/share - ''; - meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; From e18686d8a0eb56c5c2e0353a37e77b9d4137d5bd Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Sat, 30 Nov 2013 12:03:34 +0100 Subject: [PATCH 210/285] grafx2: Fixed install error. My bad for not checking suggested changes. --- pkgs/applications/graphics/grafx2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 53f49c59b9ad..6b7c9a27694a 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out" ''; + installPhase = ''make install prefix="$out"''; + meta = { description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; homepage = http://code.google.co/p/grafx2/; From 7be42c798c1f8954c793ebfa9c93302486585004 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 30 Nov 2013 11:12:48 +0000 Subject: [PATCH 211/285] haskellPackages.cassava: New expression --- .../libraries/haskell/cassava/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cassava/default.nix diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix new file mode 100644 index 000000000000..822cd41e4daf --- /dev/null +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -0,0 +1,24 @@ +{ cabal, attoparsec, blazeBuilder, deepseq, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "cassava"; + version = "0.2.2.0"; + sha256 = "0jv8lb9z7yf8rddyac0frsw4d1gchrgx8l9rryhl88gs7jss7dh7"; + buildDepends = [ + attoparsec blazeBuilder deepseq text unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/tibbe/cassava"; + description = "A CSV parsing and encoding library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daba9950319c..65e49d1852e5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -684,6 +684,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x carray = callPackage ../development/libraries/haskell/carray {}; + cassava = callPackage ../development/libraries/haskell/cassava {}; + caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {}; caseInsensitive = self.caseInsensitive_1_1_0_1; From 44a641552a6a9e93d63b4aa55a7521c5c298f8e4 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 30 Nov 2013 11:20:34 +0000 Subject: [PATCH 212/285] haskellPackages.scientific: New expression --- .../libraries/haskell/scientific/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/scientific/default.nix diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix new file mode 100644 index 000000000000..c52784826ac5 --- /dev/null +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -0,0 +1,19 @@ +{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck +, text +}: + +cabal.mkDerivation (self: { + pname = "scientific"; + version = "0.1.0.0"; + sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ smallcheck tasty tastySmallcheck text ]; + meta = { + homepage = "https://github.com/basvandijk/scientific"; + description = "Arbitrary-precision floating-point numbers represented using scientific notation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; + doCheck = false; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daba9950319c..9ada42213740 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1910,6 +1910,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {}; + scientific = callPackage ../development/libraries/haskell/scientific {}; + scotty = callPackage ../development/libraries/haskell/scotty {}; securemem = callPackage ../development/libraries/haskell/securemem {}; From d54f2176da80157e2d13f0aaeeedfb7621902c64 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 30 Nov 2013 11:25:48 +0000 Subject: [PATCH 213/285] haskellPackages.pipesPostgresqlSimple: New expression --- .../pipes-postgresql-simple/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix new file mode 100644 index 000000000000..aced7c741abd --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix @@ -0,0 +1,19 @@ +{ cabal, async, exceptions, mtl, pipes, pipesConcurrency, pipesSafe +, postgresqlSimple, stm, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-postgresql-simple"; + version = "0.1.1.2"; + sha256 = "0m9p3ddrv73c24yh0a2q14zkr4iibfysy2q9bwp6m100z3qk1bgy"; + buildDepends = [ + async exceptions mtl pipes pipesConcurrency pipesSafe + postgresqlSimple stm text transformers + ]; + meta = { + description = "Convert various postgresql-simple calls to work with pipes"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daba9950319c..e20616c666ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1734,6 +1734,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pipesParse = callPackage ../development/libraries/haskell/pipes-parse {}; + pipesPostgresqlSimple = callPackage ../development/libraries/haskell/pipes-postgresql-simple {}; + pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {}; pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {}; From 5443dd4c0087c1fb851c0fd7db4c18bf1bf538c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 30 Nov 2013 16:27:42 +0100 Subject: [PATCH 214/285] pencil: new package Pencil is a GUI prototyping/mockup tool. Homepage: http://pencil.evolus.vn/ --- pkgs/applications/graphics/pencil/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/graphics/pencil/default.nix diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix new file mode 100644 index 000000000000..737baf375d1a --- /dev/null +++ b/pkgs/applications/graphics/pencil/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, xulrunner }: + +stdenv.mkDerivation rec { + name = "pencil-2.0.5"; + + src = fetchurl { + url = "http://evoluspencil.googlecode.com/files/${name}.tar.gz"; + sha256 = "0rn5nb08p8wph5s5gajkil6y06zgrm86p4gnjdgv76czx1fqazm0"; + }; + + # Pre-built package + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out" + cp -r usr/* "$out" + cp COPYING "$out/share/pencil" + sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \ + -e "s|/usr/share/pencil|$out/share/pencil|" \ + -i "$out/bin/pencil" + sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ + -e "s|Icon=.*|Icon=$out/share/pencil/skin/classic/icon.svg|" \ + -i "$out/share/applications/pencil.desktop" + ''; + + meta = with stdenv.lib; { + description = "GUI prototyping/mockup tool"; + homepage = http://pencil.evolus.vn/; + license = licenses.gpl2; # Commercial license is also available + maintainers = [ maintainers.bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bae1e14df7a..5a92961a3a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8581,6 +8581,8 @@ let paraview = callPackage ../applications/graphics/paraview { }; + pencil = callPackage ../applications/graphics/pencil { }; + petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome) libgnomecanvas; }; From f2e88386918aa8ed446b34db77171c260b319ca1 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sat, 30 Nov 2013 19:42:27 +0100 Subject: [PATCH 215/285] bittorrentsync: upgrade 1.1.70 -> 1.2.82 --- pkgs/applications/networking/bittorrentsync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index c2d2f28751a7..895ebd7911be 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.1.70"; - sha256 = if stdenv.system == "x86_64-linux" then "1hnyncq5439fxn1q8dkzcg2alxjkanr4q4pgqqf3nngz4cdar5vi" - else if stdenv.system == "i686-linux" then "1ijdmzl8bnb4k99vrjn5gd31hy64p9wiyxw5wc5gbpgap191h5i5" + version = "1.2.82"; + sha256 = if stdenv.system == "x86_64-linux" then "0cqrscav57xwz7rag6wy06xw6z7ca97xailprgg6jdjv4pnc91ra" + else if stdenv.system == "i686-linux" then "1b9rnfk0wkhj1zybvfqwgd9dcqnxwdnp7m0vf6lhrgi75cydj7is" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From c06361a1fcfb7844a2a12cc700edbcb539e27c19 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 30 Nov 2013 14:29:49 -0500 Subject: [PATCH 216/285] Linux 3.12: Bump Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index d6581a9978be..4b1709b310c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.1"; + version = "3.12.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0r3smv7dgpimp7fabfll413byibhmscnnsd9npawpqa4q6bzapwx"; + sha256 = "19kjhvg65z6l21srghjmlfyrwr0pswbkb02nd095v45lkyi3kwyk"; }; features.iwlwifi = true; From c4885173b66afe53497feb7f796ab6496dedc187 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 29 Nov 2013 18:57:42 +0800 Subject: [PATCH 217/285] systemd: add services.journald.extraConfig option --- nixos/modules/system/boot/systemd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9f5a7678c855..75c2c788f384 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -534,6 +534,16 @@ in ''; }; + services.journald.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=volatile"; + description = '' + Extra config options for systemd-journald. See man journald.conf + for available options. + ''; + }; + services.logind.extraConfig = mkOption { default = ""; type = types.lines; @@ -585,6 +595,7 @@ in ForwardToConsole=yes TTYPath=${config.services.journald.console} ''} + ${config.services.journald.extraConfig} ''; environment.etc."systemd/logind.conf".text = From 456edc140d8fb0299441beb23f0c6b05f108a4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 30 Nov 2013 23:39:52 +0100 Subject: [PATCH 218/285] ascii: update/add meta attributes --- pkgs/tools/text/ascii/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 769cf389426c..eb72f47d5132 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { mkdir -vp "$out/bin" "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; homepage = "http://www.catb.org/~esr/ascii/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } From 214e92081f8748c508fbcd13d9b437368e17d839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 30 Nov 2013 23:48:01 +0100 Subject: [PATCH 219/285] ascii: update 3.12 -> 3.14 The Makefile has changed so the I had to update the sed line. --- pkgs/tools/text/ascii/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index eb72f47d5132..071b93683294 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "ascii-${version}"; - version = "3.12"; + version = "3.14"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; - sha256 = "17jhmmdbhzzaai0lr5aslg0nmqchq1ygdxwd8pgl7qn2jnxhc6ci"; + sha256 = "1ldwi4cs2d36r1fv3j13cfa8h2pc4yayq5qii91758qqwfzky3kz"; }; prePatch = '' - sed -i -e 's|$(DESTDIR)/usr|$(out)|g' Makefile + sed -i -e "s|^PREFIX = .*|PREFIX = $out|" Makefile ''; preInstall = '' From a29f3a916774f89c0a33cef8379f1fa1790ec8f7 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 1 Dec 2013 12:35:22 +0100 Subject: [PATCH 220/285] Mutt: Update to 1.5.22. Signed-off-by: Moritz Ulrich --- .../networking/mailreaders/mutt/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index fa006dc5f0db..97722a51bb5a 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -15,22 +15,16 @@ assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; let - gpgmePatch = fetchurl { - # Solution for gpgme >= 1.2: http://dev.mutt.org/trac/ticket/3300 - url = "http://dev.mutt.org/trac/raw-attachment/ticket/3300/mutt-1.5.21-gpgme-init.patch"; - sha256 = "1qa1c8gns4q3as1h2lk3x4di2k3hr804ar7xlc6xh9r0zjhzmlk4"; - }; + version = "1.5.22"; in stdenv.mkDerivation rec { - name = "mutt-1.5.21"; + name = "mutt-${version}"; src = fetchurl { url = "ftp://ftp.mutt.org/mutt/devel/${name}.tar.gz"; - sha256 = "1864cwz240gh0zy56fb47qqzwyf6ghg01037rb4p2kqgimpg6h91"; + sha256 = "19zk81spnb0gc8y5mwmcfn33g77wv1xz5bmgic8aan07xn8fislg"; }; - patches = [ (if gpgmeSupport then gpgmePatch else null) ]; - buildInputs = [ ncurses which perl (if headerCache then gdbm else null) @@ -58,8 +52,12 @@ stdenv.mkDerivation rec { (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") ]; - meta = { + meta = with stdenv.lib; { + description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; + license = "GPLv2+"; + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny ]; }; } From 556dab6878b152ba971523a14ebdb66b45e52acb Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 1 Dec 2013 12:39:19 +0100 Subject: [PATCH 221/285] Pngcrush: Update to 1.7.69. Signed-off-by: Moritz Ulrich --- pkgs/tools/graphics/pngcrush/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 60301b9b164e..7b5f16c502d1 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.50"; + name = "pngcrush-1.7.69"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1xabqjgvwsyazs0hw7bzzm256zbd7v33alwzp0lbawm521m3m651"; + sha256 = "0j9nis6513hxd6klcv5559rwnfg7kawp2vqd4qgc1ax6wyvga4mw"; }; configurePhase = '' @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = "free"; platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } From e05f21d1edbb1385f2d08063a22cb49b92ac7ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 1 Dec 2013 12:44:44 +0100 Subject: [PATCH 222/285] bluez5: add missing dependency on pygobject Fixes this: $ bluez-monitor-bluetooth Traceback (most recent call last): File "/nix/store/d3gv219wnnjd2c9agyq2gjpwxp0m84l8-bluez-5.8/test/.monitor-bluetooth-wrapped", line 5, in import gobject ImportError: No module named gobject --- pkgs/os-specific/linux/bluez/bluez5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 6bc0759c1a2b..3f5d85e8f6ff 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ pythonDBus pygobject3 recursivePthLoader ]; + [ pythonDBus pygobject pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib python pythonPackages.wrapPython From 902fa50f02a9f279c68988bd879f5195130ccf3c Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 1 Dec 2013 16:20:52 +0100 Subject: [PATCH 223/285] fix texlive build, older files were removed on debian servers --- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- pkgs/tools/typesetting/tex/texlive/extra.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 8cb64f9ec423..2b9c6d066372 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -11,8 +11,8 @@ rec { }; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131010.orig.tar.xz; - sha256 = "17wfd2qmyafv74ac3ssy9aga12g09l2q0r1p19fb4vvs0wrkwzbz"; + url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20131112.orig.tar.xz; + sha256 = "003rj7pv38lgmggya2nbzcyfdx5d4wa7h1h4xh7iivsxja7z4m1d"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index b49f02d6fda5..ab8046fcc967 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -2,8 +2,8 @@ args: with args; rec { name = "texlive-extra-2013"; src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131010.orig.tar.xz; - sha256 = "1wciyjwp0swny22amwcnr6vvdwjy423856q7c3l1sd5b31xfbc18"; + url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131112.orig.tar.xz; + sha256 = "0qpiig9sz8wx3dhy1jha7rkxrhvpf2cmfx424h68s3ql05nnw65i"; }; buildInputs = [texLive xz]; From 12404fd7a03e1ef3b9a578785eaa4c6d77ce363c Mon Sep 17 00:00:00 2001 From: Arseniy Alekseyev Date: Sun, 1 Dec 2013 17:13:26 +0000 Subject: [PATCH 224/285] updated dcraw to version 9.19 --- pkgs/tools/graphics/dcraw/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 959241d30abf..5df814530a11 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libjpeg, lcms, gettext }: +{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.04"; + name = "dcraw-9.19"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "1i9w35pldyzp5xjjcy20rps7p9wkxs6vj4wz43vhfyda93nij4y0"; + sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv"; }; - buildInputs = [ libjpeg lcms gettext ]; + buildInputs = [ libjpeg lcms gettext jasper ]; patchPhase = '' sed -i -e s@/usr/local@$out@ install @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin - set +e sh install - set -e ''; meta = { From f4d4e12ca648299b7db6891807ba5058313f3d64 Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Wed, 27 Nov 2013 12:44:09 +0100 Subject: [PATCH 225/285] Remove caches from liferea, evince and network-manager-applet --- pkgs/applications/networking/newsreaders/liferea/default.nix | 3 +++ pkgs/desktops/gnome-3/core/evince/default.nix | 2 ++ pkgs/tools/networking/network-manager-applet/default.nix | 3 +++ 3 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 55e0ed88814f..093b801401dc 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { libnotify ]; + preFixup = '' + rm $out/share/icons/hicolor/icon-theme.cache''; + meta = { description = "A GTK-based news feed agregator"; homepage = http://lzone.de/liferea/; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index a9fce6369372..b4e2171dd38d 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { makeWrapper ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + configureFlags = [ "--disable-nautilus" # Do not use nautilus "--disable-dbus" # strange compilation error diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index a196c309197e..4f72c0e294f2 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; + preFixup = '' + rm $out/share/glib-2.0/schemas/gschemas.compiled''; + postInstall = '' mkdir -p $out/etc/NetworkManager/VPN ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name From c1501291d7ad8f4581a7ed652706ec5ab6ffcde2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:20:40 +0100 Subject: [PATCH 226/285] nbd: update to version 3.5 --- pkgs/tools/networking/nbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 653bec897474..99793c139cbd 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.4"; + name = "nbd-3.5"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "1krj185fagnqsqpcfig7zkqa3cqgyyn956241ix224wssvynsajm"; + sha256 = "0frnbmdcm1b0nmmpvpwjb9h1yabdpwwd2l95056mhl2zaafh8gqx"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; From 2cb492a8476785cbe9d278d8b0cfecd82603f00c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 1 Dec 2013 17:29:22 -0500 Subject: [PATCH 227/285] cups: Allow users in the wheel group to do admin actions --- nixos/modules/services/printing/cupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 951cef3eac07..56ae399c9011 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -149,7 +149,7 @@ in '' LogLevel info - SystemGroup root + SystemGroup root wheel Listen localhost:631 Listen /var/run/cups/cups.sock From 3b94410d866c44e8fdd92dbfea25e2a6eb5db4c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 1 Dec 2013 18:20:39 -0500 Subject: [PATCH 228/285] linux: Update to 3.4.71 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 0c0e41570aab..e7405c522a62 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.70"; + version = "3.4.71"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0l0ln1jmrknvg9ibv13s8b9rzn3ck789y13hpdv04as5wp738v20"; + sha256 = "0l9bv40mwk45ccmb2pfy574h6zrclrz5vhvmnn61q3z16j269dpp"; }; features.iwlwifi = true; From 1f626579f027be949959a7ed26e0eb0a72412fef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 12:37:24 +0100 Subject: [PATCH 229/285] opensc: update to version 0.13.0 --- pkgs/tools/security/opensc/0.11.7.nix | 28 -------------------- pkgs/tools/security/opensc/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/security/opensc/0.11.7.nix create mode 100644 pkgs/tools/security/opensc/default.nix diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix deleted file mode 100644 index 526b0276848f..000000000000 --- a/pkgs/tools/security/opensc/0.11.7.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, - libassuan1, pkgconfig, libXt, pinentry}: - -stdenv.mkDerivation rec { - name = "opensc-0.11.7"; - - src = fetchurl { - url = "http://www.opensc-project.org/files/opensc/${name}.tar.gz"; - sha256 = "0781qi0bsm01wdhkb1vd3ra9wkwgyjcm2w87jb2r53msply2gavd"; - }; - - configureFlags = [ "--enable-pcsc" "--enable-nsplugin" - "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" - "--with-pinentry=${pinentry}/bin/pinentry" ]; - - buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig - libXt ] ++ - stdenv.lib.optional (! stdenv.isLinux) libiconv; - - meta = { - description = "Set of libraries and utilities to access smart cards"; - homepage = http://www.opensc-project.org/opensc/; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix new file mode 100644 index 000000000000..42303fc356aa --- /dev/null +++ b/pkgs/tools/security/opensc/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite +, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 +}: + +stdenv.mkDerivation rec { + name = "opensc-0.13.0"; + + src = fetchurl { + url = "mirror://sourceforge/opensc/${name}.tar.gz"; + sha256 = "054v11yc2lqlfqs556liw18klhkx9zyjylqcwirk4axiafp4dpmb"; + }; + + buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig + libXt libxslt libiconvOrNull docbook_xml_dtd_412 + ]; + + configureFlags = [ + "--enable-doc" + "--enable-man" + "--enable-openssl" + "--enable-pcsc" + "--enable-readline" + "--enable-sm" + "--enable-zlib" + "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" + ]; + + meta = { + description = "Set of libraries and utilities to access smart cards"; + homepage = "https://github.com/OpenSC/OpenSC/wiki"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac304ad462b2..abe3644b5c3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1490,9 +1490,7 @@ let openresolv = callPackage ../tools/networking/openresolv { }; - opensc_0_11_7 = callPackage ../tools/security/opensc/0.11.7.nix { }; - - opensc = opensc_0_11_7; + opensc = callPackage ../tools/security/opensc { }; opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { }; From 38418526e0348658c14065bd6d1639b5c5e7097d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 13:26:21 +0100 Subject: [PATCH 230/285] libopensc-dnie: fix reference to opensc The package is still broken, though. --- .../libraries/libopensc-dnie/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index c231682b6211..2d736411780f 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct, libtool, pcsclite, -zlib}: - -# Version 1.4.6-2 works only with opensc 0.11.7 -assert opensc.name == "opensc-0.11.7"; +{ stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct +, libtool, pcsclite, zlib +}: stdenv.mkDerivation rec { name = "libopensc-dnie-1.4.6-2"; - + src = if stdenv.system == "i686-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar; sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i"; @@ -26,14 +24,14 @@ stdenv.mkDerivation rec { RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.gcc.libc}/lib:${zlib}/lib - for a in usr/lib/*.so*; do + for a in "usr/lib/"*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a fi done - sed -i s,/usr,$out, usr/lib/pkgconfig/* - + sed -i s,/usr,$out, "usr/lib/pkgconfig/"* + mkdir -p $out cp -R usr/lib $out cp -R usr/share $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abe3644b5c3f..6d8c96a9e165 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5377,9 +5377,7 @@ let openlierox = callPackage ../games/openlierox { }; - libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { - opensc = opensc_0_11_7; - }; + libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { }; opencolorio = callPackage ../development/libraries/opencolorio { }; From d555031aa80f94009b09a3d58fc1b5c6c352ee63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:08 +0100 Subject: [PATCH 231/285] haskell-git-annex: update to version 5.20131130 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 01eda5002952..ea27852c4fd8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20131120"; - sha256 = "0l046dx10z59k5xqp8vjnqx6r7aiqr4v71cviy9gxdy05y0873j5"; + version = "5.20131130"; + sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1"; isLibrary = false; isExecutable = true; buildDepends = [ From 1d191dd56fce6e2eccef04bd3b0b53471a330a4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:08 +0100 Subject: [PATCH 232/285] haskell-idris: update to version 0.9.10 --- pkgs/development/compilers/idris/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 30ef18a1ef91..51f5759c5fee 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,21 +1,21 @@ { cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal -, filepath, gmp, happy, haskeline, languageJava, libffi -, llvmGeneral, llvmGeneralPure, mtl, parsec, parsers, split, text -, time, transformers, trifecta, unorderedContainers, utf8String -, vector, vectorBinaryInstances +, deepseq, filepath, gmp, happy, haskeline, languageJava, mtl +, network, parsers, split, text, time, transformers, trifecta +, unorderedContainers, utf8String, vector, vectorBinaryInstances +, xml }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.9.3"; - sha256 = "1l19xx0xbcwlnnh2w0rmri7wwixffzfrafpbji64nwyx1awz4iab"; + version = "0.9.10"; + sha256 = "0sbadjc4kj59f5240036pryxr4b6k6y2zkmszv99wq660mm7a3d3"; isLibrary = false; isExecutable = true; buildDepends = [ - ansiTerminal ansiWlPprint binary Cabal filepath haskeline - languageJava libffi llvmGeneral llvmGeneralPure mtl parsec parsers - split text time transformers trifecta unorderedContainers - utf8String vector vectorBinaryInstances + ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline + languageJava mtl network parsers split text time transformers + trifecta unorderedContainers utf8String vector + vectorBinaryInstances xml ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; From da811319b8e5b4856a19e38bf148a722b09adcda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:08 +0100 Subject: [PATCH 233/285] haskell-HList: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/HList/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index df2bfcf1f798..21866193ccde 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,9 +1,13 @@ -{ cabal, diffutils }: +{ cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl +, syb +}: cabal.mkDerivation (self: { pname = "HList"; - version = "0.2.3"; - sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908"; + version = "0.3.0.1"; + sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4"; + buildDepends = [ mtl ]; + testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; meta = { description = "Heterogeneous lists"; From 997fe3f031c266e55fa4b710cb06a352de1d5a8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:29:22 +0100 Subject: [PATCH 234/285] haskell-HList: don't run test suite to avoid build failures --- pkgs/development/libraries/haskell/HList/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 21866193ccde..99cb73dcf1f1 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ mtl ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; + doCheck = false; meta = { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; From cb3386bd2305f9cb82715410c047bb72ec304285 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:08 +0100 Subject: [PATCH 235/285] haskell-active: update to version 0.1.0.10 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 322e411db8ed..99e217ba647d 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.9"; - sha256 = "0639qp4yc3dfvc9xcjk9k7qagvbcjwdgz3lklqsak9h551ccl7bv"; + version = "0.1.0.10"; + sha256 = "173ri9hv86sjfp3a0jp1y3v8rz0lfb6nz3yilcfvgc9sglcxa4bm"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From b6692c43115ed494bf5f8bece2f12cb9fdf029ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 236/285] haskell-cairo: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/cairo/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 59126959bfb5..686cf3b9bcb3 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,10 +1,12 @@ -{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }: +{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String +, zlib +}: cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.4"; - sha256 = "0gy6nxhxam3yv0caj4psg9dd1a5yazh616fjbmjfh0kbk8vl6fbq"; - buildDepends = [ mtl ]; + version = "0.12.5.0"; + sha256 = "1khpksznh51yl27hs0zbabx8df04d26ccwh0vjidcwf3flvrbgwb"; + buildDepends = [ mtl utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; From 988a81224c038abf73be4beb13451b906134110a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 237/285] haskell-connection: update to version 0.1.3.1 --- pkgs/development/libraries/haskell/connection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index a7930cab08b3..186557d81b07 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "connection"; - version = "0.1.3"; - sha256 = "13bwlbga612kc7g3m3rrdzbdv4w0glp4af9r6crwgjsmxgimrgs9"; + version = "0.1.3.1"; + sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w"; buildDepends = [ certificate cprngAes dataDefault network socks tls tlsExtra ]; From 8d3e8ed52f44d5f5bc666d04ec7450338c33bd81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 238/285] haskell-data-memocombinators: update to version 0.5.0 --- .../libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 2b3adde1d728..df6777313264 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.4.4"; - sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2"; + version = "0.5.0"; + sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; From 3a8cc3fb1a3f6249341732464fa4cdd045114766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 239/285] haskell-diagrams-contrib: update to version 1.0.0.1 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 24b880303166..672cd60e7a57 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.0"; - sha256 = "1jmv8z1xz0vqv8hjhymh2za265897fl3m0p6y5s2gy0mqy6d5z25"; + version = "1.0.0.1"; + sha256 = "0h0rgy2wlmqicrq4zqr1pdff7b7l7ylm1z82iy3adxf38ca2r6y2"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From bbb167fda54709b5793d1284888ab13a56401f1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 240/285] haskell-diagrams-core: update to version 1.0.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 0469139f9901..c291ce9a48cc 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.0"; - sha256 = "0my82q2lm8crlrdlgd48gblvjbqpf4g2cjharz0nhyny06mcgpgz"; + version = "1.0.0.1"; + sha256 = "19jri4np14lgf4pxyyczqjwh30cdmcpnb8alj60b0z5fca7042xm"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From f02bb4fcfcbab5e536e184adab4a1e69e81034de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 241/285] haskell-diagrams-lib: update to version 1.0.0.1 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 52af7b25a3c3..858e24976421 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.0"; - sha256 = "0afrk9y7h5g9cqds9b7b0jvz4xylaxyj3q9aj5415ldwwzdf6cc8"; + version = "1.0.0.1"; + sha256 = "1ilkc8dh1ma0wwmzgy6x3a6q6bwlw7dfv3mb24a5ny4i3wgvsnv8"; buildDepends = [ active colour dataDefaultClass diagramsCore filepath fingertree intervals lens MemoTrie monoidExtras NumInstances From 633ad4d76337d5ac24828666d9398a826e0afd7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 242/285] haskell-dimensional-tf: update to version 0.2.1 --- pkgs/development/libraries/haskell/dimensional-tf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix index d28de6c67a09..6bed24f5c40a 100644 --- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional-tf"; - version = "0.2"; - sha256 = "0j23iamgcm7wy6y7i7diq5nnaimpsz0vvb1yrmyh0qz792d60fw1"; + version = "0.2.1"; + sha256 = "1avvq8kgxagdw3345y7ly30i4x43l0i0m43rlb72j3inv6rdgxgz"; buildDepends = [ numtypeTf time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From ca1f3f8bb7a32ef50507420115587a7b29b0f5f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 243/285] haskell-dimensional: update to version 0.12.2 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 1f672c25cfa0..512ea378b66e 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.12.1.1"; - sha256 = "1fjkvyp62bh5gyzhkn189z5mxrr1acwmk39mqxk4579xbchvpyq6"; + version = "0.12.2"; + sha256 = "0b5w9g3xn74b7z4bcsfcijnj54r8cwbbd8129q61c3nhng1f896a"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From 1490837484c5b81268731a39e594f47351ab2421 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 244/285] haskell-dlist: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/dlist/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 1a7fc56efd5f..547ea9f8a478 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,12 +1,13 @@ -{ cabal }: +{ cabal, Cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "dlist"; - version = "0.5"; - sha256 = "1shr5wlpha68h82gwpndr5441847l01gh3j7szyvnmgzkr0fb027"; + version = "0.6.0.1"; + sha256 = "08q8dsczh59a0ii3nqk6yqz70msd0pndjjcg9dzq8iyknbbqbi45"; + testDepends = [ Cabal QuickCheck ]; meta = { - homepage = "http://code.haskell.org/~dons/code/dlist/"; - description = "Differences lists"; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From a14ba391b8082ba004dd6719514932a0f292e217 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 245/285] haskell-dual-tree: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 218855f322e8..f8ef34a17234 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.2"; - sha256 = "0wasnjkixl6zkskjp18qj3jym3yv3a85i3w5qphgjr3xifbzwnjf"; + version = "0.2.0.1"; + sha256 = "0v9kdhnwq8nv30ci5q7n43abl0wag21i06wp8pv1xgrva4lhswm5"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From e39f867cb4d1df2a3ed69386895c419ec4cfa50b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 246/285] haskell-file-embed: update to version 0.0.6 --- pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 3d7015d7ec20..7aa1b78a03eb 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.5"; - sha256 = "0s77g7azw73f7d07hvwwps8sx79jpwj8ap9iqzcglyjw1sw4l1n1"; + version = "0.0.6"; + sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { From 09a2f62d3dd3ccaad82264f77a4336bf871ba69e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 247/285] haskell-gio: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/gio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index e9d295798b63..6506800a1740 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.12.4"; - sha256 = "0npvq77z72c9z009krvs4n9vv3gqj6g8fdqd777kzw1dbkhp9ziy"; + version = "0.12.5.0"; + sha256 = "08gg3dh3xsgvj3hwylg5pgrhdrvi1chsybkd0l4hd4bycpm3sx98"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; From b83e06a1ad1c48971e5521b94d0bb1b52534f796 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 248/285] haskell-glib: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/glib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 29d2f92d7bac..4761c35127e3 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,9 +1,10 @@ -{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: +{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String }: cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.4"; - sha256 = "0s92phy1xlgjzqc7y5plviipb98m13h5lj4n9g6lbv4i106z97ax"; + version = "0.12.5.0"; + sha256 = "0s3gw4xd6d84hylzniy3sjjzz2ia2q4249vplhqn6y64dj96l196"; + buildDepends = [ utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; From 2494b593fbad44323cb831a4b00cf34cb35853be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:09 +0100 Subject: [PATCH 249/285] haskell-gtk: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index ed5244d72629..6acf1fb90c64 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.4"; - sha256 = "0w6ffi9fdz44kb6g1kipk5780r2wc2l3f5cgxjx5nd60qz1xh7p2"; + version = "0.12.5.0"; + sha256 = "1xj2x9aakk70k3z88klfniqvffzbdkn55vslbqk60k6sv4k3qs2n"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 8ca2b5788ad51bf862de130610c2f7f6d732fc8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 250/285] haskell-gtk2hs-buildtools: update to version 0.12.5.0 --- .../libraries/haskell/gtk2hs-buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 677c6c15214b..3956546e7231 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.12.4"; - sha256 = "0xh5z8pix5q48d9liicl021kq9py4rj5612va6lfjkj813p5zq2z"; + version = "0.12.5.0"; + sha256 = "1pm1ifwy37xk0xkyqqwwaxi0wqwgr7vl1sazwgalsw46qmagwv0b"; isLibrary = false; isExecutable = true; buildDepends = [ filepath random ]; From 3a7bfc481b3d7c9f3bc1131c03a385e0c2f174d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 251/285] haskell-gtksourceview2: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/gtksourceview2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 756e1a1df978..492a343e2096 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.12.3.1"; - sha256 = "1c91ja753dzr2c7sv13wn47sjbjg45jv8xx9ybx1q3188xrldqng"; + version = "0.12.5.0"; + sha256 = "125psfr58na60nz5ax3va08fq1aa4knzjccj8ghwk8x9fkzddfs9"; buildDepends = [ glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 02400cec770d12980764064410f0f02df2bca1ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 252/285] haskell-hamlet: update to version 1.1.7.4 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b40025ff7166..b64668b43660 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.3"; - sha256 = "0532gf4xdbjxjpv7gsfv0bapnnb4g81jcfzkn71nwizi8zls3qck"; + version = "1.1.7.4"; + sha256 = "01sgd4p2d4irphgpvr7waag6jn8y329yj9zdjswrqklyygpp98hj"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From f97e6fa452f7ea9c0d1aee63572635d64dca9084 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 253/285] haskell-haskell-names: update to version 0.3.2.1 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index a127ade50bed..7e6619d4f357 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.1"; - sha256 = "134rxpsgki1disb24gvj1bq5xi4491k9ihb5pjhab78w4m7b99gn"; + version = "0.3.2.1"; + sha256 = "1ddixm37y1wkqsrs4cxvnmjczapwq1n67xg5rhkj0k7d04c8agha"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass From 729e2c34078d4a00d641688d8dba59162f80d40a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 254/285] haskell-haskell-src-meta: update to version 0.6.0.5 --- .../libraries/haskell/haskell-src-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 6ce8f9e72ba2..cad077f7c9c3 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.6.0.4"; - sha256 = "10dixf2abk0canwikf3wdp1ahc51400wxa7x4g59pygv8a3c1c1x"; + version = "0.6.0.5"; + sha256 = "1cx3fkhmyhj18b4nm460xrcb1w53qw198gkqb38cjyafr2frlbyh"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { From 4108e8e293b85d9db3045ed24b87a20b2ad83a04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 255/285] haskell-heist: update to version 0.13.0.3 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index b8f709a402cb..e97fecb67bbb 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.2"; - sha256 = "0rbzizgrvwj505dk7qyc9ky5vwyaxyj91xz1dsv0mv7cjl9pp17n"; + version = "0.13.0.3"; + sha256 = "0aynsb74i7yzw02cqd9fhcbz6sqkid98l6gpzxssaydq7vnkpj7a"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From fccfb897adb89abd079c5d43c282825271aa2724 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 256/285] haskell-monoid-extras: update to version 0.3.2.4 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 8eb61453f9c0..73f720ba4214 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.2.3"; - sha256 = "1q7aw4adg082rszkc3skdvidcn86n06xvr3x8qarpjb285znsmc4"; + version = "0.3.2.4"; + sha256 = "1qrgwnczznjp1visspqf3dk224nvqf5icv3646j96acl5srn84qc"; buildDepends = [ groupoids groups semigroupoids semigroups ]; jailbreak = true; meta = { From 9c5ec1a83303c8713883392dc381948ec05c650a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 257/285] haskell-pango: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index bbd935eb043f..db426f397247 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.4"; - sha256 = "08c7kmbnga6lijv7hpxgs766lsvaqpbqbph1gsxncqsl8haq4v5c"; + version = "0.12.5.0"; + sha256 = "06hchdnw4nfnpb46nb1gwgpwwk41dhp0xfimnbf310idiy0pavcg"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From c7da217c22c48e5e42cee6aa21e0d8d8a3b5701c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 258/285] haskell-shakespeare-text: update to version 1.0.0.9 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index d5e91da61b1e..ec60c0375b0c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.8"; - sha256 = "0gf4gsdfjz9c15wvxz886gjzzifgzanfhblgab15inl2rblirv7l"; + version = "1.0.0.9"; + sha256 = "1rh1dwmc7xam76isa6cwc25rcricakc7ay54hz01fpiy059imx52"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { From 9bd9d80c109e01d445122baa58705d64414101ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 259/285] haskell-shakespeare: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index a5428b0ee3c1..8b5de8ec76b7 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.2.0.1"; - sha256 = "07qfbqvq8fqbf7y43h0qq2gk9brpf4g0k7gghrjzyjrd57v5zygp"; + version = "1.2.0.2"; + sha256 = "1vp7zskxrjxcznj1d0nx9iqkfvwa9xwpbxq46z054bizqfkri96c"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time From a82223eba6f8acf766b5cbed5346ad15370f5560 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 260/285] haskell-snap: update to version 0.13.1.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 8df654049627..63103471ac2a 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.0.4"; - sha256 = "1cbc42x7p87fmazm0dqc519rdaiiiwmkri8y1n4hgvr70kfi6569"; + version = "0.13.1.1"; + sha256 = "0nak84xwrfvdcb2ngq71qy8h0h1ih3wifnkgwxabhjbrqmd7ma0x"; isLibrary = true; isExecutable = true; buildDepends = [ From 1129d7628df0ca20cd1564627f02373cb8ccf2f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 261/285] haskell-stm-conduit: update to version 2.1.4 --- .../libraries/haskell/stm-conduit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index a2da329121b3..4ab74d23bc23 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,14 +1,16 @@ -{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet -, stm, stmChans, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, transformers +{ cabal, async, conduit, HUnit, liftedAsync, liftedBase +, monadControl, monadLoops, QuickCheck, resourcet, stm, stmChans +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, transformers }: cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.1.2"; - sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k"; + version = "2.1.4"; + sha256 = "0xl3g96blawy5bkvialq6jxnf4wajxb5fg1sh7p9kvw1gvacqwqk"; buildDepends = [ - async conduit monadControl resourcet stm stmChans transformers + async conduit liftedAsync liftedBase monadControl monadLoops + resourcet stm stmChans transformers ]; testDepends = [ conduit HUnit QuickCheck stm stmChans testFramework From a9f3780c007441ecb94502687e670577c7515aa0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:10 +0100 Subject: [PATCH 262/285] haskell-thyme: update to version 0.3.1.0 --- .../libraries/haskell/thyme/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index da8fd1e3ec83..6f1a6b41bba3 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,15 +1,15 @@ -{ cabal, attoparsec, Cabal, deepseq, filepath, lens, QuickCheck -, random, systemPosixRedirect, text, time, transformers, vector -, vectorSpace +{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, lens +, QuickCheck, random, systemPosixRedirect, text, time, transformers +, vector, vectorSpace }: cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.0.3"; - sha256 = "187q8ag6ypbvlikynanzyv8c3hskprcz6xf3p3fjraalp95p86ay"; + version = "0.3.1.0"; + sha256 = "0dhnsqn6miiqnbpqln2vmkq7cbm8bz5jz1dwc1bif6dwl16fvhm6"; buildDepends = [ - attoparsec deepseq lens QuickCheck random text time transformers - vector vectorSpace + aeson attoparsec deepseq lens QuickCheck random text time + transformers vector vectorSpace ]; testDepends = [ attoparsec Cabal filepath lens QuickCheck random From 8920e9da72afc4b8088227c2bfdf312c814e59e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:11 +0100 Subject: [PATCH 263/285] haskell-unix-time: update to version 0.2.2 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 67dbdac34859..0ca4ea5f5c24 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.2.1"; - sha256 = "15kg1rxbw86p5jzig9ac7lsizmlvqkxikq7h8jfi04rri39a9jiy"; + version = "0.2.2"; + sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; From cd9055305433eae540869055b33683cafec360e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:11 +0100 Subject: [PATCH 264/285] haskell-warp-tls: update to version 1.4.2 --- pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index dd1404e02fd2..5b1456c0c48c 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "1.4.1.4"; - sha256 = "1w6i26r5xjjc594h53q07bad835ryg3k6vmbzf5d59xngfvm7b9k"; + version = "1.4.2"; + sha256 = "05mbf73859n2ns3bdnw24i7vygr4kysyxfq0xdkmmrd47fh3k9r6"; buildDepends = [ certificate conduit cprngAes cryptocipher cryptoRandomApi network networkConduit pem tls tlsExtra transformers wai warp From 066c03f5a12f009dac22d0fdaea491af12cbd594 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:11 +0100 Subject: [PATCH 265/285] haskell-hlint: update to version 1.8.55 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 73ab425ea8de..b78785f8fc13 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.53"; - sha256 = "1gnv9h909qgf80bpb769mr1paf8lzp3xlwmyw4nxdj84fn0y57q0"; + version = "1.8.55"; + sha256 = "184y0vh5rwsv13vj49zvgwwpgdf5y7wxfisry9pv2998flwkf4rj"; isLibrary = true; isExecutable = true; buildDepends = [ From 8baecad9f9ea7caf781c98fed954543d3bc3d448 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Dec 2013 23:29:11 +0100 Subject: [PATCH 266/285] haskell-LambdaHack: update to version 0.2.10 --- pkgs/games/LambdaHack/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 4f276d50105c..f76aab551648 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,17 +1,18 @@ { cabal, binary, ConfigFile, deepseq, enummapset, filepath, gtk -, hashable, keys, miniutter, mtl, random, stm, text, transformers -, unorderedContainers, zlib +, hashable, keys, miniutter, mtl, prettyShow, random, stm, text +, transformers, unorderedContainers, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.8"; - sha256 = "0dwv6ljigwc46czyivn4ivszfiykvhjx6n4agv7lwx8faan7kax3"; + version = "0.2.10"; + sha256 = "1lj960r6gyg8kpc13fs6yq51l0qkpk4yd7ixhh0j4j8xghvx9mw5"; isLibrary = true; isExecutable = true; buildDepends = [ binary ConfigFile deepseq enummapset filepath gtk hashable keys - miniutter mtl random stm text transformers unorderedContainers zlib + miniutter mtl prettyShow random stm text transformers + unorderedContainers zlib ]; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; From 676428dd5543974cf0bd5157263681d07efb6d13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:30:17 +0100 Subject: [PATCH 267/285] haskell-graphviz: jailbreak to support recent versions of dlist --- pkgs/development/libraries/haskell/graphviz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 6f7aea3289e3..50e70c27dd20 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { transformers wlPprintText ]; patchPhase = '' - sed -i -e 's|polyparse.*,|polyparse,|' graphviz.cabal + sed -i -e 's|polyparse.*,|polyparse,|' -e 's|dlist ==.*|dlist|' graphviz.cabal ''; doCheck = false; meta = { From 7e9816d9bd5af5f4f8ff7049a1ddfa431b5e4d5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:31:31 +0100 Subject: [PATCH 268/285] haskell-Glob: jailbreak to support recent versions of dlist --- pkgs/development/libraries/haskell/Glob/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 08ae46179569..ccd162e3e6a0 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.7.2"; sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i"; buildDepends = [ dlist filepath transformers ]; + jailbreak = true; meta = { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; From 8dc23a537b0b97e363a1e0939a661bca24465c5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:28 +0100 Subject: [PATCH 269/285] haskell-github: update to version 0.7.2 --- .../libraries/haskell/github/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 6154ed6c9a77..5a45e48bdc7b 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -1,15 +1,16 @@ { cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault -, failure, HTTP, httpConduit, httpTypes, network, text, time -, unorderedContainers, vector +, failure, hashable, HTTP, httpConduit, httpTypes, network, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "github"; - version = "0.7.1"; - sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90"; + version = "0.7.2"; + sha256 = "0w8m8ybzb63j1631v2a6xpm727zbj19dv98cml9fyzlxzlvlg5fs"; buildDepends = [ - aeson attoparsec caseInsensitive conduit dataDefault failure HTTP - httpConduit httpTypes network text time unorderedContainers vector + aeson attoparsec caseInsensitive conduit dataDefault failure + hashable HTTP httpConduit httpTypes network text time + unorderedContainers vector ]; jailbreak = true; meta = { From 555a5db1f94eb9befc85d53ee91e13b531bb3a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:28 +0100 Subject: [PATCH 270/285] haskell-gtk2hs-buildtools: update to version 0.12.5.1 --- .../libraries/haskell/gtk2hs-buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 3956546e7231..821b328b0a91 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.12.5.0"; - sha256 = "1pm1ifwy37xk0xkyqqwwaxi0wqwgr7vl1sazwgalsw46qmagwv0b"; + version = "0.12.5.1"; + sha256 = "1zjm7y38089b57q3csgq7ydfm104ffhvsycszddkj0cgfgafshfm"; isLibrary = false; isExecutable = true; buildDepends = [ filepath random ]; From 08944805bdb79d1fc5303462ddc177094d6ebe26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:28 +0100 Subject: [PATCH 271/285] haskell-pandoc-citeproc: update to version 0.2 --- .../haskell/pandoc-citeproc/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index dd400ef550d1..bbfd6430d4f2 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -1,22 +1,22 @@ -{ cabal, aeson, aesonPretty, attoparsec, Diff, filepath, hexpat -, hsBibutils, HTTP, json, mtl, network, pandoc, pandocTypes, parsec -, rfc5051, split, syb, tagsoup, texmath, text, time, utf8String +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, HTTP, mtl, network, pandoc, pandocTypes, parsec +, rfc5051, split, syb, tagsoup, temporary, texmath, text, time , vector, yaml }: cabal.mkDerivation (self: { pname = "pandoc-citeproc"; - version = "0.1.2.1"; - sha256 = "13i4shpbd9swbsrpmkpb7jx79m12z12m9f3x167fs78509dak3iv"; + version = "0.2"; + sha256 = "0ghdkzml2rcvjf1wlpsa6ih117x56qlb3ajpbwnpwm3y4wm0jm2d"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec filepath hexpat hsBibutils HTTP json mtl network - pandoc pandocTypes parsec rfc5051 split syb tagsoup texmath text - time utf8String vector yaml + aeson aesonPretty attoparsec filepath hexpat hsBibutils HTTP mtl + network pandoc pandocTypes parsec rfc5051 split syb tagsoup + temporary texmath text time vector yaml ]; testDepends = [ - aeson aesonPretty Diff filepath pandoc pandocTypes yaml + aeson aesonPretty filepath pandoc pandocTypes temporary text yaml ]; doCheck = false; meta = { From ed392acdd10250ffee794640beebf9074199df07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:28 +0100 Subject: [PATCH 272/285] haskell-socket-activation: update to version 0.1.0.1 --- .../libraries/haskell/socket-activation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix index 4309e2d34563..741b12bf4631 100644 --- a/pkgs/development/libraries/haskell/socket-activation/default.nix +++ b/pkgs/development/libraries/haskell/socket-activation/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socket-activation"; - version = "0.1.0.0"; - sha256 = "1w10i9a10lq5gscwm1vf1w7pqkfyx3n108jw8dx4zdqhrh82lmwv"; + version = "0.1.0.1"; + sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma"; buildDepends = [ network transformers ]; meta = { homepage = "https://github.com/sakana/haskell-socket-activation"; From 3a14e2ab438f7a8bcfea94caf204b732d5ccfa83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:28 +0100 Subject: [PATCH 273/285] haskell-svgcairo: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/svgcairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index e7aafd37264e..3663b8b2ed62 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "svgcairo"; - version = "0.12.1.1"; - sha256 = "0fl9flsv4brvwryzxv4xpy8x3w0if4psx8nypxm2ix6l9qh3pghb"; + version = "0.12.5.0"; + sha256 = "1b5n96l8addif8a6yv21w95g83dpamr043yqm2wb7vaca8m82r28"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; From 84a050811fcd5652a1f8aeac7f217aa064cf7e50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:32:57 +0100 Subject: [PATCH 274/285] haskell-Glob: update to version 0.7.3 --- pkgs/development/libraries/haskell/Glob/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index ccd162e3e6a0..80c0eaa44ab9 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "Glob"; - version = "0.7.2"; - sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i"; + version = "0.7.3"; + sha256 = "0yl0wxbd03dv0hfr2aqwm9f3xnhjkdicymqv3nmhjjslqq3a59zd"; buildDepends = [ dlist filepath transformers ]; - jailbreak = true; meta = { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; From a64262ea3d3e531f1174256c76548150f4c03f8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 11:59:57 +0100 Subject: [PATCH 275/285] haskell-lifted-async: add version 0.1.0 --- .../haskell/lifted-async/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/lifted-async/default.nix diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix new file mode 100644 index 000000000000..8fbfd1f51b01 --- /dev/null +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -0,0 +1,20 @@ +{ cabal, async, HUnit, liftedBase, monadControl, mtl, testFramework +, testFrameworkHunit, testFrameworkTh, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "lifted-async"; + version = "0.1.0"; + sha256 = "09ns06qgnwls6zcqsjvr7ykhpr1w12vq49ix4bkqriarl1q3ap7b"; + buildDepends = [ async liftedBase monadControl transformersBase ]; + testDepends = [ + HUnit liftedBase monadControl mtl testFramework testFrameworkHunit + testFrameworkTh + ]; + meta = { + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a1baaf90835..c7ddad8895d9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1358,7 +1358,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; indents = callPackage ../development/libraries/haskell/indents {}; - + indexed = callPackage ../development/libraries/haskell/indexed {}; indexedFree = callPackage ../development/libraries/haskell/indexed-free {}; @@ -1444,6 +1444,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; + liftedAsync = callPackage ../development/libraries/haskell/lifted-async {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; linear = callPackage ../development/libraries/haskell/linear {}; From df6490e8ddeff54307d5630d2b89abb45195e03d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 13:11:20 +0100 Subject: [PATCH 276/285] haskell-hakyll: jailbreak to support recent versions of pandoc-citeproc --- pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 22cdf149ef7b..424860c4677f 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -25,6 +25,9 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; + patchPhase = '' + sed -i -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal + ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; From 47cb33819d13faedf6f6090ad5b08103597242c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 16:23:11 +0100 Subject: [PATCH 277/285] haskell-hsyslog: update to version 1.6 --- pkgs/development/libraries/haskell/hsyslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index 3f4754256599..552ed94c9620 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "hsyslog"; - version = "1.5"; - sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp"; + version = "1.6"; + sha256 = "1vw0yhp4s7wiq18rfg1jgm3ccqaim7w8ry0cdqijzbdnz65hibvp"; meta = { homepage = "http://github.com/peti/hsyslog"; - description = "FFI interface to syslog(3) from POSIX.1-2001."; + description = "FFI interface to syslog(3) from POSIX.1-2001"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 09dd7f9afc3ff8e907218d78dd92e40875e72159 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Dec 2013 11:53:53 -0500 Subject: [PATCH 278/285] Fix passing of kernel parameters Broken in 9ee30cd9b51c46cea7193993d006bb4301588001. Reported by Arvin Moezzi. --- nixos/modules/system/activation/top-level.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 4146cd8394a5..d9891f434cc8 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -98,6 +98,7 @@ let systemd = config.systemd.package; inherit children; + kernelParams = config.boot.kernelParams; installBootLoader = config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; From 87fd8c1f8f9679a3ed24ee356e8cf006089757a9 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 2 Dec 2013 18:09:57 +0100 Subject: [PATCH 279/285] dropbox: Update to 2.4.7. Signed-off-by: Moritz Ulrich --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 99589a3d71b5..17703b2b3fc1 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -25,9 +25,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "2.4.3"; - sha256 = if stdenv.system == "x86_64-linux" then "0g8iqgc18qbw8fvdjf0fhbal34rvwr5izrf5acfzqjg99dgih81r" - else if stdenv.system == "i686-linux" then "1nhmk319whj6cil6wg9hrfln9bxin3fnf6sxb0zg2ycfpnnqi0la" + version = "2.4.7"; + sha256 = if stdenv.system == "x86_64-linux" then "08fh0zx9q83dvivnbx5zr1cwb69ihhlx9mkbd3ikynk1wd8df8n8" + else if stdenv.system == "i686-linux" then "0rhblpahg2axglpi8iavsglffw83rj71qy113wj2dh6q72124j2h" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored From 8da629a3b98cee4f5e9ca314170135f42240fb81 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 2 Dec 2013 22:47:52 +0400 Subject: [PATCH 280/285] Adding libnl 3.2.19 to use instead of the latest with ntrack ntrack has a bug about fresher libnl compatilbility. There are no updates since September. --- pkgs/os-specific/linux/libnl/3.2.19.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/libnl/3.2.19.nix diff --git a/pkgs/os-specific/linux/libnl/3.2.19.nix b/pkgs/os-specific/linux/libnl/3.2.19.nix new file mode 100644 index 000000000000..ea508c088e76 --- /dev/null +++ b/pkgs/os-specific/linux/libnl/3.2.19.nix @@ -0,0 +1,20 @@ + +{stdenv, fetchurl, bison, flex}: + +stdenv.mkDerivation rec { + name = "libnl-3.2.19"; + + src = fetchurl { + url = "${meta.homepage}files/${name}.tar.gz"; + sha256 = "12q97cw680hg4rylyd8j3d7azwwia4ndsv3kybd1ajp8hjni39ip"; + }; + + buildInputs = [ bison flex ]; + + meta = { + homepage = "http://www.infradead.org/~tgr/libnl/"; + description = "Linux NetLink interface library"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d8c96a9e165..89e9e7a53e88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5329,7 +5329,9 @@ let includeTools = true; }; - ntrack = callPackage ../development/libraries/ntrack { }; + ntrack = callPackage ../development/libraries/ntrack { + libnl = libnl_3_2_19; + }; ode = builderDefsPackage (import ../development/libraries/ode) { }; @@ -6635,6 +6637,7 @@ let libcgroup = callPackage ../os-specific/linux/libcgroup { }; libnl = callPackage ../os-specific/linux/libnl { }; + libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { }; linuxHeaders = linuxHeaders37; From 7a01483d51dd84ee093926a56517f0e13b6d531e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 16:42:18 +0000 Subject: [PATCH 281/285] Fixes ruby 2.0.0 compilation on Darwin. --- pkgs/development/interpreters/ruby/ruby-2.0.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix index 7c47bac0bbbc..975fecd1a3f8 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix @@ -30,11 +30,19 @@ stdenv.mkDerivation rec { ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) - ++ (op yamlSupport libyaml); + ++ (op yamlSupport libyaml) + # Looks like ruby fails to build on darwin without readline even if curses + # support is not enabled, so add readline to the build inputs if curses + # support is disabled (if it's enabled, we already have it) and we're + # running on darwin + ++ (op (!cursesSupport && stdenv.isDarwin) readline); enableParallelBuilding = true; - configureFlags = ["--enable-shared" ]; + configureFlags = ["--enable-shared" ] + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory From 7c6e108c2d7d39d0a61312ab0e322cc0aececfbd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 16:35:50 +0000 Subject: [PATCH 282/285] Use the recommended http://cache.ruby-lang.org host to get the ruby archives --- pkgs/development/interpreters/ruby/ruby-18.nix | 2 +- pkgs/development/interpreters/ruby/ruby-19.nix | 2 +- pkgs/development/interpreters/ruby/ruby-2.0.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-18.nix b/pkgs/development/interpreters/ruby/ruby-18.nix index cfb498394665..e6cc755981b6 100644 --- a/pkgs/development/interpreters/ruby/ruby-18.nix +++ b/pkgs/development/interpreters/ruby/ruby-18.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz"; + url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz"; sha256 = "0g2dsn8lmiqwqsp13ryzi97qxr7742v5l7v506x6wq9aiwpk42p6"; }; diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 038a160b3279..8689e41867bb 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; + url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; sha256 = "0w1avj8qfskvkgvrjxxc1cxjm14bf1v60ipvcl5q3zpn9k14k2cx"; }; diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix index 975fecd1a3f8..b9f031986594 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2"; + url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2"; sha256 = "0pr9jf01cfap93xcngyd5zpns67ffjsgaxkm0qr1r464rj9d7066"; }; From 75a6ed8ddb558627207689ff4a3b97495cb76fef Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 16:37:26 +0000 Subject: [PATCH 283/285] Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164 --- pkgs/development/interpreters/ruby/ruby-19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 8689e41867bb..345439b593e9 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; - sha256 = "0w1avj8qfskvkgvrjxxc1cxjm14bf1v60ipvcl5q3zpn9k14k2cx"; + sha256 = "0fdc6e860d0023ba7b94c7a0cf1f7d32908b65b526246de9dfd5bb39d0d7922b"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; minorVersion = "3"; - patchLevel = "429"; + patchLevel = "484"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; From c8065de0afcc7f3d3b8381057a2f11f56846f643 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 16:38:40 +0000 Subject: [PATCH 284/285] Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164 --- pkgs/development/interpreters/ruby/ruby-2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.nix index b9f031986594..4ad2f8c515ed 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2"; - sha256 = "0pr9jf01cfap93xcngyd5zpns67ffjsgaxkm0qr1r464rj9d7066"; + sha256 = "3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "2.0"; minorVersion = "0"; - patchLevel = "0"; + patchLevel = "353"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; From b802a7be880becece15c378349c623128592c507 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 16:49:03 +0000 Subject: [PATCH 285/285] Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported ruby 1.8 should be phased out as it contains security issues and is unsupported by the ruby core team. This is the last update available but it doesn't fix all CVEs. --- pkgs/development/interpreters/ruby/ruby-18.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-18.nix b/pkgs/development/interpreters/ruby/ruby-18.nix index e6cc755981b6..f37e8baa68d5 100644 --- a/pkgs/development/interpreters/ruby/ruby-18.nix +++ b/pkgs/development/interpreters/ruby/ruby-18.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz"; - sha256 = "0g2dsn8lmiqwqsp13ryzi97qxr7742v5l7v506x6wq9aiwpk42p6"; + url = "http://cache.ruby-lang.org/pub/ruby/1.8/${name}.tar.bz2"; + sha256 = "b4e34703137f7bfb8761c4ea474f7438d6ccf440b3d35f39cc5e4d4e239c07e3"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.8"; minorVersion = "7"; - patchLevel = "371"; + patchLevel = "374"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; };