From 774a0b4a009b6c96ee5f51fff69d477c9101fa10 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:44:11 +0000 Subject: [PATCH 01/81] sdlmame: update to latest version --- pkgs/games/sdlmame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 645312dd54e..acc72449018 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -3,17 +3,17 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - version = "0.150.u0-1"; + version = "0.151.u0-1"; name = "sdlmame-${version}"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "ftp://ftp.archlinux.org/community/os/x86_64/${name}-x86_64.pkg.tar.xz"; - sha256 = "0393xnzrzq53szmicn96lvapm66wmlykdxaa1n7smx8a0mcz0kah"; + sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9"; } else fetchurl { url = "ftp://ftp.archlinux.org/community/os/i686/${name}-i686.pkg.tar.xz"; - sha256 = "0js67w2szd0qs7ycgxb3bbmcdziv1fywyd9ihra2f6bq5rhcs2jp"; + sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7"; }; buildPhase = '' From 311a25648b4d2f9b938d0e6d862c4a6114305fe2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:57:40 +0000 Subject: [PATCH 02/81] mpd: update to latest version --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 238176aadff..67a11e01651 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.17.4"; + name = "mpd-0.18.3"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3"; + url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; + sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh"; }; buildInputs = [ pkgconfig glib ] From d6800031572a616962a8bc9f50e6b6616be6de21 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 01:40:17 +0000 Subject: [PATCH 03/81] awesome: add which to build inputs (for awesome-client) --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 61f2145ff33..d29aec9976f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua +{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils}: +, docbook_xml_dtd_45, libxslt, coreutils, which }: let version = "3.4.13"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as From 3203c7177c3e75aeea4f85cef607c78e6479a8c2 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 13:09:30 +0000 Subject: [PATCH 04/81] haskellPackages.webRoutesBoomerang: new expression --- .../haskell/web-routes-boomerang/default.nix | 14 +++++++++++ .../libraries/haskell/web-routes/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/haskell/web-routes-boomerang/default.nix create mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix new file mode 100644 index 00000000000..602d95f45df --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -0,0 +1,14 @@ +{ cabal, boomerang, mtl, parsec, text, webRoutes }: + +cabal.mkDerivation (self: { + pname = "web-routes-boomerang"; + version = "0.28.0"; + sha256 = "1xp8p0fkwirrpssb9lnxl7fmlmrql28r2ywaa99gw9cdqxifzbbl"; + buildDepends = [ boomerang mtl parsec text webRoutes ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix new file mode 100644 index 00000000000..ce767e7b5f5 --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -0,0 +1,23 @@ +{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck +, split, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String +}: + +cabal.mkDerivation (self: { + pname = "web-routes"; + version = "0.27.3"; + sha256 = "06a3b88gzbn7dr7hff2fjy1q7sxc479ha4g1wqsbjrb2ajrp376q"; + buildDepends = [ + blazeBuilder httpTypes mtl parsec split text utf8String + ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + 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 22257a81f95..9d78706f721 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2250,6 +2250,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; WebBitsHtml = self.WebBitsHtml_1_0_2; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; + + webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; + CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprint = callPackage ../development/libraries/haskell/wl-pprint {}; From 452b25b6c33c04a745008457fcb9f8f45de054c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Nov 2013 12:02:37 +0100 Subject: [PATCH 05/81] qmmp: add meta.respositories This metadata is used by the tool @phreedom is writing to automatically find package updates. --- pkgs/applications/audio/qmmp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 8b99988f07b..6a1e4e7ea83 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [maintainers.bjornfor]; + repositories.svn = http://qmmp.googlecode.com/svn/; }; } From f49f9225d5d69797e3ddbf1a0a13776dbaa77fa7 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Tue, 12 Nov 2013 22:23:44 +0000 Subject: [PATCH 06/81] newsbeuter: add dev expression --- .../networking/feedreaders/newsbeuter/dev.nix | 45 +++++++++++++++++++ pkgs/development/libraries/json-c/0.11.nix | 22 +++++++++ pkgs/top-level/all-packages.nix | 6 ++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/feedreaders/newsbeuter/dev.nix create mode 100644 pkgs/development/libraries/json-c/0.11.nix diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix new file mode 100644 index 00000000000..df98e756868 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses +, gettext, libiconvOrEmpty, makeWrapper, perl }: + +stdenv.mkDerivation rec { + name = "newsbeuter-dev-20131103"; + + src = fetchurl { + url = "https://github.com/akrennmair/newsbeuter/archive/8abefa3efb5e6d70c32bac9e068248e98616d6ec.tar.gz"; + sha256 = "1pfkr4adm7rxwq44hpxwblw6gg8vd0frsi6szvhmzkpn5qmnpwpg"; + }; + + buildInputs + # use gettext instead of libintlOrEmpty so we have access to the msgfmt + # command + = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ] + ++ libiconvOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; + + preBuild = '' + sed -i -e 104,108d config.sh + sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl + export LDFLAGS=-lncursesw + ''; + + NIX_CFLAGS_COMPILE = + "-I${libxml2}/include/libxml2 -I${json-c-0-11}/include/json-c"; + + NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson"; + + installPhase = '' + DESTDIR=$out prefix=\"\" make install + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.newsbeuter.org; + description = "An open-source RSS/Atom feed reader for text terminals"; + maintainers = with maintainers; [ lovek323 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/json-c/0.11.nix b/pkgs/development/libraries/json-c/0.11.nix new file mode 100644 index 00000000000..029921ee08c --- /dev/null +++ b/pkgs/development/libraries/json-c/0.11.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "json-c-0.11"; + src = fetchurl { + url = "https://github.com/json-c/json-c/archive/json-c-0.11-20130402.tar.gz"; + sha256 = "1m8fy7lbahv1r7yqbhw4pl057sxmmgjihm1fsvc3h66710s2i24r"; + }; + meta = with stdenv.lib; { + description = "A JSON implementation in C"; + homepage = https://github.com/json-c/json-c/wiki; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + JSON-C implements a reference counting object model that allows you to + easily construct JSON objects in C, output them as JSON formatted strings + and parse JSON formatted strings back into the C representation of JSON + objects. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a4a085ead3..e05f7647d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1409,6 +1409,8 @@ let newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; + ngrok = callPackage ../tools/misc/ngrok { }; mpack = callPackage ../tools/networking/mpack { }; @@ -4574,7 +4576,9 @@ let json_glib = callPackage ../development/libraries/json-glib { }; - json_c = callPackage ../development/libraries/json-c { }; + json-c-0-9 = callPackage ../development/libraries/json-c { }; + json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; + json_c = json-c-0-9; jsoncpp = callPackage ../development/libraries/jsoncpp { }; From 9f9f9058192eb48a21714e48d0b6ddcb304b4518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Nov 2013 12:13:24 +0100 Subject: [PATCH 07/81] json-c: add meta.platforms and break overlong line --- pkgs/development/libraries/json-c/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index fa53cb2ddd4..7953b04183a 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "json-c-0.9"; @@ -6,9 +6,15 @@ stdenv.mkDerivation rec { url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz"; sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://oss.metaparadigm.com/json-c/"; description = "A JSON implementation in C"; - longDescription = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."; + longDescription = '' + JSON-C implements a reference counting object model that allows you to + easily construct JSON objects in C, output them as JSON formatted strings + and parse JSON formatted strings back into the C representation of JSON + objects. + ''; + platforms = platforms.linux; }; } From 8677a22dd5eac37089a34b41caa6ffbc06ce1bc2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 17 Nov 2013 13:31:11 +0000 Subject: [PATCH 08/81] Fixes go 1.1.2 compilation on OSX Maverick Apparently Apple thinks that faking gcc wiht a clang stub but not providing a compatile libgcc.a is not going to cause any issues. They really do hate GPL. --- pkgs/development/compilers/go/1.1-darwin.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix index 2cbb8d49611..5b17f56ac37 100644 --- a/pkgs/development/compilers/go/1.1-darwin.nix +++ b/pkgs/development/compilers/go/1.1-darwin.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" + + # CGO is broken on Maverick. See: http://code.google.com/p/go/issues/detail?id=5926 + # Reevaluate once go 1.1.3 is out + export CGO_ENABLED=0 + export GOROOT="$(pwd)/" export GOBIN="$out/bin" export PATH="$GOBIN:$PATH" From 98e8d9d5a3adc7c2b927c557d16485735e191e90 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 17 Nov 2013 21:48:13 +0400 Subject: [PATCH 09/81] Adding BadVPN network (mostly BPN) tools --- pkgs/tools/networking/badvpn/default.nix | 35 +++++++++++++++++++ pkgs/tools/networking/badvpn/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/badvpn/default.nix create mode 100644 pkgs/tools/networking/badvpn/default.upstream diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix new file mode 100644 index 00000000000..d2e53d677e2 --- /dev/null +++ b/pkgs/tools/networking/badvpn/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash}: +let + s = # Generated upstream information + rec { + baseName="badvpn"; + version="1.999.128"; + name="${baseName}-${version}"; + hash="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; + url="http://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2"; + sha256="1z4v1jydv8zkkszsq7scc17rw5dqz9zlpcc40ldxsw34arfqvcnn"; + }; + buildInputs = [ + cmake openssl nss pkgconfig nspr + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + preConfigure = '' + find . -name '*.sh' -exec sed -e 's@#!/bin/sh@${stdenv.shell}@' -i '{}' ';' + find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' + ''; + + meta = { + inherit (s) version; + description = ''A set of network-related (mostly VPN-related) tools''; + license = stdenv.lib.licenses.bsd3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream new file mode 100644 index 00000000000..1c746698fef --- /dev/null +++ b/pkgs/tools/networking/badvpn/default.upstream @@ -0,0 +1,3 @@ +url http://gc.codehum.com/p/badvpn/downloads/list +version_link '[.]tar[.][a-z0-9]+$' +process 'gc.codehum.com//' '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e05f7647d2e..263cbe8ef12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -517,6 +517,8 @@ let babeld = callPackage ../tools/networking/babeld { }; + badvpn = callPackage ../tools/networking/badvpn {}; + banner = callPackage ../games/banner {}; barcode = callPackage ../tools/graphics/barcode {}; From bb8406b3c055664a8b46131bbf8abce0f700c80b Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Sun, 17 Nov 2013 16:45:09 +0100 Subject: [PATCH 10/81] calibre: upgrade 1.8.0 -> 1.11.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 10d92e4d517..f4134cd7f25 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.8.0"; + name = "calibre-1.11.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0awh24n5bvypmiylngmz0w0126yz1jxlrjfy9b4w5aflg7vgr0qq"; + sha256 = "17jp93wzq11yb89yg2x42f65yyx6v0hy6nhvrd42ig0vhk7sdh2n"; }; inherit python; From d33f1a218ecb70a50d4f86463cf82c58ec0c8c88 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 17 Nov 2013 14:24:49 +0000 Subject: [PATCH 11/81] Add myself to the maintainers. Hello NixOS ! --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 221201a6041..ad110389f7a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -63,5 +63,6 @@ winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; + zimbatm = "zimbatm "; zoomulator = "Kim Simmons "; } From 55639c3aeb20cf799de5394cc6c9229a99ac505c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 17 Nov 2013 14:00:12 +0000 Subject: [PATCH 12/81] Adds a new package: direnv --- pkgs/tools/misc/direnv/default.nix | 37 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/direnv/default.nix diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix new file mode 100644 index 00000000000..5588fe3d647 --- /dev/null +++ b/pkgs/tools/misc/direnv/default.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, go }: + +let + version = "2.1.0"; +in +stdenv.mkDerivation { + name = "direnv-${version}"; + src = fetchurl { + url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; + name = "direnv-${version}.tar.gz"; + sha256 = "4dad14e53aa5a20fd11cdbb907c19a05f16464172af302981adb410bd691cefe"; + }; + + buildInputs = [ go ]; + + buildPhase = "make"; + installPhase = "make install DESTDIR=$out"; + + meta = { + description = "a shell extension that manages your environment"; + longDescription = '' + Once hooked into your shell direnv is looking for an .envrc file in your + current directory before every prompt. + + If found it will load the exported environment variables from that bash + script into your current environment, and unload them if the .envrc is + not reachable from the current path anymore. + + In short, this little tool allows you to have project-specific + environment variables. + ''; + homepage = http://direnv.net; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.zimbatm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 263cbe8ef12..fd1fbe2c400 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,6 +553,8 @@ let ditaa = callPackage ../tools/graphics/ditaa { }; + direnv = callPackage ../tools/misc/direnv { }; + dlx = callPackage ../misc/emulators/dlx { }; eggdrop = callPackage ../tools/networking/eggdrop { }; From 21e86d498fe5aded70bd40c4c90cfd138697969a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Nov 2013 21:33:24 +0100 Subject: [PATCH 13/81] newsbeuter: update 2.6 -> 2.7 --- .../networking/feedreaders/newsbeuter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index 3bca5cc91da..029a6f8e633 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -2,11 +2,11 @@ , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-2.6"; + name = "newsbeuter-2.7"; src = fetchurl { url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; - sha256 = "1hywz5206k0ykjklkjvnfy9fm4jfv9phz8dkzzwhfcjvqv9zv29i"; + sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6"; }; buildInputs From 9c0e95663a22fd76154fb570603761d8d54965bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Nov 2013 23:06:25 +0100 Subject: [PATCH 14/81] lighttpd: update 1.4.32 -> 1.4.33 Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/ --- pkgs/servers/http/lighttpd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 61070ef22b6..0da9f05901d 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -4,12 +4,12 @@ assert enableMagnet -> lua5 != null; -stdenv.mkDerivation { - name = "lighttpd-1.4.32"; +stdenv.mkDerivation rec { + name = "lighttpd-1.4.33"; src = fetchurl { - url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz; - sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k"; + url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; + sha256 = "0331671snhhf48qb43mfb6l85v2rc3ryd3qvz56s8z454gfax1i8"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = http://www.lighttpd.net/; license = "BSD"; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } From 99c09eacb4f73a5c302b3449fb9ccd295dd72f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 17 Nov 2013 23:14:30 +0100 Subject: [PATCH 15/81] asciidoc: update 8.6.8 -> 8.6.9 Changes: http://www.methods.co.nz/asciidoc/CHANGELOG.html --- pkgs/tools/typesetting/asciidoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 869fb99c63f..723741b2c83 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -128,11 +128,11 @@ let in stdenv.mkDerivation rec { - name = "asciidoc-8.6.8"; + name = "asciidoc-8.6.9"; src = fetchurl { url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4"; + sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"; }; buildInputs = [ python unzip ]; From 1eb47b17af9c2c65b146245d899b37ba7743ee03 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 10:47:25 +0000 Subject: [PATCH 16/81] haskellPackages.tastyAntXml: New expression --- .../haskell/tasty-ant-xml/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-ant-xml/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix new file mode 100644 index 00000000000..e8a8abe3159 --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -0,0 +1,18 @@ +{ cabal, genericDeriving, mtl, reducers, stm, tagged, tasty +, transformers, xml +}: + +cabal.mkDerivation (self: { + pname = "tasty-ant-xml"; + version = "1.0.0.1"; + sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj"; + buildDepends = [ + genericDeriving mtl reducers stm tagged tasty transformers xml + ]; + meta = { + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework."; + 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 9d78706f721..a42b6f88ecd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2046,6 +2046,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tasty = callPackage ../development/libraries/haskell/tasty {}; + tastyAntXml = callPackage ../development/libraries/haskell/tasty-ant-xml {}; + tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; From 2e8c5b626cbe4b021b930a3b4a9d13fabb5f6972 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:04:12 +0000 Subject: [PATCH 17/81] haskellPackages.tastyHspec: New expression --- .../libraries/haskell/tasty-hspec/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-hspec/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix new file mode 100644 index 00000000000..34b13c69bf6 --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -0,0 +1,15 @@ +{ cabal, hspec, tasty }: + +cabal.mkDerivation (self: { + pname = "tasty-hspec"; + version = "0.1"; + sha256 = "1pf4ffaqy0f25a2sjirg5g4gdcfslapwq4mm0pkdsysmh9bv1f64"; + buildDepends = [ hspec tasty ]; + meta = { + homepage = "http://github.com/mitchellwrosen/tasty-hspec"; + description = "Hspec support for the Tasty test framework"; + 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 a42b6f88ecd..3eb55a9f47b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2048,6 +2048,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyAntXml = callPackage ../development/libraries/haskell/tasty-ant-xml {}; + tastyHspec = callPackage ../development/libraries/haskell/tasty-hspec {}; + tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; From 17b738330cdc0d1e20db2a10abd80f4df54a880d Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:04:47 +0000 Subject: [PATCH 18/81] haskellPackages.tastyQuickcheck: New expression --- .../libraries/haskell/tasty-quickcheck/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-quickcheck/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix new file mode 100644 index 00000000000..e18f3d7cd33 --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -0,0 +1,14 @@ +{ cabal, QuickCheck, random, tagged, tasty }: + +cabal.mkDerivation (self: { + pname = "tasty-quickcheck"; + version = "0.3.1"; + sha256 = "1rajvcq2a1yxdbb4kykvab1p9rnmsd2lgmlk61nd4fxvsvfj5gzn"; + buildDepends = [ QuickCheck random tagged tasty ]; + meta = { + description = "QuickCheck support for the Tasty test framework"; + 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 3eb55a9f47b..6d7c409ae6e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2052,6 +2052,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; + tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; templateDefault = callPackage ../development/libraries/haskell/template-default {}; From 6e89adc6ba0ec1f7364d8de73de81fe2fe0302c7 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:07:57 +0000 Subject: [PATCH 19/81] haskellPackages.tastyGolden: New expression --- .../haskell/tasty-golden/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-golden/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix new file mode 100644 index 00000000000..2f27e50d8f9 --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -0,0 +1,19 @@ +{ cabal, filepath, mtl, optparseApplicative, tagged, tasty +, temporary +}: + +cabal.mkDerivation (self: { + pname = "tasty-golden"; + version = "2.2"; + sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb"; + buildDepends = [ + filepath mtl optparseApplicative tagged tasty temporary + ]; + meta = { + homepage = "https://github.com/feuerbach/tasty-golden"; + description = "Golden tests support for tasty"; + 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 6d7c409ae6e..7db4b8dab48 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2048,6 +2048,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyAntXml = callPackage ../development/libraries/haskell/tasty-ant-xml {}; + tastyGolden = callPackage ../development/libraries/haskell/tasty-golden {}; + tastyHspec = callPackage ../development/libraries/haskell/tasty-hspec {}; tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; From 41a0cb7bd96c0880c36cd6d02049b2de2473e387 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:09:08 +0000 Subject: [PATCH 20/81] haskellPackages.tastyTh: New expression --- .../libraries/haskell/tasty-th/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-th/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix new file mode 100644 index 00000000000..b1b9c179dba --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -0,0 +1,15 @@ +{ cabal, languageHaskellExtract, tasty }: + +cabal.mkDerivation (self: { + pname = "tasty-th"; + version = "0.1.1"; + sha256 = "0ndwfz2gq0did6dfjilhdaxzya2qw9gckjkj090cp2rbkahywsga"; + buildDepends = [ languageHaskellExtract tasty ]; + meta = { + homepage = "http://github.com/bennofs/tasty-th"; + description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell"; + 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 7db4b8dab48..7ff91204b94 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2058,6 +2058,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; + tastyTh = callPackage ../development/libraries/haskell/tasty-th {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; From db8c22c6d38fea72318bd30027c8cbfa89ab4248 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:12:30 +0000 Subject: [PATCH 21/81] haskellPackages.tasty*: Add ocharles to the list of maintainers --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 1 + pkgs/development/libraries/haskell/tasty-hunit/default.nix | 1 + pkgs/development/libraries/haskell/tasty-smallcheck/default.nix | 1 + pkgs/development/libraries/haskell/tasty/default.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index e8a8abe3159..baabf323723 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 8bfaf3e4365..92ab3cd99b2 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "HUnit support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index b5b718cf04e..36a9c4280af 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "SmallCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 556ee2b65bf..41fa16b916d 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { description = "Modern and extensible testing framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) From 9d51b03053d15ed4ee421d88c1af0d4bc6554742 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 11:13:59 +0000 Subject: [PATCH 22/81] haskellPackages.smallcheck: Update to 1.1 --- .../development/libraries/haskell/smallcheck/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index bf4ba55e751..df2517a01ac 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,14 +2,17 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.0.4"; - sha256 = "0zqssw7r56k7gi1lxdss3f4piqa692y728rli9p81q9rbcvi3x7z"; + version = "1.1"; + sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; 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 1fa1dd24ad1c27b7f3aeaf822b09f205f83c4cd4 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 18 Nov 2013 14:00:13 +0400 Subject: [PATCH 23/81] yandex-disk: add the Yandex.Disk cloud storage client Details: http://help.yandex.com/disk/cli-clients.xml --- .../tools/filesystems/yandex-disk/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/filesystems/yandex-disk/default.nix diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix new file mode 100644 index 00000000000..31b1471fb7f --- /dev/null +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: +let + p = if stdenv.is64bit then { + arch = "x86_64"; + gcclib = "${stdenv.gcc.gcc}/lib64"; + sha256 = "1fmmlvvh97d60n9k08bn4k6ghwr3yhs8sib82025nwpw1sq08vim"; + } + else { + arch = "i386"; + gcclib = "${stdenv.gcc.gcc}/lib"; + sha256 = "3940420bd9d1fe1ecec1a117bfd9d21d545bca59f5e0a4364304ab808c976f7f"; + }; +in +stdenv.mkDerivation rec { + + name = "yandex-disk-0.1.2.481"; + + src = fetchurl { + url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + sha256 = p.sha256; + }; + + builder = writeText "builder.sh" '' + . $stdenv/setup + mkdir -pv $out/bin + mkdir -pv $out/share + mkdir -pv $out/etc + + mkdir -pv unpacked + cd unpacked + ${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd + + cp -r -t $out/bin usr/bin/* + cp -r -t $out/share usr/share/* + cp -r -t $out/etc etc/* + + sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + $out/etc/bash_completion.d/yandex-disk-completion.bash + + ${patchelf}/bin/patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${zlib}/lib:${p.gcclib}" \ + $out/bin/yandex-disk + ''; + + meta = { + homepage = http://help.yandex.com/disk/cli-clients.xml; + description = "Yandex.Disk is a free cloud file storage service"; + maintainers = with stdenv.lib.maintainers; [smironov]; + platforms = ["i686-linux" "x86_64-linux"]; + license = stdenv.lib.licenses.unfree; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23612638ceb..75e51b5a1f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10250,6 +10250,8 @@ let yafc = callPackage ../applications/networking/yafc { }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; From 2df5e8122b8f508128edc1ddbb6a554258563851 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Nov 2013 12:14:16 +0100 Subject: [PATCH 24/81] haskell-language-ecmascript: fix build The test suite fails because of . Jailbreak to support current versions of QuickCheck: . --- .../libraries/haskell/language-ecmascript/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 8fc147191ad..7e78800a7f5 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -14,6 +14,8 @@ cabal.mkDerivation (self: { dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/jswebtools/language-ecmascript"; description = "JavaScript parser and pretty-printer library"; From f73185d596b0ae3f168da8d625b633cbef203fb8 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 18 Nov 2013 16:02:33 +0100 Subject: [PATCH 25/81] nginx: adding rtmp module --- pkgs/servers/http/nginx/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 28390aa38da..48ea4260ae8 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,6 +1,15 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false, syslog ? false }: +{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat +, rtmp ? false +, fullWebDAV ? false +, syslog ? false}: let + rtmp-ext = fetchgit { + url = git://github.com/arut/nginx-dav-rtmp-module.git; + rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; + sha256 = "1dvpq1fg4rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + }; + dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; @@ -35,7 +44,8 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" + ] ++ stdenv.lib.optional fullWebDAV "--add-module=${rtmp-ext}" + ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; preConfigure = '' From 174f5813ef39ead3e42e70003242baadde92156a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 18 Nov 2013 17:04:30 +0100 Subject: [PATCH 26/81] nginx: rtmp module - commited to fast. now it works. --- pkgs/servers/http/nginx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 48ea4260ae8..f6f4415e806 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,9 +5,9 @@ let rtmp-ext = fetchgit { - url = git://github.com/arut/nginx-dav-rtmp-module.git; + url = git://github.com/arut/nginx-rtmp-module.git; rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; - sha256 = "1dvpq1fg4rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + sha256 = "03ikfd2l8mzsjwx896l07rdrw5jn7jjfdiyl572yb9jfrnk48fwi"; }; dav-ext = fetchgit { @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf"; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; + buildInputs = [ openssl zlib pcre libxml2 libxslt + ] ++ stdenv.lib.optional fullWebDAV expat; patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else []; @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${rtmp-ext}" + ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; From 08a85c2152192f231dccea4d7a3c26dd894d9812 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 13:18:58 +0100 Subject: [PATCH 27/81] Allow building/testing individual systemd units --- nixos/doc/manual/development.xml | 31 +++++++++++++ nixos/modules/system/boot/systemd.nix | 63 +++++++++++++++------------ 2 files changed, 66 insertions(+), 28 deletions(-) diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml index 6bbccac6e5c..cbf7ff8902f 100644 --- a/nixos/doc/manual/development.xml +++ b/nixos/doc/manual/development.xml @@ -652,6 +652,37 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/ + + systemd.units.unit-name.unit + + This builds the unit with the specified name. Note that + since unit names contain dots + (e.g. httpd.service), you need to put them + between quotes, like this: + + +$ nix-build -A 'config.systemd.units."httpd.service".unit' + + + You can also test individual units, without rebuilding the whole + system, by putting them in + /run/systemd/system: + + +$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service +$ systemctl daemon-reload +$ systemctl start tmp-httpd.service + + + Note that the unit must not have the same name as any unit in + /etc/systemd/system since those take + precedence over /run/systemd/system. + That’s why the unit is installed as + tmp-httpd.service here. + + + diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8895f9bf727..5c25dabd0c0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -311,8 +311,6 @@ let ''; }; - nixosUnits = mapAttrsToList makeUnit cfg.units; - units = pkgs.runCommand "units" { preferLocalBuild = true; } '' mkdir -p $out @@ -338,7 +336,7 @@ let done done - for i in ${toString nixosUnits}; do + for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do ln -s $i/* $out/ done @@ -387,32 +385,41 @@ in description = "Definition of systemd units."; default = {}; type = types.attrsOf types.optionSet; - options = { - text = mkOption { - type = types.str; - description = "Text of this systemd unit."; + options = { name, config, ... }: + { options = { + text = mkOption { + type = types.str; + description = "Text of this systemd unit."; + }; + enable = mkOption { + default = true; + type = types.bool; + description = '' + If set to false, this unit will be a symlink to + /dev/null. This is primarily useful to prevent specific + template instances (e.g. serial-getty@ttyS0) + from being started. + ''; + }; + requiredBy = mkOption { + default = []; + type = types.listOf types.string; + description = "Units that require (i.e. depend on and need to go down with) this unit."; + }; + wantedBy = mkOption { + default = []; + type = types.listOf types.string; + description = "Units that want (i.e. depend on) this unit."; + }; + unit = mkOption { + internal = true; + description = "The generated unit."; + }; + }; + config = { + unit = makeUnit name config; + }; }; - enable = mkOption { - default = true; - type = types.bool; - description = '' - If set to false, this unit will be a symlink to - /dev/null. This is primarily useful to prevent specific - template instances (e.g. serial-getty@ttyS0) - from being started. - ''; - }; - requiredBy = mkOption { - default = []; - type = types.listOf types.string; - description = "Units that require (i.e. depend on and need to go down with) this unit."; - }; - wantedBy = mkOption { - default = []; - type = types.listOf types.string; - description = "Units that want (i.e. depend on) this unit."; - }; - }; }; systemd.packages = mkOption { From f8a034172a42bf1f6b436df2e45677bd972d777f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 15:42:05 +0100 Subject: [PATCH 28/81] Fix broken Conflicts options --- nixos/modules/system/boot/kernel.nix | 6 ++---- nixos/modules/tasks/kbd.nix | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 006909fbd0c..64d4c33c965 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -230,10 +230,8 @@ in { description = "Load Kernel Modules"; wantedBy = [ "sysinit.target" "multi-user.target" ]; before = [ "sysinit.target" "shutdown.target" ]; - unitConfig = - { DefaultDependencies = "no"; - Conflicts = "shutdown.target"; - }; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = "no"; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 9f294a5f93e..1083fb784fc 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -55,9 +55,9 @@ in { description = "Setup Virtual Console"; wantedBy = [ "sysinit.target" "multi-user.target" ]; before = [ "sysinit.target" "shutdown.target" ]; + conflicts = [ "shutdown.target" ]; unitConfig = { DefaultDependencies = "no"; - Conflicts = "shutdown.target"; ConditionPathExists = "/dev/tty1"; }; serviceConfig = From 5620e69b5dfce29f1759ec653d0f26745239f2af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 15:45:24 +0100 Subject: [PATCH 29/81] Apply better type checking to unitConfig/serviceConfig/... In particular, complain if two modules define the same systemd option. --- .../system/boot/systemd-unit-options.nix | 24 ++++-- nixos/modules/system/boot/systemd.nix | 78 +++++++++---------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index a1faea886f9..cb116e9e92a 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -14,6 +14,16 @@ let in if errors == [] then true else builtins.trace (concatStringsSep "\n" errors) false; + unitOption = mkOptionType { + name = "systemd option"; + merge = loc: defs: + let defs' = getValues defs; + in + if isList (head defs') + then concatLists defs' + else mergeOneOption loc defs; + }; + in rec { unitOptions = { @@ -112,7 +122,7 @@ in rec { unitConfig = mkOption { default = {}; example = { RequiresMountsFor = "/data"; }; - type = types.attrs; + type = types.attrsOf unitOption; description = '' Each attribute in this set specifies an option in the [Unit] section of the unit. See @@ -137,7 +147,7 @@ in rec { environment = mkOption { default = {}; - type = types.attrs; + type = types.attrs; # FIXME example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; @@ -159,7 +169,7 @@ in rec { { StartLimitInterval = 10; RestartSec = 5; }; - type = types.addCheck types.attrs checkService; + type = types.addCheck (types.attrsOf unitOption) checkService; description = '' Each attribute in this set specifies an option in the [Service] section of the unit. See @@ -263,7 +273,7 @@ in rec { socketConfig = mkOption { default = {}; example = { ListenStream = "/run/my-socket"; }; - type = types.attrs; + type = types.attrsOf unitOption; description = '' Each attribute in this set specifies an option in the [Socket] section of the unit. See @@ -280,7 +290,7 @@ in rec { timerConfig = mkOption { default = {}; example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; }; - type = types.attrs; + type = types.attrsOf unitOption; description = '' Each attribute in this set specifies an option in the [Timer] section of the unit. See @@ -328,7 +338,7 @@ in rec { mountConfig = mkOption { default = {}; example = { DirectoryMode = "0775"; }; - type = types.attrs; + type = types.attrsOf unitOption; description = '' Each attribute in this set specifies an option in the [Mount] section of the unit. See @@ -352,7 +362,7 @@ in rec { automountConfig = mkOption { default = {}; example = { DirectoryMode = "0775"; }; - type = types.attrs; + type = types.attrsOf unitOption; description = '' Each attribute in this set specifies an option in the [Automount] section of the unit. See diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 5c25dabd0c0..31e795ea2d0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -160,16 +160,43 @@ let }; serviceConfig = { name, config, ... }: { - config = { - # Default path for systemd services. Should be quite minimal. - path = - [ pkgs.coreutils - pkgs.findutils - pkgs.gnugrep - pkgs.gnused - systemd - ]; - }; + config = mkMerge + [ { # Default path for systemd services. Should be quite minimal. + path = + [ pkgs.coreutils + pkgs.findutils + pkgs.gnugrep + pkgs.gnused + systemd + ]; + environment.PATH = config.path; + environment.LD_LIBRARY_PATH = ""; + } + (mkIf (config.preStart != "") + { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' + #! ${pkgs.stdenv.shell} -e + ${config.preStart} + ''; + }) + (mkIf (config.script != "") + { serviceConfig.ExecStart = makeJobScript "${name}-start" '' + #! ${pkgs.stdenv.shell} -e + ${config.script} + '' + " " + config.scriptArgs; + }) + (mkIf (config.postStart != "") + { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' + #! ${pkgs.stdenv.shell} -e + ${config.postStart} + ''; + }) + (mkIf (config.postStop != "") + { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' + #! ${pkgs.stdenv.shell} -e + ${config.postStop} + ''; + }) + ]; }; mountConfig = { name, config, ... }: { @@ -223,41 +250,10 @@ let ${attrsToSection def.unitConfig} [Service] - Environment=PATH=${def.path} - Environment=LD_LIBRARY_PATH= ${let env = cfg.globalEnvironment // def.environment; in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)} ${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"} ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"} - - ${optionalString (def.preStart != "") '' - ExecStartPre=${makeJobScript "${name}-pre-start" '' - #! ${pkgs.stdenv.shell} -e - ${def.preStart} - ''} - ''} - - ${optionalString (def.script != "") '' - ExecStart=${makeJobScript "${name}-start" '' - #! ${pkgs.stdenv.shell} -e - ${def.script} - ''} ${def.scriptArgs} - ''} - - ${optionalString (def.postStart != "") '' - ExecStartPost=${makeJobScript "${name}-post-start" '' - #! ${pkgs.stdenv.shell} -e - ${def.postStart} - ''} - ''} - - ${optionalString (def.postStop != "") '' - ExecStopPost=${makeJobScript "${name}-post-stop" '' - #! ${pkgs.stdenv.shell} -e - ${def.postStop} - ''} - ''} - ${attrsToSection def.serviceConfig} ''; }; From 33cb0bbb4b18ae1c1a5762b9f9f3f46c7008d7fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 15:48:37 +0100 Subject: [PATCH 30/81] Use types.lines for script/preStart/postStart/postStop --- .../system/boot/systemd-unit-options.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index cb116e9e92a..d30a80a6f06 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -47,7 +47,7 @@ in rec { requires = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' Start the specified units when this unit is started, and stop this unit when the specified units are stopped or fail. @@ -56,7 +56,7 @@ in rec { wants = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' Start the specified units when this unit is started. ''; @@ -64,7 +64,7 @@ in rec { after = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' If the specified units are started at the same time as this unit, delay this unit until they have started. @@ -73,7 +73,7 @@ in rec { before = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' If the specified units are started at the same time as this unit, delay them until this unit has started. @@ -82,7 +82,7 @@ in rec { bindsTo = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' Like ‘requires’, but in addition, if the specified units unexpectedly disappear, this unit will be stopped as well. @@ -91,7 +91,7 @@ in rec { partOf = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' If the specified units are stopped or restarted, then this unit is stopped or restarted as well. @@ -100,7 +100,7 @@ in rec { conflicts = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = '' If the specified units are started, then this unit is stopped and vice versa. @@ -109,13 +109,13 @@ in rec { requiredBy = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = "Units that require (i.e. depend on and need to go down with) this unit."; }; wantedBy = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; description = "Units that want (i.e. depend on) this unit."; }; @@ -179,7 +179,7 @@ in rec { }; script = mkOption { - type = types.str; + type = types.lines; default = ""; description = "Shell commands executed as the service's main process."; }; @@ -191,7 +191,7 @@ in rec { }; preStart = mkOption { - type = types.string; + type = types.lines; default = ""; description = '' Shell commands executed before the service's main process @@ -200,7 +200,7 @@ in rec { }; postStart = mkOption { - type = types.string; + type = types.lines; default = ""; description = '' Shell commands executed after the service's main process @@ -209,7 +209,7 @@ in rec { }; postStop = mkOption { - type = types.string; + type = types.lines; default = ""; description = '' Shell commands executed after the service's main process @@ -262,7 +262,7 @@ in rec { listenStreams = mkOption { default = []; - type = types.listOf types.string; + type = types.listOf types.str; example = [ "0.0.0.0:993" "/run/my-socket" ]; description = '' For each item in this list, a ListenStream From 8951be2d805cfb03b98900530a0bdb64146111a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 15:51:21 +0100 Subject: [PATCH 31/81] Allow overrides to work for unit options --- nixos/modules/system/boot/systemd-unit-options.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index d30a80a6f06..4eb3f1a43a6 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -17,11 +17,13 @@ let unitOption = mkOptionType { name = "systemd option"; merge = loc: defs: - let defs' = getValues defs; + let + defs' = filterOverrides defs; + defs'' = getValues defs'; in - if isList (head defs') - then concatLists defs' - else mergeOneOption loc defs; + if isList (head defs'') + then concatLists defs'' + else mergeOneOption loc defs'; }; in rec { From dc87f8e0809d2c4453b8f6460e33a879af098574 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 16:26:39 +0100 Subject: [PATCH 32/81] Check whether fileSystems defines the root FS --- nixos/modules/system/boot/stage-1.nix | 5 +++++ nixos/modules/tasks/filesystems.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b2b66280372..7f7184b1e45 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -330,6 +330,11 @@ in config = { + assertions = singleton + { assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems); + message = "The ‘fileSystems’ option does not specify your root file system."; + }; + system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; system.build.extraUtils = extraUtils; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 3f484045ed4..b0bcd2eb373 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -81,6 +81,7 @@ in options = { fileSystems = mkOption { + default = {}; example = { "/".device = "/dev/hda1"; "/data" = { From 2b0aea17934fda4aca24d4b6b99f0b9c24486ff7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 16:51:39 +0100 Subject: [PATCH 33/81] Allow running NixOS services outside of systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The attribute ‘config.systemd.services..runner’ generates a script that runs the service outside of systemd. This is useful for testing, and also allows NixOS services to be used outside of NixOS. For instance, given a configuration file foo.nix: { config, pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql92; services.postgresql.dataDir = "/tmp/postgres"; } you can build and run PostgreSQL as follows: $ nix-build -A config.systemd.services.postgresql.runner -I nixos-config=./foo.nix $ ./result This will run the service's ExecStartPre, ExecStart, ExecStartPost and ExecStopPost commands in an appropriate environment. It doesn't work well yet for "forking" services, since it can't track the main process. It also doesn't work for services that assume they're always executed by root. --- nixos/modules/module-list.nix | 1 + .../modules/services/databases/postgresql.nix | 9 +- nixos/modules/testing/service-runner.nix | 114 ++++++++++++++++++ 3 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/testing/service-runner.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 09625511bba..caba5ef18c3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -274,6 +274,7 @@ ./tasks/network-interfaces.nix ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix + ./testing/service-runner.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 73447e3cf0d..a1ab1c92b8f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -181,8 +181,13 @@ in # Initialise the database. if ! test -e ${cfg.dataDir}; then mkdir -m 0700 -p ${cfg.dataDir} - chown -R postgres ${cfg.dataDir} - su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root' + if [ "$(id -u)" = 0 ]; then + chown -R postgres ${cfg.dataDir} + su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root' + else + # For non-root operation. + initdb + fi rm -f ${cfg.dataDir}/*.conf touch "${cfg.dataDir}/.first_startup" fi diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix new file mode 100644 index 00000000000..6f17ed77dad --- /dev/null +++ b/nixos/modules/testing/service-runner.nix @@ -0,0 +1,114 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + makeScript = name: service: pkgs.writeScript "${name}-runner" + '' + #! ${pkgs.perl}/bin/perl -w -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl + + use File::Slurp; + + sub run { + my ($cmd) = @_; + my @args = split " ", $cmd; + my $prog; + if (substr($args[0], 0, 1) eq "@") { + $prog = substr($args[0], 1); + shift @args; + } else { + $prog = $args[0]; + } + my $pid = fork; + if ($pid == 0) { + setpgrp; # don't receive SIGINT etc. from terminal + exec { $prog } @args; + die "failed to exec $prog\n"; + } elsif (!defined $pid) { + die "failed to fork: $!\n"; + } + return $pid; + }; + + sub run_wait { + my ($cmd) = @_; + my $pid = run $cmd; + die if waitpid($pid, 0) != $pid; + return $?; + }; + + # Set the environment. FIXME: escaping. + foreach my $key (keys %ENV) { + next if $key eq 'LOCALE_ARCHIVE'; + delete $ENV{$key}; + } + ${concatStrings (mapAttrsToList (n: v: '' + $ENV{'${n}'} = '${v}'; + '') service.environment)} + + # Run the ExecStartPre program. FIXME: this could be a list. + my $preStart = '${service.serviceConfig.ExecStartPre or ""}'; + if ($preStart ne "") { + print STDERR "running ExecStartPre: $preStart\n"; + my $res = run_wait $preStart; + die "$0: ExecStartPre failed with status $res\n" if $res; + }; + + # Run the ExecStart program. + my $cmd = '${service.serviceConfig.ExecStart}'; + print STDERR "running ExecStart: $cmd\n"; + my $mainPid = run $cmd; + $ENV{'MAINPID'} = $mainPid; + + # Catch SIGINT, propagate to the main program. + sub intHandler { + print STDERR "got SIGINT, stopping service...\n"; + kill 'INT', $mainPid; + }; + $SIG{'INT'} = \&intHandler; + $SIG{'QUIT'} = \&intHandler; + + # Run the ExecStartPost program. + my $postStart = '${service.serviceConfig.ExecStartPost or ""}'; + if ($postStart ne "") { + print STDERR "running ExecStartPost: $postStart\n"; + my $res = run_wait $postStart; + die "$0: ExecStartPost failed with status $res\n" if $res; + } + + # Wait for the main program to exit. + die if waitpid($mainPid, 0) != $mainPid; + my $mainRes = $?; + + # Run the ExecStopPost program. + my $postStop = '${service.serviceConfig.ExecStopPost or ""}'; + if ($postStop ne "") { + print STDERR "running ExecStopPost: $postStop\n"; + my $res = run_wait $postStop; + die "$0: ExecStopPost failed with status $res\n" if $res; + } + + exit($mainRes & 127 ? 255 : $mainRes << 8); + ''; + +in + +{ + options = { + systemd.services = mkOption { + options = + { config, name, ... }: + { options.runner = mkOption { + internal = true; + description = '' + A script that runs the service outside of systemd, + useful for testing or for using NixOS services outside + of NixOS. + ''; + }; + config.runner = makeScript name config; + }; + }; + }; +} From 886b9e27a6a34f714eca5f5e750884a1ac57e810 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 17:00:24 +0100 Subject: [PATCH 34/81] httpd.nix: Support non-root operation --- nixos/modules/services/web-servers/apache-httpd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 90094889348..cdb42fa7308 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -628,10 +628,10 @@ in preStart = '' mkdir -m 0750 -p ${mainCfg.stateDir} - chown root.${mainCfg.group} ${mainCfg.stateDir} + [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir} ${optionalString version24 '' mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" - chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" + [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" ''} mkdir -m 0700 -p ${mainCfg.logDir} @@ -659,6 +659,7 @@ in serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}"; serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop"; serviceConfig.Type = "forking"; + serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid"; serviceConfig.Restart = "always"; }; From 678bcc6d4d3f02ad738d408816c00091edd9d874 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 17:06:40 +0100 Subject: [PATCH 35/81] firefox: Update to 25.0.1 --- .../applications/networking/browsers/firefox/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 45606c9af82..1f37911b832 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,12 +15,11 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let optional = stdenv.lib.optional; -in rec { +rec { - firefoxVersion = "25.0"; + firefoxVersion = "25.0.1"; - xulVersion = "25.0"; # this attribute is used by other packages + xulVersion = "25.0.1"; # this attribute is used by other packages src = fetchurl { @@ -30,7 +29,7 @@ in rec { # Fall back to this url for versions not available at releases.mozilla.org. "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "854722e283659d2b6b2eacd38f757b3c5b63a448"; + sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3"; }; commonConfigureFlags = From 1ce709ee005a3310b7fab8ee4b5de824474252bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 17:33:20 +0100 Subject: [PATCH 36/81] polkit: The rule file needs to end in .rules Otherwise it's ignored. --- nixos/modules/security/polkit.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 940e87e0b02..614e10cd8f3 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -58,18 +58,15 @@ in # The polkit daemon reads action/rule files environment.pathsToLink = [ "/share/polkit-1" ]; - # PolKit rules for NixOS - environment.etc = [ { - source = pkgs.writeText "10-nixos.conf" - '' - polkit.addAdminRule(function(action, subject) { - return ["${cfg.adminIdentities}"]; - }); + # PolKit rules for NixOS. + environment.etc."polkit-1/rules.d/10-nixos.rules".text = + '' + polkit.addAdminRule(function(action, subject) { + return ["${cfg.adminIdentities}"]; + }); - ${cfg.extraConfig} - ''; #TODO: validation on compilation (at least against typos) - target = "polkit-1/rules.d/10-nixos.conf"; - } ]; + ${cfg.extraConfig} + ''; #TODO: validation on compilation (at least against typos) services.dbus.packages = [ pkgs.polkit ]; From 7ea47df0a4b2154f9a1a46a0c7d105805bfbde3a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 17:45:31 +0100 Subject: [PATCH 37/81] polkit: Fix authenticating as a wheel user In Javascript-based PolKit, "unix-user:0;unix-group:wheel" is not valid; it should be a list "unix-user:0", "unix-group:wheel". --- nixos/modules/security/polkit.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 614e10cd8f3..e81a4d95f05 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -33,9 +33,9 @@ in }; security.polkit.adminIdentities = mkOption { - type = types.str; - default = "unix-user:0;unix-group:wheel"; - example = ""; + type = types.listOf types.str; + default = [ "unix-user:0" "unix-group:wheel" ]; + example = [ "unix-user:alice" "unix-group:admin" ]; description = '' Specifies which users are considered “administrators”, for those @@ -62,7 +62,7 @@ in environment.etc."polkit-1/rules.d/10-nixos.rules".text = '' polkit.addAdminRule(function(action, subject) { - return ["${cfg.adminIdentities}"]; + return [${concatStringsSep ", " (map (i: "\"${i}\"") cfg.adminIdentities)}]; }); ${cfg.extraConfig} From bc56bb7546dc49178100eab4b82fcc2bb4e87e48 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 18:01:07 +0100 Subject: [PATCH 38/81] polkit: Add some examples --- nixos/modules/security/polkit.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index e81a4d95f05..dbec4ad98d1 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -23,7 +23,15 @@ in default = ""; example = '' - TODO + /* Log authorization checks. */ + polkit.addRule(function(action, subject) { + polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid); + }); + + /* Allow any local user to do anything (dangerous!). */ + polkit.addRule(function(action, subject) { + if (subject.local) return "yes"; + }); ''; description = '' From 3343716c7f5f060effa5c7aa46d627d339070070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 18 Nov 2013 20:37:40 +0100 Subject: [PATCH 39/81] teamviewer8: wrap daemon so teamviewer actually works --- .../networking/remote/teamviewer/8.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 8113e33e0a7..f580b6ae7a9 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -1,12 +1,6 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper -, bash }: +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper, libXau +, bash, patchelf }: -# Work in progress. - -# It doesn't want to start unless teamviewerd is running as root. -# I haven't tried to make the daemon run. - -assert stdenv.system == "i686-linux"; let topath = "${wine}/bin"; @@ -17,10 +11,10 @@ stdenv.mkDerivation { name = "teamviewer-8.0.17147"; src = fetchurl { url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb"; - sha256 = "01iynk954pphl5mq4avs843xyzvdfzng1lpsy7skgwvw0k9cx5ab"; + sha256 = "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper patchelf ]; unpackPhase = '' ar x $src @@ -39,6 +33,10 @@ stdenv.mkDerivation { $out/share/teamviewer8/tv_bin/script/teamviewer EOF chmod +x $out/bin/teamviewer + + patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd + ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ ''; meta = { From 368ce9b70b1fa78b5d83735c587ec12e4e957e1d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 18 Nov 2013 20:39:17 +0100 Subject: [PATCH 40/81] Add Fuze for Linux 1.0.5 --- .../instant-messengers/fuze/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/fuze/default.nix diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix new file mode 100644 index 00000000000..61b440a26dc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr +, libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib +, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper, cacert +}: +let + curl_custom = + stdenv.lib.overrideDerivation curl (args: { + configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ; + } ); +in +stdenv.mkDerivation { + name = "fuze-1.0.5"; + src = fetchurl { + url = http://apt.fuzebox.com/apt/pool/lucid/main/f/fuzelinuxclient/fuzelinuxclient_1.0.5.lucid_amd64.deb; + sha256 = "0gvxc8qj526cigr1lif8vdn1aawj621camkc8kvps23r7zijhnqv"; + }; + buildInputs = [ dpkg makeWrapper ]; + libPath = + stdenv.lib.makeLibraryPath [ + openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom + libX11 libXmu libXv qt4 libXtst mesa stdenv.gcc.gcc zlib + gnome.GConf libidn rtmpdump c-ares openldap + ]; + buildCommand = '' + dpkg-deb -x $src . + mkdir -p $out/lib $out/bin + cp -R usr/lib/fuzebox $out/lib + + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib/fuzebox:$libPath \ + $out/lib/fuzebox/FuzeLinuxApp + + wrapProgram $out/lib/fuzebox/FuzeLinuxApp --prefix LD_LIBRARY_PATH : $libPath + for f in $out/lib/fuzebox/*.so.*; do + patchelf \ + --set-rpath $out/lib/fuzebox:$libPath \ + $f + done + + ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8 + ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8 + + ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze + ''; + + meta = { + description = "Fuze for Linux"; + homepage = http://www.fuzebox.com; + license = "unknown"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd1fbe2c400..bc6c4f4e858 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7922,6 +7922,8 @@ let gtksharp = gtksharp1; }; + fuze = callPackage ../applications/networking/instant-messengers/fuze {}; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_6 = callPackage ../applications/graphics/gimp { From c2ea1f50ba2531b7326240bde13a62fd387afcb1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 18 Nov 2013 20:41:11 +0100 Subject: [PATCH 41/81] Add assertion for x86_64-linux for Fuze package. --- pkgs/applications/networking/instant-messengers/fuze/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 61b440a26dc..9ccada87fe2 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -2,6 +2,7 @@ , libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib , gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper, cacert }: +assert stdenv.system == "x86_64-linux"; let curl_custom = stdenv.lib.overrideDerivation curl (args: { From 522275f2979369da4b196aecf3705b3eef93a553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 18 Nov 2013 06:52:19 +0100 Subject: [PATCH 42/81] qmmp: update 0.7.0 -> 0.7.3 The included changes seems to be only fixes, see http://qmmp.ylsoftware.com/ --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6a1e4e7ea83..8cb64820295 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -28,11 +28,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-0.7.0"; + name = "qmmp-0.7.3"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0g8qcs82y3dy06lsgam2w6gh2ccx0frlw9fp4xg947vi3a16g6ig"; + sha256 = "0qjmnyq3qmrm510g3lsa6vd80nmbz0859pwhnaaa19ah0jhf3r2p"; }; buildInputs = From c41cf22b623ace09919600b6baf7f21536a95c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 18 Nov 2013 06:54:56 +0100 Subject: [PATCH 43/81] xmlrpc-c: update 1.25.25 -> 1.25.26 From http://xmlrpc-c.sourceforge.net/change_super_stable.html: Release 1.25.26, released September 29, 2013. Fix interpretation of dateTime.iso8601 variant with timezone information. As broken, it would add up to a second to the correct datetime or reject the message claiming that it has invalid syntax. Always broken (recognition of the timezone variant was introduced in Xmlrpc-c 1.20 (September 2009). --- pkgs/development/libraries/xmlrpc-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 4a208dbc64e..ef7a65599a9 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.25.25"; + name = "xmlrpc-c-1.25.26"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "1sk33q4c6liza920rp4w803cfq0a79saq7fg1yjsp8hks7q011ml"; + sha256 = "1f82vsdkldhk1sfqyh6z0ylp5769x4fx3rnd2hw0c6fhx8swcmgj"; }; buildInputs = [ curl ]; From b09f8110dbcb8bc8a1fcdb3e9a5dddb0956aba96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 Nov 2013 15:23:30 -0500 Subject: [PATCH 44/81] nspr: Bump to 4.10.2 Signed-off-by: Shea Levy --- pkgs/development/interpreters/python/wrapper.nix | 5 +++++ pkgs/development/libraries/nspr/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 34af23740d5..a408397ef89 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -22,6 +22,11 @@ rm -f "$out/bin/$prg" makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" done + + if [ -f ${python}/nix-support/setup-hook ]; then + mkdir -p $out/nix-support/ + ln -sv ${python}/nix-support/setup-hook $out/nix-support + fi '' + postBuild; }) // { inherit python; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 80368031349..2b6f952696c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.1"; in +let version = "4.10.2"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7"; + sha1 = "650e4aa35d58624bc1083ed585c81c4af09cf23c"; }; preConfigure = "cd nspr"; From 2909634cacd987550c626176c0ef4684a0f0f93a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 18 Nov 2013 15:39:13 -0500 Subject: [PATCH 45/81] nss: Bump Signed-off-by: Shea Levy --- pkgs/development/libraries/nss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 49f3754bc14..bc361b39dd6 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,17 +11,17 @@ let secLoadPatch = fetchurl { name = "security_load.patch"; - urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch; + urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3-1/85_security_load.patch; sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds"; }; in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_2_RTM/src/${name}.tar.gz"; - sha1 = "2d900c296bf11deabbf833ebd6ecdea549c97a5f"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_3_RTM/src/${name}.tar.gz"; + sha1 = "1d0f6707eda35f6c7be92fe2b0537dc090a8f203"; }; buildInputs = [ nspr perl zlib sqlite ]; From 9fc575367d31455434295656725b1534c38aabbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 19 Nov 2013 01:13:32 +0100 Subject: [PATCH 46/81] prey: specify sha256 for fetchgit --- pkgs/tools/security/prey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index fe71806301d..0333e931858 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -10,6 +10,7 @@ let modulesSrc = fetchgit { url = "git://github.com/prey/prey-bash-client-modules.git"; rev = "aba260ef110834cb2e92923a31f50c15970639ee"; + sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; }; in stdenv.mkDerivation rec { name = "prey-bash-client-${version}"; From 544475cb45d3dc38ff91f2f7cd28fd826d00a1a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Nov 2013 14:44:05 +0100 Subject: [PATCH 47/81] mkDerivation: Set meta.position to the source file of the derivation This requires Nix 1.7. --- pkgs/stdenv/generic/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fcd7439e97e..a139d47a8cc 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -20,6 +20,8 @@ let allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); + stdenvGenerator = setupScript: rec { # The stdenv that we are producing. @@ -51,12 +53,20 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: + let + pos = + if attrs.meta.description or null != null then + unsafeGetAttrPos "description" attrs.meta + else + unsafeGetAttrPos "name" attrs; + pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; + in if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then - throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" + throw "package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate" else if !allowBroken && attrs.meta.broken or false then - throw "you can't use package ‘${attrs.name}’ because it has been marked as broken" + throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - throw "the package ‘${attrs.name}’ is not supported on ‘${result.system}’" + throw "the package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’" else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) @@ -89,8 +99,11 @@ let # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for - # queries. - meta = attrs.meta or {}; + # queries. We also a meta.position attribute here to + # identify the source location of the package. + meta = attrs.meta or {} // (if pos != null then { + position = pos.file + ":" + (toString pos.line); + } else {}); passthru = attrs.passthru or {}; } // # Pass through extra attributes that are not inputs, but From 06fe4d9904e7b79f8b2cd94761237b72431acc62 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 19 Nov 2013 09:04:32 -0500 Subject: [PATCH 48/81] Partial revert of b09f8110dbcb8bc8a1fcdb3e9a5dddb0956aba96 Didn't mean to commit this change Signed-off-by: Shea Levy --- pkgs/development/interpreters/python/wrapper.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index a408397ef89..34af23740d5 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -22,11 +22,6 @@ rm -f "$out/bin/$prg" makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" done - - if [ -f ${python}/nix-support/setup-hook ]; then - mkdir -p $out/nix-support/ - ln -sv ${python}/nix-support/setup-hook $out/nix-support - fi '' + postBuild; }) // { inherit python; From 934c46183997a157fac661a2f873c231a71e953f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 02:27:43 +0100 Subject: [PATCH 49/81] xfce4-xkb-plugin: Add package Allows you to setup and use multiple keyboard layouts. --- pkgs/desktops/xfce/common.nix | 1 + pkgs/desktops/xfce/default.nix | 3 ++- .../xfce/panel-plugins/xfce4-xkb-plugin.nix | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix index a7e64707f91..c9d8c150565 100644 --- a/pkgs/desktops/xfce/common.nix +++ b/pkgs/desktops/xfce/common.nix @@ -68,6 +68,7 @@ xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f812336ee7f..aebbff9b7be 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -55,7 +55,8 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix new file mode 100644 index 00000000000..51f30ed796e --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel +, gtk, libxklavier, librsvg, libwnck +}: + +stdenv.mkDerivation rec { + p_name = "xfce4-xkb-plugin"; + ver_maj = "0.5"; + ver_min = "4.3"; + + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0v9r0w9m5lxrzmz12f8w67l781lsywy9p1vixgn4xq6z5sxh2j6a"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk + libxklavier librsvg libwnck ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "Allows you to setup and use multiple keyboard layouts"; + platforms = stdenv.lib.platforms.linux; + }; +} From bc05abe5c30489136eb9e34386f05d15ef8becc0 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 02:52:10 +0100 Subject: [PATCH 50/81] xfce4-datetime-plugin: Add package Shows the date and time in the panel, and a calendar appears when you left-click on it. --- pkgs/desktops/xfce/common.nix | 1 + pkgs/desktops/xfce/default.nix | 1 + .../panel-plugins/xfce4-datetime-plugin.nix | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix index c9d8c150565..9f048b18c06 100644 --- a/pkgs/desktops/xfce/common.nix +++ b/pkgs/desktops/xfce/common.nix @@ -69,6 +69,7 @@ xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index aebbff9b7be..ede7ffb6c49 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -57,6 +57,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix new file mode 100644 index 00000000000..267a8b77ff1 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel +, gtk }: + +stdenv.mkDerivation rec { + p_name = "xfce4-datetime-plugin"; + ver_maj = "0.6"; + ver_min = "1"; + + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "06xvh22y5y0bcy7zb9ylvjpcl09wdyb751r7gwyg7m3h44f0qd7v"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "Shows the date and time in the panel, and a calendar appears when you left-click on it"; + platforms = stdenv.lib.platforms.linux; + }; +} From fa52e46203837f9d81f561b4ea92c1e4702040ad Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 12 Nov 2013 04:06:42 +0100 Subject: [PATCH 51/81] xfce4-session: Don't set $PATH in xflock4 script This makes Xfce4's "Lock Screen" action button actually work when xscreensaver is installed and the daemon is running. --- pkgs/desktops/xfce/core/xfce4-session.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 2f05f521e01..a419f076b6e 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { polkit ]; + preBuild = '' + sed '/^PATH=/d' -i scripts/xflock4 + sed '/^export PATH$/d' -i scripts/xflock4 + ''; + configureFlags = [ "--with-xsession-prefix=$(out)" ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; From 4df8a04f143ce7042299cdb35dc007f57cb8ff34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Nov 2013 19:09:18 +0100 Subject: [PATCH 52/81] Don't include the code name in the EBS AMI name --- nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 2e7a3273118..541eadd7b8c 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -67,7 +67,7 @@ m.run_command("mkdir -p /mnt/etc/nixos") m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable") m.run_command("nix-channel --update") m.run_command("nixos-rebuild switch") -version = m.run_command("nixos-version", capture_stdout=True).replace('"', '').rstrip() +version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0] print >> sys.stderr, "NixOS version is {0}".format(version) m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") m.run_command("nixos-install") From e511edfedfeafb317e44d5f6fd107c612e189e4f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 19 Nov 2013 21:32:18 +0100 Subject: [PATCH 53/81] Update s3http --- pkgs/top-level/node-packages-generated.nix | 686 +++++++++++++-------- 1 file changed, 424 insertions(+), 262 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 841061bd77a..8ee7cca49e5 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -135,13 +135,13 @@ passthru.names = [ "adm-zip" ]; }; by-spec."almond"."*" = - self.by-version."almond"."0.2.6"; - by-version."almond"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "almond-0.2.6"; + self.by-version."almond"."0.2.7"; + by-version."almond"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "almond-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/almond/-/almond-0.2.6.tgz"; - sha1 = "7165a9246894239efe74ec4a41d6c97898eafc05"; + url = "http://registry.npmjs.org/almond/-/almond-0.2.7.tgz"; + sha1 = "9cda2385a3198cbd8fea8e0c6edc79d5a2c354c2"; }) ]; buildInputs = @@ -152,7 +152,7 @@ ]; passthru.names = [ "almond" ]; }; - "almond" = self.by-version."almond"."0.2.6"; + "almond" = self.by-version."almond"."0.2.7"; by-spec."amdefine"."*" = self.by-version."amdefine"."0.1.0"; by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -721,14 +721,14 @@ }; by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; - by-spec."blueimp-md5"."~1.0.3" = - self.by-version."blueimp-md5"."1.0.3"; - by-version."blueimp-md5"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "blueimp-md5-1.0.3"; + by-spec."blueimp-md5"."~1.1.0" = + self.by-version."blueimp-md5"."1.1.0"; + by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "blueimp-md5-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.0.3.tgz"; - sha1 = "932f8fa56652701823cee46cecc0477c88333ab2"; + url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz"; + sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd"; }) ]; buildInputs = @@ -1144,6 +1144,24 @@ ]; passthru.names = [ "bunyan" ]; }; + by-spec."bytes"."0.1.0" = + self.by-version."bytes"."0.1.0"; + by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "bytes-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; by-spec."bytes"."0.2.0" = self.by-version."bytes"."0.2.0"; by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1402,13 +1420,13 @@ passthru.names = [ "chmodr" ]; }; by-spec."chokidar"."~0.7.0" = - self.by-version."chokidar"."0.7.0"; - by-version."chokidar"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.7.0"; + self.by-version."chokidar"."0.7.1"; + by-version."chokidar"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.7.0.tgz"; - sha1 = "bfaa9bdf30c0921dbe0a98bd93a3e06a5d5814e5"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.7.1.tgz"; + sha1 = "a5a5b2d5df265f96d90b9888f45a9e604254112c"; }) ]; buildInputs = @@ -1437,33 +1455,14 @@ ]; passthru.names = [ "chownr" ]; }; - by-spec."clean-css"."1.0.x" = - self.by-version."clean-css"."1.0.12"; - by-version."clean-css"."1.0.12" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-1.0.12"; + by-spec."clean-css"."2.0.x" = + self.by-version."clean-css"."2.0.2"; + by-version."clean-css"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-1.0.12.tgz"; - sha1 = "e6e0d977860466363d9110a17423d27cd6874300"; - }) - ]; - buildInputs = - (self.nativeDeps."clean-css" or []); - deps = [ - self.by-version."commander"."1.3.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "clean-css" ]; - }; - by-spec."clean-css"."~2.0.0" = - self.by-version."clean-css"."2.0.1"; - by-version."clean-css"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.1.tgz"; - sha1 = "12770bc087fa8287174626db3d46de278b7c4f86"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.2.tgz"; + sha1 = "69ca3c124f4a476a154c081e9d5a54f1bcdec9c4"; }) ]; buildInputs = @@ -1475,6 +1474,8 @@ ]; passthru.names = [ "clean-css" ]; }; + by-spec."clean-css"."~2.0.0" = + self.by-version."clean-css"."2.0.2"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1825,24 +1826,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."0.5.1" = - self.by-version."commander"."0.5.1"; - by-version."commander"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "commander-0.5.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-0.5.1.tgz"; - sha1 = "08477afb326d1adf9d4ee73af7170c70caa14f95"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; by-spec."commander"."0.6.1" = self.by-version."commander"."0.6.1"; by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { @@ -1880,8 +1863,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."1.3.x" = - self.by-version."commander"."1.3.2"; by-spec."commander"."2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."2.0.x" = @@ -2006,6 +1987,32 @@ ]; passthru.names = [ "connect" ]; }; + by-spec."connect"."2.3.x" = + self.by-version."connect"."2.3.9"; + by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.3.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; + }) + ]; + buildInputs = + (self.nativeDeps."connect" or []); + deps = [ + self.by-version."qs"."0.4.2" + self.by-version."formidable"."1.0.11" + self.by-version."crc"."0.2.0" + self.by-version."cookie"."0.0.4" + self.by-version."bytes"."0.1.0" + self.by-version."send"."0.0.3" + self.by-version."fresh"."0.1.0" + self.by-version."debug"."0.7.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; by-spec."connect"."2.7.5" = self.by-version."connect"."2.7.5"; by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage { @@ -2208,6 +2215,24 @@ ]; passthru.names = [ "constantinople" ]; }; + by-spec."cookie"."0.0.4" = + self.by-version."cookie"."0.0.4"; + by-version."cookie"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "cookie-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; + }) + ]; + buildInputs = + (self.nativeDeps."cookie" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cookie" ]; + }; by-spec."cookie"."0.0.5" = self.by-version."cookie"."0.0.5"; by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -2335,13 +2360,13 @@ passthru.names = [ "cookiejar" ]; }; by-spec."cookies".">= 0.2.2" = - self.by-version."cookies"."0.3.6"; - by-version."cookies"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "cookies-0.3.6"; + self.by-version."cookies"."0.3.7"; + by-version."cookies"."0.3.7" = lib.makeOverridable self.buildNodePackage { + name = "cookies-0.3.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookies/-/cookies-0.3.6.tgz"; - sha1 = "1b5e4bd66fc732ea2e8b5087a8fb3718b4ec8597"; + url = "http://registry.npmjs.org/cookies/-/cookies-0.3.7.tgz"; + sha1 = "89ff5ecd74a2d4e1224bdb775db83c407fb6774f"; }) ]; buildInputs = @@ -2414,6 +2439,24 @@ passthru.names = [ "coveralls" ]; }; "coveralls" = self.by-version."coveralls"."2.3.0"; + by-spec."crc"."0.2.0" = + self.by-version."crc"."0.2.0"; + by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "crc-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; + }) + ]; + buildInputs = + (self.nativeDeps."crc" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crc" ]; + }; by-spec."crossroads"."~0.12.0" = self.by-version."crossroads"."0.12.0"; by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { @@ -2471,6 +2514,24 @@ ]; passthru.names = [ "cryptiles" ]; }; + by-spec."crypto"."0.0.3" = + self.by-version."crypto"."0.0.3"; + by-version."crypto"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "crypto-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; + }) + ]; + buildInputs = + (self.nativeDeps."crypto" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crypto" ]; + }; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2671,6 +2732,24 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."0.5.0" = + self.by-version."debug"."0.5.0"; + by-version."debug"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; by-spec."debug"."0.7.0" = self.by-version."debug"."0.7.0"; by-version."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -2693,6 +2772,8 @@ self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; + by-spec."debug"."~0.7.3" = + self.by-version."debug"."0.7.4"; by-spec."debuglog"."0.0.2" = self.by-version."debuglog"."0.0.2"; by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -3297,6 +3378,33 @@ ]; passthru.names = [ "events.node" ]; }; + by-spec."everyauth"."0.4.5" = + self.by-version."everyauth"."0.4.5"; + by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "everyauth-0.4.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; + }) + ]; + buildInputs = + (self.nativeDeps."everyauth" or []); + deps = [ + self.by-version."oauth"."0.9.10" + 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."node-swt"."0.1.1" + self.by-version."node-wsfederation"."0.1.1" + self.by-version."debug"."0.5.0" + self.by-version."express"."3.4.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "everyauth" ]; + }; by-spec."express"."*" = self.by-version."express"."3.4.4"; by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage { @@ -3378,6 +3486,8 @@ ]; passthru.names = [ "express" ]; }; + by-spec."express"."3.4.4" = + self.by-version."express"."3.4.4"; by-spec."express"."3.x" = self.by-version."express"."3.4.4"; by-spec."express"."~3.1.1" = @@ -4558,7 +4668,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.by-version."clean-css"."2.0.1" + self.by-version."clean-css"."2.0.2" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4568,13 +4678,13 @@ }; "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0"; by-spec."grunt-contrib-jshint"."*" = - self.by-version."grunt-contrib-jshint"."0.7.1"; - by-version."grunt-contrib-jshint"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-jshint-0.7.1"; + self.by-version."grunt-contrib-jshint"."0.7.2"; + by-version."grunt-contrib-jshint"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-jshint-0.7.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.7.1.tgz"; - sha1 = "b636e1100b5804c4be56ad88d8a574ef0637d97a"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.7.2.tgz"; + sha1 = "29859ddcf42e7f6c54c43fe75da3c4bd90384a8e"; }) ]; buildInputs = @@ -4587,7 +4697,7 @@ ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.1"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.2"; by-spec."grunt-contrib-less"."*" = self.by-version."grunt-contrib-less"."0.8.2"; by-version."grunt-contrib-less"."0.8.2" = lib.makeOverridable self.buildNodePackage { @@ -4601,7 +4711,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.by-version."less"."1.5.0" + self.by-version."less"."1.5.1" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4801,14 +4911,14 @@ ]; passthru.names = [ "has-color" ]; }; - by-spec."hasher"."~1.1.4" = - self.by-version."hasher"."1.1.4"; - by-version."hasher"."1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "hasher-1.1.4"; + by-spec."hasher"."~1.2.0" = + self.by-version."hasher"."1.2.0"; + by-version."hasher"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "hasher-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/hasher/-/hasher-1.1.4.tgz"; - sha1 = "cb0a6c480bfa402adfbd4208452c64c684da9490"; + url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }) ]; buildInputs = @@ -4920,7 +5030,7 @@ (self.nativeDeps."hipache" or []); deps = [ self.by-version."read-installed"."0.2.2" - self.by-version."http-proxy"."0.10.0" + self.by-version."http-proxy"."0.10.3" self.by-version."redis"."0.8.6" self.by-version."lru-cache"."2.2.4" self.by-version."optimist"."0.3.7" @@ -5039,25 +5149,6 @@ ]; passthru.names = [ "hooks" ]; }; - by-spec."htdigest"."1.0.7" = - self.by-version."htdigest"."1.0.7"; - by-version."htdigest"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "htdigest-1.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/htdigest/-/htdigest-1.0.7.tgz"; - sha1 = "0c55ba3a018855e134fd82f7a4aa6235167181b2"; - }) - ]; - buildInputs = - (self.nativeDeps."htdigest" or []); - deps = [ - self.by-version."commander"."0.5.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "htdigest" ]; - }; by-spec."htmlparser2"."2.x" = self.by-version."htmlparser2"."2.6.0"; by-version."htmlparser2"."2.6.0" = lib.makeOverridable self.buildNodePackage { @@ -5101,55 +5192,35 @@ ]; passthru.names = [ "htmlparser2" ]; }; - by-spec."htpasswd"."1.1.0" = - self.by-version."htpasswd"."1.1.0"; - by-version."htpasswd"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "htpasswd-1.1.0"; + by-spec."http-auth"."2.0.7" = + self.by-version."http-auth"."2.0.7"; + by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage { + name = "http-auth-2.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/htpasswd/-/htpasswd-1.1.0.tgz"; - sha1 = "4e9e6a2203405005aa1ae7dee80d3b6d6a8d93d6"; - }) - ]; - buildInputs = - (self.nativeDeps."htpasswd" or []); - deps = [ - self.by-version."commander"."0.5.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "htpasswd" ]; - }; - by-spec."http-auth"."1.2.7" = - self.by-version."http-auth"."1.2.7"; - by-version."http-auth"."1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "http-auth-1.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-auth/-/http-auth-1.2.7.tgz"; - sha1 = "d15b9c08646c9fdcc4f92edb9888f57cb6cf9ca7"; + url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; }) ]; buildInputs = (self.nativeDeps."http-auth" or []); deps = [ - self.by-version."node-uuid"."1.2.0" - self.by-version."htpasswd"."1.1.0" - self.by-version."htdigest"."1.0.7" + self.by-version."coffee-script"."1.6.3" + self.by-version."node-uuid"."1.4.1" ]; peerDependencies = [ ]; passthru.names = [ "http-auth" ]; }; by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = - self.by-version."http-proxy"."0.10.0"; - by-version."http-proxy"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "http-proxy-0.10.0"; + self.by-version."http-proxy"."0.10.3"; + by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { + name = "http-proxy-0.10.3"; src = [ (fetchgit { url = "git://github.com/samalba/node-http-proxy"; - rev = "5a5a41081165435867b4e5d3a2a269d099d21c56"; - sha256 = "ea865a91272903ed8506aa572e6a2b58f83f78e9da52f265c732d85a4f7b4380"; + rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5"; + sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f"; }) ]; buildInputs = @@ -5166,26 +5237,6 @@ }; by-spec."http-proxy"."~0.10" = self.by-version."http-proxy"."0.10.3"; - by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { - name = "http-proxy-0.10.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.3.tgz"; - sha1 = "72ca9d503a75e064650084c58ca11b82e4b0196d"; - }) - ]; - buildInputs = - (self.nativeDeps."http-proxy" or []); - deps = [ - self.by-version."colors"."0.6.2" - self.by-version."optimist"."0.3.7" - self.by-version."pkginfo"."0.2.3" - self.by-version."utile"."0.1.7" - ]; - peerDependencies = [ - ]; - passthru.names = [ "http-proxy" ]; - }; by-spec."http-signature"."0.9.11" = self.by-version."http-signature"."0.9.11"; by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage { @@ -5261,7 +5312,7 @@ buildInputs = (self.nativeDeps."i18next" or []); deps = [ - self.by-version."cookies"."0.3.6" + self.by-version."cookies"."0.3.7" ]; peerDependencies = [ ]; @@ -5536,13 +5587,13 @@ passthru.names = [ "isbinaryfile" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.1.44"; - by-version."istanbul"."0.1.44" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.1.44"; + self.by-version."istanbul"."0.1.45"; + by-version."istanbul"."0.1.45" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.1.45"; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.44.tgz"; - sha1 = "7ea1d55e34234e7b7d8f2f61cceb29b59439d983"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.45.tgz"; + sha1 = "905f360213d1aefbcb7bad6ef823015ce7d6f9fd"; }) ]; buildInputs = @@ -5564,9 +5615,9 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.1.44"; + "istanbul" = self.by-version."istanbul"."0.1.45"; by-spec."istanbul"."~0.1.41" = - self.by-version."istanbul"."0.1.44"; + self.by-version."istanbul"."0.1.45"; by-spec."jade"."*" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -5950,7 +6001,7 @@ deps = [ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.0" + self.by-version."chokidar"."0.7.1" self.by-version."glob"."3.1.21" self.by-version."minimatch"."0.2.12" self.by-version."http-proxy"."0.10.3" @@ -5996,7 +6047,7 @@ buildInputs = (self.nativeDeps."karma-coverage" or []); deps = [ - self.by-version."istanbul"."0.1.44" + self.by-version."istanbul"."0.1.45" self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ @@ -6072,7 +6123,7 @@ deps = [ self.by-version."di"."0.0.1" self.by-version."socket.io"."0.9.16" - self.by-version."chokidar"."0.7.0" + self.by-version."chokidar"."0.7.1" self.by-version."glob"."3.1.21" self.by-version."minimatch"."0.2.12" self.by-version."http-proxy"."0.10.3" @@ -6087,7 +6138,7 @@ 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-2" + self.by-version."phantomjs"."1.9.2-3" ]; peerDependencies = [ ]; @@ -6362,13 +6413,13 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; by-spec."less"."~1.5.0" = - self.by-version."less"."1.5.0"; - by-version."less"."1.5.0" = lib.makeOverridable self.buildNodePackage { - name = "less-1.5.0"; + self.by-version."less"."1.5.1"; + by-version."less"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "less-1.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.5.0.tgz"; - sha1 = "a97be1d2607577f5f33632a7e098024ab828f699"; + url = "http://registry.npmjs.org/less/-/less-1.5.1.tgz"; + sha1 = "633313130efd12a3b78c56aa799dab3eeffffff4"; }) ]; buildInputs = @@ -6377,7 +6428,7 @@ self.by-version."mime"."1.2.11" self.by-version."request"."2.27.0" self.by-version."mkdirp"."0.3.5" - self.by-version."clean-css"."1.0.12" + self.by-version."clean-css"."2.0.2" self.by-version."source-map"."0.1.31" ]; peerDependencies = [ @@ -6552,14 +6603,14 @@ }; by-spec."lodash"."~1.3.1" = self.by-version."lodash"."1.3.1"; - by-spec."lodash"."~2.2.1" = - self.by-version."lodash"."2.2.1"; - by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-2.2.1"; + by-spec."lodash"."~2.3.0" = + self.by-version."lodash"."2.3.0"; + by-version."lodash"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; - sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.3.0.tgz"; + sha1 = "dfbdac99cf87a59a022c474730570d8716c267dd"; }) ]; buildInputs = @@ -6704,13 +6755,13 @@ by-spec."lru-cache"."~2.3.1" = self.by-version."lru-cache"."2.3.1"; by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.3"; - by-version."mailcomposer"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "mailcomposer-0.2.3"; + self.by-version."mailcomposer"."0.2.4"; + by-version."mailcomposer"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "mailcomposer-0.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.3.tgz"; - sha1 = "763b96561159ea233cb29ab6995ee45e78be5918"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.4.tgz"; + sha1 = "bdda60a5810a66305529ce002ff3f7f063692222"; }) ]; buildInputs = @@ -7900,13 +7951,13 @@ passthru.names = [ "node-gyp" ]; }; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.6.0"; - by-version."node-inspector"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.6.0"; + self.by-version."node-inspector"."0.6.1"; + by-version."node-inspector"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.6.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.0.tgz"; - sha1 = "4981dbbaf3cc3cc7a75040af17c4120c559ffbb0"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.1.tgz"; + sha1 = "9ed1b1dd4410fe4f2929b93c98c55378a3edd6f0"; }) ]; buildInputs = @@ -7918,12 +7969,31 @@ self.by-version."glob"."3.2.7" self.by-version."rc"."0.3.1" self.by-version."strong-data-uri"."0.1.0" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.6.0"; + "node-inspector" = self.by-version."node-inspector"."0.6.1"; + by-spec."node-swt".">=0.1.1" = + self.by-version."node-swt"."0.1.1"; + by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-swt-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + sha1 = "af0903825784be553b93dbae57d99d59060585dd"; + }) + ]; + buildInputs = + (self.nativeDeps."node-swt" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-swt" ]; + }; by-spec."node-syslog"."1.1.3" = self.by-version."node-syslog"."1.1.3"; by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { @@ -7994,24 +8064,6 @@ passthru.names = [ "node-uuid" ]; }; "node-uuid" = self.by-version."node-uuid"."1.4.1"; - by-spec."node-uuid"."1.2.0" = - self.by-version."node-uuid"."1.2.0"; - by-version."node-uuid"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; - sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; - }; by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -8048,8 +8100,29 @@ ]; passthru.names = [ "node-uuid" ]; }; + by-spec."node-uuid"."1.4.1" = + self.by-version."node-uuid"."1.4.1"; by-spec."node-uuid"."~1.4.0" = self.by-version."node-uuid"."1.4.1"; + by-spec."node-wsfederation".">=0.1.1" = + self.by-version."node-wsfederation"."0.1.1"; + by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-wsfederation-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; + }) + ]; + buildInputs = + (self.nativeDeps."node-wsfederation" or []); + deps = [ + self.by-version."xml2js"."0.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-wsfederation" ]; + }; by-spec."node.extend"."1.0.0" = self.by-version."node.extend"."1.0.0"; by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -8081,8 +8154,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.3" - self.by-version."simplesmtp"."0.3.14" + self.by-version."mailcomposer"."0.2.4" + self.by-version."simplesmtp"."0.3.15" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -8249,7 +8322,7 @@ self.by-version."chownr"."0.0.1" self.by-version."npmlog"."0.0.6" self.by-version."ansi"."0.2.1" - self.by-version."npm-registry-client"."0.2.29" + 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."glob"."3.2.7" @@ -8274,7 +8347,7 @@ passthru.names = [ "npm" ]; }; "npm" = self.by-version."npm"."1.3.14"; - by-spec."npm"."~1.3.13" = + by-spec."npm"."~1.3.14" = self.by-version."npm"."1.3.14"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; @@ -8305,13 +8378,13 @@ passthru.names = [ "npm-registry-client" ]; }; by-spec."npm-registry-client"."~0.2.29" = - self.by-version."npm-registry-client"."0.2.29"; - by-version."npm-registry-client"."0.2.29" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.29"; + self.by-version."npm-registry-client"."0.2.30"; + by-version."npm-registry-client"."0.2.30" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.2.30"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.29.tgz"; - sha1 = "66ff2766f0c61d41e8a6139d3692d8833002c686"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.30.tgz"; + sha1 = "f01cae5c51aa0a1c5dc2516cbad3ebde068d3eaa"; }) ]; buildInputs = @@ -8500,6 +8573,24 @@ ]; passthru.names = [ "nssocket" ]; }; + by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = + self.by-version."oauth"."0.9.10"; + by-version."oauth"."0.9.10" = lib.makeOverridable self.buildNodePackage { + name = "oauth-0.9.10"; + src = [ + (fetchurl { + url = "https://github.com/ciaranj/node-oauth/tarball/master"; + sha256 = "c0c59efccbd34819ed51e912bc74b872e812a0157784dc8604434378a14cf64a"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "oauth" ]; + }; by-spec."oauth-sign"."~0.2.0" = self.by-version."oauth-sign"."0.2.0"; by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -8648,6 +8739,24 @@ ]; passthru.names = [ "opener" ]; }; + by-spec."openid".">=0.2.0" = + self.by-version."openid"."0.5.5"; + by-version."openid"."0.5.5" = lib.makeOverridable self.buildNodePackage { + name = "openid-0.5.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz"; + sha1 = "a4ce534ca82d68f81ccf45109fc92b4547b2cdd1"; + }) + ]; + buildInputs = + (self.nativeDeps."openid" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "openid" ]; + }; by-spec."optimist"."*" = self.by-version."optimist"."0.6.0"; by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { @@ -8943,13 +9052,13 @@ passthru.names = [ "pause" ]; }; by-spec."phantomjs"."~1.9" = - self.by-version."phantomjs"."1.9.2-2"; - by-version."phantomjs"."1.9.2-2" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-2"; + 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"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-2.tgz"; - sha1 = "256228800bc18292395eb0f54b14cd42c8093889"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-3.tgz"; + sha1 = "621d95c8888234b76b2a626940b0d7c4462a5780"; }) ]; buildInputs = @@ -8960,7 +9069,7 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.0.3" + self.by-version."rimraf"."2.2.2" self.by-version."which"."1.0.5" ]; peerDependencies = [ @@ -8968,7 +9077,7 @@ passthru.names = [ "phantomjs" ]; }; by-spec."phantomjs"."~1.9.1-2" = - self.by-version."phantomjs"."1.9.2-2"; + self.by-version."phantomjs"."1.9.2-3"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -9253,7 +9362,7 @@ self.by-version."q"."0.9.7"; by-spec."q"."~0.9.6" = self.by-version."q"."0.9.7"; - by-spec."qs"."0.4.x" = + by-spec."qs"."0.4.2" = self.by-version."qs"."0.4.2"; by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "qs-0.4.2"; @@ -9271,6 +9380,8 @@ ]; passthru.names = [ "qs" ]; }; + by-spec."qs"."0.4.x" = + self.by-version."qs"."0.4.2"; by-spec."qs"."0.5.1" = self.by-version."qs"."0.5.1"; by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -9403,14 +9514,14 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raven"."~0.5.4" = - self.by-version."raven"."0.5.6"; - by-version."raven"."0.5.6" = lib.makeOverridable self.buildNodePackage { - name = "raven-0.5.6"; + by-spec."raven"."~0.6.0" = + self.by-version."raven"."0.6.0"; + by-version."raven"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "raven-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raven/-/raven-0.5.6.tgz"; - sha1 = "ff0704be90911694c0866893e0f8f2fb8422e063"; + url = "http://registry.npmjs.org/raven/-/raven-0.6.0.tgz"; + sha1 = "440aa58143e95760cb7b73b7b23b3429ca9b5576"; }) ]; buildInputs = @@ -10275,28 +10386,35 @@ self.by-version."rimraf"."2.1.4"; by-spec."rimraf"."~2.2.0" = self.by-version."rimraf"."2.2.2"; + by-spec."rimraf"."~2.2.2" = + self.by-version."rimraf"."2.2.2"; by-spec."s3http"."*" = - self.by-version."s3http"."0.0.2"; - by-version."s3http"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "s3http-0.0.2"; + self.by-version."s3http"."0.0.3"; + by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "s3http-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/s3http/-/s3http-0.0.2.tgz"; - sha1 = "e0c8bdee66981c6ddef2dfc41bb1fe51765984e5"; + url = "http://registry.npmjs.org/s3http/-/s3http-0.0.3.tgz"; + sha1 = "4d8965ae1c62c7fc2bbdc3fb6b95067429aac87a"; }) ]; buildInputs = (self.nativeDeps."s3http" or []); deps = [ self.by-version."aws-sdk"."1.12.0" - self.by-version."commander"."0.5.1" - self.by-version."http-auth"."1.2.7" + self.by-version."commander"."2.0.0" + self.by-version."http-auth"."2.0.7" + self.by-version."express"."3.4.4" + self.by-version."everyauth"."0.4.5" + self.by-version."string"."1.6.1" + self.by-version."util"."0.4.9" + self.by-version."crypto"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "s3http" ]; }; - "s3http" = self.by-version."s3http"."0.0.2"; + "s3http" = self.by-version."s3http"."0.0.3"; by-spec."sauce-connect-launcher"."~0.1.10" = self.by-version."sauce-connect-launcher"."0.1.11"; by-version."sauce-connect-launcher"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -10484,6 +10602,28 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.0.3" = + self.by-version."send"."0.0.3"; + by-version."send"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz"; + sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = [ + self.by-version."debug"."0.7.4" + self.by-version."mime"."1.2.6" + self.by-version."fresh"."0.1.0" + self.by-version."range-parser"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; by-spec."send"."0.1.0" = self.by-version."send"."0.1.0"; by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10646,13 +10786,13 @@ by-spec."signals"."~1.0.0" = self.by-version."signals"."1.0.0"; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.14"; - by-version."simplesmtp"."0.3.14" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.14"; + self.by-version."simplesmtp"."0.3.15"; + by-version."simplesmtp"."0.3.15" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.15"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.14.tgz"; - sha1 = "48feabc1a87113adb1a2508a000ed50d19d229dc"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.15.tgz"; + sha1 = "345da4c54a3c7f9a2cddfe9110672df2b432231d"; }) ]; buildInputs = @@ -11022,7 +11162,7 @@ ]; passthru.names = [ "ssh-agent" ]; }; - by-spec."ssh2"."~0.2.12" = + by-spec."ssh2"."~0.2.14" = self.by-version."ssh2"."0.2.14"; by-version."ssh2"."0.2.14" = lib.makeOverridable self.buildNodePackage { name = "ssh2-0.2.14"; @@ -11157,6 +11297,24 @@ ]; passthru.names = [ "streamsearch" ]; }; + by-spec."string"."1.6.1" = + self.by-version."string"."1.6.1"; + by-version."string"."1.6.1" = lib.makeOverridable self.buildNodePackage { + name = "string-1.6.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz"; + sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; + }) + ]; + buildInputs = + (self.nativeDeps."string" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "string" ]; + }; by-spec."stringify-object"."~0.1.4" = self.by-version."stringify-object"."0.1.7"; by-version."stringify-object"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -11195,13 +11353,13 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.40.2"; - by-version."stylus"."0.40.2" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.40.2"; + self.by-version."stylus"."0.40.3"; + by-version."stylus"."0.40.3" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.40.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.40.2.tgz"; - sha1 = "4b4f7a2d8a6aeecfe0a62ef0e2d8a45a78b1e2bd"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.40.3.tgz"; + sha1 = "17e566274ebd6e56f23a8928fa38626c4260ded3"; }) ]; buildInputs = @@ -11216,7 +11374,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.40.2"; + "stylus" = self.by-version."stylus"."0.40.3"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -11982,13 +12140,13 @@ passthru.names = [ "underscore.string" ]; }; by-spec."ungit"."*" = - self.by-version."ungit"."0.5.0"; - by-version."ungit"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.5.0"; + self.by-version."ungit"."0.6.0"; + by-version."ungit"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.5.0.tgz"; - sha1 = "89abd98e200c6bf7b102d3efc45eebf79ac1cdcc"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.6.0.tgz"; + sha1 = "fffc26cafc5d138bc6b3585fef3f15744f5f3d31"; }) ]; buildInputs = @@ -11996,7 +12154,7 @@ deps = [ self.by-version."express"."3.4.4" self.by-version."superagent"."0.15.7" - self.by-version."lodash"."2.2.1" + self.by-version."lodash"."2.3.0" self.by-version."temp"."0.6.0" self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.4.0" @@ -12014,19 +12172,19 @@ self.by-version."optimist"."0.6.0" self.by-version."crossroads"."0.12.0" self.by-version."signals"."1.0.0" - self.by-version."hasher"."1.1.4" - self.by-version."blueimp-md5"."1.0.3" + self.by-version."hasher"."1.2.0" + self.by-version."blueimp-md5"."1.1.0" self.by-version."color"."0.4.4" self.by-version."keen.io"."0.0.3" self.by-version."getmac"."1.0.6" self.by-version."deep-extend"."0.2.6" - self.by-version."raven"."0.5.6" + self.by-version."raven"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.by-version."ungit"."0.5.0"; + "ungit" = self.by-version."ungit"."0.6.0"; by-spec."unzip"."~0.1.7" = self.by-version."unzip"."0.1.9"; by-version."unzip"."0.1.9" = lib.makeOverridable self.buildNodePackage { @@ -12094,7 +12252,7 @@ ]; passthru.names = [ "useragent" ]; }; - by-spec."util".">= 0.4.9" = + by-spec."util"."0.4.9" = self.by-version."util"."0.4.9"; by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage { name = "util-0.4.9"; @@ -12113,6 +12271,8 @@ ]; 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 { @@ -12434,7 +12594,7 @@ 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-2" + self.by-version."phantomjs"."1.9.2-3" self.by-version."tmp"."0.0.21" self.by-version."follow-redirects"."0.0.3" ]; @@ -12760,6 +12920,8 @@ }; by-spec."xml2js".">= 0.0.1" = self.by-version."xml2js"."0.2.8"; + by-spec."xml2js".">=0.1.7" = + self.by-version."xml2js"."0.2.8"; by-spec."xmlbuilder"."*" = self.by-version."xmlbuilder"."0.4.3"; by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage { From a0a068060b3875cb9eea7ae09c75597cc416d450 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 19 Nov 2013 15:59:22 -0500 Subject: [PATCH 54/81] npm2nix/patchSrc minor fix Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 14 +++++++------- pkgs/top-level/node-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 8ee7cca49e5..6ebf0ecfafc 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -3383,7 +3383,7 @@ by-version."everyauth"."0.4.5" = lib.makeOverridable self.buildNodePackage { name = "everyauth-0.4.5"; src = [ - (fetchurl { + (self.patchSource fetchurl { url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; }) @@ -8424,13 +8424,13 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.3.0"; - by-version."npm2nix"."5.3.0" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.3.0"; + self.by-version."npm2nix"."5.3.1"; + by-version."npm2nix"."5.3.1" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.3.0.tgz"; - sha1 = "ff5d66824033dd8815cc74c661ea30956eba2664"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.3.1.tgz"; + sha1 = "f1a334e794e4faba821629d84c4d3d3555b6a15d"; }) ]; buildInputs = @@ -8449,7 +8449,7 @@ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.3.0"; + "npm2nix" = self.by-version."npm2nix"."5.3.1"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 56bcda57aa0..3daaa262280 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -19,7 +19,7 @@ rec { unpackFile ${src} chmod -R +w */ mv */ package 2>/dev/null || true - sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json + sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: \"*\"/" package/package.json mv */ $out ''; From 76ab3916de3862c41f5ee6f17726290fe5b5c387 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 13 Nov 2013 02:34:49 +0000 Subject: [PATCH 55/81] awesome-3-5: add expression and nixos module --- .../window-managers/awesome/3.4.nix | 50 +++++ .../window-managers/awesome/default.nix | 97 ++++++---- pkgs/development/libraries/lgi/default.nix | 24 +++ .../libraries/xcb-util-cursor/default.nix | 38 ++++ .../xcb-util-cursor/m4/ax_compare_version.m4 | 174 ++++++++++++++++++ .../xcb-util-cursor/m4/xcb_util_common.m4 | 44 +++++ .../m4/xcb_util_m4_with_include_path.m4 | 24 +++ pkgs/top-level/all-packages.nix | 13 +- 8 files changed, 425 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/window-managers/awesome/3.4.nix create mode 100644 pkgs/development/libraries/lgi/default.nix create mode 100644 pkgs/development/libraries/xcb-util-cursor/default.nix create mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 create mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 create mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix new file mode 100644 index 00000000000..b21f73ddc54 --- /dev/null +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua +, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil +, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau +, libXdmcp, pixman, doxygen +, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl +, docbook_xml_dtd_45, libxslt, coreutils, which }: + +let + version = "3.4.13"; +in + +stdenv.mkDerivation rec { + name = "awesome-${version}"; + + src = fetchurl { + url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; + sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; + }; + + buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango + imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm + libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen + asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; + + # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in + # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as + # dependencies. + prePatch = '' + # Fix the tab completion (supporting bash or zsh) + sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in + # Remove the 'root' PATH override (I don't know why they have that) + sed /WHOAMI/d -i utils/awsetbg + # Russian manpages fail to be generated: + # [ 56%] Generating manpages/ru/man1/awesome.1.xml + # asciidoc: ERROR: : line 3: name section expected + # asciidoc: FAILED: : line 3: section title expected + # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 + substituteInPlace CMakeLists.txt \ + --replace "set(AWE_MAN_LANGS it es fr de ru)" \ + "set(AWE_MAN_LANGS it es fr de)" + ''; + + meta = { + homepage = http://awesome.naquadah.org/; + description = "Highly configurable, dynamic window manager for X"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d29aec9976f..b8e1257c5bc 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,51 +1,72 @@ -{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua -, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil -, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau -, libXdmcp, pixman, doxygen -, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils, which }: +{ stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs +, xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode +, which, dbus, nettools, git, asciidoc, doxygen }: let - version = "3.4.13"; + version = "3.5.2"; in stdenv.mkDerivation rec { name = "awesome-${version}"; src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; + url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; + sha256 = "11iya03yzr8sa3snmywlw22ayg0d3dcy49pi8fz0bycf5aq6b38q"; }; - - buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm - libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; - # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in - # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as - # dependencies. - prePatch = '' - # Fix the tab completion (supporting bash or zsh) - sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in - # Remove the 'root' PATH override (I don't know why they have that) - sed /WHOAMI/d -i utils/awsetbg - # Russian manpages fail to be generated: - # [ 56%] Generating manpages/ru/man1/awesome.1.xml - # asciidoc: ERROR: : line 3: name section expected - # asciidoc: FAILED: : line 3: section title expected - # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 - substituteInPlace CMakeLists.txt \ - --replace "set(AWE_MAN_LANGS it es fr de ru)" \ - "set(AWE_MAN_LANGS it es fr de)" - ''; - - meta = { - homepage = http://awesome.naquadah.org/; + meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://awesome.naquadah.org/; + license = "GPLv2+"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; }; -} + + buildInputs = [ + asciidoc + cairo + cmake + dbus + doxygen + gdk_pixbuf + git + imagemagick + lgi + libpthreadstubs + libstartup_notification + libxdg_basedir + lua + makeWrapper + nettools + pango + pkgconfig + xcb-util-cursor + xlibs.libXau + xlibs.libXdmcp + xlibs.libxcb + xlibs.xcbutil + xlibs.xcbutilimage + xlibs.xcbutilkeysyms + xlibs.xcbutilrenderutil + xlibs.xcbutilwm + ]; + AWESOME_IGNORE_LGI = 1; + + LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; + LUA_PATH = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"; + + postInstall = '' + wrapProgram $out/bin/awesome \ + --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \ + --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \ + --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \ + --set LD_LIBRARY_PATH "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ + --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" + + wrapProgram $out/bin/awesome-client \ + --prefix PATH : "${which}/bin" + ''; +} diff --git a/pkgs/development/libraries/lgi/default.nix b/pkgs/development/libraries/lgi/default.nix new file mode 100644 index 00000000000..663185831f6 --- /dev/null +++ b/pkgs/development/libraries/lgi/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }: + +stdenv.mkDerivation { + name = "lgi-0.7.2"; + + src = fetchurl { + url = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz; + sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + }; + + meta = with stdenv.lib; { + description = "Gobject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = "custom"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + + preBuild = '' + sed -i "s|/usr/local|$out|" lgi/Makefile + ''; +} diff --git a/pkgs/development/libraries/xcb-util-cursor/default.nix b/pkgs/development/libraries/xcb-util-cursor/default.nix new file mode 100644 index 00000000000..a0e71724fb9 --- /dev/null +++ b/pkgs/development/libraries/xcb-util-cursor/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, bashInteractive, autoconf, automake, libtool, pkgconfig +, git, xlibs, gnum4, libxcb, gperf }: + +stdenv.mkDerivation rec { + name = "xcb-util-cursor-0.1.1"; + + src = fetchurl { + url = "http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.1.tar.gz"; + sha256 = "0lkjbcml305imyzr80yb8spjvq6y83v2allk5gc9plkv39zag29z"; + }; + + meta = with stdenv.lib; { + description = "XCB cursor library (libxcursor port)"; + homepage = http://cgit.freedesktop.org/xcb/util-cursor; + license = licenses.mit; + maintainer = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ + autoconf + automake + gnum4 + gperf + libtool + libxcb + pkgconfig + xlibs.utilmacros + xlibs.xcbutilimage + xlibs.xcbutilrenderutil + ]; + + configurePhase = '' + sed -i '15 i\ + LT_INIT' configure.ac + ${bashInteractive}/bin/bash autogen.sh --prefix="$out" + ''; +} diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 new file mode 100644 index 00000000000..e22b50fd9fd --- /dev/null +++ b/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 @@ -0,0 +1,174 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_PROG_AWK + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 new file mode 100644 index 00000000000..f9463d37fca --- /dev/null +++ b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 @@ -0,0 +1,44 @@ +# XCB_UTIL_COMMON(xcb-required-version, xcb-proto-required-version) +# ----------------------------------------------------------------- +# +# Defines default options for xcb-util libraries. xorg/util/macros >= +# 1.6.0 is required for cross-platform compiler flags and to build +# library documentation. +# +AC_DEFUN([XCB_UTIL_COMMON], [ +m4_ifndef([AX_COMPARE_VERSION], + [m4_fatal([could not find AX_COMPARE_VERSION in macros search path])]) + +AC_REQUIRE([AC_PROG_LIBTOOL]) + +# Define header files and pkgconfig paths +xcbincludedir='${includedir}/xcb' +AC_SUBST(xcbincludedir) +pkgconfigdir='${libdir}/pkgconfig' +AC_SUBST(pkgconfigdir) + +# Check xcb version +PKG_CHECK_MODULES(XCB, xcb >= [$1]) + +# Check version of xcb-proto that xcb was compiled against +xcbproto_required=[$2] + +AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required]) +xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb` +AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", + xcbproto_ok="no") +AC_MSG_RESULT([$xcbproto_ok]) + +if test $xcbproto_ok = no; then + AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher]) +fi + +# Call macros from Xorg util-macros +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.6.0 or later before running autoconf/autogen])]) + +XORG_MACROS_VERSION([1.6.0]) +XORG_DEFAULT_OPTIONS +XORG_ENABLE_DEVEL_DOCS +XORG_WITH_DOXYGEN +]) # XCB_UTIL_COMMON diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 new file mode 100644 index 00000000000..a3ddce4a706 --- /dev/null +++ b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 @@ -0,0 +1,24 @@ +# XCB_UTIL_M4_WITH_INCLUDE_PATH +# ------------------------------ +# +# This macro attempts to locate an m4 macro processor which supports +# -I option and is only useful for modules relying on M4 in order to +# expand macros in source code files. +# +# M4: variable holding the path to an usable m4 program. +# +# This macro requires Autoconf 2.62 or later as it is relying upon +# AC_PATH_PROGS_FEATURE_CHECK macro. NOTE: As soon as the minimum +# required version of Autoconf for Xorg is bumped to 2.62, this macro +# is supposed to be shipped with xorg/util/macros. +# +AC_DEFUN([XCB_UTIL_M4_WITH_INCLUDE_PATH], [ +AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4], + [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4], + [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \ + ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], + [AC_MSG_ERROR([could not find m4 that supports -I option])], + [$PATH:/usr/gnu/bin])]) + +AC_SUBST([M4], [$ac_cv_path_M4]) +]) # XCB_UTIL_M4_WITH_INCLUDE_PATH diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23612638ceb..af67c8bd10b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,6 +4580,10 @@ let libpng = libpng12; }; + lgi = callPackage ../development/libraries/lgi { + lua = lua5_1; + }; + lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -5821,6 +5825,8 @@ let xbase = callPackage ../development/libraries/xbase { }; + xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -7388,10 +7394,15 @@ let avxsynth = callPackage ../applications/video/avxsynth { }; - awesome = callPackage ../applications/window-managers/awesome { + awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { lua = lua5; cairo = cairo.override { xcbSupport = true; }; }; + awesome-3-5 = callPackage ../applications/window-managers/awesome { + lua = lua5_1; + cairo = cairo.override { xcbSupport = true; }; + }; + awesome = awesome-3-5; baresip = callPackage ../applications/networking/instant-messengers/baresip {}; From 2bf530ab4b3bd9949949777bd913c81f4e1e4294 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Tue, 19 Nov 2013 14:44:22 +1100 Subject: [PATCH 56/81] openbox: Update to 3.5.2 --- pkgs/applications/window-managers/openbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index e8314ef1b43..487a8a5b387 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -3,7 +3,7 @@ , imlib2, pango, libstartup_notification }: stdenv.mkDerivation rec { - name = "openbox-3.5.0"; + name = "openbox-3.5.2"; buildInputs = [ pkgconfig libxml2 @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://openbox.org/dist/openbox/${name}.tar.gz"; - sha256 = "02pa1wa2rzvnq1z3xchzafc96hvp3537jh155q8acfhbacb01abg"; + sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj"; }; meta = { From 1bf33cf08394e42f9c828f85ad6fffae879c898b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 19 Nov 2013 21:36:30 +0000 Subject: [PATCH 57/81] haskellPackages.digits: New expression --- .../libraries/haskell/digits/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/digits/default.nix diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix new file mode 100644 index 00000000000..3c7c08cd296 --- /dev/null +++ b/pkgs/development/libraries/haskell/digits/default.nix @@ -0,0 +1,14 @@ +{ cabal, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "digits"; + version = "0.2"; + sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l"; + buildDepends = [ QuickCheck ]; + meta = { + description = "Converts integers to lists of digits and back"; + 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 7ff91204b94..482bee40a37 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -895,6 +895,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {}; + digits = callPackage ../development/libraries/haskell/digits {}; + dimensional = callPackage ../development/libraries/haskell/dimensional {}; dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {}; From f48af13c5ac71f4f128a73b2be1168a9b5969b33 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 8 Nov 2013 11:13:08 -0600 Subject: [PATCH 58/81] Add a nix module for AMD Hybrid Graphics --- nixos/modules/module-list.nix | 1 + .../services/hardware/amd-hybrid-graphics.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 nixos/modules/services/hardware/amd-hybrid-graphics.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index caba5ef18c3..2189d0358da 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -91,6 +91,7 @@ ./services/databases/virtuoso.nix ./services/games/ghost-one.nix ./services/hardware/acpid.nix + ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix new file mode 100644 index 00000000000..d938867186d --- /dev/null +++ b/nixos/modules/services/hardware/amd-hybrid-graphics.nix @@ -0,0 +1,39 @@ +{ config, pkgs, ... }: + +{ + + ###### interface + + options = { + + hardware.amdHybridGraphics.disable = pkgs.lib.mkOption { + default = false; + type = pkgs.lib.types.bool; + description = '' + Completely disable the AMD graphics card and use the + integrated graphics processor instead. + ''; + }; + + }; + + + ###### implementation + + config = pkgs.lib.mkIf config.hardware.amdHybridGraphics.disable { + systemd.services."amd-hybrid-graphics" = { + path = [ pkgs.bash ]; + description = "Disable AMD Card"; + after = [ "sys-kernel-debug.mount" ]; + requires = [ "sys-kernel-debug.mount" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch; exit 0'"; + ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch; exit 0'"; + }; + }; + }; + +} From c987f5c14c5abe692432372fce576d8317f2adba Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 20 Nov 2013 00:03:40 +0000 Subject: [PATCH 59/81] ttmkfdir: update URL (close #1244) --- pkgs/tools/misc/ttmkfdir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 12adb5318a8..3583b5b8f30 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { # who knows more about C/C++ .. patches = [ (fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; + url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) From a65ecb6382aaa518c6bdd31729100f69068f7721 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 19 Nov 2013 16:49:11 +0100 Subject: [PATCH 60/81] linux: Update to 3.11.8 (close #1243) --- pkgs/os-specific/linux/kernel/linux-3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 52e2032daab..5167a426310 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11.7"; + version = "3.11.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nb93pchv72c7jibv1kvkmgkg2556gb9a0xx21nf9mclf46a9dx9"; + sha256 = "0g2c7zzgsrwg6y6j8rn3sn7nx464857i7w0575b1lz24493cgdna"; }; features.iwlwifi = true; From 635ce5df889678e48aea2d23b43d4206e8a52c9c Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:55:57 +0000 Subject: [PATCH 61/81] texlive: update to latest version --- pkgs/tools/typesetting/tex/texlive/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 57f7424dc2d..8cb64f9ec42 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -6,8 +6,8 @@ rec { }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20130918.orig.tar.xz; - sha256 = "0h7x49zsd2gs8fr28f4h04dv5m8p2mpgqxk2vvl5xlf4wwxxbm2p"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20131112.orig.tar.xz; + sha256 = "1zak95xh35bnzr3hjrjaxg0yisyw8g3xcym0ywsspc4dxpn1qgk1"; }; langTexmfSrc = fetchurl { @@ -133,4 +133,3 @@ rec { platforms = platforms.unix; }; } - From 821cd1644926216827598dacd06ae5f2ae9b9036 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 Nov 2013 00:55:10 -0600 Subject: [PATCH 62/81] Upgrade Django Versions This patch pushes django 1.4.1 -> 1.4.10 and adds django 1.5.5 and django 1.6. Additionally, it creates the default django package which always points to the latest version. --- pkgs/top-level/python-packages.nix | 45 +++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75dd2bc12f0..60daca2bf50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2128,13 +2128,15 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - django = buildPythonPackage rec { + django = django_1_6; + + django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.1"; + version = "1.6"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "16s0anvpaccbqmdrhl71z73k0dy2sl166nnc2fbd5lshlgmj13ad"; + url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; + sha256 = "165bd5wmv2an9h365d12k0112z0l375dxsy7dlxa7r8kyg4gvnfk"; }; # error: invalid command 'test' @@ -2146,6 +2148,41 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + django_1_5 = buildPythonPackage rec { + name = "Django-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; + sha256 = "07fp8ycx76q2nz96mxld1svvpfsrivjgpql0mr20r7gwzcfrrrka"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + + django_1_4 = buildPythonPackage rec { + name = "Django-${version}"; + version = "1.4.10"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; + sha256 = "1pi9mi14f19xlp29j2c8dz8rs749c1m41d9j1i0b3nlz0cy0h7rx"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; django_1_3 = buildPythonPackage rec { name = "Django-1.3.7"; From 794afb0c78f68ba9bd1b35409b3cb127d056d5d2 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Mon, 18 Nov 2013 22:33:19 +0800 Subject: [PATCH 63/81] Update xonotic to 0.7. Add scheme48 1.9. --- .../development/interpreters/scheme48/default.nix | 15 +++++++++++++++ pkgs/games/xonotic/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/scheme48/default.nix diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix new file mode 100644 index 00000000000..39056717597 --- /dev/null +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "scheme48-1.9"; + + meta = { + homepage = http://s48.org/; + description = "Scheme 48"; + }; + + src = fetchurl { + url = http://s48.org/1.9/scheme48-1.9.tgz; + md5 = "b4c20057f92191d05a61fac1372878ad"; + }; +} diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 5245c12e6ce..137429cdc83 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: stdenv.mkDerivation rec { - name = "xonotic-0.5.0"; + name = "xonotic-0.7.0"; src = fetchurl { url = "http://dl.xonotic.org/${name}.zip"; - sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq"; + sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6"; }; # Commented out things needed to build cl-release because of errors. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f817a5f22a..bef1cff60ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3323,6 +3323,8 @@ let scsh = callPackage ../development/interpreters/scsh { }; + scheme48 = callPackage ../development/interpreters/scheme48 { }; + spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; From fe3253355d6343cfc5be8f999ba328336cfd12a4 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 21 Nov 2013 08:44:41 +0000 Subject: [PATCH 64/81] haskellPackages.socketActivation: New expression --- .../haskell/socket-activation/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/socket-activation/default.nix diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix new file mode 100644 index 00000000000..4309e2d3456 --- /dev/null +++ b/pkgs/development/libraries/haskell/socket-activation/default.nix @@ -0,0 +1,15 @@ +{ cabal, network, transformers }: + +cabal.mkDerivation (self: { + pname = "socket-activation"; + version = "0.1.0.0"; + sha256 = "1w10i9a10lq5gscwm1vf1w7pqkfyx3n108jw8dx4zdqhrh82lmwv"; + buildDepends = [ network transformers ]; + meta = { + homepage = "https://github.com/sakana/haskell-socket-activation"; + description = "systemd socket activation 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 7ff91204b94..85a038f8280 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1994,6 +1994,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; + socketActivation = callPackage ../development/libraries/haskell/socket-activation {}; + split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; From d93d7c645c34c2a0b7064a237c7ae44ba2c345a9 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 21 Nov 2013 08:42:54 +0000 Subject: [PATCH 65/81] haskellPackages.quickcheckInstances: New expression --- .../haskell/quickcheck-instances/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/quickcheck-instances/default.nix diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix new file mode 100644 index 00000000000..647e08718a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -0,0 +1,15 @@ +{ cabal, QuickCheck, text, time }: + +cabal.mkDerivation (self: { + pname = "quickcheck-instances"; + version = "0.3.3"; + sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72"; + buildDepends = [ QuickCheck text time ]; + meta = { + homepage = "https://github.com/aslatter/qc-instances"; + description = "Common quickcheck instances"; + 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 85a038f8280..8c289ad9bb1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1769,6 +1769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; + quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; + quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; qrencode = callPackage ../development/libraries/haskell/qrencode { From 7a18f1125ef59838a92275a2cdd3a67d7c43899e Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 18 Nov 2013 14:34:52 +0000 Subject: [PATCH 66/81] haskellPackages.ariadne: New expression and related dependencies --- .../libraries/haskell/EitherT/default.nix | 14 ++++++++++ .../libraries/haskell/ariadne/default.nix | 22 +++++++++++++++ .../libraries/haskell/bert/default.nix | 24 ++++++++++++++++ .../haskell/binary-conduit/default.nix | 20 +++++++++++++ .../libraries/haskell/filemanip/default.nix | 15 ++++++++++ .../haskell/haskell-names/default.nix | 28 +++++++++++++++++++ .../haskell/haskell-packages/default.nix | 20 +++++++++++++ .../libraries/haskell/hse-cpp/default.nix | 14 ++++++++++ .../haskell/quickcheck-assertions/default.nix | 16 +++++++++++ .../haskell/traverse-with-class/default.nix | 14 ++++++++++ .../libraries/haskell/type-eq/default.nix | 14 ++++++++++ pkgs/top-level/haskell-packages.nix | 24 ++++++++++++++++ 12 files changed, 225 insertions(+) create mode 100644 pkgs/development/libraries/haskell/EitherT/default.nix create mode 100644 pkgs/development/libraries/haskell/ariadne/default.nix create mode 100644 pkgs/development/libraries/haskell/bert/default.nix create mode 100644 pkgs/development/libraries/haskell/binary-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/filemanip/default.nix create mode 100644 pkgs/development/libraries/haskell/haskell-names/default.nix create mode 100644 pkgs/development/libraries/haskell/haskell-packages/default.nix create mode 100644 pkgs/development/libraries/haskell/hse-cpp/default.nix create mode 100644 pkgs/development/libraries/haskell/quickcheck-assertions/default.nix create mode 100644 pkgs/development/libraries/haskell/traverse-with-class/default.nix create mode 100644 pkgs/development/libraries/haskell/type-eq/default.nix diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix new file mode 100644 index 00000000000..cb2195ef6ab --- /dev/null +++ b/pkgs/development/libraries/haskell/EitherT/default.nix @@ -0,0 +1,14 @@ +{ cabal, monadControl, transformers, transformersBase }: + +cabal.mkDerivation (self: { + pname = "EitherT"; + version = "0.2.0"; + sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw"; + buildDepends = [ monadControl transformers transformersBase ]; + meta = { + description = "EitherT monad transformer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix new file mode 100644 index 00000000000..5baf9f63326 --- /dev/null +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -0,0 +1,22 @@ +{ cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts +, mtl, utf8String +}: + +cabal.mkDerivation (self: { + pname = "ariadne"; + version = "0.1.2.1"; + sha256 = "1gx6jrv3s86h02cjx8pvqyklp445ljiysx29hg39qykyhi1q5a3z"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + bert Cabal haskellNames haskellPackages haskellSrcExts mtl + utf8String + ]; + meta = { + homepage = "https://github.com/feuerbach/ariadne"; + description = "Go-to-definition for Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix new file mode 100644 index 00000000000..0ae519dde58 --- /dev/null +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -0,0 +1,24 @@ +{ cabal, async, binary, binaryConduit, conduit, mtl, network +, networkConduit, parsec, smallcheck, tasty, tastyHunit +, tastySmallcheck, time, void +}: + +cabal.mkDerivation (self: { + pname = "bert"; + version = "1.2.1.1"; + sha256 = "1g5sm23cxlzc7lqdlrjn4f89g65ia2bhr25yfh286awxf23z8pyh"; + buildDepends = [ + binary binaryConduit conduit mtl network networkConduit parsec time + void + ]; + testDepends = [ + async binary network smallcheck tasty tastyHunit tastySmallcheck + ]; + meta = { + homepage = "https://github.com/feuerbach/bert"; + description = "BERT implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix new file mode 100644 index 00000000000..0149fcabe72 --- /dev/null +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions +, vector +}: + +cabal.mkDerivation (self: { + pname = "binary-conduit"; + version = "1.2"; + sha256 = "1m58zgmivapn51gs5983vpsivzkki94kkac014mwvnp90q46nkvx"; + buildDepends = [ binary conduit vector ]; + testDepends = [ + binary conduit hspec QuickCheck quickcheckAssertions + ]; + meta = { + homepage = "http://github.com/qnikst/binary-conduit"; + description = "data serialization/deserialization conduit library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix new file mode 100644 index 00000000000..94fa68977bb --- /dev/null +++ b/pkgs/development/libraries/haskell/filemanip/default.nix @@ -0,0 +1,15 @@ +{ cabal, filepath, mtl, unixCompat }: + +cabal.mkDerivation (self: { + pname = "filemanip"; + version = "0.3.6.2"; + sha256 = "03l114rhb4f6nyzs9w14i79d7kyyq9ia542alsqpbmikm9gxm4rz"; + buildDepends = [ filepath mtl unixCompat ]; + meta = { + homepage = "https://github.com/bos/filemanip"; + description = "Expressive file and directory manipulation for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix new file mode 100644 index 00000000000..a127ade50be --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -0,0 +1,28 @@ +{ cabal, aeson, Cabal, dataLens, dataLensTemplate, filemanip +, filepath, haskellPackages, haskellSrcExts, hseCpp, mtl +, prettyShow, tagged, tasty, tastyGolden, transformers +, traverseWithClass, typeEq, uniplate, utf8String +}: + +cabal.mkDerivation (self: { + pname = "haskell-names"; + version = "0.3.1"; + sha256 = "134rxpsgki1disb24gvj1bq5xi4491k9ihb5pjhab78w4m7b99gn"; + buildDepends = [ + aeson Cabal dataLens dataLensTemplate filepath haskellPackages + haskellSrcExts hseCpp mtl tagged transformers traverseWithClass + typeEq uniplate + ]; + testDepends = [ + aeson Cabal filemanip filepath haskellPackages haskellSrcExts + hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass + uniplate utf8String + ]; + meta = { + homepage = "http://documentup.com/haskell-suite/haskell-names"; + description = "Name resolution library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix new file mode 100644 index 00000000000..598fd63306d --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, Cabal, deepseq, EitherT, filepath, haskellSrcExts +, hseCpp, mtl, optparseApplicative, tagged +}: + +cabal.mkDerivation (self: { + pname = "haskell-packages"; + version = "0.2.3.1"; + sha256 = "0sryw0gdwkgd53la6gryf7i5h8rlpys6j8nh75f9j014i4y1p0jw"; + buildDepends = [ + aeson Cabal deepseq EitherT filepath haskellSrcExts hseCpp mtl + optparseApplicative tagged + ]; + meta = { + homepage = "http://documentup.com/haskell-suite/haskell-packages"; + description = "Haskell suite library for package management and integration with Cabal"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hse-cpp/default.nix b/pkgs/development/libraries/haskell/hse-cpp/default.nix new file mode 100644 index 00000000000..1d7494308bd --- /dev/null +++ b/pkgs/development/libraries/haskell/hse-cpp/default.nix @@ -0,0 +1,14 @@ +{ cabal, cpphs, haskellSrcExts }: + +cabal.mkDerivation (self: { + pname = "hse-cpp"; + version = "0.1"; + sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0"; + buildDepends = [ cpphs haskellSrcExts ]; + meta = { + description = "Preprocess+parse haskell code"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix new file mode 100644 index 00000000000..90d26883d98 --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix @@ -0,0 +1,16 @@ +{ cabal, hspec, ieee754, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "quickcheck-assertions"; + version = "0.1.1"; + sha256 = "0hrnr17wafng7nc6d8w6pp1lygplri8xkb5380aq64zg9iik2s21"; + buildDepends = [ ieee754 QuickCheck ]; + testDepends = [ hspec ieee754 QuickCheck ]; + meta = { + homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; + description = "HUnit like assertions for QuickCheck"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix new file mode 100644 index 00000000000..12a6f393bc6 --- /dev/null +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "traverse-with-class"; + version = "0.1.1.1"; + sha256 = "0agdgnibv8q65av2fkr2qm0air8zqmygwpkl30wmay5mqqknzxiq"; + buildDepends = [ transformers ]; + meta = { + description = "Generic applicative traversals"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix new file mode 100644 index 00000000000..4a730891998 --- /dev/null +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-eq"; + version = "0.3"; + sha256 = "094m8mk4a1iiqgrnqw0yk89rimp5ffj7i4n61nx3lzxqs5mw0kws"; + meta = { + homepage = "http://github.com/glehel/type-eq"; + description = "Type equality evidence you can carry around"; + 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 e9f0aa10664..461e202bd3d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -541,6 +541,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; + ariadne = callPackage ../development/libraries/haskell/ariadne { + Cabal = self.Cabal_1_18_1_2; + }; + arithmoi = callPackage ../development/libraries/haskell/arithmoi {}; arrows = callPackage ../development/libraries/haskell/arrows {}; @@ -588,6 +592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x benchpress = callPackage ../development/libraries/haskell/benchpress {}; + bert = callPackage ../development/libraries/haskell/bert {}; + bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; bimap = callPackage ../development/libraries/haskell/bimap {}; @@ -596,6 +602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; binary = self.binary_0_7_1_0; + binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; + binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {}; @@ -959,6 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x either = callPackage ../development/libraries/haskell/either {}; + EitherT = callPackage ../development/libraries/haskell/EitherT {}; + esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; @@ -998,6 +1008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fileEmbed = callPackage ../development/libraries/haskell/file-embed {}; + filemanip = callPackage ../development/libraries/haskell/filemanip {}; + flexibleDefaults = callPackage ../development/libraries/haskell/flexible-defaults {}; filestore = callPackage ../development/libraries/haskell/filestore {}; @@ -1158,6 +1170,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mpi = pkgs.openmpi; }; + haskellNames = callPackage ../development/libraries/haskell/haskell-names {}; + + haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {}; + haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; @@ -1173,6 +1189,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hexpat = callPackage ../development/libraries/haskell/hexpat {}; + hseCpp = callPackage ../development/libraries/haskell/hse-cpp {}; + HTF = callPackage ../development/libraries/haskell/HTF {}; HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; @@ -1771,6 +1789,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; + quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; + quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; @@ -2141,6 +2161,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; + trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { parsers = self.parsers_0_9; }; @@ -2149,6 +2171,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tuple = callPackage ../development/libraries/haskell/tuple {}; + typeEq = callPackage ../development/libraries/haskell/type-eq {}; + typeEquality = callPackage ../development/libraries/haskell/type-equality {}; typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; From d14831c5daf18570a24da9cd01ff469ffb90327e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Nov 2013 12:30:04 +0100 Subject: [PATCH 67/81] zc_buildout_nix: update to 2.2.1 --- pkgs/development/python-modules/buildout-nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 26b6fb0cfcd..43e8a45c0cf 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, buildPythonPackage }: buildPythonPackage { - name = "zc.buildout-nix-2.2.0"; + name = "zc.buildout-nix-2.2.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz"; - md5 = "771dd9807da7d5ef5bb998991c5fdae1"; + url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.1.tar.gz"; + md5 = "476a06eed08506925c700109119b6e41"; }; patches = [ ./nix.patch ]; From 52d1973b3eb8ffc3dd95854a635406f45e971d0e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Nov 2013 12:33:20 +0100 Subject: [PATCH 68/81] adding zc_buildout 2.2.1 --- pkgs/top-level/python-packages.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60daca2bf50..33c562ed5ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,9 +126,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage pygobject pycairo; }; - # A patched version of buildout, useful for buildout based development on Nix - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - # packages defined here aafigure = buildPythonPackage rec { @@ -725,7 +722,26 @@ pythonPackages = modules // import ./python-packages-generated.nix { buildout = zc_buildout; buildout152 = zc_buildout152; + # A patched version of buildout, useful for buildout based development on Nix + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + zc_buildout = zc_buildout171; + zc_buildout2 = zc_buildout221; + zc_buildout221 = buildPythonPackage rec { + name = "zc.buildout-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; + md5 = "476a06eed08506925c700109119b6e41"; + }; + + meta = { + homepage = "http://www.buildout.org"; + description = "A software build and configuration system"; + license = pkgs.lib.licenses.zpt21; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; zc_buildout171 = buildPythonPackage rec { name = "zc.buildout-1.7.1"; From b6a720141ed178e80056328f0315711c73ba5fe3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 21 Nov 2013 12:33:37 +0100 Subject: [PATCH 69/81] Pillow: update to 2.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33c562ed5ee..bcba77e3e53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4319,11 +4319,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pillow = buildPythonPackage rec { - name = "Pillow-2.1.0"; + name = "Pillow-2.2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; - md5 = "ec630d8ae15d4a3c4ae7b7efdeac8200"; + md5 = "d1d20d3db5d1ab312da0951ff061e6bf"; }; buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; From 241738bca67fbbf9e097523ac501c1e9f4a8fb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 21 Nov 2013 00:25:23 +0100 Subject: [PATCH 70/81] teamviewer: pass script argument to underlying command --- pkgs/applications/networking/remote/teamviewer/8.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index f580b6ae7a9..ca938c08653 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper, libXau +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau , bash, patchelf }: let - topath = "${wine}/bin"; + topath = "${wineUnstable}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); + [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { #!${bash}/bin/sh export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer8/tv_bin/script/teamviewer + $out/share/teamviewer8/tv_bin/script/teamviewer "\$@" EOF chmod +x $out/bin/teamviewer From f77073929004259b229e178168d025417a20a508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 21 Nov 2013 00:28:31 +0100 Subject: [PATCH 71/81] curl: 7.30.0 -> 7.33.0 (CVE-2013-4545) --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 40e2d970622..3fee2507b86 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.30.0"; + name = "curl-7.33.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "04dgm9aqvplsx43n8xin5rkr8mwmc6mdd1gcp80jda5yhw1l273b"; + sha256 = "1cyiali7jq613qz5zb28myhywrdi35dngniwvknmh9lyjk6y9z8a"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From bd67a1a16ff7983923e8d5e47ab866d45b7122d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 21 Nov 2013 22:52:42 +0100 Subject: [PATCH 72/81] basex: bump 7.7 -> 7.7.2 This update brings "fixes and better CSV support": http://basex.org/about-us/news/ --- pkgs/tools/text/xml/basex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 4f120601c8e..2484aac8b0d 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7"; + name = "basex-7.7.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7/BaseX77.zip"; - sha256 = "1wnndq8lcnfx29bc3j2sgswk6dxgv2nln2chmwbf7h4a05fcavdj"; + url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; + sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; }; buildInputs = [ unzip jre ]; From fed248c78e3db25edfda4ae76c49910a9170ea46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 21 Nov 2013 23:22:06 +0100 Subject: [PATCH 73/81] sdcc: bump 3.2.0 -> 3.3.0 SDCC 3.3.0 Feature List: * Many small improvements in code generation for the z80-related ports - merged smallopts branch * lospre (currently enabled for z80-related and hc08-related ports only) - merged lospre branch * More efficient initialization of globals in z80, z180, r2k and r3ka ports. * Inclusion of tests from the gcc test suite into the sdcc regression test suite led to many bugs being found and fixed. * Split sdas390 from sdas8051 * Merged big parts of ASxxxx v5 into sdas * New pic devices (synchronization with MPLABX 1.60). (Except for very old MCU-s.) * New script which disassembles those hex files, in which MCS51 code there is. (mcs51-disasm.pl) * Added the PIC16F1788 and PIC16F1789 devices. * C11 _Alignof operator. * C11 _Alignas alignment specifier. * C11 _Static_Assert static assertion. Numerous feature requests and bug fixes are included as well. --- pkgs/development/compilers/sdcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index a22b0d9ea00..472930d047b 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex, boost, gputils ? null }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "15gdl04kqpvmwvvplss5nmp3bz8rhz48dhb0wmb2v9v9sn7qj01d"; + sha256 = "1pj4hssvq34vbryvxc2jpp2b14cgxp695ygwiax6b7l2kvr62gw7"; }; # TODO: remove this comment when gputils != null is tested From 3a4281a3c94a64482a5d45d2bb012efc1bf41256 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 Nov 2013 01:49:33 -0600 Subject: [PATCH 74/81] Update ccid to 1.4.13 --- pkgs/tools/security/ccid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 0e607092412..ad1cb6bec90 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - name = "ccid-1.4.9"; + name = "ccid-1.4.13"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/3866/${name}.tar.bz2"; - sha256 = "1dj0cw4js4ab678l94rf9p8a8gppkf1hm66qhmq5ajra6r5nv3m9"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2"; + sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar"; }; patchPhase = '' From 61b8ebc77f8fce3d4d6bbf45cac81e3a8febbab9 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 22 Nov 2013 09:41:17 +0800 Subject: [PATCH 75/81] swig: bump 2.0.4 -> 2.0.11 --- pkgs/development/tools/misc/swig/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index f56598e2f0f..2066ead51a1 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pcre }: stdenv.mkDerivation rec { - name = "swig-2.0.4"; + name = "swig-2.0.11"; src = fetchurl { url = "mirror://sourceforge/swig/${name}.tar.gz"; - sha256 = "12pcw4whi36vd41c43v8c62bn7vnq331hmvzsrg8wvyj61vi2fkn"; + sha256 = "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33"; }; buildInputs = [ pcre ]; From 50ee1b2498a2ab98cf5f9b92288f64ea0ed30819 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 22 Nov 2013 10:34:08 +0400 Subject: [PATCH 76/81] Updating Visual Understanding Environment --- pkgs/applications/misc/vue/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index c90e4d24f37..542f11f6e67 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="vue"; - version="3.1.2"; + version="3.2.2"; name="${baseName}-${version}"; - url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_2.zip"; - hash="0ga98gnp4qhcrb31cb8j0mwbrh6ym6hr4k5y4blxvyfff9c0vq47"; + url="releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2"; + hash="0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld"; }; in rec { @@ -30,9 +30,8 @@ rec { phaseNames = ["doDeploy"]; doDeploy = a.fullDepEntry '' - unzip ${src} mkdir -p "$out"/{share/vue,bin} - cp VUE.jar "$out/share/vue/vue.jar" + cp ${src} "$out/share/vue/vue.jar" echo '#!${a.stdenv.shell}' >> "$out/bin/vue" echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" From a383fe887f49ef27098ee94276aa9cd7b8c095e2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 22 Nov 2013 15:23:45 +0100 Subject: [PATCH 77/81] Make dd-agent services restart when killed. --- nixos/modules/services/monitoring/dd-agent.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index f99114ac9ad..37ce1c099df 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -62,6 +62,8 @@ in { ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; User = "dd-agent"; Group = "dd-agent"; + Restart = "always"; + RestartSec = 2; }; restartTriggers = [ pkgs.dd-agent datadog_conf ]; }; @@ -76,6 +78,8 @@ in { Group = "dd-agent"; Type = "forking"; PIDFile = "/tmp/dogstatsd.pid"; + Restart = "always"; + RestartSec = 2; }; restartTriggers = [ pkgs.dd-agent datadog_conf ]; }; From c853841c8c69b938378cdd00edc9afa683402364 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Nov 2013 15:28:25 +0100 Subject: [PATCH 78/81] log4cxx: Fix build by adding missing includes. This adds a bit too many includes but in the end it won't hurt on the size of the build output because those are optimized away. But having a whole bunch of sed expressions just for selectively adding includes just clutters up the package expression. Signed-off-by: aszlig --- pkgs/development/libraries/log4cxx/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 0e6c24bf61e..67d917f699d 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -9,7 +9,18 @@ stdenv.mkDerivation { url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; - + + postPatch = '' + sed -i -e '1,/^#include/ { + /^#include/i \ + #include \ + #include \ + #include + }' src/examples/cpp/console.cpp \ + src/main/cpp/inputstreamreader.cpp \ + src/main/cpp/socketoutputstream.cpp + ''; + buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat]; meta = { From 440af2e5e50f4f9b44a0a911ece2948f4a5b5271 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Nov 2013 16:26:26 +0100 Subject: [PATCH 79/81] log4cxx: Clean up package expression. Add meta.license and use a version attribute instead of hardcoding everything. Signed-off-by: aszlig --- pkgs/development/libraries/log4cxx/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 67d917f699d..983fabc041e 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -2,11 +2,12 @@ , apr, aprutil, db45, expat }: -stdenv.mkDerivation { - name = "log4cxx-0.10.0"; - +stdenv.mkDerivation rec { + name = "log4cxx-${version}"; + version = "0.10.0"; + src = fetchurl { - url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz; + url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz"; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; @@ -26,5 +27,6 @@ stdenv.mkDerivation { meta = { homepage = http://logging.apache.org/log4cxx/index.html; description = "A logging framework for C++ patterned after Apache log4j"; + license = stdenv.lib.licenses.asl20; }; } From c6d548f9b3a9ba86b123430154caeaada79fcd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 22 Nov 2013 23:56:17 +0100 Subject: [PATCH 80/81] spyder: update 2.1.13.1 -> 2.2.5 This update brings bug fixes and new features. Full changelog: https://code.google.com/p/spyderlib/source/browse/CHANGELOG --- pkgs/applications/science/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index cd2bd4fecf3..600bd6bc439 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - name = "spyder-2.1.13.1"; + name = "spyder-2.2.5"; namePrefix = ""; src = fetchurl { url = "https://spyderlib.googlecode.com/files/${name}.zip"; - sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya"; + sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2"; }; buildInputs = [ unzip ]; From 325894eb1b00eabbd1fbad89c8db0d71f0eb1ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 23 Nov 2013 00:11:23 +0100 Subject: [PATCH 81/81] smc: new package SMC is a state machine compiler. It generates state machine code from text input files (state diagrams). Homepage: http://smc.sourceforge.net/ --- pkgs/tools/misc/smc/default.nix | 49 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/misc/smc/default.nix diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix new file mode 100644 index 00000000000..a12a40e8ed7 --- /dev/null +++ b/pkgs/tools/misc/smc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, jre }: + +stdenv.mkDerivation rec { + name = "smc-6.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/smc/smc/6_3_0/smc_6_3_0.tgz"; + sha256 = "0arzi8kc4vycp1ccf0v87p08cdpylwhx4za2pzvp08vkfwi8zc7z"; + }; + + # Prebuilt Java package. + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/smc" + mkdir -p "$out/share/smc/lib" + mkdir -p "$out/share/icons" + mkdir -p "$out/lib/java" + + cp bin/Smc.jar "$out/lib/java/" + cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/" + cp -r lib/* "$out/share/smc/lib/" + cp misc/smc.ico "$out/share/icons/" + + cat > "$out/bin/smc" << EOF + #!${stdenv.shell} + ${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@" + EOF + chmod a+x "$out/bin/smc" + ''; + + meta = with stdenv.lib; { + description = "Generate state machine code from text input (state diagram)"; + longDescription = '' + SMC (State Machine Compiler) takes a text input file describing states, + events and actions of a state machine and generates source code that + implements the state machine. + + SMC supports many target languages: + C, C++, DotNet, Groovy, java, Java, JavaScript, Lua, ObjC, Perl, Php, + Python, Ruby, Scala, Tcl. + + SMC can also generate GraphViz state diagrams from the input file. + ''; + homepage = http://smc.sourceforge.net/; + license = licenses.mpl11; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bef1cff60ed..ea21d94668d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3768,6 +3768,8 @@ let buildc2xml = false; }; + smc = callPackage ../tools/misc/smc { }; + sparse = callPackage ../development/tools/analysis/sparse { }; speedtest_cli = callPackage ../tools/networking/speedtest-cli { };