From 195800e8816a53d5faafde4a0990a904dbac2510 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 16 Jun 2014 14:26:40 -0700 Subject: [PATCH 001/224] Do not use static-libgcc flag on Darwin --- pkgs/development/libraries/zlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 088eb1b94930..f45c18dd0f14 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; crossAttrs = { dontStrip = static; From f39471a87314e5a6a67c15b3831acbc090f999fb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 16 Jun 2014 16:39:20 -0700 Subject: [PATCH 002/224] ncurses: apply a patch on Darwin for a clang bug --- pkgs/development/libraries/ncurses/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 993993cecd07..7b502822a180 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,13 @@ stdenv.mkDerivation (rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - patches = [ ./patch-ac ]; + clangPatch = fetchurl { + # Patch referenced from https://github.com/Homebrew/homebrew-dupes/issues/43 + url = "http://lists.gnu.org/archive/html/bug-ncurses/2011-04/txtkWQqiQvcZe.txt"; + sha256 = "03lrwqvb0r2qgi8hz7ayd3g26d6xilr3c92j8li3b77kdc0w0rlv"; + }; + + patches = [ ./patch-ac ] ++ stdenv.lib.optional stdenv.isDarwin clangPatch; configureFlags = '' --with-shared --without-debug --enable-pc-files --enable-symlinks From db8de47ce7ac0932dceb9e7cb14723f92c4aa8a1 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 18 Jun 2014 13:36:53 +0200 Subject: [PATCH 003/224] nixos/logstash: add enableWeb option to enable kibana web interface --- nixos/modules/services/logging/logstash.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 480e35a1156d..c92c81135704 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -17,6 +17,11 @@ in description = "Enable logstash"; }; + enableWeb = mkOption { + default = false; + description = "Enable logstash web interface"; + }; + inputConfig = mkOption { default = ''stdin { type => "example" }''; description = "Logstash input configuration"; @@ -62,7 +67,7 @@ in config = mkIf cfg.enable { systemd.services.logstash = with pkgs; { - description = "Logstash daemon"; + description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -78,7 +83,7 @@ in output { ${cfg.outputConfig} } - ''}"; + ''} ${optionalString cfg.enableWeb "-- web"}"; }; }; }; From 048ec2575791b1d1022889b607865fea5d94902b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 18 Jun 2014 17:14:45 -0500 Subject: [PATCH 004/224] Wrap haddock 2.10+ to find GHC packages --- pkgs/development/tools/documentation/haddock/2.10.0.nix | 9 +++++++-- pkgs/development/tools/documentation/haddock/2.11.0.nix | 9 +++++++-- .../development/tools/documentation/haddock/2.13.2.1.nix | 9 +++++++-- pkgs/development/tools/documentation/haddock/2.13.2.nix | 9 +++++++-- pkgs/development/tools/documentation/haddock/2.14.2.nix | 9 +++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index cfda3b66704a..d3e48c619fac 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 968efe2260b0..6a2cf668682b 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix index 3cac6e133236..89a488fdd31f 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix index 95890f5bd43f..6227f55888b4 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix index af611de4b9fa..8838b6def422 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix @@ -1,5 +1,5 @@ { cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml +, xhtml, makeWrapper }: cabal.mkDerivation (self: { @@ -8,9 +8,14 @@ cabal.mkDerivation (self: { sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; From a0aadd7577546490a30892ffa4f4f4a166995734 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 18 Jun 2014 17:32:19 -0500 Subject: [PATCH 005/224] Wrap ghc-modi to find GHC packages --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 04545dda87e4..8394dd31ba2d 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod < $out/bin/ghc-modi < Date: Thu, 19 Jun 2014 18:03:40 +0200 Subject: [PATCH 006/224] syncthing: update from 0.8.11 to 0.8.15 --- .../networking/syncthing/default.nix | 6 ++-- .../networking/syncthing/upnp.patch | 28 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing/upnp.patch diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 28603daa9c67..8f169180dd5e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { name = "syncthing-${version}"; - version = "0.8.11"; + version = "0.8.15"; src = fetchgit { url = "git://github.com/calmh/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "16dl9sqwhv0n1602pmi10d5j7z2196ijhvz4rfx7732210qbkpnn"; + sha256 = "0xv8kaji60zqxws72srh5hdi9fyvaipdcsawp6gcyahhr3cz0ddq"; }; buildInputs = [ go ]; - patches = [ ./upnp.patch ]; - buildPhase = '' mkdir -p "./dependencies/src/github.com/calmh/syncthing" diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch deleted file mode 100644 index f4164b4f6bc3..000000000000 --- a/pkgs/applications/networking/syncthing/upnp.patch +++ /dev/null @@ -1,28 +0,0 @@ -Trying to fix upnp for miniupnpd: -https://github.com/calmh/syncthing/issues/211 - -diff --git a/upnp/upnp.go b/upnp/upnp.go -index 9de719a..9c85b23 100644 ---- a/upnp/upnp.go -+++ b/upnp/upnp.go -@@ -60,14 +60,12 @@ func Discover() (*IGD, error) { - return nil, err - } - -- search := []byte(` --M-SEARCH * HTTP/1.1 --Host: 239.255.255.250:1900 --St: urn:schemas-upnp-org:device:InternetGatewayDevice:1 --Man: "ssdp:discover" --Mx: 3 -- --`) -+ search := []byte("M-SEARCH * HTTP/1.1\r\n" + -+"Host: 239.255.255.250:1900\r\n" + -+"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" + -+"Man: \"ssdp:discover\"\r\n" + -+"Mx: 3\r\n" + -+"\r\n") - - _, err = socket.WriteTo(search, ssdp) - if err != nil { From e5bf7af90a457035f70217f15b3129571c1f55da Mon Sep 17 00:00:00 2001 From: third3ye Date: Fri, 20 Jun 2014 01:54:16 +0000 Subject: [PATCH 007/224] The folder $url/steam/archive seems to be empty... Changed the URLs to the packages over to the steam folder inside pool/steam/s/steam. If the archive folder has been repopulated the next 24hrs ignore this. --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 80be4ec85957..51149d4f2607 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "steam-${version}"; src = fetchurl { - url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb"; + url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_${version}_all.deb"; sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk"; }; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { stdenv.mkDerivation { name = "steam-1.0.0.42"; src = fetchurl { - url = http://repo.steampowered.com/steam/archive/precise/steam-launcher_1.0.0.42_all.deb; + url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_1.0.0.42_all.deb; sha256 = "1jyvk0h1z78sdpvl4hs1kdvr6z2kwamf09vjgjx1f6j04kgqrfbw"; }; buildInputs = [ dpkg ]; From 869cd7d44a275482640e1df027ff87eb2e28ee84 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 20 Jun 2014 09:58:35 +0100 Subject: [PATCH 008/224] haskellPackages.authenticateOauth: Update to 1.5 --- .../haskell/authenticate-oauth/RSA2.patch | 57 ------------------- .../haskell/authenticate-oauth/default.nix | 15 ++--- 2 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch b/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch deleted file mode 100644 index 6a888aa32778..000000000000 --- a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c401c2c585b5345243211e981c123a92b995b448 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 25 Jan 2014 13:35:52 +0300 -Subject: [PATCH] authenticate-oauth.cabal: allow RSA-2 - -The only cosmetic change is rename of 'ha_SHA1' to 'hashSHA1' - -Signed-off-by: Sergei Trofimovich ---- - authenticate-oauth/Web/Authenticate/OAuth.hs | 10 ++++++++-- - authenticate-oauth/authenticate-oauth.cabal | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/authenticate-oauth/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs -index 3f38c8c..eccd0f1 100644 ---- a/authenticate-oauth/Web/Authenticate/OAuth.hs -+++ b/authenticate-oauth/Web/Authenticate/OAuth.hs -@@ -21,7 +21,7 @@ module Web.Authenticate.OAuth - paramEncode, addScope, addMaybeProxy - ) where - import Blaze.ByteString.Builder (toByteString, Builder) --import Codec.Crypto.RSA (ha_SHA1, rsassa_pkcs1_v1_5_sign) -+import qualified Codec.Crypto.RSA as RSA - import Control.Exception - import Control.Monad - import Control.Monad.IO.Class (MonadIO, liftIO) -@@ -346,7 +346,13 @@ genSign oa tok req = - PLAINTEXT -> - return $ BS.intercalate "&" $ map paramEncode [oauthConsumerSecret oa, tokenSecret tok] - RSASHA1 pr -> -- liftM (encode . toStrict . rsassa_pkcs1_v1_5_sign ha_SHA1 pr) (getBaseString tok req) -+ liftM (encode . toStrict . RSA.rsassa_pkcs1_v1_5_sign -+#if MIN_VERSION_RSA(2, 0, 0) -+ RSA.hashSHA1 -+#else -+ RSA.ha_SHA1 -+#endif -+ pr) (getBaseString tok req) - - #if MIN_VERSION_http_conduit(2, 0, 0) - addAuthHeader :: BS.ByteString -> Credential -> Request -> Request -diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal -index 00507da..e11c3bd 100644 ---- a/authenticate-oauth/authenticate-oauth.cabal -+++ b/authenticate-oauth/authenticate-oauth.cabal -@@ -19,7 +19,7 @@ library - , transformers >= 0.1 && < 0.4 - , bytestring >= 0.9 - , crypto-pubkey-types >= 0.1 && < 0.5 -- , RSA >= 1.2 && < 1.3 -+ , RSA >= 1.2 && < 2.1 - , time - , data-default - , base64-bytestring >= 0.1 && < 1.1 --- -1.9.1 - diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 9a75bd0cea50..364e81d9ee38 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -1,18 +1,15 @@ { cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit -, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes -, monadControl, random, resourcet, RSA, SHA, time, transformers +, cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random +, RSA, SHA, time, transformers }: cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.8"; - sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; - patches = [ ./RSA2.patch ]; - patchFlags = "-p2"; + version = "1.5"; + sha256 = "07y9zh4v9by588k86wlyj3czivj5jlb9jk6g4j9p8j1qgbv4hpk9"; buildDepends = [ - base64Bytestring blazeBuilder blazeBuilderConduit conduit - cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl - random resourcet RSA SHA time transformers + base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes + dataDefault httpClient httpTypes random RSA SHA time transformers ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; From bc75a339880b46cf525f868bc4d4598cfd5ea4fb Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 20 Jun 2014 14:08:06 +0200 Subject: [PATCH 009/224] release-python: heavily reduce list of built packages --- pkgs/top-level/release-python.nix | 1913 +---------------------------- 1 file changed, 1 insertion(+), 1912 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 61d1ad7ad681..ea7ca4d501f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -29,1404 +29,7 @@ let } // (mapTestOn rec { - a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2005 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2006 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2008 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2009 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2010 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aangifte2011 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - abc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - abcde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - abiword = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alsaPlugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alsaPluginWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amsn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amule = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amuleDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amuleGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - androidsdk_4_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - andyetitmoves = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ardour3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - arora = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - asc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - asciidoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - asio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aspectj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - asymptote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atari800 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ataripp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atermjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - attica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aubio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - auctex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - audacious = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - audacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - autojump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - automoc4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - avahi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - avidemux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - avogadro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - awesome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aws_mturk_clt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - axis2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - azureus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ballAndPaddle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - baresip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bazaar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - beast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - beret = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ber_metaocaml_003 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bibletime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bibtextools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - binutils_gold = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - biolib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bitcoin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bitlbee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bitsnbots = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bittornado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bittorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blackshades = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blackshadeselite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blueman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bluez = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boinc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boomerang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost144 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost146 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost149 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - botan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - box2d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - box2d_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - briss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bsddb3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - btanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - btrfsProgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - buildbot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bumblebee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bzflag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - caelum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cairomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - calf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - calibre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - caneda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - carrier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - castle_combat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cbrowser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cc1394 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cdrdao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cflow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cgal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - chatzilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cheetahTemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - chipmunk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - chromiumWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - chromium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cilaterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cinelerra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clutter_gtk_0_10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cmakeWithGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cmus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coccinelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cogl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coin3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - comical = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - compiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - compton = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - conkeror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - conky = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - consolekit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - construo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - construoBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coq_8_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coriander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - couchdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - crack_attack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - crrcsim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cryptsetup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - csound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - csslint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cudatoolkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cuneiform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cups_pdf_filter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - curlftpfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cvs2svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - d4x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - darktable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dblatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dbus_cplusplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dbus_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dbus_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dbus_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ddd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - debian_devscripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dejagnu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - desktop_file_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - devicemapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dico = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - directfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - directvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - disnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - disnixos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - DisnixWebService = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - disper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distcc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distrho = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - djview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dmenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dmraid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dmtcp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dosbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - doxygen_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dragonegg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - drbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - drgeo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dropbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dstat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - duplicity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dvdauthor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dvswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dwarf_fortress = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eaglemode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - easytag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ec2_api_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ecj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipses = { - eclipse_cpp_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_cpp_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_modeling_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_sdk_35 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_sdk_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_sdk_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eclipse_sdk_42 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - ecryptfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - edk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eduke32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eggdbus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - egoboo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ekiga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - elasticmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - electricsheep = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - elinks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emacs23 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emacs24Packages = { - autoComplete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bbdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - calfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cedet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coffee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - colorTheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ecb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emacsSessionManagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emacsw3m = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flymakeCursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - graphvizDot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jdee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - js2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logito = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - loremIpsum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - magit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - maudeMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocamlMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - org = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - org2blog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pcache = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - proofgeneral = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rectMark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - remember = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scalaMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sunriseCommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmlRpc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - emboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - enblendenfuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - encfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - enchant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - enlightenment = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - epdfview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - epm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - esdl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - espeakedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - etherape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - euca2ools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eukleides = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - evince = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - evolution_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - evopedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - expect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - exrdisplay = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - extremetuxracer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - exult = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - facile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fail2ban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fakenes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - farsight2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fbida = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fbpanel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fdisk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - feh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - firefox13Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - firefox17Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - firefox36Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flann = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flashplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flightgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fltk13 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fltk20 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fluidsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fontforgeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - foo2zjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - foursuite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - framac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freeciv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freedink = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freeglut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freemind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freepv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freerdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freerdpUnstable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freestyle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freetalk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - freetts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fspot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ftgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ftgl212 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fuppes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fusesmb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdome2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gecko_mediaplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - geeqie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gegl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gegl_0_0_22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gemrb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gensgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - geoclue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - geoipjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - get_iplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - getmail = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ghostOne = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ghostscriptX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - giblib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gifsicle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gigedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gimp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gimp_2_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gimpPlugins = { - fourier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gimplensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gmic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lqrPlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - resynthesizer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texturize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - waveletSharpen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - girara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitAndTools = { - darcsToGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - git2cl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitAnnex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitBz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitFastExport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitSubtree = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qgitGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - svn2git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - svn2git_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - giv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gkrellm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gl117 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glestae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glibmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glib_networking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - globulation2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gltron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glxinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gmime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gmtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnokii = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome = { - at_spi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GConf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gconfmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_control_center = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_desktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_doc_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_icon_theme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_menus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_settings_daemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_vfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_vfs_monikers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtk_doc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkglext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkglextmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtksourceview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libbonobo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libbonoboui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libglade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libglademm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomecanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomecanvasmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomecups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomekbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomeprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomeprintui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnomeui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libIDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libunique = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwnck = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - metacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nautilus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ORBit2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pangomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python_rsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - startup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zenity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - gnome_mplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_terminator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnome_user_docs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnonlin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnucash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnu = { - hurdHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libpthreadHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - machHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mig_raw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - gnumeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnunet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnunet08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnupg2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gnuplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gob2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gobby5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gobjectIntrospection = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - goffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - goffice_0_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - goldendict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - golly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - goocanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - googleearth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - google_talk_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gosmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gource = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gparted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gphoto2fs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gpscorrelate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gpsd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gqview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grantlee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - graphicsmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - graphicsmagick137 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - graphviz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - graphviz_2_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gravit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grub2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - grub2_efi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gsettings_desktop_schemas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gsmartcontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gssdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_plugins_bad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_plugins_base = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_plugins_good = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_plugins_ugly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gst_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtk3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkdatabox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkdialog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkgnutella = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkimageview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkmm3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkmozembedsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtksharp1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtksharp2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtksourceviewsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkspell = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtkwave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtmess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - guileCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - guileGnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - guitone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gupnp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gupnp_igd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gupnptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gutenprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gutenprintBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gwenhywfar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gxneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hadoop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - harfbuzz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPackages = { - accelerateCuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - accelerateExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - Chart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - diagrams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - diagramsCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ghcMod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLFW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gloss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLURaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLUT = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLUT_2_1_1_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLUT_2_1_2_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLUT_2_2_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GLUT_2_3_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtksourceview2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2009_2_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2010_1_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2010_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2011_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2011_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2011_4_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - haskellPlatform_2012_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - HGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hmatrix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hp2anyGraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lambdacubeEngine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - LambdaHack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - leksah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - leksahServer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lhs2tex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ltk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGL_2_2_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGL_2_2_3_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGL_2_4_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGL_2_6_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OpenGLRaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pakcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reactiveBananaWx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - repaAlgorithms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - repaExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDLImage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDLMixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDLTtf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - splot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - svgcairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - threadscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - timeplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - uhc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vacuumCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxcore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - X11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - X11Xft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmobar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmonad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmonadContrib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmonadExtras = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - haxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - heimdall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - herqq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hevea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hexen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - highlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hol_light = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - homebank = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hplip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - htmldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - httpfs2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hwloc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hydraAntLogger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hydrogen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - i3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - i3lock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - i7z = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icbm3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icecat3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - imagemagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - imagemagickBig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - imlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - imlib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - impressive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - indilib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - inkscape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - instead = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - intelgen4asm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - io = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ion3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iotop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - irrlicht3843 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - irssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - isabelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - isocodes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - itk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - itstool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jackaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jack_capture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jackmeter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jamp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - javaCup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jbidwatcher = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jboss_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jbrout = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jclasslib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jdiskreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jfsrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jigdo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jjtraveler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jnettop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jrePlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jruby165 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jscoverage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - json_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - julia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - k3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kde3 = { - arts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - kde4 = { - akonadi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - akunambol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amarok = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - aurorae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bangarang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - basket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - blinken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - calligra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cantor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cervisia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ColorSchemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - desktopthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - digikam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dolphin_plugins_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dolphin_plugins_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - emoticons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - filelight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - filesharing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gwenview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - HighResolutionWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - IconThemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jovie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - k3b = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kaccessible = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kadu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kalgebra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kalzium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kamera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kanagram = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kapptemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kbibtex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kbluetooth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kbruch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kcachegrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kcalc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kcharselect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kcolorchooser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kcron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeaccessibility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeaccounts_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeartwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kde_baseapps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdebindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdegames = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdegraphics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdegraphics_strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdegraphics_thumbnailers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdemultimedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdenetwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdenlive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdepim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdepimlibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdepim_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeplasma_addons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kde_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdesdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdesvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdetoys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdeutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdevplatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kde_wacomtablet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdewebdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kde_workspace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdiff3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kdnssd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kfile_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kfilereplace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kfloppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kgeography = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kgpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - khangman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kimagemapeditor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kioslave_perldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kioslave_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kipi_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kiten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - klettres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - klinkstatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmousetool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kmymoney = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - koffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kolourpaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kompare = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - konq_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - konsole = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - konversation = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kopete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kpartloader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kppp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kprofilemethod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - krdc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kremotecontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - krename = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - krfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kruler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - krusader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ksaneplugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ksnapshot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ksshaskpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kstars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kstartperf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ksystemlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kteatime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ktimer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ktouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kturtle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ktux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kuickshow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kuiviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kuser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kwallet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kwin_styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kwooty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kwordquiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.bg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.bs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ca = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ca_valencia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.cs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.da = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.de = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.el = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.en_GB = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.es = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.et = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.eu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.fi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.fr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.gl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.he = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.hr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.hu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.id = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.is = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.it = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ja = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.kk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.km = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.kn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.lt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.lv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.nb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.nds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.nl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.nn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.pa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.pl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.pt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.pt_BR = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ru = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.si = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.sk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.sl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.sr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.sv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.th = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.tr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.ug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.uk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.wa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.zh_CN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - l10n.zh_TW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libalkimia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libkdcraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libkdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libkexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libkipi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libksane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libkvkontakte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liblikeback = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lokalize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - marble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mobipocket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - networkmanagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - okteta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - okular = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - parley = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - partitionManager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polkit_kde_agent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - poxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - printer_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - psi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pykde4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quassel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quasselClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quasselDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rekonq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rocs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rsibreak = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - semnotes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - skrooge = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smokegen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smokeqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sounds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - step = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - superkaramba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - svgpart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sweeper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - system_config_printer_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.accounts_kcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.approver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.auth_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.call_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.common_internals = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.contact_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.contact_list = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.contact_runner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.filetransfer_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.kded_integration_module = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.presence_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.send_file = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.telepathy_logger_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy.text_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - umbrello = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - WeatherWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - yakuake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zanshin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - keen4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - keepassx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - keepnote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - keymon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - keynav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kicad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - klavaro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kobodeluxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kona = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - larswm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lastwatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - latencytop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lazarus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ldcpp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ledger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ledger3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - leiningen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - leo2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lesstif = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lesstif93 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libassuan2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libatasmart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libbluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libbluray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcanberra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcdr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libchamplain = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libchamplain_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcroco = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libdbusmenu_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libdevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libdmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libdrm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libfixposix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgdata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgdata_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgdiplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgnome_keyring3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liblastfm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liblqr1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libmatchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libmatthew_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libmusclecard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libnice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libnotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liboil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libopensc_dnie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libplist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libpseudo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libqalculate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libQGLViewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - librecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libreoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - librsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libsexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libstartup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libtiger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libtorrentRasterbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libva = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libvdpau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libviper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libvirt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libvisio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libvncserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libvterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwmf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwnck3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwpd_08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libwpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxklavier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxml2Python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxmlxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lilv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lilypond = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lincity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lingot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - links2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - linphone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - linux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - linuxConsoleTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - linuxPackages = { - acpi_call = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - atheros = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ati_drivers_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bbswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - broadcom_sta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cryptodev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - e1000e = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - exmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - frandom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - systemtap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tp_smapi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - v86d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtualbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtualboxGuestAdditions = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wis_go7007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - linuxsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - liquidwar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - llvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - log4cxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logstalgica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - loudmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - love = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mailutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - martyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - matchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - matita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - matita_130312 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - maven = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - maxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mcabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mcelog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mcomix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mcrl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mdbtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mdbtools_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - metaocaml_3_09 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mhwaveedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - micropolis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - midori = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - midoriWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - minecraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - miniHttpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mirage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mitscheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mjpegtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mkvtoolnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mlt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mmex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - modemmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mod_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mod_wsgi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mono = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - monodevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - monodoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - monotone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - monotoneViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mozart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mozilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mozplugger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mp3info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mpc123 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mpg321 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mpich2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - MPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mrxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - msilbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mtdutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - multipath_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - multisync = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mumble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mupdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mupen64plus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - muscleframework = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - muscletool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mutt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mygui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - myguiSvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mysqlWorkbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mythtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - naev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - navipowm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - navit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ncbiCTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - netbeans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - netboot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - netsurf.browser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ninka = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - njam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nodejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nodePackages = { - abbrev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ansi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - async = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - backbone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - browserchannel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - buffertools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - commander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - connect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cookie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - crc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cssmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - datetime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - debug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - diff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - formidable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hiredis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - inherits = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - knox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - less = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - minimatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mkdirp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mrclean = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - npm2nix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - npmlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - optimist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - options = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - osenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pause = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - policyfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rbytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - redis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - request = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - requirejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rimraf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - semver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - send = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - showdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sockjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - swig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - temp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - timerstub = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tinycolor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - underscore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vows = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - which = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wordwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ws = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmlhttprequest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zeparser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nova = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - novaclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nspluginwrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nss_pam_ldapd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nssTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ntop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ntrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - numeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nut_2_6_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - obexd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - obex_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - obexfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - obexftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - obnam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_3_08_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_3_10_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_3_11_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_4_00_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocamlnat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocamlPackages = { - camlidl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camlp5_5_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camlp5_5_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camlp5_6_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camlp5_6_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camlzip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camomile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - camomile_0_8_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cryptokit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - findlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gmetadom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lablgtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lablgtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - menhir = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mldonkey = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_batteries = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_cryptgps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_expat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_extlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocamlgraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_http = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_lwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_mysql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocamlnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_pcre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_react = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_sexplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_ssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ocaml_typeconv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ounit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ulex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ulex08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - octave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - octaveHG = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - offlineimap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ogre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ogrepaged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ois = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - omake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oneteam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openbabel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opencascade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opencsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openct = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opencv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opencv_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openscenegraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openttd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opentyrian = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opkg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - opusTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oraclejdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oraclejre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - OVMF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oxygen_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pam_console = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pam_usb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pangoxsl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - panomatic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paraview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - parted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - parted_2_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - path64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pavucontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pcmciaUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pcsclite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pdf2djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pdfread = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pdftk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - perlPackages = { - Autodia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GD = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GraphViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - InlineJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - PerlMagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SQLTranslator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - TextRecordParser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - X11GUITest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - petrifoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pfstools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pgadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - philter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - phonon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - phonon_backend_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - phonon_backend_vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pianobooster = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - picard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - picolisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidgin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidginlatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidginlatexSF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidginmsnpecan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidginotr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pidginsipe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pinentry = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pinta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pioneers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pius = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - plan9port = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - plib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ploticus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pltScheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pmutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - policykit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polkit_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polkit_qt_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pommed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pong3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - popplerQt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - postgresql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pqiv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - praat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - prboom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - prison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - privateer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - proxychains = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pstack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ptlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pulseaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - puredata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - putty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + offlineimap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pycairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pycrypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pycups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1461,520 +64,6 @@ let pythonSexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pyxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qca2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qca2_ossl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qcmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qemu_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qfsm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qgis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qimageblitz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qjackctl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qjoypad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qoauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qrdecode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qrupdate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qshowdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qtpfsgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qtractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qtscriptgenerator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quake3demo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quake3game = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qucs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - quesoglc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rabbitmq_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - racer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - racket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rakarrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rapcad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rapidsvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ratpoison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rawtherapee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rdf4store = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rdiff_backup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - recutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - redshift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - relfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - remmina = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reptyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rhino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - R = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rssglx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rtmpdump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rubber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rubyLibs.buildr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rubyLibs.rjb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rxvt_unicode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - s3cmd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - s3cmd_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sabnzbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sakura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - salut_a_toi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - samba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - saneFrontends = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - satallax = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sauerbraten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - saxonb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sbcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - schroedinger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scilab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scorched3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scribus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scummvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_gfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_image = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_net = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_sound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - SDL_ttf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - seeks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - seg3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - seleniumRCBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - seq24 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - serd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sfml_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sgtpuzzles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - shared_mime_info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sharedobjects = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - silgraphite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - simgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - simutrans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - skype = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - slim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - slock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smbnetfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - snack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - snd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sndBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sofia_sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - soi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sonic_visualiser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - soprano = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - soqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sord = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - spring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - springLobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sratom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sshfsFuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ssreflect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - st = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stalin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stalonetray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stardict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stardust = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stellarium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - strigi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stumpwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stuntrally = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sublime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - subversionClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - suil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - suitesparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - superTux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - superTuxKart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - surf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - swh_lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - swiProlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - swt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sylpheed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - synergy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - syslogng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - system_config_printer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - systemd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - t1lib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tabbed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tahoelafs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tailor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tangogps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - taskjuggler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tbe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - teamspeak_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - teetertorture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - teeworlds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_gabble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_haze = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_logger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_mission_control = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_rakia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - telepathy_salut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tennix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texDisser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveBeamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveCMSuper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveContext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveExtra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveLatexXColor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLiveModerncv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texLivePGF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - texmacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - thunderbird = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tigervnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tightvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - timidity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkcvs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkgate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkgate2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tomcat5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tomcat_connectors = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tomcat_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - torchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - torcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trackballs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - transmission = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - transmission_remote_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tremulous = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tribler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trigger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - truecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tulip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tvtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - twinkle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - uae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ubootGuruplug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ubootNanonote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - unclutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - unetbootin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - unison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - upower = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - uqm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - urbanterror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - usbmuxd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - uzbl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - v4l_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - v8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vacuum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vala = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - valgrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vidalia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - viewMtn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vigra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - viking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vimHugeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vimprobable2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vimprobable2Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtinst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtualgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vkeybd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vncrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vorbisTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vrpn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - w3cCSSValidator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - warmux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - warsow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - warzone2100 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wicd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - widelands = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wineWarcraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wireshark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wkhtmltopdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wmiimenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wmiiSnap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wmname = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wordnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wpa_supplicant_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wvdial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wvstreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxGTK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxGTK29 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxmaxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x11_ssh_askpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xautolock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - Xaw3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xawtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xbindkeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xbursttools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xchm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xclip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcompmgr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xconq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86_video_nested = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86_video_nouveau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce = { - exo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - garcon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mousepad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ristretto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - terminal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - thunar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - thunar_volman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4_appfinder = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4_cpufreq_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4icontheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4_power_manager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4settings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4_systemload_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfce4_taskmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfceutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfconf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfwm4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - xfig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xfontsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xineLib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xineUI = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xkeyboard_config = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlaunch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlibs = { - libAppleWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libdmx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libWindowsWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libX11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxcb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXcomposite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXcursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXdamage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXfixes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXinerama = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libxkbfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXrender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXScrnSaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXtst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXvMC = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXxf86dga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXxf86misc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libXxf86vm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setxkbmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - smproxy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - twm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - x11perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xbacklight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbproto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbutilimage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbutilkeysyms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbutilrenderutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcbutilwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcmsdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcursorgen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xcursorthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xdm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xdpyinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xdriinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xeyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputevdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputjoystick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputkeyboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputsynaptics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputvmmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86inputvoid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoati = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videocirrus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videodummy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videofbdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videogeode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoglide = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoglint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoi128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videointel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videointel_2_14_901 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videointel_2_17_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videomach64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videomga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoneomagic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videonewport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videonv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videoopenchrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videor128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videosavage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videosiliconmotion = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videosis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videosuncg6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videosunffb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videotdfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videotga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videotrident = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videov4l = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videovesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videovmware = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videovoodoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xf86videowsfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xhost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xinit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xinput = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xkbcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xkbevd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xkbutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xkill = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlsatoms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlsclients = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xrdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xrefresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xset = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xsetroot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xvinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xwd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xwininfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xwud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - xlockmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlsfonts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmacro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmlroff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmoto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmove = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xmpppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xosd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xournal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xpdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xpf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xplanet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xpra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xsane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xsokoban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xsynth_dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xtreemfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xulrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xvfb_run = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xvidcap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xxdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - yate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - yoshimi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - youtubeDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zathura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zathuraCollection = { - zathura_core = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zathura_djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zathura_pdf_poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zathura_ps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - zbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zdoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zgrviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ZopeInterface = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; }); in jobs From e3734c96dfd8c72859e9cd636dca3029feaa25da Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Fri, 20 Jun 2014 15:20:42 +0300 Subject: [PATCH 010/224] php-packages: add zmq --- pkgs/top-level/php-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8a01151bd77f..39ea219cf645 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -48,4 +48,18 @@ let self = with self; { sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; }; }; + + zmq = buildPecl rec { + name = "zmq-1.1.2"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; + }; + + configureFlags = [ + "--with-zmq=${pkgs.zeromq2}" + ]; + + buildInputs = [ pkgs.pkgconfig ]; + }; }; in self From 727de4c49e704f8c65e95628b7d1bd78012fc646 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:04:37 +0200 Subject: [PATCH 011/224] haskell-hedis: re-generate with cabal2nix --- pkgs/development/libraries/haskell/hedis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix index c4e34b2d3612..daa4370ef7ab 100644 --- a/pkgs/development/libraries/haskell/hedis/default.nix +++ b/pkgs/development/libraries/haskell/hedis/default.nix @@ -12,11 +12,11 @@ cabal.mkDerivation (self: { time vector ]; testDepends = [ HUnit mtl testFramework testFrameworkHunit time ]; + doCheck = false; meta = { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; }) From 6782b9dbd1806548f50f7f078646a22da733def4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:04:58 +0200 Subject: [PATCH 012/224] haskell-snaplet-redis: re-generate with cabal2nix --- pkgs/development/libraries/haskell/snaplet-redis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 83a82ac80ce1..3e19f1db49b3 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -9,11 +9,11 @@ cabal.mkDerivation (self: { buildDepends = [ configurator hedis lens mtl network snap transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - jailbreak = true; }) From 72dae9f3e0f388f80aaf896f6f67b2d9e507eeea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:05:21 +0200 Subject: [PATCH 013/224] ShellCheck: re-generate with cabal2nix --- pkgs/development/tools/misc/ShellCheck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index 328cba4145f5..a3f67393eed5 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = self.stdenv.lib.licenses.agpl3Plus; + license = "unknown"; platforms = self.ghc.meta.platforms; }; }) From ee1ff09e3bb17229c9d476686bd748a61598dbed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:10:47 +0200 Subject: [PATCH 014/224] haskell-BoundedChan: update to version 1.0.3.0 --- pkgs/development/libraries/haskell/BoundedChan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix index 0ce294c2258c..0d049c848500 100644 --- a/pkgs/development/libraries/haskell/BoundedChan/default.nix +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BoundedChan"; - version = "1.0.1.0"; - sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8"; + version = "1.0.3.0"; + sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k"; meta = { description = "Implementation of bounded channels"; license = self.stdenv.lib.licenses.bsd3; From e07fde40177dc2d2479cf3d30b17b8f450a24b62 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 20 Jun 2014 08:00:06 -0500 Subject: [PATCH 015/224] Update zotero 4.0.20 -> 4.0.21.1 --- pkgs/applications/office/zotero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5b311956da9e..f0f7d801d8fd 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -3,7 +3,7 @@ assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); let - version = "4.0.20"; + version = "4.0.21.1"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" else "linux-i686"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2"; sha256 = if stdenv.system == "x86_64-linux" - then "0d7813k3h60fpxabdwiw83g5zfy9knxc9irgxxz60z31vd14zi0x" - else "0nj4mj22bkn2nwbkfs40kg4br6h6gcf718v9lfnvs13cyhx0wapc"; + then "1d6ih9q0daxxqqbr134la5y39648hpd53srf43lljjs8wr71wbn8" + else "121myzwxw3frps77lpzza82glyz9qgwbl5bh3zngfx9vwx3n8q0v"; }; # Strip the bundled xulrunner From 50e91ea1ad6071d24bd9ea194827778002efc97a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:10:51 +0200 Subject: [PATCH 016/224] haskell-compdata: update to version 0.8.1.2 --- pkgs/development/libraries/haskell/compdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 13e6fd8a2b21..edb44d45d1c8 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.0"; - sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; + version = "0.8.1.2"; + sha256 = "1jhfhinkn6klh68rzl5skh1rianjycc6cfkrglsi17j60a723v9x"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; From 861c1ca445ba43380acd0ef831c4e658d48edd1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:10:53 +0200 Subject: [PATCH 017/224] haskell-distributed-static: update to version 0.3.0.0 --- .../libraries/haskell/distributed-static/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 9147b724ba22..8f7dd0d8cddd 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.2.1.1"; - sha256 = "08y9554x6avjwdmbf33fw1pw1wl8qmgfngmgb6vgad88krnixq1h"; + version = "0.3.0.0"; + sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; buildDepends = [ binary rank1dynamic ]; meta = { - homepage = "http://www.github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Compositional, type-safe, polymorphic static values and closures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 64f2634b49925f84e8776460fda95c22301f2176 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:10:56 +0200 Subject: [PATCH 018/224] haskell-fay: update to version 0.20.1.0 --- pkgs/development/libraries/haskell/fay/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d32a57597802..3c8a962a4224 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom , haskellNames, haskellPackages, haskellSrcExts, languageEcmascript , mtl, optparseApplicative, safe, sourcemap, split, spoon, syb -, tasty, tastyHunit, tastyTh, text, transformers, uniplate +, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate , unorderedContainers, utf8String, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.4"; - sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; + version = "0.20.1.0"; + sha256 = "0b2nhf1qnlr5pa03dcy487ylb3aldrn6cj0hkjsa761pkb8mkw71"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec dataDefault filepath ghcPaths groom haskellNames haskellPackages haskellSrcExts languageEcmascript mtl optparseApplicative safe sourcemap split spoon syb tasty tastyHunit - tastyTh text transformers uniplate unorderedContainers utf8String - vector + tastyTh text time transformers uniplate unorderedContainers + utf8String vector ]; meta = { homepage = "http://fay-lang.org/"; From 53ca82c6b7d0582d75b2bfccdc87628c5f9e3637 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:10:58 +0200 Subject: [PATCH 019/224] haskell-foldl: update to version 1.0.5 --- pkgs/development/libraries/haskell/foldl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 5224bf11f291..e19eff2a631f 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.4"; - sha256 = "0l5gyaw2rb0wfdm5q13vsxfr0z2y9ad5nsjh605p1jp8i0rgwgkv"; + version = "1.0.5"; + sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048"; buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; From 191941fc52679d9989c7d022eed97527628d07b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:00 +0200 Subject: [PATCH 020/224] haskell-ghc-mod: update to version 4.1.3 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 04545dda87e4..2da0ea5b24ee 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.2"; - sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7"; + version = "4.1.3"; + sha256 = "0n7nbjbiiphlasqfcxx15fa8axwd9csq2nh3r0wvkrgpsazdlw8c"; isLibrary = true; isExecutable = true; buildDepends = [ From 23da971e45ad6e8e97e3866985f9283d2bbe42fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:02 +0200 Subject: [PATCH 021/224] haskell-ghcjs-dom: update to version 0.0.10 --- pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 2c9770b20e30..7ea85f2cb1f5 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.9"; - sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a"; + version = "0.0.10"; + sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm"; buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; From 1a5bef70069e02c49ddb973dfd09e7cb51a149d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:04 +0200 Subject: [PATCH 022/224] haskell-hoogle: update to version 4.2.33 --- pkgs/development/libraries/haskell/hoogle/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 624cc9319812..69f1d679c0ac 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -2,13 +2,12 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp -, fetchurl }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.32"; - sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; + version = "4.2.33"; + sha256 = "0jwik79qcflaghqxfvsd8xvb7y1czb1xihg1ijd29lx7p5mz03il"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,9 +18,6 @@ cabal.mkDerivation (self: { ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; - patches = [ (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; - sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) - ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 847bc3e0d33a16ad540a56d74fad4e6814101f35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:06 +0200 Subject: [PATCH 023/224] haskell-hp2any-graph: update to version 0.5.4.1 --- pkgs/development/libraries/haskell/hp2any-graph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 83369ac008b7..85fd26e56056 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.4"; - sha256 = "1lhp9saw51w09fhk94hz31rjawnnxavd7x3lxjc8xn1778wp3v9h"; + version = "0.5.4.1"; + sha256 = "0cvli36lbipi29fw45mfpv35dn7ndbkxhpd3wjy9xn9gy8g0r9xx"; isLibrary = true; isExecutable = true; buildDepends = [ From ff4ce5a704c5609a82b3567f8e8d5ae07457ee87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:08 +0200 Subject: [PATCH 024/224] haskell-http-conduit: update to version 2.1.2.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 918993e6be8c..eaf23d8f4f6b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2.1"; - sha256 = "17bq72qkgn7sh31ad5w7gqf15dlzl027nmx8k7kmm268mf9bz0b5"; + version = "2.1.2.2"; + sha256 = "0pg0ln99rddcjalrnf6ycmby1hy6yknslm46r9ghhg13z1plhwxr"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers From 39a02984a09b5146f6f311953f5ab625fee13257 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:10 +0200 Subject: [PATCH 025/224] haskell-io-memoize: update to version 1.1.1.0 --- pkgs/development/libraries/haskell/io-memoize/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index 3343ee9cbe9d..2699666cedda 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "io-memoize"; - version = "1.1.0.0"; - sha256 = "1xnrzrvs5c3lrzdxm4hrqbh8chl8sxv2j98b28na73w8b7yv2agm"; + version = "1.1.1.0"; + sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7"; buildDepends = [ async ]; meta = { + homepage = "https://github.com/DanBurton/io-memoize"; description = "Memoize IO actions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From d00e504a923b4e3dbd08e92c003855888aced09d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:12 +0200 Subject: [PATCH 026/224] haskell-miniutter: update to version 0.4.4.0 --- pkgs/development/libraries/haskell/miniutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 389a79dd6e1e..5c242f9493d4 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.3.0"; - sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50"; + version = "0.4.4.0"; + sha256 = "1pfgbvnxh3c9b489i121p5bg785bp9ivfwizjfwc9w3r6spgppvk"; buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { From 3ad632c777568e9484cea23a772f4ba1dc023c72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:14 +0200 Subject: [PATCH 027/224] haskell-mwc-random: update to version 0.13.1.2 --- pkgs/development/libraries/haskell/mwc-random/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 995571abc202..b8543d2b3761 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.13.1.1"; - sha256 = "1hi9ci65m3pjkli0rvx2x4fmp73c9fsmnc1zkpaj4g64ibhhir64"; + version = "0.13.1.2"; + sha256 = "0b0amp9nv750azg3jc5yyfpdaqzh0z09jp41hwgrzr0j6kq1ygqi"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit From 4d3fc68c64d6547b6bf1836ca94731b2211e5331 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:16 +0200 Subject: [PATCH 028/224] haskell-network-transport-tcp: update to version 0.4.0 --- .../haskell/network-transport-tcp/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 840712e34160..d75e83639f0c 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,22 +1,15 @@ -{ cabal, dataAccessor, dataAccessorTransformers, HUnit -, lockfreeQueue, mtl, network, networkTransport -, networkTransportTests, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers +{ cabal, dataAccessor, network, networkTransport +, networkTransportTests }: cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.3.1"; - sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; + version = "0.4.0"; + sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; buildDepends = [ dataAccessor network networkTransport ]; - testDepends = [ - dataAccessor dataAccessorTransformers HUnit lockfreeQueue mtl - network networkTransport networkTransportTests QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 - transformers - ]; + testDepends = [ network networkTransport networkTransportTests ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 6509d2df2a2f8480097359a8d2e5703052cae11d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:18 +0200 Subject: [PATCH 029/224] haskell-network-transport: update to version 0.4.0.0 --- .../libraries/haskell/network-transport/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index eaa41944a6bd..032cb043faba 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, transformers }: +{ cabal, binary, hashable, transformers }: cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.3.0.1"; - sha256 = "1iijcd864znik83smk1bjidinm199wri5fdyrhnffj0n35knrvas"; - buildDepends = [ binary transformers ]; + version = "0.4.0.0"; + sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + buildDepends = [ binary hashable transformers ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Network abstraction layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From a161d100718329572f31a4f939f597d14b18a60b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:20 +0200 Subject: [PATCH 030/224] haskell-rank1dynamic: update to version 0.2.0.0 --- pkgs/development/libraries/haskell/rank1dynamic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index 8694d2399b2b..a62fe8d0c8b8 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "rank1dynamic"; - version = "0.1.0.2"; - sha256 = "1341hhbdm6y0mj0qjda0ckqsla51fxiy1yfpbwfvsmpi2bkzgxn6"; + version = "0.2.0.0"; + sha256 = "09p3lggnsn0355440d9cazwijv9qm4siw99gg2xkk2hamp2sj42h"; buildDepends = [ binary ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From d783e5c32d8f3f0de789455a136389fcacc4b494 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:23 +0200 Subject: [PATCH 031/224] haskell-recursion-schemes: update to version 4.1 --- .../libraries/haskell/recursion-schemes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix index 78e7da44061a..1d6f5934ba70 100644 --- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "recursion-schemes"; - version = "4.0"; - sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06"; + version = "4.1"; + sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf"; buildDepends = [ comonad free transformers ]; meta = { homepage = "http://github.com/ekmett/recursion-schemes/"; From 3ee3329c1fc6e9932294d7dae2a0d01fbb8d1e30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:25 +0200 Subject: [PATCH 032/224] haskell-shelly: update to version 1.5.4.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index a37fb044bc01..7f021e82ad6c 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.4"; - sha256 = "1jxw3c25n7azvfyj9vark9149sk36d01pfij6lgamhjs28mb860d"; + version = "1.5.4.1"; + sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers From aa01efc6657b8fb01595362b11d4daaf34474d6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:27 +0200 Subject: [PATCH 033/224] haskell-snaplet-redis: update to version 0.1.3.2 --- pkgs/development/libraries/haskell/snaplet-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 3e19f1db49b3..00617f517286 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.1"; - sha256 = "1aprz9rxs01a86vfr8s7mjydafdfljg89grl7i43vmsw927izc6k"; + version = "0.1.3.2"; + sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf"; buildDepends = [ configurator hedis lens mtl network snap transformers ]; From fa20bf6fc7964618572bf617c67e8676c15f527a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:29 +0200 Subject: [PATCH 034/224] haskell-string-combinators: update to version 0.6.0.5 --- .../libraries/haskell/string-combinators/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index bfc38fb07e89..1f6cf569b566 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,10 +1,9 @@ -{ cabal, baseUnicodeSymbols }: +{ cabal }: cabal.mkDerivation (self: { pname = "string-combinators"; - version = "0.6.0.4"; - sha256 = "0r1za5ypx9fz073h1yljjdkxmz0h77vg94bk827ndwkfgzgpzvh7"; - buildDepends = [ baseUnicodeSymbols ]; + version = "0.6.0.5"; + sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl"; meta = { homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; From a2570f8448c6773d5015a4ce8c2a8cf9d22bda85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:31 +0200 Subject: [PATCH 035/224] haskell-twitter-conduit: update to version 0.0.3 --- .../development/libraries/haskell/twitter-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 4d14ed4582af..d86e46dc34ad 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.2.1"; - sha256 = "1z0d8hwjrdw8gkww9zkn9cqv3g40my952li8pm3c164d7ywswszq"; + version = "0.0.3"; + sha256 = "0snhy5xbdr4iy3mmm04i7sqz6fycw8hd50vndf527fncm9vr65wb"; isLibrary = true; isExecutable = true; buildDepends = [ From f25e9c435dcf24289d96054ec9c80540b0ce4144 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:11:35 +0200 Subject: [PATCH 036/224] haskell-yesod-auth: update to version 1.3.1.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index a54c714e979a..ae3c3cd8a008 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1"; - sha256 = "1fv5z938rpiyhkl4zjb2ss496bgqvdvn7di5im089zmxvx1m81lz"; + version = "1.3.1.1"; + sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable From 011e696f6d7d29aaa75d78ba56481a68b2dab468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:17:04 +0200 Subject: [PATCH 037/224] haskell-platform-2010.1.0.0: un-break the expression to try and fix it --- .../libraries/haskell/haskell-platform/2010.1.0.0.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix index 65395662a89e..a5107a5fe031 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi libary doesn't compile }; }) From 6dcbc2ef9f7004823a6e3338d971f87153771f7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jun 2014 16:17:20 +0200 Subject: [PATCH 038/224] haskell-platform-2009.2.0.2: un-break the expression to try and fix it --- .../libraries/haskell/haskell-platform/2009.2.0.2.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix index 369d7fbb8c8f..eac734a8422e 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi and cabal-install won't compile }; }) From 18283ac861c08c24c90cd3fadd43a5d3f9a2993e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:04:02 +0200 Subject: [PATCH 039/224] haskell-fb: re-generate with cabal2nix --- pkgs/development/libraries/haskell/fb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 9efbd285068e..92f256ae811a 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { aeson conduit dataDefault hspec httpConduit HUnit liftedBase monadControl QuickCheck resourcet text time transformers ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/meteficha/fb"; @@ -27,5 +28,4 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - jailbreak = true; }) From 80ffd99100e052223d9df244e1a6778e6d7fa4a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:02 +0200 Subject: [PATCH 040/224] haskell-tcache-AWS: re-generate with cabal2nix --- pkgs/development/libraries/haskell/tcache-AWS/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix index 0bccb38d3817..b223f6b36555 100644 --- a/pkgs/development/libraries/haskell/tcache-AWS/default.nix +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { description = "tcache using Amazon Web Services as default persistence mechanism"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; }; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; }) From 6587a30c4abc142810178223e7ab6bbcb3f63702 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:32 +0200 Subject: [PATCH 041/224] haskell-websockets: re-generate with cabal2nix --- pkgs/development/libraries/haskell/websockets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 683885cb7122..2ec9847e8ef6 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { entropy HUnit ioStreams mtl network QuickCheck random SHA testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; @@ -24,5 +25,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - jailbreak = true; }) From 46abd4dfbcde2feaee2d8b0dfed8628d3c8a32c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:41 +0200 Subject: [PATCH 042/224] haskell-SHA: update to version 1.6.4.1 --- pkgs/development/libraries/haskell/SHA/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index d2bc69295421..9b51a3167f75 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.6.4"; - sha256 = "13d7sg8r0qqs425banrwd15hahy8gnl4k81q0wfqld77xpb2vvbj"; + version = "1.6.4.1"; + sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; From 2536eea460b5a21170b2692e01809d79df2b3650 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:43 +0200 Subject: [PATCH 043/224] haskell-amqp: update to version 0.9 --- pkgs/development/libraries/haskell/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 8256ff54e191..d151128213e6 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.3"; - sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; + version = "0.9"; + sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j"; isLibrary = true; isExecutable = true; buildDepends = [ From c3ac79a5cbcf9d855181b3607c345e14471300fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:44 +0200 Subject: [PATCH 044/224] haskell-cryptohash: update to version 0.11.6 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 894d317336d2..ebfff759595e 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.5"; - sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d"; + version = "0.11.6"; + sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck From 2a88d3e56b12a1eb2c1e231f929dcf214e324743 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:46 +0200 Subject: [PATCH 045/224] haskell-data-lens-light: update to version 0.1.2 --- .../development/libraries/haskell/data-lens-light/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 14614b8ab008..a5681fe123ef 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.1"; - sha256 = "03nsfwpcl7wmw2bgcb8z3w04krlbrbks7bjpnzfdz6cgdr5mnjrs"; + version = "0.1.2"; + sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; From 6b8539aa442ae3ae882c305849e0e889b8f9645a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:47 +0200 Subject: [PATCH 046/224] haskell-dns: update to version 1.4.0 --- pkgs/development/libraries/haskell/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index d563348c371a..8cbd44b7dbc0 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.3.0"; - sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n"; + version = "1.4.0"; + sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet From 8ca2a7c9c332becc857bbff3e5b309b1ed2d994f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:49 +0200 Subject: [PATCH 047/224] haskell-fay: update to version 0.20.1.1 --- pkgs/development/libraries/haskell/fay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index 3c8a962a4224..f253d3a927be 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.1.0"; - sha256 = "0b2nhf1qnlr5pa03dcy487ylb3aldrn6cj0hkjsa761pkb8mkw71"; + version = "0.20.1.1"; + sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4"; isLibrary = true; isExecutable = true; buildDepends = [ From 99ee8510466bf6cfaa6a46b4e766b646f675aa94 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:50 +0200 Subject: [PATCH 048/224] haskell-haskell-packages: update to version 0.2.4.1 --- .../libraries/haskell/haskell-packages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 168c6babb3d9..6574b6c208c3 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4"; - sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch"; + version = "0.2.4.1"; + sha256 = "014zcq27rwsgj3n4kdgswbppr5yzf3lnj5gnv45r3i5c3rd1mz6k"; buildDepends = [ aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged From 1554bcf3b4b4f5e70977e9de94bddfdf5099eb85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:52 +0200 Subject: [PATCH 049/224] haskell-haxr: update to version 3000.10.3 --- pkgs/development/libraries/haskell/haxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index eff9ada1da54..68479f6560ff 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.10.2"; - sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc"; + version = "3000.10.3"; + sha256 = "082w86vawjiqz589s3gmawssd0b43b1vcw0h6cndadwww8yc35bg"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String From ca89435a5d4c92883fb80c0688e03b79c925e268 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:53 +0200 Subject: [PATCH 050/224] haskell-highlighting-kate: update to version 0.5.8.3 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 6418c7f03267..25dc666cfa1e 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.8.2"; - sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb"; + version = "0.5.8.3"; + sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf"; isLibrary = true; isExecutable = true; buildDepends = [ From e9387206dad2ec17a29f18b1d5fef18d81a2056b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:55 +0200 Subject: [PATCH 051/224] haskell-http-client-tls: update to version 0.2.1.2 --- .../development/libraries/haskell/http-client-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5ec8eecd06c7..320551bcac3f 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.1.1"; - sha256 = "07kwcamc100y48gghmlfvj5ycf6y3cynqqg5kx0ymgjk85k7vim7"; + version = "0.2.1.2"; + sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy"; buildDepends = [ connection dataDefaultClass httpClient network tls ]; From 54cd79330536e0e764c5d2b407afe9350ca97c9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:56 +0200 Subject: [PATCH 052/224] haskell-http-client: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index be261bf60272..54888a4b7b53 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.3.1"; - sha256 = "0zzh4vr563f8rb51b64gcwmal7gswif8ndsf2x5kw6f7q55md0dw"; + version = "0.3.3.2"; + sha256 = "02q2zph6clff0k86wkyf19j5dhfglqi3zvbs52hw8lygpkycpkk7"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes From c4dcee2dd06e14990c92ac80d81881e5d7490fca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:58 +0200 Subject: [PATCH 053/224] haskell-http-conduit: update to version 2.1.2.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index eaf23d8f4f6b..2f9317817de0 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2.2"; - sha256 = "0pg0ln99rddcjalrnf6ycmby1hy6yknslm46r9ghhg13z1plhwxr"; + version = "2.1.2.3"; + sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers From 54ef970c6b84efe9d98076aad2984d5a00b55760 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:05:59 +0200 Subject: [PATCH 054/224] haskell-language-c-quote: update to version 0.8.0 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 3f4ec1e54d82..aa6c03e53508 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.7"; - sha256 = "0rj508hfv9xf30rfjhalz3yfb15vp4r4acdj8aahwfnbls2qb37v"; + version = "0.8.0"; + sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 35d53b368ffd6512efaa3a63440477299f08cbf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:01 +0200 Subject: [PATCH 055/224] haskell-mono-traversable: update to version 0.6.0.3 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index b8acec758dea..a6066c580f2e 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.2"; - sha256 = "1ckdx8szllk4np5samfdx7l6lzarmfabm8w4210b5m7yms2w98sy"; + version = "0.6.0.3"; + sha256 = "1zg8hig4wgbiswb0sppjiga1r6sw7fjkxfiwlck4bwvghpyr5bp3"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From b76e86c782b3ddb3b02777e1a75ea29ccbd11864 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:02 +0200 Subject: [PATCH 056/224] haskell-purescript: update to version 0.5.2.4 --- pkgs/development/libraries/haskell/purescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 4109fc89a2c8..c3fd7a357fbd 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.3"; - sha256 = "09z56gb3k1ya5c3yznm49sgd1g9i5wvn5ih4mycf5ys2wvy3v9sl"; + version = "0.5.2.4"; + sha256 = "19k8kggmmy75qgg9xcvvd194s1vf5qx15ljx82zdscvks2j1r1sd"; isLibrary = true; isExecutable = true; buildDepends = [ From 3662aab37a574f18653d6e9830984194da70e26e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:04 +0200 Subject: [PATCH 057/224] haskell-robots-txt: update to version 0.4.1.0 --- .../development/libraries/haskell/robots-txt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix index a325c9e86647..f15391ec5e15 100644 --- a/pkgs/development/libraries/haskell/robots-txt/default.nix +++ b/pkgs/development/libraries/haskell/robots-txt/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec, heredoc, hspec, QuickCheck, transformers }: +{ cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers +}: cabal.mkDerivation (self: { pname = "robots-txt"; - version = "0.4.0.0"; - sha256 = "1z0bn4v6fx0nx1hr4bbxi5k2c8bv6x3d4pywpav67m5pswxb2yp7"; - buildDepends = [ attoparsec ]; + version = "0.4.1.0"; + sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4"; + buildDepends = [ attoparsec time ]; testDepends = [ attoparsec heredoc hspec QuickCheck transformers ]; meta = { homepage = "http://github.com/meanpath/robots"; From aa599700425dce1b83b1947f71a7f8e2664309a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:05 +0200 Subject: [PATCH 058/224] haskell-scotty: update to version 0.8.1 --- .../libraries/haskell/scotty/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 398d3a1dfb85..02f63cbf9a17 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,17 +1,18 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, hspec, httpTypes, mtl, regexCompat, text, transformers, wai -, waiExtra, warp +, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat +, text, transformers, transformersBase, wai, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.8.0"; - sha256 = "07198m8rsavdqr51abxsrmi8jail6h4ldzrr9s47il1djjba6lhh"; + version = "0.8.1"; + sha256 = "182iwsz5h7p08sqwfzb332gwj1wjx7fhhazm6gfdc0incab769m0"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat text transformers wai waiExtra warp + monadControl mtl regexCompat text transformers transformersBase wai + waiExtra warp ]; - testDepends = [ hspec httpTypes wai waiExtra ]; + testDepends = [ hspec httpTypes liftedBase wai waiExtra ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; From ed16672aa95613b40f524d8c61a36a5eafbca20a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:07 +0200 Subject: [PATCH 059/224] haskell-snap-cors: update to version 1.2.5 --- pkgs/development/libraries/haskell/snap-cors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index 338e2c4693f5..5f694b45d981 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.4"; - sha256 = "0mg5sjvrcs60s8k28vgi49vbgfpswkcd7i7yyfi1n1649vqb69mb"; + version = "1.2.5"; + sha256 = "1zjvvi1prskkb26yp51j09gfkhpw0ggj69d89098yq0sl6d0vy1c"; buildDepends = [ attoparsec caseInsensitive hashable network snap text transformers unorderedContainers From d78aa3621b819abfefd895c89dd0340772e7044c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:08 +0200 Subject: [PATCH 060/224] haskell-syntactic: update to version 1.13 --- pkgs/development/libraries/haskell/syntactic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix index 39fbeebd33c1..17cb5039a640 100644 --- a/pkgs/development/libraries/haskell/syntactic/default.nix +++ b/pkgs/development/libraries/haskell/syntactic/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "syntactic"; - version = "1.12.1"; - sha256 = "0p68jgfwzr9mvgrcjdj3235109nhpaichm5irj9m29076axrsb94"; + version = "1.13"; + sha256 = "1d5mb7ss6xr7rj93mwrdvkxkx1dlmywxx9sxsmqy7l6gaxs6gq8l"; buildDepends = [ constraints dataHash mtl transformers treeView tuple ]; From 8a0186e65b690534ecc48c412806984471734f65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:09 +0200 Subject: [PATCH 061/224] haskell-twitter-conduit: update to version 0.0.4 --- .../haskell/twitter-conduit/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index d86e46dc34ad..334b7fcfe399 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -1,23 +1,28 @@ -{ cabal, aeson, attoparsec, attoparsecConduit, authenticateOauth -, conduit, dataDefault, doctest, failure, filepath, hlint -, httpClient, httpConduit, httpTypes, lens, liftedBase -, monadControl, monadLogger, resourcet, shakespeare, text, time +{ cabal, aeson, attoparsec, authenticateOauth, caseInsensitive +, conduit, conduitExtra, dataDefault, doctest, filepath, hlint +, hspec, httpClient, httpConduit, httpTypes, lens, monadControl +, monadLogger, network, resourcet, shakespeare, text, time , transformers, transformersBase, twitterTypes }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.3"; - sha256 = "0snhy5xbdr4iy3mmm04i7sqz6fycw8hd50vndf527fncm9vr65wb"; + version = "0.0.4"; + sha256 = "0fv2m3sy1gklch4v3sarvq4xk9p7pdz1s3ssl52riy3mg076ab09"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec attoparsecConduit authenticateOauth conduit - dataDefault failure httpClient httpConduit httpTypes lens - liftedBase monadControl monadLogger resourcet shakespeare text time - transformers transformersBase twitterTypes + aeson attoparsec authenticateOauth conduit conduitExtra dataDefault + httpClient httpConduit httpTypes lens monadLogger resourcet + shakespeare text time transformers twitterTypes + ]; + testDepends = [ + aeson attoparsec authenticateOauth caseInsensitive conduit + conduitExtra dataDefault doctest filepath hlint hspec httpClient + httpConduit httpTypes lens monadControl monadLogger network + resourcet shakespeare text time transformers transformersBase + twitterTypes ]; - testDepends = [ doctest filepath hlint ]; meta = { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; From b99b0f3ca22ed2d2a73bece9686610adc55cad2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:11 +0200 Subject: [PATCH 062/224] haskell-vector-space: update to version 0.8.7 --- pkgs/development/libraries/haskell/vector-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index c6d440a5d471..8badc0d9c510 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.6"; - sha256 = "03kz2qhnynbgs4vk7348zjkkakzzwvxhbasl0lcazj1cx1ay7c4l"; + version = "0.8.7"; + sha256 = "1i3c34b3ngksmw4blhldap8fiw1jddm2h1qyr92csn3cllj6j1vm"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { description = "Vector & affine spaces, linear maps, and derivatives"; From 44853ef4d22f68e544fc2631441db90fd08ed620 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:12 +0200 Subject: [PATCH 063/224] haskell-vinyl: update to version 0.4.2 --- pkgs/development/libraries/haskell/vinyl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index 725567ff16bb..bac5d880ba32 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.4.1"; - sha256 = "1x8kxb4z4nj7h6pbl0r37rr7k88ly64cn0bf7izyaqjrsf0kxdci"; + version = "0.4.2"; + sha256 = "17vh5yv9dzw6zq1xw22k7mljpha0rcngbk5k0kynh7hyh6xy4zxz"; testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; From dd451edb4f530041f093136593cd9d114f3fb16f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:14 +0200 Subject: [PATCH 064/224] haskell-wai-extra: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d54e8351d4fd..45d4177305ab 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.0"; - sha256 = "0spjyimqfj7hx8zgmal4laqy8p1inj8hl2402b5s6zqdn36lldfs"; + version = "3.0.0.1"; + sha256 = "0i28d3pwz2fskg94xlkapdw07zkq3acnqk21kpgm5ffbj6qvbvsg"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network From c861de561565c0f1d1e76743f198ed476c347961 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:15 +0200 Subject: [PATCH 065/224] haskell-yesod-bin: update to version 1.2.11 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 145df1e625fe..30a75724e0ec 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.10.2"; - sha256 = "18faylxjrd790xv6zr77wikkcy99l7824bb1sq1y225kd7a3alsm"; + version = "1.2.11"; + sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; isLibrary = false; isExecutable = true; buildDepends = [ From 89797dd67171a827cdb270c529d4c871b784c5f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:17 +0200 Subject: [PATCH 066/224] haskell-yesod-core: update to version 1.2.17 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 7ea674aa0d9d..45bcf97f942f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.16.1"; - sha256 = "1wr5labhp3wc23ki2wvaypanm54qw9vz3v77rxyj1za1y2n1cprw"; + version = "1.2.17"; + sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie From 435e9144c0ad820cfa2cfbc4174c35652dedf90f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:18 +0200 Subject: [PATCH 067/224] haskell-yesod-form: update to version 1.3.11 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 4309df0e4c4e..0c045be968a8 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.10"; - sha256 = "1qq0r5phb6xygz4w5ysir3ky7bw0rmd1q4vz57dz1aza2pchb1ih"; + version = "1.3.11"; + sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet From 4c1621decf6a21779540e1d5a51e08180ea4493d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:20 +0200 Subject: [PATCH 068/224] haskell-yesod-test: update to version 1.2.3.1 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 44b147586236..d1a3b6ab63e9 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.3"; - sha256 = "082zi53q1pw9xv4l6ld1y3xxnvq3iwgbrdnxjknhwsxph7glkn3p"; + version = "1.2.3.1"; + sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 006eca8947013335011b8c1ef5e78562c097fee6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 15:06:21 +0200 Subject: [PATCH 069/224] haskell-keter: update to version 1.3.2 --- pkgs/development/tools/haskell/keter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 8a5bc8eb7c85..a065d7f01eb1 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.1"; - sha256 = "19isyslrxbp430ira7v2d3r5f1j1526rg7v6lzzyl3dsyfpvxjg6"; + version = "1.3.2"; + sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; isLibrary = true; isExecutable = true; buildDepends = [ From 8a1f4d4e24ba6ff884ac30f8806d63873c9223ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 17:14:24 +0200 Subject: [PATCH 070/224] haskell-MonadCatchIO-mtl: jailbreak to support latest MonadCatchIO-transformers --- pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index dfaa69bca93f..4ae0212d6ef5 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.1.0"; sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq"; buildDepends = [ extensibleExceptions MonadCatchIOTransformers ]; + jailbreak = true; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; From 16b07cfc4f6b80af1a8ffddda55d3f082a002fc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 17:14:29 +0200 Subject: [PATCH 071/224] haskell-MonadCatchIO-transformers: update to version 0.3.1.1 --- .../libraries/haskell/MonadCatchIO-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index b6402f63abb5..a37d4bc673b1 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.3.1.0"; - sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn"; + version = "0.3.1.1"; + sha256 = "1kfq9py053zic69f25gcsm802dhk7y5k01ipsf2jvl8d4r5iw5kk"; buildDepends = [ extensibleExceptions monadsTf transformers ]; jailbreak = true; meta = { From 9c1a8030192761b83ddadaa15fddf1b890d467b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 18:40:14 +0200 Subject: [PATCH 072/224] libgnome: fix build by adding missing libogg --- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 2535398380b6..de7dac013e74 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra -, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}: +, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg +}: stdenv.mkDerivation rec { name = src.pkgname; @@ -13,6 +14,6 @@ stdenv.mkDerivation rec { patches = [ ./new-glib.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool libogg ]; propagatedBuildInputs = [ glib libbonobo ]; } From ca9f7f47ec38ba493b5892893054ad19d903c46f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Jun 2014 18:51:32 +0200 Subject: [PATCH 073/224] libgnome: add libogg some more --- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index de7dac013e74..edcd868b2f31 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { patches = [ ./new-glib.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool libogg ]; - propagatedBuildInputs = [ glib libbonobo ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; + propagatedBuildInputs = [ glib libbonobo libogg ]; } From 333b6bdfeed95eb65f496395f08014e0571cbf20 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 20 Jun 2014 20:42:46 +0200 Subject: [PATCH 074/224] python nose-1.3.3 --- 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 3e7267166b52..cb47ab58a546 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4465,12 +4465,12 @@ rec { }); nose = buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; name = "nose-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; - sha256 = "1fmn5b7v183ym793ghrbh76b27aww9qv0lhl7dz31f9xmf3kn9w5"; + sha256 = "09h3a74hzw1cfx4ic19ibxq8kg6sl1n64px2mmb57f5yd3r2y35l"; }; buildInputs = [ coverage ]; From 11e25f1a3e89b9c54778c178f9b113e4b44ac111 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Fri, 20 Jun 2014 21:34:21 +0300 Subject: [PATCH 075/224] Implement per-user socket units --- nixos/modules/system/boot/systemd.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index ee94c91716cf..51ebca7dd43c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -683,6 +683,13 @@ in description = "Definition of systemd per-user service units."; }; + systemd.user.sockets = mkOption { + default = {}; + type = types.attrsOf types.optionSet; + options = [ socketOptions unitConfig ]; + description = "Definition of systemd per-user socket units."; + }; + }; @@ -767,7 +774,8 @@ in in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); systemd.user.units = - mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services; + mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets; system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" From 0cf6e55a701a460ac6b28850cd16641b707d3ba8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Jun 2014 22:31:55 -0700 Subject: [PATCH 076/224] proofgeneral_4_3_pre: Add expression needed for current prooftree --- .../editors/emacs-modes/proofgeneral/4.2.nix | 54 +++++++++++++++++++ .../emacs-modes/proofgeneral/4.3pre.nix | 48 +++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++- 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix create mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix new file mode 100644 index 000000000000..0dea1a13977e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: + +stdenv.mkDerivation (rec { + name = "ProofGeneral-4.2"; + + src = fetchurl { + url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz; + sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm"; + }; + + sourceRoot = name; + + buildInputs = [ emacs texinfo texLive perl which ]; + + prePatch = + '' sed -i "Makefile" \ + -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ + s|/sbin/install-info|install-info|g" + + + # Workaround for bug #458 + # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 + # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 + sed -i "Makefile" \ + -e "s|(setq byte-compile-error-on-warn t)||g" + + sed -i "bin/proofgeneral" -e's/which/type -p/g' + + # @image{ProofGeneral} fails, so remove it. + sed -i '94d' doc/PG-adapting.texi + sed -i '101d' doc/ProofGeneral.texi + ''; + + preBuild = '' + make clean; + ''; + + installPhase = + # Copy `texinfo.tex' in the right place so that `texi2pdf' works. + '' cp -v "${automake}/share/"automake-*/texinfo.tex doc + make install install-doc + ''; + + meta = { + description = "Proof General, an Emacs front-end for proof assistants"; + longDescription = '' + Proof General is a generic front-end for proof assistants (also known as + interactive theorem provers), based on the customizable text editor Emacs. + ''; + homepage = http://proofgeneral.inf.ed.ac.uk; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.unix; # arbitrary choice + }; +}) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix new file mode 100644 index 000000000000..3a492dc0c7f4 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: + +stdenv.mkDerivation (rec { + name = "ProofGeneral-4.3pre131011"; + + src = fetchurl { + url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.3pre131011.tgz; + sha256 = "0104iy2xik5npkdg9p2ir6zqyrmdc93azrgm3ayvg0z76vmnb816"; + }; + + sourceRoot = name; + + buildInputs = [ emacs texinfo texLive perl which ]; + + prePatch = + '' sed -i "Makefile" \ + -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ + s|/sbin/install-info|install-info|g" + + + sed -i "bin/proofgeneral" -e's/which/type -p/g' + + # @image{ProofGeneral} fails, so remove it. + sed -i '94d' doc/PG-adapting.texi + sed -i '96d' doc/ProofGeneral.texi + ''; + + preBuild = '' + make clean; + ''; + + installPhase = + # Copy `texinfo.tex' in the right place so that `texi2pdf' works. + '' cp -v "${automake}/share/"automake-*/texinfo.tex doc + make install install-doc + ''; + + meta = { + description = "Proof General, an Emacs front-end for proof assistants"; + longDescription = '' + Proof General is a generic front-end for proof assistants (also known as + interactive theorem provers), based on the customizable text editor Emacs. + ''; + homepage = http://proofgeneral.inf.ed.ac.uk; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.unix; # arbitrary choice + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ede0521df28..e7ade25cbf4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8383,12 +8383,19 @@ let prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { + proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { texinfo = texinfo4 ; texLive = pkgs.texLiveAggregationFun { paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; }; }; + proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { + texinfo = texinfo4 ; + texLive = pkgs.texLiveAggregationFun { + paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; + }; + }; + proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; From 9d36361931af2d6295904bd53dd7ee3390796c6f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Jun 2014 22:33:36 -0700 Subject: [PATCH 077/224] haskell-free-operational: Remove expression --- .../haskell/free-operational/default.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/free-operational/default.nix diff --git a/pkgs/development/libraries/haskell/free-operational/default.nix b/pkgs/development/libraries/haskell/free-operational/default.nix deleted file mode 100644 index 804577563845..000000000000 --- a/pkgs/development/libraries/haskell/free-operational/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, comonadTransformers, free, kanExtensions, mtl, comonad -, transformers -}: - -cabal.mkDerivation (self: { - pname = "free-operational"; - version = "0.5.0.0"; - sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb"; - jailbreak = true; # needs an old version of kan-extensions - buildDepends = [ - comonadTransformers free kanExtensions mtl transformers comonad - ]; - meta = { - description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; - 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 08b7c875c909..4441a85b1998 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -801,8 +801,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; - freeOperational = callPackage ../development/libraries/haskell/free-operational {}; - freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { boundingboxes = self.boundingboxes_0_1_1; }; From 34c1d46c60e7a5ceb3913fe66c62adee177ac8f7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Jun 2014 22:34:27 -0700 Subject: [PATCH 078/224] hoogle-local: Add patch based on main hoogle expression --- pkgs/development/libraries/haskell/hoogle/local.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 9f56d028c590..67f38f260e07 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -27,6 +27,7 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, fetchurl , parallel, perl, wget, rehoo, haskellPlatform , packages ? haskellPlatform.propagatedUserEnvPkgs @@ -51,7 +52,10 @@ cabal.mkDerivation (self: rec { # The tests will fail because of the added documentation. doCheck = false; - patches = [ ./hoogle-local.diff ]; + patches = [ ./hoogle-local.diff + (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; + sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) + ]; docPackages = packages; From 073933101e7aa47eb8756dc0b4385bd46a436c70 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Jun 2014 22:36:06 -0700 Subject: [PATCH 079/224] proofgeneral: Delete default.nix for proofgeneral --- .../emacs-modes/proofgeneral/default.nix | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/default.nix diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix deleted file mode 100644 index 3f974423fd70..000000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: - -stdenv.mkDerivation (rec { - name = "ProofGeneral-4.2"; - - src = fetchurl { - url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz; - sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm"; - }; - - sourceRoot = name; - - buildInputs = [ emacs texinfo texLive perl which ]; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - - # Workaround for bug #458 - # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 - # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 - sed -i "Makefile" \ - -e "s|(setq byte-compile-error-on-warn t)||g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi - sed -i '101d' doc/ProofGeneral.texi - ''; - - preBuild = '' - make clean; - ''; - - installPhase = - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - ''; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -}) From bfe77718d491cd54948cd1fa27f40cbd7b589083 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 20 Jun 2014 22:37:09 -0700 Subject: [PATCH 080/224] emacs-modes-emms, emacs-modes-org: Relax platform qualifier --- pkgs/applications/editors/emacs-modes/emms/default.nix | 2 +- pkgs/applications/editors/emacs-modes/org/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 5439ba9e4d6e..d8bbb83c4e58 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 776a817fc49d..e52011547c7a 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } From 5a080b9d72f7dd20a36fb8ad0c0fc024cf775e95 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 12:58:05 +0300 Subject: [PATCH 081/224] Disable network-transport-tcp tests, since it should depend on network-transport-tests-0.2.0.0 which is not released yet. --- .../libraries/haskell/network-transport-tcp/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index d75e83639f0c..4a564beb13be 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,4 +1,4 @@ -{ cabal, dataAccessor, network, networkTransport +{ cabal, dataAccessor, network_2_4_1_2, networkTransport , networkTransportTests }: @@ -6,8 +6,11 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; version = "0.4.0"; sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; - buildDepends = [ dataAccessor network networkTransport ]; - testDepends = [ network networkTransport networkTransportTests ]; + buildDepends = [ dataAccessor network_2_4_1_2 networkTransport ]; + testDepends = [ network_2_4_1_2 networkTransport networkTransportTests ]; + # tests should be enabled when network-transport-tests 0.2.0.0 released. + doCheck = false; + meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; From 7179bdbcfe4b00245069e37228d55671a1281701 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 13:14:35 +0200 Subject: [PATCH 082/224] haskell-network-transport-tcp: jailbreak to fix build with network 2.5 --- .../libraries/haskell/network-transport-tcp/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 4a564beb13be..f4cab5090166 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,4 +1,4 @@ -{ cabal, dataAccessor, network_2_4_1_2, networkTransport +{ cabal, dataAccessor, network, networkTransport , networkTransportTests }: @@ -6,11 +6,10 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; version = "0.4.0"; sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; - buildDepends = [ dataAccessor network_2_4_1_2 networkTransport ]; - testDepends = [ network_2_4_1_2 networkTransport networkTransportTests ]; - # tests should be enabled when network-transport-tests 0.2.0.0 released. + buildDepends = [ dataAccessor network networkTransport ]; + testDepends = [ network networkTransport networkTransportTests ]; doCheck = false; - + jailbreak = true; meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; From 92082524a96f74f356fe821608ed48ef04f9bc2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 12:25:31 +0200 Subject: [PATCH 083/224] Revert "add OPENSSL_X509_CERT_FILE to the `git` command environment" This reverts commit 88b5578a579ca7eefc8ac5507f9a5be3cc3684ca because of the following issues: 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then its value will overwrite any settings the user may have configured in http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not supposed to have an effect on Git. 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO environment variable as documented in git-config(1), because anything set there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which might be empty). 3) The patch breaks other builds of packages that depend on Git, i.e. . --- .../version-management/git-and-tools/git/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ce1344906208..f95b5a493a65 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -82,10 +82,6 @@ stdenv.mkDerivation { # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi - - wrapProgram $out/bin/git \ - --set GIT_SSL_CAINFO "\$OPENSSL_X509_CERT_FILE" - '' + (if svnSupport then From d95004cabff908785bfbe9760bc1050fd537b1b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 14:03:09 +0200 Subject: [PATCH 084/224] gsl: update to version 1.16 --- pkgs/development/libraries/gsl/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index eee977e97037..9631746691f8 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.15"; + name = "gsl-1.16"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; # ToDo: there might be more impurities than FMA support check @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; + homepage = http://www.gnu.org/software/gsl/; + license = "GPLv3+"; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -27,10 +29,5 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - - homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; - - maintainers = [ ]; }; } From 8420a2e9792b335bac78df0d26efc41debfe0f27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 14:04:15 +0200 Subject: [PATCH 085/224] cppcheck: update from 1.64 to 1.65 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 500cef43bcbe..ca4176dbe1eb 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.64"; + version = "1.65"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; + sha256 = "0rsxnqvjyiviqsq4y5x4p1jpvcmhf8hh7d710rsvnv5d4cj7lmqn"; }; configurePhase = '' From 05f78d60c1857672f9405d09d5561d4fcddc6403 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 15:04:25 +0200 Subject: [PATCH 086/224] haskell-network-transport-tcp: fix build with ghc < 7.8.2 --- .../libraries/haskell/network-transport-tcp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index f4cab5090166..728a40d8d3e6 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -9,7 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ dataAccessor network networkTransport ]; testDepends = [ network networkTransport networkTransportTests ]; doCheck = false; - jailbreak = true; + patchPhase = '' + sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal + ''; meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; From e9385023d749aa96f00c4e06e9bdad1d655af0f9 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 16:37:02 +0300 Subject: [PATCH 087/224] Added distributed-process 0.5. Bump binary version dependency of rank1dynamic, distributed-static, network-transport-* to 0.7.2.1. --- .../haskell/distributed-process/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 20 +++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix new file mode 100644 index 000000000000..80458c808a8d --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable +, mtl, networkTransport, random, rank1dynamic, stm, syb, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process"; + version = "0.5.0"; + sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny"; + buildDepends = [ + binary dataAccessor deepseq distributedStatic hashable mtl + networkTransport random rank1dynamic stm syb time transformers + ]; + meta = { + homepage = "http://haskell-distributed.github.com/"; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + 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 4441a85b1998..07ba23323359 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,7 +635,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; - distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; + distributedStatic = callPackage ../development/libraries/haskell/distributed-static { + binary = self.binary_0_7_2_1; + }; + + distributedProcess = callPackage ../development/libraries/haskell/distributed-process { + binary = self.binary_0_7_2_1; + }; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -1573,9 +1579,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkSimple = callPackage ../development/libraries/haskell/network-simple { }; - networkTransport = callPackage ../development/libraries/haskell/network-transport {}; + networkTransport = callPackage ../development/libraries/haskell/network-transport { + binary = self.binary_0_7_2_1; + }; - networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; + networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp { + binary = self.binary_0_7_2_1; + }; networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; @@ -1834,7 +1844,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; - rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {}; + rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic { + binary = self.binary_0_7_2_1; + }; ranges = callPackage ../development/libraries/haskell/ranges {}; From 116807aa5527138a2f277385d4d2033a3ed732cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Jun 2014 15:53:22 +0200 Subject: [PATCH 088/224] retroshare: place plugins at proper place Now they can be used. --- .../networking/p2p/retroshare/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 3ae4f2a74838..4e3f495456cd 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -11,7 +11,13 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2"; - patchPhase = "sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' libretroshare/src/upnp/UPnPBase.cpp"; + patchPhase = '' + sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ + libretroshare/src/upnp/UPnPBase.cpp + # Extensions get installed + sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ + libretroshare/src/rsserver/rsinit.cc + ''; buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig protobuf bzip2 libXScrnSaver curl libxml2 libxslt ]; @@ -24,8 +30,12 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/bin - ln -s $out/retroshare-nogui $out/bin - ln -s $out/RetroShare $out/bin + mv $out/retroshare-nogui $out/bin + mv $out/RetroShare $out/bin + + # plugins + mkdir -p $out/share/retroshare + mv $out/lib* $out/share/retroshare ''; meta = with stdenv.lib; { From 88050e4a41b8dc140d307f52375e34e66f4d5268 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 17:44:29 +0300 Subject: [PATCH 089/224] Moved package overrides from haskell-packages.nix to haskell-defaults.nix. --- pkgs/top-level/haskell-defaults.nix | 5 +++++ pkgs/top-level/haskell-packages.nix | 20 +++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index beeee5663dc0..652a826e95a9 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -44,6 +44,11 @@ haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; + rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; + networkTransportTcp = super.networkTransportTcp.override { binary = self.binary_0_7_2_1; }; + distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; + distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 07ba23323359..73d5f060f354 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,13 +635,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; - distributedStatic = callPackage ../development/libraries/haskell/distributed-static { - binary = self.binary_0_7_2_1; - }; + distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; - distributedProcess = callPackage ../development/libraries/haskell/distributed-process { - binary = self.binary_0_7_2_1; - }; + distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -1579,13 +1575,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkSimple = callPackage ../development/libraries/haskell/network-simple { }; - networkTransport = callPackage ../development/libraries/haskell/network-transport { - binary = self.binary_0_7_2_1; - }; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; - networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp { - binary = self.binary_0_7_2_1; - }; + networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; @@ -1844,9 +1836,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; - rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic { - binary = self.binary_0_7_2_1; - }; + rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {}; ranges = callPackage ../development/libraries/haskell/ranges {}; From 719d0b64e03a46eabc0cc460baa2d8faaf7d3584 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 18:01:51 +0300 Subject: [PATCH 090/224] Removed binary argument from networkTransport and networkTransportTcp --- pkgs/top-level/haskell-defaults.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 652a826e95a9..7cbe57c49c79 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -45,8 +45,6 @@ modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; - networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; - networkTransportTcp = super.networkTransportTcp.override { binary = self.binary_0_7_2_1; }; distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 From 8fe08c34a4bfb440e4288ec8728ae0910e78e88d Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 18:06:24 +0300 Subject: [PATCH 091/224] Add binary to networkTransport again. --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 7cbe57c49c79..a770cbdda8f7 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -46,6 +46,7 @@ pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; From 476700d56f25122aaea0f2bc657b2d396e3b97bd Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 09:20:46 -0700 Subject: [PATCH 092/224] git-annex: Build on Darwin, let Cabal determine proper flags --- .../git-and-tools/git-annex/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 72f00bbad2ef..8c2ee6a49448 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -11,6 +11,7 @@ , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers , unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which , xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, fsnotify }: cabal.mkDerivation (self: { @@ -21,9 +22,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance exceptions extensibleExceptions fdoNotify - feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient + clientsession cryptoApi cryptohash dataDefault dataenc DAV + dlist dns editDistance exceptions extensibleExceptions + feed filepath gnutls hamlet hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl mtl network networkConduit networkInfo networkMulticast networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa @@ -31,19 +32,13 @@ cabal.mkDerivation (self: { tastyQuickcheck tastyRerun text time transformers unixCompat utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic - ]; + ] ++ (if (!self.stdenv.isDarwin) then [ + dbus fdoNotify hinotify + ] else [ + fsnotify + ]); buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fS3 - -fWebDAV - -fInotify - -fDbus - -fAssistant - -fWebapp - -fPairing - -fXMPP - -fDNS - -fProduction - -fTDFA"; + configureFlags = "-fAssistant -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" From ba048baaff9e56d47c4f414b4df53517862957c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 May 2014 13:28:06 +0200 Subject: [PATCH 093/224] tig: enable command line history/completion support Since version 2.0, tig can use readline for history/completion support, so add readline as a build input. Increases closure size from 53 MiB to 54 MiB. --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/tig/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 96e4631889c7..482866969a11 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -69,7 +69,7 @@ rec { }; tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45; + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45 readline; }; hub = import ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 6f2fe890cfa5..239fa87d32c5 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline +}: stdenv.mkDerivation rec { name = "tig-2.0.2"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r"; }; - buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; + buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ]; preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' From 7ac13c40ab6acd98bbe36483869849e30ced243e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 21 Jun 2014 20:15:45 +0200 Subject: [PATCH 094/224] Add hackage mirror to mirrors.nix --- pkgs/build-support/fetchurl/mirrors.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index eb3b8a105cdb..8417499cd00d 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -373,4 +373,10 @@ rec { http://lib.stat.cmu.edu/ ]; + # Hackage mirrors + hackage = [ + http://hackage.haskell.org/package/ + http://hdiff.luite.com/packages/archive/package/ + ]; + } From b24da6b15d03dc0b0a1c964902d4217ed39bc23c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 11:31:50 -0700 Subject: [PATCH 095/224] gccApple: Patches for building on Mavericks --- .../compilers/gcc/4.2-apple64/default.nix | 6 +- .../gcc/4.2-apple64/fix-libstdc++-link.patch | 54 ++++++++++++++++ .../gcc/4.2-apple64/floor_log2_patch.diff | 62 +++++++++++++++++++ 3 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index 011086164adf..229f68fd8411 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -12,7 +12,7 @@ let revision = "5666.3"; # Apple's fork revision number. in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gcc-apple-${version}.${revision}"; builder = ./builder.sh; @@ -33,8 +33,10 @@ stdenv.mkDerivation { sourceRoot = "gcc-${revision}/"; + # The floor_log2_patch is from a Gentoo fix for the same issue: + # https://bugs.gentoo.org/attachment.cgi?id=363174&action=diff patches = - [ ./pass-cxxcpp.patch ] + [ ./pass-cxxcpp.patch ./floor_log2_patch.diff ] ++ stdenv.lib.optional noSysDirs ./no-sys-dirs.patch ++ stdenv.lib.optional langCC ./fix-libstdc++-link.patch; diff --git a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch index e7b8a55a29af..5a417f8151b5 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch +++ b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch @@ -3,6 +3,9 @@ Prevent our libstdc++.dylib from having a runtime dependency on passed by g++ when it links libstdc++.dylib. Adding "-nostdlib" to the g++ invocation prevents this. +jww (2014-06-21): I've added several more patches to this, for building on +Mavericks. + diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstdcxx-39/libstdcxx/libstdc++-v3/src/Makefile.in --- x/libstdcxx/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200 +++ y/libstdcxx/libstdc++-v3/src/Makefile.in 2012-02-17 18:44:05.210570590 +0100 @@ -15,3 +18,54 @@ diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstd # Use special rules for the deprecated source files so that they find +--- x/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h ++++ y/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include "unwind.h" ++#include "unwind-generic.h" + + #pragma GCC visibility push(default) + +@@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid (); + // throws, and if bad_exception needs to be thrown. Called from the + // compiler. + extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); +-extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); ++extern "C" void __cxa_call_terminate(_Unwind_Exception* ue_header); + + #ifdef __ARM_EABI_UNWINDER__ + // Arm EABI specified routines. +--- x/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h ++++ y/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h +@@ -549,6 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + */ + class free_list + { ++ public: + typedef size_t* value_type; + typedef __detail::__mini_vector vector_type; + typedef vector_type::iterator iterator; +--- x/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h ++++ y/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h +@@ -433,7 +433,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + { + size_t __old_len = __r->_M_size; + _CharT* __new_data = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__old_len + __len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__old_len + __len)); + _RopeLeaf* __result; + + uninitialized_copy_n(__r->_M_data, __old_len, __new_data); +@@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + if (__result_len > __lazy_threshold) + goto lazy; + __section = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__result_len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__result_len)); + try + { (*(__f->_M_fn))(__start, __result_len, __section); } + catch(...) + diff --git a/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff new file mode 100644 index 000000000000..f37e6c4990e2 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff @@ -0,0 +1,62 @@ +--- gcc-5666.3/gcc/toplev.h ++++ gcc-5666.3/gcc/toplev.h +@@ -151,6 +151,8 @@ + /* Return true iff flags are set as if -ffast-math. */ + extern bool fast_math_flags_set_p (void); + ++#if GCC_VERSION < 3004 ++ + /* Return log2, or -1 if not exact. */ + extern int exact_log2 (unsigned HOST_WIDE_INT); + +@@ -158,7 +160,7 @@ + extern int floor_log2 (unsigned HOST_WIDE_INT); + + /* Inline versions of the above for speed. */ +-#if GCC_VERSION >= 3004 ++#else /* GCC_VERSION < 3004 */ + # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG + # define CLZ_HWI __builtin_clzl + # define CTZ_HWI __builtin_ctzl +@@ -172,18 +172,18 @@ + # define CTZ_HWI __builtin_ctz + # endif + +-extern inline int ++static inline int + floor_log2 (unsigned HOST_WIDE_INT x) + { + return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1; + } + +-extern inline int ++static inline int + exact_log2 (unsigned HOST_WIDE_INT x) + { + return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1; + } +-#endif /* GCC_VERSION >= 3004 */ ++#endif /* GCC_VERSION < 3004 */ + + /* Functions used to get and set GCC's notion of in what directory + compilation was started. */ +--- gcc-5666.3/gcc/toplev.c ++++ gcc-5666.3/gcc/toplev.c +@@ -555,7 +555,7 @@ + for floor_log2 and exact_log2; see toplev.h. That construct, however, + conflicts with the ISO C++ One Definition Rule. */ + +-#if GCC_VERSION < 3004 || !defined (__cplusplus) ++#if GCC_VERSION < 3004 + + /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X. + If X is 0, return -1. */ +@@ -607,7 +607,7 @@ + #endif + } + +-#endif /* GCC_VERSION < 3004 || !defined (__cplusplus) */ ++#endif /* GCC_VERSION < 3004 */ + + /* Handler for fatal signals, such as SIGSEGV. These are transformed + into ICE messages, which is much more user friendly. In case the From 1228caae9e5f525abed6061001121fbb670716a6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 16:29:28 -0700 Subject: [PATCH 096/224] php-5.4: Do not build with mssql support on Darwin --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 99f18c175c3f..fd0628a6524e 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -171,7 +171,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-fpm"]; }; - mssql = { + mssql = stdenv.lib.optional (!stdenv.isDarwin) { configureFlags = ["--with-mssql=${freetds}"]; buildInputs = [freetds]; }; @@ -218,7 +218,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; - mssqlSupport = config.php.mssql or true; + mssqlSupport = config.php.mssql or (!stdenv.isDarwin); }; configurePhase = '' From 523cb5cf68f7c97a3e0b8da3f46f5ce34568d93b Mon Sep 17 00:00:00 2001 From: drozv Date: Sat, 21 Jun 2014 19:30:27 -0400 Subject: [PATCH 097/224] Fix broken checksums and update to version 4.2.018. --- pkgs/games/urbanterror/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 020d60fa3fae..c7144b96a3d7 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.2.009"; + version = "4.2.018"; srcs = [ (fetchurl { - url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip"; - sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i"; + url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full018.zip"; + sha256 = "10710c5b762687a75a7abd3cc56de005ce12dcb7ac14c08f40bcb4e9d96f4e83"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz"; - sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz"; + sha256 = "c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494"; }) ]; buildInputs = [ unzip SDL mesa openal curl ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007"; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.018"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local From 6b345e088b84e07028d46b7a887657fb316a73b3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 21 Jun 2014 21:15:29 -0500 Subject: [PATCH 098/224] php: Fix fallout from 1228caae9e5f Signed-off-by: Austin Seipp --- pkgs/development/interpreters/php/5.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index fd0628a6524e..ed7c0a2b82ec 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -171,7 +171,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-fpm"]; }; - mssql = stdenv.lib.optional (!stdenv.isDarwin) { + mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) { configureFlags = ["--with-mssql=${freetds}"]; buildInputs = [freetds]; }; From b8ede68b25af12acf88560d4bf31452390ff69b8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 21 Jun 2014 22:13:49 -0500 Subject: [PATCH 099/224] kernel/grsec: updates Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index ac2ba6113868..a08ad5ea53d1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.41"; + version = "3.10.44"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0rpz2nxay0a4573dnnb8szq3ly3bhjd6wrz5z6iw3kpj19crs0r1"; + sha256 = "06brvvxkgx4im4jzyl08y8hifgqb8ndxlhdkczwlqx3cgs6769c0"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 8675c529bde7..4fbca05501d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.6"; + version = "3.14.8"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1wk3zdka9n49ixl2s7djavbk0b2nd0772gbmiaxi9mljah9inlhw"; + sha256 = "0l2k7c8i3vzcs8mwdy3h1yzlqli6vr56wbn6bxp4nyvxkwxlhs5d"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index d5fd820cac0b..80b9ff614d66 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.59"; + version = "3.2.60"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a62nmn90k3g48m8g3y27q6a0qwa3k2s6synss7378kdi4f938i4"; + sha256 = "10nigsr0i08ykmkbalsjm4v283iy42zxgxxl77h6484xxb52bw7s"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 165baf0a17f4..8308340f3f5e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.91"; + version = "3.4.94"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "003l9i14m5ci2232wl68nxbgi0ipkzq00yfgxfp9cmh2sipxy1dk"; + sha256 = "0kc1s38zij39z8mrk9x29wizhbn4i7c7gyd796s1ib4826p3k48k"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c0cca64967c4..9f62042d09c8 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,24 +60,24 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.2.59"; - revision = "201406042136"; + { kversion = "3.2.60"; + revision = "201406191345"; branch = "stable"; - sha256 = "01frz80n7zl3yyl11d1i517n0rw8ivb46cl0swp3zgjx29adwc8s"; + sha256 = "1zb2qxh2qhsrqi4gnslr3b6342ni9c6y20gb8jgh5plhnk5szx7v"; }; grsecurity_vserver = grsecPatch - { kversion = "3.2.59"; - revision = "vs2.3.2.16-201406042138"; + { kversion = "3.2.60"; + revision = "vs2.3.2.16-201406191346"; branch = "vserver"; - sha256 = "1vlmcf2fshxvhsparmvwlbn3gpccc8zjc341sjwsmyc3i8csmysr"; + sha256 = "0qlbqpnh5wkgk8phh67bl4a25rb8n1k1hlq0kmcrnz6c3kflrsdz"; }; grsecurity_unstable = grsecPatch - { kversion = "3.14.5"; - revision = "201406021708"; + { kversion = "3.14.8"; + revision = "201406191347"; branch = "test"; - sha256 = "002sbbcmvg6wa41a1q8vgf3zcjakns72dc885b6jml0v396hb5c6"; + sha256 = "01kl89vhr3mrp7g4ypcf9xrv0i4f9d4sdq4a11qhwyf1w48qr7da"; }; grsec_fix_path = From 6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 21 Jun 2014 23:35:09 -0500 Subject: [PATCH 100/224] nagios: significant upgrades - Upgrade Nagios Core to 4.x - Expose mainConfigFile and cgiConfigFile in module for finer configuration control. - Upgrade Plugins to 2.x - Remove default objectDefs, which users probably want to customize. - Systemd-ify Nagios module and simplify directory structure - Upgrade Nagios package with more modern patch, and ensure the statedir is set to /var/lib/nagios Signed-off-by: Austin Seipp --- nixos/modules/module-list.nix | 2 +- .../{nagios/default.nix => nagios.nix} | 120 +++++++++--------- .../services/monitoring/nagios/commands.cfg | 34 ----- .../monitoring/nagios/host-templates.cfg | 27 ---- .../monitoring/nagios/service-templates.cfg | 32 ----- .../monitoring/nagios/timeperiods.cfg | 11 -- pkgs/servers/monitoring/nagios/default.nix | 27 ++-- pkgs/servers/monitoring/nagios/nagios.patch | 18 ++- .../default.nix => official-2.x.nix} | 22 ++-- pkgs/top-level/all-packages.nix | 6 +- 10 files changed, 106 insertions(+), 193 deletions(-) rename nixos/modules/services/monitoring/{nagios/default.nix => nagios.nix} (64%) delete mode 100644 nixos/modules/services/monitoring/nagios/commands.cfg delete mode 100644 nixos/modules/services/monitoring/nagios/host-templates.cfg delete mode 100644 nixos/modules/services/monitoring/nagios/service-templates.cfg delete mode 100644 nixos/modules/services/monitoring/nagios/timeperiods.cfg rename pkgs/servers/monitoring/nagios/plugins/{official/default.nix => official-2.x.nix} (50%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f4f1abba4de4..a82cef3e0769 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -160,7 +160,7 @@ ./services/monitoring/graphite.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix - ./services/monitoring/nagios/default.nix + ./services/monitoring/nagios.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix diff --git a/nixos/modules/services/monitoring/nagios/default.nix b/nixos/modules/services/monitoring/nagios.nix similarity index 64% rename from nixos/modules/services/monitoring/nagios/default.nix rename to nixos/modules/services/monitoring/nagios.nix index 2eeddf782501..97d153153a55 100644 --- a/nixos/modules/services/monitoring/nagios/default.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -4,21 +4,12 @@ with lib; let - cfg = config.services.nagios; - nagiosUser = "nagios"; - nagiosGroup = "nogroup"; - nagiosState = "/var/lib/nagios"; nagiosLogDir = "/var/log/nagios"; - nagiosObjectDefs = - [ ./timeperiods.cfg - ./host-templates.cfg - ./service-templates.cfg - ./commands.cfg - ] ++ cfg.objectDefs; + nagiosObjectDefs = cfg.objectDefs; nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;} "ensureDir $out; ln -s $nagiosObjectDefs $out/"; @@ -30,19 +21,20 @@ let log_archive_path=${nagiosLogDir}/archive status_file=${nagiosState}/status.dat object_cache_file=${nagiosState}/objects.cache - comment_file=${nagiosState}/comment.dat - downtime_file=${nagiosState}/downtime.dat temp_file=${nagiosState}/nagios.tmp lock_file=/var/run/nagios.lock # Not used I think. state_retention_file=${nagiosState}/retention.dat + query_socket=${nagiosState}/nagios.qh + check_result_path=${nagiosState} + command_file=${nagiosState}/nagios.cmd # Configuration files. #resource_file=resource.cfg cfg_dir=${nagiosObjectDefsDir} # Uid/gid that the daemon runs under. - nagios_user=${nagiosUser} - nagios_group=${nagiosGroup} + nagios_user=nagios + nagios_group=nogroup # Misc. options. illegal_macro_output_chars=`~$&|'"<> @@ -53,26 +45,24 @@ let # authentication. nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf" '' - main_config_file=${nagiosCfgFile} + main_config_file=${cfg.mainConfigFile} use_authentication=0 - url_html_path=/nagios + url_html_path=${cfg.urlPath} ''; - urlPath = cfg.urlPath; - extraHttpdConfig = '' - ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin + ScriptAlias ${cfg.urlPath}/cgi-bin ${pkgs.nagios}/sbin Options ExecCGI AllowOverride None Order allow,deny Allow from all - SetEnv NAGIOS_CGI_CONFIG ${nagiosCGICfgFile} + SetEnv NAGIOS_CGI_CONFIG ${cfg.cgiConfigFile} - Alias ${urlPath} ${pkgs.nagios}/share + Alias ${cfg.urlPath} ${pkgs.nagios}/share Options None @@ -83,14 +73,9 @@ let ''; in - { - ###### interface - options = { - services.nagios = { - enable = mkOption { default = false; description = " @@ -116,6 +101,21 @@ in "; }; + mainConfigFile = mkOption { + default = nagiosCfgFile; + description = " + Derivation for the main configuration file of Nagios. + "; + }; + + cgiConfigFile = mkOption { + default = nagiosCGICfgFile; + description = " + Derivation for the configuration file of Nagios CGI scripts + that can be used in web servers for running the Nagios web interface. + "; + }; + enableWebInterface = mkOption { default = false; description = " @@ -132,55 +132,53 @@ in http://server/urlPath. "; }; - }; - }; - ###### implementation - config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = nagiosUser; - uid = config.ids.uids.nagios; - description = "Nagios monitoring daemon"; - home = nagiosState; - }; + users.extraUsers.nagios = { + description = "Nagios user "; + uid = config.ids.uids.nagios; + home = nagiosState; + createHome = true; + }; # This isn't needed, it's just so that the user can type "nagiostats # -c /etc/nagios.cfg". - environment.etc = singleton - { source = nagiosCfgFile; + environment.etc = [ + { source = cfg.mainConfigFile; target = "nagios.cfg"; - }; + } + ]; environment.systemPackages = [ pkgs.nagios ]; + systemd.services.nagios = { + description = "Nagios monitoring daemon"; + path = [ pkgs.nagios ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; - jobs.nagios = - { description = "Nagios monitoring daemon"; - - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; - - preStart = - '' - mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir} - chown ${nagiosUser} ${nagiosState} ${nagiosLogDir} - ''; - - script = - '' - for i in ${toString config.services.nagios.plugins}; do - export PATH=$i/bin:$i/sbin:$i/libexec:$PATH - done - exec ${pkgs.nagios}/bin/nagios ${nagiosCfgFile} - ''; + serviceConfig = { + User = "nagios"; + Restart = "always"; + RestartSec = 2; + PermissionsStartOnly = true; }; + preStart = '' + mkdir -m 0755 -p ${nagiosState} ${nagiosLogDir} + chown nagios ${nagiosState} ${nagiosLogDir} + ''; + + script = '' + for i in ${toString cfg.plugins}; do + export PATH=$i/bin:$i/sbin:$i/libexec:$PATH + done + exec ${pkgs.nagios}/bin/nagios ${cfg.mainConfigFile} + ''; + }; + services.httpd.extraConfig = optionalString cfg.enableWebInterface extraHttpdConfig; - }; - } diff --git a/nixos/modules/services/monitoring/nagios/commands.cfg b/nixos/modules/services/monitoring/nagios/commands.cfg deleted file mode 100644 index 6efdefcd37dc..000000000000 --- a/nixos/modules/services/monitoring/nagios/commands.cfg +++ /dev/null @@ -1,34 +0,0 @@ -define command { - command_name host-notify-by-email - command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] Host $HOSTSTATE$ alert for $HOSTNAME$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | sendmail $CONTACTEMAIL$ -} - - -define command { - command_name notify-by-email - command_line printf "%b" "To: $CONTACTEMAIL$\nSubject: [Nagios] $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$\n\n***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | sendmail $CONTACTEMAIL$ -} - - -define command { - command_name dummy-ok - command_line true -} - - -define command { - command_name check-host-alive - command_line check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 1 -} - - -define command { - command_name check_local_disk - command_line check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ -} - - -define command { - command_name check_ssh - command_line check_ssh $HOSTADDRESS$ -} diff --git a/nixos/modules/services/monitoring/nagios/host-templates.cfg b/nixos/modules/services/monitoring/nagios/host-templates.cfg deleted file mode 100644 index 3a4c269e2572..000000000000 --- a/nixos/modules/services/monitoring/nagios/host-templates.cfg +++ /dev/null @@ -1,27 +0,0 @@ -define host { - name generic-host - notifications_enabled 1 - event_handler_enabled 1 - flap_detection_enabled 1 - failure_prediction_enabled 1 - process_perf_data 1 - retain_status_information 1 - retain_nonstatus_information 1 - notification_period 24x7 - register 0 -} - - -define host { - name generic-server - use generic-host - check_period 24x7 - max_check_attempts 10 - check_command check-host-alive - notification_period 24x7 - notification_interval 120 - notification_options d,u,r - contact_groups admins - register 0 - #check_interval 1 -} diff --git a/nixos/modules/services/monitoring/nagios/service-templates.cfg b/nixos/modules/services/monitoring/nagios/service-templates.cfg deleted file mode 100644 index e729ea77675d..000000000000 --- a/nixos/modules/services/monitoring/nagios/service-templates.cfg +++ /dev/null @@ -1,32 +0,0 @@ -define service { - name generic-service - active_checks_enabled 1 - passive_checks_enabled 1 - parallelize_check 1 - obsess_over_service 1 - check_freshness 0 - notifications_enabled 1 - event_handler_enabled 1 - flap_detection_enabled 1 - failure_prediction_enabled 1 - process_perf_data 1 - retain_status_information 1 - retain_nonstatus_information 1 - is_volatile 0 - register 0 -} - - -define service { - name local-service - use generic-service - check_period 24x7 - max_check_attempts 4 - normal_check_interval 5 - retry_check_interval 1 - contact_groups admins - notification_options w,u,c,r - notification_interval 0 # notify only once - notification_period 24x7 - register 0 -} diff --git a/nixos/modules/services/monitoring/nagios/timeperiods.cfg b/nixos/modules/services/monitoring/nagios/timeperiods.cfg deleted file mode 100644 index 2669be54d3db..000000000000 --- a/nixos/modules/services/monitoring/nagios/timeperiods.cfg +++ /dev/null @@ -1,11 +0,0 @@ -define timeperiod { - timeperiod_name 24x7 - alias 24 Hours A Day, 7 Days A Week - sunday 00:00-24:00 - monday 00:00-24:00 - tuesday 00:00-24:00 - wednesday 00:00-24:00 - thursday 00:00-24:00 - friday 00:00-24:00 - saturday 00:00-24:00 -} diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index dba063bb1069..5af759db1c9d 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, perl, gdSupport ? false -, gd ? null, libpng ? null, zlib ? null -}: +{ stdenv, fetchurl, perl, php, gd, libpng, zlib }: stdenv.mkDerivation { - name = "nagios-2.10"; + name = "nagios-4.0.7"; src = fetchurl { - url = mirror://sourceforge/nagios/nagios-2.10.tar.gz; - md5 = "8c3a29e138f2ff8c8abbd3dd8a40c4b6"; + url = mirror://sourceforge/nagios/nagios-4.x/nagios-4.0.7/nagios-4.0.7.tar.gz; + sha256 = "1687qnbsag84r57y9745g2klypacfixd6gkzaj42lmzn0v8y27gg"; }; - patches = [./nagios.patch]; - buildInputs = [perl] ++ (if gdSupport then [gd libpng zlib] else []); + patches = [ ./nagios.patch ]; + buildInputs = [ php perl gd libpng zlib ]; + + configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = "all"; + + # Do not create /var directories + preInstall = '' + substituteInPlace Makefile --replace '$(MAKE) install-basic' "" + ''; installTargets = "install install-config"; meta = { description = "A host, service and network monitoring program"; - homepage = http://www.nagios.org/; - license = "GPL"; + homepage = http://www.nagios.org/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; }; } diff --git a/pkgs/servers/monitoring/nagios/nagios.patch b/pkgs/servers/monitoring/nagios/nagios.patch index 6fc271536171..cec4c4942b53 100644 --- a/pkgs/servers/monitoring/nagios/nagios.patch +++ b/pkgs/servers/monitoring/nagios/nagios.patch @@ -1,7 +1,7 @@ -diff -ruN nagios-2.6/configure nagios-2.6.new/configure ---- nagios-2.6/configure 2006-11-28 03:29:04.000000000 +0100 -+++ nagios-2.6.new/configure 2006-12-28 01:22:56.000000000 +0100 -@@ -4810,7 +4810,8 @@ +diff -ruN nagios-4.0.7.orig/configure nagios-4.0.7/configure +--- nagios-4.0.7.orig/configure 2014-06-03 10:41:42.000000000 -0400 ++++ nagios-4.0.7/configure 2014-06-12 00:30:17.516468583 -0400 +@@ -6014,7 +6014,8 @@ #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -11,3 +11,13 @@ diff -ruN nagios-2.6/configure nagios-2.6.new/configure +@@ -6035,7 +6036,8 @@ + + + +-COMMAND_OPTS="-o $command_user -g $command_grp" ++#COMMAND_OPTS="-o $command_user -g $command_grp" ++COMMAND_OPTS="" + + + MAIL_PROG=no diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix similarity index 50% rename from pkgs/servers/monitoring/nagios/plugins/official/default.nix rename to pkgs/servers/monitoring/nagios/plugins/official-2.x.nix index c466813b23b0..3420003c641c 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, openssh}: +{ stdenv, fetchurl, openssh }: -stdenv.mkDerivation { - name = "nagios-plugins-1.4.10"; +stdenv.mkDerivation rec { + name = "nagios-plugins-${version}"; + version = "2.0"; src = fetchurl { - url = https://www.monitoring-plugins.org/download/nagios-plugins-1.4.10.tar.gz; - sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr"; + url = "http://nagios-plugins.org/download/${name}.tar.gz"; + sha256 = "113nv9jqpbqpdjqilqbj1iyshxyvcmq8w94bq5ajz4dxi9j8045s"; }; # !!! Awful hack. Grrr... this of course only works on NixOS. @@ -22,11 +23,14 @@ stdenv.mkDerivation { postInstall = "ln -s libexec $out/bin"; - buildInputs = [openssh]; # !!! make openssh a runtime dependency only + # !!! make openssh a runtime dependency only + buildInputs = [ openssh ]; meta = { - description = "Plugins for Nagios"; - homepage = http://www.monitoring-plugins.org; - license = "GPL"; + description = "Official plugins for Nagios"; + homepage = http://www.nagios.org/download/plugins; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7ade25cbf4b..d1619cf52ece 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6756,13 +6756,11 @@ let mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - nagios = callPackage ../servers/monitoring/nagios { - gdSupport = true; - }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; - nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; + nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; net_snmp = callPackage ../servers/monitoring/net-snmp { }; From fc4adcd7af62503e1a6735af2087913786ff4174 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Jun 2014 00:45:41 -0500 Subject: [PATCH 101/224] php: 5.4.27 -> 5.4.29 Signed-off-by: Austin Seipp --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index ed7c0a2b82ec..4b25224b85a8 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.27"; + version = "5.4.29"; name = "php-${version}"; @@ -246,7 +246,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" ]; - md5 = "1c6e99187d25023411b663ea09f145ee"; + sha256 = "19z2n6h1fvj30n6hl2mwhw2f4i1vwhbj3j7abq3gc16gcfh3rkk2"; name = "php-${version}.tar.bz2"; }; From ff860fa21f2ed8c244eb7f105bc81c32b5d8b5cf Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sun, 22 Jun 2014 07:49:31 +0200 Subject: [PATCH 102/224] Added simple-sql-parser 0.4.0 --- .../haskell/simple-sql-parser/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/simple-sql-parser/default.nix diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix new file mode 100644 index 000000000000..30c3ce4b1053 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix @@ -0,0 +1,19 @@ +{ cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "simple-sql-parser"; + version = "0.4.0"; + sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec testFramework testFrameworkHunit + ]; + meta = { + homepage = "http://jakewheat.github.io/simple-sql-parser/"; + description = "A parser for SQL queries"; + 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 4441a85b1998..dd1969ad7853 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1964,6 +1964,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + simpleSqlParser = callPackage ../development/libraries/haskell/simple-sql-parser {}; + silently = callPackage ../development/libraries/haskell/silently {}; sizedTypes = callPackage ../development/libraries/haskell/sized-types {}; From 812bba77f16b498217b01c374c1a91d86137135c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 23:52:11 -0700 Subject: [PATCH 103/224] swig: ccache tests broken on Darwin with Gcc 4.8.3 --- pkgs/development/tools/misc/swig/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 80c6b20e69d0..09978b5ad650 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; + meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; From e07c7e773c82e427aeb7cf7c5d1732c416eb0edd Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 23:52:43 -0700 Subject: [PATCH 104/224] python2.7-gyp: No longer use no-xcode.patch on Darwin --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb47ab58a546..2bb5f2c58f7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3395,7 +3395,6 @@ rec { }; patches = optionals pkgs.stdenv.isDarwin [ - ../development/python-modules/gyp/no-xcode.patch ../development/python-modules/gyp/no-darwin-cflags.patch ]; From 640d09f8c77571a5892c7004ae9cd47067820843 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Jun 2014 23:53:13 -0700 Subject: [PATCH 105/224] gdk_pixbuf: tests crash on Darwin with gcc 4.8.3 --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1619cf52ece..cb16f1235a59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4762,7 +4762,12 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { + # workaround signal 10 in gdk_pixbuf tests + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; From ffc485547f149088811cc3084c18d5b98231135b Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 22 Jun 2014 02:57:05 -0400 Subject: [PATCH 106/224] enable bazaar on darwin --- pkgs/applications/version-management/bazaar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 2ea916052a38..648d59ac01c2 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 2b9fed52fdc8a7cc64568b3416677b06176ee353 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Jun 2014 02:21:16 -0500 Subject: [PATCH 107/224] pyrax: 1.7.4 -> 1.8.2 Signed-off-by: Austin Seipp --- 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 2bb5f2c58f7e..d4b78e11c89b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5926,11 +5926,11 @@ rec { }; pyrax = buildPythonPackage rec { - name = "pyrax-1.7.3"; + name = "pyrax-1.8.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz"; - sha256 = "1br2kspw0sn7xgkk7z93h72s2v3qm88jvi4213zgz90jhzjj42bv"; + sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp"; }; meta = { From 3f15312b4455ca199fe1475102c1689fdcede997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 22 Jun 2014 10:02:20 +0200 Subject: [PATCH 108/224] xorg: add xkbprint Suggested by @KoviRobi on ML. --- pkgs/servers/x11/xorg/default.nix | 10 ++++++++++ pkgs/servers/x11/xorg/tarballs-7.7.list | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7fca58f54461..1834dfd6a963 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1869,6 +1869,16 @@ let buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; + xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) { + name = "xkbprint-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2; + sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s"; + }; + buildInputs = [pkgconfig libX11 libxkbfile ]; + })) // {inherit libX11 libxkbfile ;}; + xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { name = "xkbutils-1.0.4"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 512bbbb9eff1..e7b3a6f4ad60 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,3 +185,4 @@ mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2 From 9801800563f394c7dd8216ed5950cb71f32092c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 13:59:21 +0200 Subject: [PATCH 109/224] haskell: fix spelling of 'hmatrixSpecial' attribute --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 73d5f060f354..63404d854767 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1104,7 +1104,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; - hmatrix-special = callPackage ../development/libraries/haskell/hmatrix-special {}; + hmatrixSpecial = callPackage ../development/libraries/haskell/hmatrix-special {}; hoauth = callPackage ../development/libraries/haskell/hoauth {}; From f20464e2810166790c902f2afe8a2d35241a06de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 13:59:33 +0200 Subject: [PATCH 110/224] haskell-network-info: update to version 0.2.0.5 --- pkgs/development/libraries/haskell/network-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index c1bfea43bde6..2b16cc7d2941 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-info"; - version = "0.2.0.3"; - sha256 = "04nwl5akrsppxkqqq7a7qi5sixvrzvj4njl8rbz7sglbh9393rs2"; + version = "0.2.0.5"; + sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf"; meta = { homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; From 1c87337b4618167a41ac1cedcbe7a288feb87929 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 13:59:34 +0200 Subject: [PATCH 111/224] haskell-shake: update to version 0.13.2 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f07e0f54b9b8..deb7b65beba9 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.13.1"; - sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7"; + version = "0.13.2"; + sha256 = "0ibq0y0dxxahfwgcvamjfhbl5mrqmj7ryzf8bfmqky843fg7dyna"; isLibrary = true; isExecutable = true; buildDepends = [ From 484e9d4e7040927d6b4c779a87ba4332b9053721 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Jun 2014 13:59:36 +0200 Subject: [PATCH 112/224] haskell-twitter-types: update to version 0.3.20140620 --- pkgs/development/libraries/haskell/twitter-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 4b73fc5cf5a5..6783993f7188 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.3.20140601"; - sha256 = "1z8vdhyklgb4s3jxkavb8n62h9cn3y80qqzab3hswfv5xwri20ni"; + version = "0.3.20140620"; + sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec httpTypes HUnit shakespeare testFramework From 15166ca5c2447e9ea7971c2648ca6ba0128f13fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 22 Jun 2014 10:56:43 +0200 Subject: [PATCH 113/224] Add KDE Connect: A tool to connect and sync your devices with KDE --- pkgs/applications/misc/kdeconnect/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/kdeconnect/default.nix diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix new file mode 100644 index 000000000000..70f3855c3d66 --- /dev/null +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gettext, kdelibs, makeWrapper, qca2, qca2_ossl, qjson }: + +stdenv.mkDerivation rec { + name = "kdeconnect-${version}"; + version = "0.5.2.1"; + + src = fetchurl { + url = "http://download.kde.org/unstable/kdeconnect/0.5.2/src/kdeconnect-kde-${version}.tar.xz"; + sha256 = "0g632ha7xcqf839c4h0dz5637bz6gnn2gz76dc0qq09zbrq49i08"; + }; + + buildInputs = [ gettext kdelibs makeWrapper qca2 qca2_ossl qjson ]; + + postInstall = '' + wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins + ''; + + meta = with stdenv.lib; { + description = "A tool to connect and sync your devices with KDE"; + longDescription = '' + The corresponding Android app, "KDE Connect", is available in + F-Droid and Google play and has the following features: + + - Share files and URLs to KDE from any app + - Clipboard share: copy from or to your desktop + - Notifications sync (4.3+): Read your Android notifications from KDE + - Multimedia remote control: Use your phone as a remote control + - WiFi connection: no usb wire or bluetooth needed + - RSA Encryption: your information is safe + ''; + license = licenses.gpl2; + homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb16f1235a59..3ba5f6d76dbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10433,6 +10433,8 @@ let kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; + kdenlive = callPackage ../applications/video/kdenlive { }; kdesvn = callPackage ../applications/version-management/kdesvn { }; From a6a729b207f995674c931cea3c2d818cc7f0ffc4 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 20 Jun 2014 23:05:48 -0400 Subject: [PATCH 114/224] add nix-prefetch-zip --- .../nix-prefetch-scripts/default.nix | 12 +- .../nix-prefetch-scripts/nix-prefetch-zip | 147 ++++++++++++++++++ 2 files changed, 155 insertions(+), 4 deletions(-) create mode 100755 pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index d7210b2f616b..8f5e7c4a544c 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs }: +{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl }: stdenv.mkDerivation { name = "nix-prefetch-scripts"; @@ -11,9 +11,12 @@ stdenv.mkDerivation { function copyScript { local name=nix-prefetch-$1; local src=$2; - local exe=$3/bin; cp $src $out/bin/$name; - wrapProgram $out/bin/$name --suffix PATH : "$exe" + for dep in ''${@:3}; do + local exe=$dep/bin; + local wrapArgs="$wrapArgs --suffix PATH : $exe" + done + wrapProgram $out/bin/$name $wrapArgs } copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} @@ -21,6 +24,7 @@ stdenv.mkDerivation { copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} + copyScript "zip" ${./nix-prefetch-zip} ${unzip} ${curl} ''; meta = with stdenv.lib; { @@ -30,4 +34,4 @@ stdenv.mkDerivation { # Quicker to build than to download, I hope hydraPlatforms = []; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip b/pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip new file mode 100755 index 000000000000..b1c71bbff332 --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip @@ -0,0 +1,147 @@ +#! /bin/sh -e + +usage(){ + echo >&2 "syntax: nix-prefetch-zip [options] + +Options: + --url name The url of the archive to fetch. + --name name The name to use for the store path (defaults to \`basename \$url\`). + --hash name The hash of unpacked archive. + --hash-type hash Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256. + --base32 Print/accept the hash in a base-32 representation rather than hexadecimal. + --leave-root Keep the root directory of the archive. + --help Show this help text. +" + exit 1 +} + + +argi=0 +argfun="" +for arg; do + if test -z "$argfun"; then + case $arg in + --url) argfun=set_url;; + --name) argfun=set_name;; + --hash) argfun=set_expHash;; + --hash-type) argfun=set_hashType;; + --base32) hashFormat="--base32";; + --leave-root) leaveRoot=true;; + --help) usage;; + *) + echo "Unexpected argument: $arg" >&2 + usage + ;; + esac + else + case $argfun in + set_*) + var=$(echo $argfun | sed 's,^set_,,') + eval "$var=\$arg" + ;; + esac + argfun="" + fi +done + +if [ -z "$url" ]; then + echo "Error: No --url flag given" >&2 + usage +fi + +if [ -z "$name" ]; then + name=$(basename "$url") +fi + +if test -z "$hashType"; then + hashType=sha256 +fi + +tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") +trap "rm -rf \"\$tmp\"" EXIT + +TMPDIR=$tmp/unpacked/$name +mkdir -p $TMPDIR +downloadedFile=$tmp/$name + +unpackFile() { + local curSrc="$1" + + case "$curSrc" in + *.tar.xz | *.tar.lzma) + # Don't rely on tar knowing about .xz. + xz -d < $curSrc | tar xf - + ;; + *.tar | *.tar.* | *.tgz | *.tbz2) + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). + tar xf $curSrc + ;; + *.zip) + unzip -qq $curSrc + ;; + *) + echo "source archive $curSrc has unknown type" >&2 + exit 1 + ;; + esac +} + +# If the hash was given, a file with that hash may already be in the +# store. +if test -n "$expHash"; then + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name") + if ! nix-store --check-validity "$finalPath" 2> /dev/null; then + finalPath= + fi + hash=$expHash +fi + +# If we don't know the hash or a path with that hash doesn't exist, +# download the file and add it to the store. +if test -z "$finalPath"; then + curl="curl \ + --location --max-redirs 20 \ + --disable-epsv \ + --insecure" + + if ! $curl --fail "$url" --output "$downloadedFile"; then + echo "error: could not download $url" >&2 + exit 1 + fi + + cd $TMPDIR + unpackFile "$downloadedFile" + + # FIXME: handle zip files that contain a single regular file. + if [ -z "$leaveRoot" ]; then + shopt -s dotglob + if [ $(ls -d $TMPDIR/* | wc -l) != 1 ]; then + echo "error: zip file must contain a single directory." + exit 1 + fi + fn=$(cd "$TMPDIR" && echo *) + mv $TMPDIR/$fn/* "$TMPDIR/" + rmdir "$TMPDIR/$fn" + fi + + # Compute the hash. + hash=$(nix-hash --type $hashType $hashFormat $TMPDIR) + if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi + + # Add the downloaded file to the Nix store. + finalPath=$(nix-store --add-fixed --recursive "$hashType" $TMPDIR) + + if test -n "$expHash" -a "$expHash" != "$hash"; then + echo "hash mismatch for URL \`$url'" + exit 1 + fi +fi + +if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi + +echo $hash + +if test -n "$PRINT_PATH"; then + echo $finalPath +fi From 400b94e120462f9d6b503e38baa3e4d52917986d Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 22 Jun 2014 05:05:50 -0400 Subject: [PATCH 115/224] fix bzr prefetcher on darwin --- .../package-management/nix-prefetch-scripts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 8f5e7c4a544c..bb0d717a5a2e 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl }: +{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused }: stdenv.mkDerivation { name = "nix-prefetch-scripts"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp $src $out/bin/$name; for dep in ''${@:3}; do local exe=$dep/bin; - local wrapArgs="$wrapArgs --suffix PATH : $exe" + local wrapArgs="$wrapArgs --prefix PATH : $exe" done wrapProgram $out/bin/$name $wrapArgs } @@ -22,7 +22,7 @@ stdenv.mkDerivation { copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} - copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} + copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} ${gnused} copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} copyScript "zip" ${./nix-prefetch-zip} ${unzip} ${curl} ''; From c699a16785bd7f109060a20ae6761b1925574b8d Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sun, 22 Jun 2014 13:07:08 +0300 Subject: [PATCH 116/224] pipes-bytestring: updated to 2.1.0 --- .../libraries/haskell/pipes-bytestring/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 2a2324027d4b..348847e6e9ae 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -1,13 +1,11 @@ -{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers +{ cabal, pipes, pipesGroup, pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "2.0.1"; - sha256 = "1vsfqqkr5danb0n30av4vk8d4by9f50y5l8ywm1xjrmwrx999gvf"; - buildDepends = [ - pipes pipesGroup pipesParse profunctors transformers - ]; + version = "2.1.0"; + sha256 = "1q98444kpcdc817zbg121g2n1mhblrdfsmd0bs5rqq6ijxb213z0"; + buildDepends = [ pipes pipesGroup pipesParse transformers ]; meta = { description = "ByteString support for pipes"; license = self.stdenv.lib.licenses.bsd3; From d851ce331dad8dde4faa6853ea322c7799899104 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 22 Jun 2014 16:26:06 +0700 Subject: [PATCH 117/224] st: 0.4.1 -> 0.5 --- pkgs/applications/misc/st/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index fda89f1cd3dd..9c57fbd19a77 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.4.1"; + name = "st-0.5"; src = fetchurl { url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf"; + sha256 = "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); From c5e00799624e3dfa4f1dca727cbf81353bcfc091 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 22 Jun 2014 12:39:07 +0200 Subject: [PATCH 118/224] libvorbis: use pkgconfig instead of guessing paths. Closes #3014 --- pkgs/development/libraries/libvorbis/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 82c218d67b39..0dd99605b336 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg }: +{ stdenv, fetchurl, libogg, pkgconfig }: let name = "libvorbis-1.3.4"; @@ -11,6 +11,8 @@ stdenv.mkDerivation { sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; }; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libogg ]; doCheck = true; From 724fbd81ff744cfaa096493015ea03cf86dd8fb1 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 22 Jun 2014 18:17:09 +0700 Subject: [PATCH 119/224] i3: 4.7.2 -> 4.8 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ebdc7b143c37..17a287f8aae2 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.7.2"; + version = "4.8"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "14zkn5jgm0b7ablvxcxh9gdzq6mjdd6i1kl9dbmifl2a6rg5dr3g"; + sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm From 3ae765278f0e5d75e3d18ebac29c25780b92e9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 13:39:28 +0200 Subject: [PATCH 120/224] diffstat: clean up expression Most importantly, add meta.description and meta.platforms. --- pkgs/tools/text/diffstat/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 6bbf1a9a8c7f..94c2df9aabe0 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,17 +1,23 @@ -{fetchurl, stdenv}: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "diffstat-1.58"; src = fetchurl { - url = "ftp://invisible-island.net/diffstat/"+ name +".tgz"; + url = "ftp://invisible-island.net/diffstat/${name}.tgz"; sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs"; }; - meta = { + meta = with stdenv.lib; { + description = "Read output of diff and display a histogram of the changes"; + longDescription = '' + diffstat reads the output of diff and displays a histogram of the + insertions, deletions, and modifications per-file. It is useful for + reviewing large, complex patch files. + ''; homepage = http://invisible-island.net/diffstat/; - longDescription = "diffstat reads the output of diff and displays a -istogram of the insertions, deletions, and modifications per-file. It -s useful for reviewing large, complex patch files."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } From 9883b5806a91c4d2512c1a2908bf1857d19b256a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 14:05:26 +0200 Subject: [PATCH 121/224] chrpath: new package chrpath is a command line tool to adjust the RPATH or RUNPATH of ELF binaries. (Yes, it is similar to our patchelf tool.) gpsd and Yocto/OpenEmbedded depend on chrpath (although we have currently patched that dependency out of gpsd). --- .../tools/misc/chrpath/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/chrpath/default.nix diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix new file mode 100644 index 000000000000..4170570e08aa --- /dev/null +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "chrpath-0.16"; + + src = fetchurl { + url = "https://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.gz"; + sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; + }; + + meta = with stdenv.lib; { + description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; + longDescription = '' + chrpath changes, lists or removes the rpath or runpath setting in a + binary. The rpath, or runpath if it is present, is where the runtime + linker should look for the libraries needed for a program. + ''; + homepage = https://alioth.debian.org/projects/chrpath/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba5f6d76dbd..d05489d4b7a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3790,6 +3790,8 @@ let chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chrpath = callPackage ../development/tools/misc/chrpath { }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; complexity = callPackage ../development/tools/misc/complexity { }; From 0669981ba0d1025eb11437c9d32368f3736900ab Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Fri, 20 Jun 2014 18:38:05 +0200 Subject: [PATCH 122/224] New package: sqsh. An SQL query tool/shell for Sybase/MSSQL --- pkgs/development/tools/sqsh/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/sqsh/default.nix diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix new file mode 100644 index 000000000000..a0f7922b1aa8 --- /dev/null +++ b/pkgs/development/tools/sqsh/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, freetds, readline }: + +stdenv.mkDerivation rec { + version = "2.5.16.1"; + name = "sqsh-${version}"; + + src = fetchurl { + url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; + sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; + }; + + preConfigure = + '' + export SYBASE=${freetds} + ''; + + buildInputs = [ + freetds + readline + ]; + + meta = { + description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + longDescription = + '' + Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), + it is intended as a replacement for the venerable 'isql' program supplied + by Sybase. + ''; + homepage = "http://www.cs.washington.edu/~rose/sqsh/sqsh.html"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba5f6d76dbd..50e5949a2822 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11061,6 +11061,8 @@ let streamripper = callPackage ../applications/audio/streamripper { }; + sqsh = callPackage ../development/tools/sqsh { }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; From 74cd7cb3c8233436d79554f4ddb7dbbe554fa36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 22 Jun 2014 14:38:45 +0200 Subject: [PATCH 123/224] sane: environment.variables -> environment.sessionVariables See 13befa3979d6ac98a96880fba9a3239bc333e644 for details --- nixos/modules/services/hardware/sane.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index f7b25c187877..bbb59312753c 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -42,7 +42,7 @@ in config = mkIf config.hardware.sane.enable { environment.systemPackages = backends; - environment.variables = { + environment.sessionVariables = { SANE_CONFIG_DIR = mkDefault "${saneConfig}/etc/sane.d"; LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; }; From dc215c2988129b6e7fde64728953a5843c63e03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 22 Jun 2014 15:02:41 +0200 Subject: [PATCH 124/224] php{53,54}: fetch from generic URL I see no reason to download from a pre-specified mirror. It didn't even work for me. --- pkgs/development/interpreters/php/5.3.nix | 2 +- pkgs/development/interpreters/php/5.4.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 95120a4d9a20..867821170974 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) '' ); src = fetchurl { - url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4b25224b85a8..b692e4d8a991 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -242,12 +242,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - urls = [ - "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - ]; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; sha256 = "19z2n6h1fvj30n6hl2mwhw2f4i1vwhbj3j7abq3gc16gcfh3rkk2"; - name = "php-${version}.tar.bz2"; }; meta = { From 41648113c845516d412bcb7794e4c3c082931adb Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sun, 22 Jun 2014 14:28:24 +0100 Subject: [PATCH 125/224] haskellPackages.extensibleEffects: Jailbreak this package This is required until https://github.com/RobotGymnast/extensible-effects/issues/15 is resolved --- .../development/libraries/haskell/extensible-effects/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index eb52756ce3b4..8c188bf68203 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -18,4 +18,5 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; + jailbreak = true; }) From 114b75ce97f450920dafded342596372ab224382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 22 Jun 2014 15:28:44 +0200 Subject: [PATCH 126/224] mariadb: switch to a working download URL --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d0f7f5ef3e52..1df9f6a440fd 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "10.0.11"; src = fetchurl { - url = "https://fossies.org/linux/misc/${name}.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3"; }; From ce64f0681ad3a85f59da892179c17af0c650fb7c Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sun, 22 Jun 2014 17:23:33 +0300 Subject: [PATCH 127/224] Added haskellPackages.hweblib 0.6.3 --- .../libraries/haskell/hweblib/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hweblib/default.nix diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix new file mode 100644 index 000000000000..dd07ef503a73 --- /dev/null +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, HUnit, mtl, text, transformers }: + +cabal.mkDerivation (self: { + pname = "hweblib"; + version = "0.6.3"; + sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy"; + buildDepends = [ attoparsec mtl text transformers ]; + testDepends = [ attoparsec HUnit mtl transformers ]; + meta = { + homepage = "http://github.com/aycanirican/hweblib"; + description = "Haskell Web Library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79187c6a5455..608108a18474 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1208,6 +1208,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; HUnit = self.HUnit_1_2_5_2; + hweblib = callPackage ../development/libraries/haskell/hweblib/default.nix {}; + hxt = callPackage ../development/libraries/haskell/hxt {}; hxtCharproperties = callPackage ../development/libraries/haskell/hxt-charproperties {}; From c68e3418fb9b270fc26be5293c028602a856cf58 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 22 Jun 2014 19:44:57 +0400 Subject: [PATCH 128/224] Update 3.16-rc to -rc2: -rc1 has problems with mounting BtrFS, will test -rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 541384a8c118..bafac2fc58df 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -2,13 +2,13 @@ import ./generic.nix (args // rec { # Reason to add: RTL8192EE - version = "3.16-rc1"; - modDirVersion = "3.16.0-rc1"; + version = "3.16-rc2"; + modDirVersion = "3.16.0-rc2"; extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1y2ssifw6db40mr4j6k9c0kjwb4ssrrps74pc38krq4d6yzinhmq"; + sha256 = "12bxf62qqsf471ak6rj4gbvvjsybsamgwj9p8bphr98dp14js27w"; }; features.iwlwifi = true; From 3dec61a8a66ea55c41c3e1074b6b5bb581d9b0d4 Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Sun, 22 Jun 2014 19:42:32 +0200 Subject: [PATCH 129/224] Fix sudo not installing due to timedir deprecation --- pkgs/tools/security/sudo/default.nix | 39 +++++++++++++++------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b4c2d7f1c1fa..6324ca0c3e2d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -11,39 +11,42 @@ stdenv.mkDerivation rec { sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; - postConfigure = '' - cat >> pathnames.h <> pathnames.h <<'EOF' + #undef _PATH_MV + #define _PATH_MV "${coreutils}/bin/mv" + EOF makeFlags="install_uid=$(id -u) install_gid=$(id -g)" - installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc timedir=$TMPDIR/dummy" - ''; + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy" + ''; buildInputs = [ coreutils pam groff ]; enableParallelBuilding = true; - postInstall = '' - rm $out/share/doc/sudo/ChangeLog - ''; + postInstall = + '' + rm -f $out/share/doc/sudo/ChangeLog + ''; meta = { description = "A command to run commands as root"; - longDescription = '' + longDescription = + '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability to run some (or all) commands as root or another user while providing an audit trail of the commands and their arguments. - ''; + ''; homepage = http://www.sudo.ws/; From fbfdc8e2dcabd2bef9011a69b0bb080abc8f7a2a Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Sun, 22 Jun 2014 19:50:40 +0200 Subject: [PATCH 130/224] keep fallback visudo editor as nano --- pkgs/tools/security/sudo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6324ca0c3e2d..ab46af5a1cd9 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-env-editor" + "--with-editor=/run/current-system/sw/bin/nano" "--with-rundir=/var/run" "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" From 9ae6cc5967fea7c1f9b217a85103f57c35e39e2f Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sat, 14 Jun 2014 18:24:31 +0200 Subject: [PATCH 131/224] numexpr: new package, version 2.4 Description from the numexpr project page [1]: > Numexpr is a fast numerical expression evaluator for NumPy. With it, > expressions that operate on arrays (like "3*a+4*b") are accelerated and use > less memory than doing the same calculation in Python. I am adding it, because it is a dependency of the pytables package. [1]: https://github.com/pydata/numexpr --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d4b78e11c89b..3c733f62ff44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4601,6 +4601,43 @@ rec { }; }; + numexpr = buildPythonPackage rec { + version = "2.4"; + name = "numexpr-${version}"; + + src = fetchgit { + url = https://github.com/pydata/numexpr.git; + rev = "606cc9a110711e947d35ac2770749c00dab184c8"; + sha256 = "1gxgkg7ncgjhnifn444iha5nrjhyr8sr6w5yp204186a1ysz858g"; + }; + + propagatedBuildInputs = with pkgs; [ numpy ]; + + # Run the test suite. + # It requires the build path to be in the python search path. + checkPhase = '' + ${python}/bin/${python.executable} < Date: Sun, 15 Jun 2014 11:12:03 +0200 Subject: [PATCH 132/224] hdf5: Add zlib as optional dependency This adds addition compression modes to the hdf5 library. I am adding this, because pytables depends on it. --- pkgs/tools/misc/hdf5/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 01820aaf7780..8b1f8a3b9644 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl +, zlib ? null }: stdenv.mkDerivation { name = "hdf5-1.8.10-patch1"; @@ -8,7 +9,9 @@ stdenv.mkDerivation { url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; }; - buildInputs = [] ; + + buildInputs = [] + ++ stdenv.lib.optional (zlib != null) zlib; patches = [./bin-mv.patch]; From c24e85f3a5269e7d5d664620f755334b19b64caa Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 15 Jun 2014 13:25:43 +0200 Subject: [PATCH 133/224] szip: Fix source hash The hash code of the downloaded source tar-ball was not identical to the one specified in the nix-expression. This commit fixes that problem. --- pkgs/development/libraries/szip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 38cde3bfd707..159b8e6e8386 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "szip-2.1"; src = fetchurl { url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z"; + sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; }; -} \ No newline at end of file +} From d1f7bc7bcfd2a0a48d22c98c5c626231291c5ea4 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 15 Jun 2014 13:26:44 +0200 Subject: [PATCH 134/224] hdf5: Add szip as an optional dependency This adds additional compression modes to hdf5. Note: The szip license may not be compatible with everyone's use case. Hence, it is an optional dependency. --- pkgs/tools/misc/hdf5/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 8b1f8a3b9644..1f5fb78d100c 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl , zlib ? null +, szip ? null }: stdenv.mkDerivation { name = "hdf5-1.8.10-patch1"; @@ -11,7 +12,10 @@ stdenv.mkDerivation { }; buildInputs = [] - ++ stdenv.lib.optional (zlib != null) zlib; + ++ stdenv.lib.optional (zlib != null) zlib + ++ stdenv.lib.optional (szip != null) szip; + + configureFlags = if szip != null then "--with-szlib=${szip}" else ""; patches = [./bin-mv.patch]; From 5a960436373a44e25d08ad709ef604fc93b8bf2f Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 15 Jun 2014 11:59:58 +0200 Subject: [PATCH 135/224] hdf5: Update to 1.8.13 --- pkgs/tools/misc/hdf5/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 1f5fb78d100c..a7d03d1335f0 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -4,11 +4,12 @@ , zlib ? null , szip ? null }: -stdenv.mkDerivation { - name = "hdf5-1.8.10-patch1"; +stdenv.mkDerivation rec { + version = "1.8.13"; + name = "hdf5-${version}-patch1"; src = fetchurl { - url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; - sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; + url = "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"; + sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; buildInputs = [] From 52762ed4163b7eeba076b3393991b19f36798c65 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sat, 14 Jun 2014 18:24:50 +0200 Subject: [PATCH 136/224] tables: add new package, version 3.1.1 From the project page [1]: > PyTables is a package for managing hierarchical datasets and designed to > efficiently and easily cope with extremely large amounts of data. It offers read/write access to hdf5 archives through a hierarchical interface. I am adding it, because pandas depends on tables for hdf5 read/write functionality. Note: The name is a bit of an issue. The project is called pytables, whereas the python module is simply called tables. I chose to name the nix-expression tables for consistency with the source-tarball and the module name. [1]: http://www.pytables.org/moin --- .../python-modules/tables/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/tables/default.nix diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix new file mode 100644 index 000000000000..d3edf54788ab --- /dev/null +++ b/pkgs/development/python-modules/tables/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, cython, bzip2, lzo, numpy, numexpr, hdf5 }: + +buildPythonPackage rec { + version = "3.1.1"; + name = "tables-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pytables/${name}.tar.gz"; + sha256 = "18rdzv9xwiapb5c8y47rk2fi3fdm2dpjf68wfycma67ifrih7f9r"; + }; + + buildInputs = [ hdf5 cython bzip2 lzo ]; + propagatedBuildInputs = [ numpy numexpr ]; + + # The setup script complains about missing run-paths, but they are + # actually set. + setupPyBuildFlags = + [ "--hdf5=${hdf5}" + "--lzo=${lzo}" + "--bzip2=${bzip2}" + ]; + setupPyInstallFlags = setupPyBuildFlags; + + # Run the test suite. + # It requires the build path to be in the python search path. + # These tests take quite some time. + # If the hdf5 library is built with zlib then there is only one + # test-failure. That is the same failure as described in the following + # github issue: + # https://github.com/PyTables/PyTables/issues/269 + checkPhase = '' + ${python}/bin/${python.executable} < Date: Sun, 15 Jun 2014 14:11:37 +0200 Subject: [PATCH 137/224] pandas: Update to 0.14.0 --- 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 ee08823fe0c6..329169e6e262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4878,11 +4878,11 @@ rec { }); pandas = buildPythonPackage rec { - name = "pandas-0.12.0"; + name = "pandas-0.14.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "0vf865wh1kcq33189ykqgngb25nxhxxch6skfdl3c6w024v4r6xy"; + sha256 = "f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528"; }; buildInputs = [ nose ]; From 686d847ee2a61507a50c2a4cd110c2c11cc8e209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 20:52:52 +0200 Subject: [PATCH 138/224] 4suite: mark as broken None of the tools installed to bin/ work. They all throw an exception similar to this: ImportError: No module named Ft.Xml.XPath._4xpath --- pkgs/development/python-modules/4suite/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix index 9f900e4f50ab..94eec40d51fb 100644 --- a/pkgs/development/python-modules/4suite/default.nix +++ b/pkgs/development/python-modules/4suite/default.nix @@ -10,4 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [python]; buildPhase = "true"; installPhase = "python ./setup.py install --prefix=$out"; + + # None of the tools installed to bin/ work. They all throw an exception + # similar to this: + # ImportError: No module named Ft.Xml.XPath._4xpath + meta.broken = true; } From 76672dd9e31e43a269c4ce20a950f9e49f408c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 21:03:19 +0200 Subject: [PATCH 139/224] accountsservice: be consistent in naming (always two 's') The package is (correctly) named 'accountsservice' (with two 's'), but the attribute and expression path lacked one 's'. Fix it. --- nixos/modules/module-list.nix | 2 +- .../desktops/{accountservice.nix => accountsservice.nix} | 6 +++--- pkgs/desktops/gnome-3/3.10/core/gdm/default.nix | 4 ++-- .../gnome-3/3.10/core/gnome-control-center/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 4 ++-- .../gnome-3/3.12/core/gnome-control-center/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix | 6 +++--- .../{accountservice => accountsservice}/default.nix | 0 .../no-create-dirs.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) rename nixos/modules/services/desktops/{accountservice.nix => accountsservice.nix} (76%) rename pkgs/development/libraries/{accountservice => accountsservice}/default.nix (100%) rename pkgs/development/libraries/{accountservice => accountsservice}/no-create-dirs.patch (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a82cef3e0769..13f2656c2873 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -101,7 +101,7 @@ ./services/databases/virtuoso.nix ./services/databases/monetdb.nix ./services/databases/influxdb.nix - ./services/desktops/accountservice.nix + ./services/desktops/accountsservice.nix ./services/desktops/geoclue2.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/evolution-data-server.nix diff --git a/nixos/modules/services/desktops/accountservice.nix b/nixos/modules/services/desktops/accountsservice.nix similarity index 76% rename from nixos/modules/services/desktops/accountservice.nix rename to nixos/modules/services/desktops/accountsservice.nix index 386dfe98bd23..c28c27295761 100644 --- a/nixos/modules/services/desktops/accountservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -30,11 +30,11 @@ with lib; config = mkIf config.services.accounts-daemon.enable { - environment.systemPackages = [ pkgs.accountservice ]; + environment.systemPackages = [ pkgs.accountsservice ]; - services.dbus.packages = [ pkgs.accountservice ]; + services.dbus.packages = [ pkgs.accountsservice ]; - systemd.packages = [ pkgs.accountservice ]; + systemd.packages = [ pkgs.accountsservice ]; }; } diff --git a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix index 3df5ab40eaf8..5e53a7e86cbb 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix index 1222f03d66e3..4e472514348c 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns networkmanager modemmanager makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix index 554b09a1e592..d468e06d429f 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 070f39199d79..4e9acc822e74 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11 +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice dconf + buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice dconf gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index eb2324c9c0f2..0aed2e7a410a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile + accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 49154aa92218..49514b3dbe44 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-shell" \ --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \ + --prefix LD_LIBRARY_PATH : "${accountsservice}/lib:${ibus}/lib:${gdm}/lib" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix similarity index 100% rename from pkgs/development/libraries/accountservice/default.nix rename to pkgs/development/libraries/accountsservice/default.nix diff --git a/pkgs/development/libraries/accountservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch similarity index 100% rename from pkgs/development/libraries/accountservice/no-create-dirs.patch rename to pkgs/development/libraries/accountsservice/no-create-dirs.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5595e1cf5ae2..3af565fb1a04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4163,7 +4163,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accountservice = callPackage ../development/libraries/accountservice { }; + accountsservice = callPackage ../development/libraries/accountsservice { }; acl = callPackage ../development/libraries/acl { }; From 6693f6c3e35b6931ee99d60b940b09b02d23de6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 21:29:26 +0200 Subject: [PATCH 140/224] accountsservice: add meta.description --- pkgs/development/libraries/accountsservice/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 0ff5466e5c4f..6609da5ac822 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons" ''; + meta = { + description = "D-Bus interface for user account query and manipulation"; + }; } From a14365b568370790fc363e8b0358e3d3e542bca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 21:46:34 +0200 Subject: [PATCH 141/224] alchemy: add meta.longDescription --- pkgs/applications/graphics/alchemy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 6a212a7a931d..ee8543f7039a 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation { meta = { description = "Drawing application"; + longDescription = '' + Alchemy is an open drawing project aimed at exploring how we can sketch, + draw, and create on computers in new ways. Alchemy isn’t software for + creating finished artwork, but rather a sketching environment that + focuses on the absolute initial stage of the creation process. + Experimental in nature, Alchemy lets you brainstorm visually to explore + an expanded range of ideas and possibilities in a serendipitous way. + ''; homepage = http://al.chemy.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; From 239d35338f29f03a1b5fb33c2794eeacf4342c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 21:59:41 +0200 Subject: [PATCH 142/224] antlr: add meta attributes --- pkgs/development/tools/parsing/antlr/2.7.7.nix | 13 +++++++++++++ pkgs/development/tools/parsing/antlr/default.nix | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 8d68479dd0e6..23141185f68e 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { }; patches = [ ./2.7.7-fixes.patch ]; buildInputs = [jdk python]; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix index deb8040256b5..e866f61f25a3 100644 --- a/pkgs/development/tools/parsing/antlr/default.nix +++ b/pkgs/development/tools/parsing/antlr/default.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { md5 = "6a7e70ccece8149b735cc3aaa24241cc"; }; inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } From 24f3fb6788cfed5937347397b52c9b295f95c965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:03:40 +0200 Subject: [PATCH 143/224] maven: cosmetic changes in expression Replace hard tabs with space. Add some whitespace between lines. --- pkgs/misc/maven/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index ec2b57e222a0..287f638150ab 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -1,15 +1,18 @@ -{stdenv, fetchurl, jdk, makeWrapper}: +{ stdenv, fetchurl, jdk, makeWrapper }: assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-3.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; - sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; - }; - - buildInputs = [makeWrapper]; - inherit jdk; + name = "apache-maven-3.0.4"; + + builder = ./builder.sh; + + src = fetchurl { + url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; + sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; + }; + + buildInputs = [ makeWrapper ]; + + inherit jdk; } From d3ae8086c4213e4dbef0b6cc257bc00b93ceb4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:11:02 +0200 Subject: [PATCH 144/224] maven: add meta attributes (description, homepage, license) --- pkgs/misc/maven/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index 287f638150ab..8367e6ea72a1 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; inherit jdk; + + meta = with stdenv.lib; { + description = "Build automation tool (used primarily for Java projects)"; + homepage = http://maven.apache.org/; + license = licenses.asl20; + }; } From 9033821c34d5cd69d814d73413da7a2e5f719d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:22:51 +0200 Subject: [PATCH 145/224] asciidoc: properly differentiate the "-full" variant in meta.description --- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 8a5eb6ad759e..fd7551e234e1 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/vim"; meta = with stdenv.lib; { - description = "Text-based document generation system"; + description = "Text-based document generation system ${stdenv.lib.optionalString enableStandardFeatures "(full version)"}"; longDescription = '' AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. From 215754f4fa162fb42da4aeac7042f27d5782cb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:24:27 +0200 Subject: [PATCH 146/224] asciidoc-full: rename attribute from asciidocFull But keep asciidocFull attribute for backwards compatibility (with a timestamp so we can later decide when to finally remove the old attribute). --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af565fb1a04..782443c13b62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -661,7 +661,7 @@ let enableStandardFeatures = false; }; - asciidocFull = appendToName "full" (asciidoc.override { + asciidoc-full = appendToName "full" (asciidoc.override { inherit (pythonPackages) pygments; enableStandardFeatures = true; }); @@ -11251,6 +11251,7 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; + asciidocFull = asciidoc-full; # added 2014-06-22 }; in self; in pkgs From 20a8630c2f344ebf8d1b9e16375b410d484dbe5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:33:46 +0200 Subject: [PATCH 147/224] axis: use space instead of hardtab --- pkgs/development/libraries/axis/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix index f2c466009d45..0d35ae6aad61 100644 --- a/pkgs/development/libraries/axis/default.nix +++ b/pkgs/development/libraries/axis/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "axis-1.3"; - directory = "axis-1_3"; - builder = ./builder.sh; - src = fetchurl { - url = "http://apache.cs.uu.nl/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; - md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; - }; - inherit stdenv; + name = "axis-1.3"; + directory = "axis-1_3"; + builder = ./builder.sh; + src = fetchurl { + url = "http://apache.cs.uu.nl/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; + md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; + }; + inherit stdenv; } From 6c2d696f42259fdaef8bc8b628e8b4ceeb40c833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:34:10 +0200 Subject: [PATCH 148/224] axis: fix download url (the old one is dead) --- pkgs/development/libraries/axis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix index 0d35ae6aad61..be11098d2c79 100644 --- a/pkgs/development/libraries/axis/default.nix +++ b/pkgs/development/libraries/axis/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { directory = "axis-1_3"; builder = ./builder.sh; src = fetchurl { - url = "http://apache.cs.uu.nl/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; + url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; }; inherit stdenv; From d3769751015ac2d3cd298385340cc8fa9f03e20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:36:23 +0200 Subject: [PATCH 149/224] axis: add meta.description --- pkgs/development/libraries/axis/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix index be11098d2c79..62ae463b5fc8 100644 --- a/pkgs/development/libraries/axis/default.nix +++ b/pkgs/development/libraries/axis/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; }; inherit stdenv; + + meta = { + description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C"; + }; } From 5082caa72d75086c8927b52ea4a6e0e03159f026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:38:27 +0200 Subject: [PATCH 150/224] axis2: add meta.description --- pkgs/servers/http/tomcat/axis2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 4bf3d59685b0..cf64ba2d3c69 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { buildInputs = [ unzip apacheAnt jdk ]; builder = ./builder.sh; + + meta = { + description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + }; } From 4d120e29c50e1b0de9e555a13d147b93d4f5d231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:45:53 +0200 Subject: [PATCH 151/224] catdoc: add meta.description --- pkgs/tools/text/catdoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 5880de7a735c..e056af26877c 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-wordview"; meta = with stdenv.lib; { + description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = "GPL2"; maintainers = [ maintainers.urkud ]; From 4a5cf73caac2d6f0d7ec021ec562173a33f762ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:49:32 +0200 Subject: [PATCH 152/224] cinelerra: don't repeat package name in meta.description --- pkgs/applications/video/cinelerra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 98ba7a8e137e..ce8bbde2ecd1 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ]; meta = { - description = "Cinelerra - Video Editor"; + description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; license = "GPLv2"; From ce4c20165b8191bd459e50e3d007cc8a5636af66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:51:14 +0200 Subject: [PATCH 153/224] clearsilver: add description + homepage --- pkgs/development/libraries/clearsilver/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index fb3a7d92c8e5..4095c1ae2f4b 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,12 +1,19 @@ -{stdenv, fetchurl, python}: +{ stdenv, fetchurl, python }: stdenv.mkDerivation { name = "clearsilver-0.10.3"; + src = fetchurl { url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; md5 = "ff4104b0e58bca1b61d528edbd902769"; }; + builder = ./builder.sh; inherit stdenv python; + + meta = { + description = "Fast, powerful, and language-neutral HTML template system"; + homepage = http://www.clearsilver.net/; + }; } From 7061116faa50da80d2a791892bccd3e49c6078dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 22:55:00 +0200 Subject: [PATCH 154/224] colordiff: add meta attributes --- pkgs/tools/text/colordiff/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 06e15d07ff09..d23a06ebe485 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,13 +1,23 @@ -{stdenv, fetchurl, perl /*, xmlto */}: +{ stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation { name = "colordiff-1.0.9"; + src = fetchurl { url = http://colordiff.sourceforge.net/colordiff-1.0.9.tar.gz; sha256 = "b2c25d81c10f22380798f146cc5b54ffc5aeb6e5ca1208be2b9508fec1d8e4a6"; }; buildInputs = [ perl /* xmlto */ ]; + dontBuild = 1; # do not build doc yet. + installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; + + meta = with stdenv.lib; { + description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; + homepage = http://www.colordiff.org/; + license = licenses.gpl3; + platforms = platforms.linux; + }; } From 5d97335b6dbb10fe835a6c70b90d37f41aea6c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 23:00:14 +0200 Subject: [PATCH 155/224] colordiff: update 1.0.9 -> 1.0.13 --- pkgs/tools/text/colordiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index d23a06ebe485..34221d803661 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation { - name = "colordiff-1.0.9"; + name = "colordiff-1.0.13"; src = fetchurl { - url = http://colordiff.sourceforge.net/colordiff-1.0.9.tar.gz; - sha256 = "b2c25d81c10f22380798f146cc5b54ffc5aeb6e5ca1208be2b9508fec1d8e4a6"; + url = http://www.colordiff.org/colordiff-1.0.13.tar.gz; + sha256 = "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f"; }; buildInputs = [ perl /* xmlto */ ]; From e805731cac34e2ed53c3c66e7c95c3212442fe9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 23:03:36 +0200 Subject: [PATCH 156/224] convmv: add meta.description --- pkgs/tools/misc/convmv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6d1ce21f318d..7db7ebf96d6d 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = with stdenv.lib; { + description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ maintainers.urkud ]; }; From 4b61edb390186593c701b51f24fc1cf5fa57c407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Jun 2014 23:08:11 +0200 Subject: [PATCH 157/224] coredumper: mark as broken It doesn't build. Bumping to latest version (1.2.1) didn't fix it. It has no maintainers and the last time the expression was touched was in 2007. --- pkgs/development/libraries/coredumper/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/coredumper/default.nix b/pkgs/development/libraries/coredumper/default.nix index f62289ea1818..ddd0d87a5511 100644 --- a/pkgs/development/libraries/coredumper/default.nix +++ b/pkgs/development/libraries/coredumper/default.nix @@ -6,4 +6,13 @@ stdenv.mkDerivation { url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz; sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx"; }; + + # Doesn't build: + # + # src/elfcore.c: In function 'CreatePipeline': + # src/elfcore.c:1424:26: error: 'CLONE_VM' undeclared (first use in this function) + # CLONE_VM|CLONE_UNTRACED|SIGCHLD, &args, 0, 0, 0); + # ^ + # src/elfcore.c:1424:26: note: each undeclared identifier is reported only once for each function it appears in + meta.broken = true; } From 125c2b946833687b01cdef36f2d638d242d646b0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Jun 2014 20:26:24 -0500 Subject: [PATCH 158/224] gradm: 3.0-201401291757 -> 3.0-201405281853 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/gradm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 62a3cfa631e7..87e8fa5b074e 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gradm-${version}"; - version = "3.0-201401291757"; + version = "3.0-201405281853"; src = fetchurl { url = "http://grsecurity.net/stable/${name}.tar.gz"; - sha256 = "19p7kaqbvf41scc63n69b5v5xzpw3mbf5zy691rply8hdm7736cw"; + sha256 = "0yjmbjhm71cik5j8h2prgk40wki3sflwbf2zqmc4pwaqlvis9s2f"; }; buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ]; From 0399c5ee24fb0caa5c81be40456636dddfe7692a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 22 Jun 2014 22:28:32 -0500 Subject: [PATCH 159/224] grsecurity: update stable/testing kernels, refactoring This updates the new stable kernel to 3.14, and the new testing kernel to 3.15. This also removes the vserver kernel, since it's probably not nearly as used. Signed-off-by: Austin Seipp --- nixos/modules/security/grsecurity.nix | 21 ++++----------------- pkgs/build-support/grsecurity/default.nix | 10 ++++------ pkgs/build-support/grsecurity/flavors.nix | 8 +------- pkgs/os-specific/linux/kernel/patches.nix | 19 ++++++------------- pkgs/top-level/all-packages.nix | 8 -------- 5 files changed, 15 insertions(+), 51 deletions(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index f4af04247fe9..3bd58218c99d 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -6,12 +6,10 @@ let cfg = config.security.grsecurity; customGrsecPkg = - (import ../../../pkgs/build-support/grsecurity - { - inherit lib pkgs; - grsecOptions = cfg; - } - ).grsecPackage; + (import ../../../pkgs/build-support/grsecurity { + grsecOptions = cfg; + inherit pkgs lib; + }).grsecPackage; in { options = { @@ -36,14 +34,6 @@ in ''; }; - vserver = mkOption { - type = types.bool; - default = false; - description = '' - Enable the stable grsecurity/vserver patches, based on Linux 3.2. - ''; - }; - testing = mkOption { type = types.bool; default = false; @@ -246,9 +236,6 @@ in both. ''; } - { assertion = (cfg.testing -> !cfg.vserver); - message = "The vserver patches are only supported in the stable kernel."; - } { assertion = (cfg.config.restrictProc -> !cfg.config.restrictProcWithGroup) || (cfg.config.restrictProcWithGroup -> !cfg.config.restrictProc); message = "You cannot enable both restrictProc and restrictProcWithGroup"; diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index a9c60a2afbd0..e66b348d082a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -5,7 +5,6 @@ with lib; let cfg = { stable = grsecOptions.stable or false; - vserver = grsecOptions.vserver or false; testing = grsecOptions.testing or false; config = { mode = "auto"; @@ -29,12 +28,11 @@ let }; test-patch = with pkgs.kernelPatches; grsecurity_unstable; - stable-patch = with pkgs.kernelPatches; - if cfg.vserver then grsecurity_vserver else grsecurity_stable; + stable-patch = with pkgs.kernelPatches; grsecurity_stable; - grKernel = if (cfg.stable || cfg.vserver) - then mkKernel pkgs.linux_3_2 stable-patch - else mkKernel pkgs.linux_3_14 test-patch; + grKernel = if cfg.stable + then mkKernel pkgs.linux_3_14 stable-patch + else mkKernel pkgs.linux_3_15 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix index 57d52e7cf943..969ca579f5a6 100644 --- a/pkgs/build-support/grsecurity/flavors.nix +++ b/pkgs/build-support/grsecurity/flavors.nix @@ -16,12 +16,6 @@ in linux_grsec_stable_server_xen = mkOpts "stable" "security" "server" "guest" "xen" true; - # Stable+vserver kernels - server versions only - linux_grsec_vserver_server = - mkOpts "vserver" "security" "server" "host" "kvm" true; - linux_grsec_vserver_server_xen = - mkOpts "vserver" "security" "server" "guest" "xen" true; - # Testing kernels linux_grsec_testing_desktop = mkOpts "testing" "performance" "desktop" "host" "kvm" true; @@ -29,4 +23,4 @@ in mkOpts "testing" "security" "server" "host" "kvm" true; linux_grsec_testing_server_xen = mkOpts "testing" "security" "server" "guest" "xen" true; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9f62042d09c8..eb4d7a100be9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,24 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.2.60"; - revision = "201406191345"; + { kversion = "3.14.8"; + revision = "201406222110"; branch = "stable"; - sha256 = "1zb2qxh2qhsrqi4gnslr3b6342ni9c6y20gb8jgh5plhnk5szx7v"; - }; - - grsecurity_vserver = grsecPatch - { kversion = "3.2.60"; - revision = "vs2.3.2.16-201406191346"; - branch = "vserver"; - sha256 = "0qlbqpnh5wkgk8phh67bl4a25rb8n1k1hlq0kmcrnz6c3kflrsdz"; + sha256 = "0jar710hqpjkp4g3ldrbcpgc170v9qp8ykajq5fi8mxx4j54gjwa"; }; grsecurity_unstable = grsecPatch - { kversion = "3.14.8"; - revision = "201406191347"; + { kversion = "3.15.1"; + revision = "201406222112"; branch = "test"; - sha256 = "01kl89vhr3mrp7g4ypcf9xrv0i4f9d4sdq4a11qhwyf1w48qr7da"; + sha256 = "04sbpmzgfgn7hjiln9baynpgr7k67lm0b5wn2z8i2jsjigfmv0r4"; }; grsec_fix_path = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..a50cf7d92a00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7285,10 +7285,6 @@ let linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; - # Stable+vserver kernels - server versions only - #linux_grsec_vserver_server = grKernel grFlavors.linux_grsec_vserver_server; - #linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen; - # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; @@ -7408,10 +7404,6 @@ let linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; - # Stable+vserver kernels - server versions only - #linuxPackages_grsec_vserver_server = grPackage grFlavors.linux_grsec_vserver_server; - #linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen; - # Testing kernels linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; From 984bb6b923c27ca4e60d964c60973a044e5c8b58 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 22 Jun 2014 23:28:16 -0400 Subject: [PATCH 160/224] go 1.3 and darwin support --- pkgs/development/compilers/go/1.3.nix | 94 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/go/1.3.nix diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix new file mode 100644 index 000000000000..375a2d1705c6 --- /dev/null +++ b/pkgs/development/compilers/go/1.3.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.3"; + + src = fetchurl { + url = https://storage.googleapis.com/golang/go1.3.src.tar.gz; + sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b"; + }; + + buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + # Ensure that the source directory is named go + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + '' + lib.optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + + installPhase = '' + export CC=cc + + # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html + # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" + # during tests: + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))" + + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..bac71c07a28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2974,7 +2974,9 @@ let go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; - go = go_1_2; + go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; + + go = go_1_3; gprolog = callPackage ../development/compilers/gprolog { }; From 9bd8dffd77c8bdd0f73df14d56707250e7240857 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 22 Jun 2014 05:42:34 -0400 Subject: [PATCH 161/224] require gnused for all prefetch scripts --- .../fetchzip}/nix-prefetch-zip | 48 +++++++++++-------- .../nix-prefetch-scripts/default.nix | 9 ++-- 2 files changed, 32 insertions(+), 25 deletions(-) rename pkgs/{tools/package-management/nix-prefetch-scripts => build-support/fetchzip}/nix-prefetch-zip (75%) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip similarity index 75% rename from pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip rename to pkgs/build-support/fetchzip/nix-prefetch-zip index b1c71bbff332..76255ab36747 100755 --- a/pkgs/tools/package-management/nix-prefetch-scripts/nix-prefetch-zip +++ b/pkgs/build-support/fetchzip/nix-prefetch-zip @@ -1,14 +1,13 @@ #! /bin/sh -e usage(){ - echo >&2 "syntax: nix-prefetch-zip [options] + echo >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]] Options: - --url name The url of the archive to fetch. + --url url The url of the archive to fetch. --name name The name to use for the store path (defaults to \`basename \$url\`). - --hash name The hash of unpacked archive. - --hash-type hash Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256. - --base32 Print/accept the hash in a base-32 representation rather than hexadecimal. + --hash hash The hash of unpacked archive. + --hash-type type Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256. --leave-root Keep the root directory of the archive. --help Show this help text. " @@ -25,13 +24,18 @@ for arg; do --name) argfun=set_name;; --hash) argfun=set_expHash;; --hash-type) argfun=set_hashType;; - --base32) hashFormat="--base32";; --leave-root) leaveRoot=true;; --help) usage;; - *) - echo "Unexpected argument: $arg" >&2 - usage - ;; + *) argi=$(($argi + 1)) + case $argi in + 1) url=$arg;; + 2) rev=$arg;; + 3) expHash=$arg;; + *) echo "Unexpected argument: $arg" >&2 + usage + ;; + esac + ;; esac else case $argfun in @@ -57,11 +61,13 @@ if test -z "$hashType"; then hashType=sha256 fi -tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") -trap "rm -rf \"\$tmp\"" EXIT +hashFormat="--base32" -TMPDIR=$tmp/unpacked/$name -mkdir -p $TMPDIR +tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") +trap "rm -rf '$tmp'" EXIT + +unpackDir=$tmp/unpacked/$name +mkdir -p $unpackDir downloadedFile=$tmp/$name unpackFile() { @@ -110,27 +116,27 @@ if test -z "$finalPath"; then exit 1 fi - cd $TMPDIR + cd $unpackDir unpackFile "$downloadedFile" # FIXME: handle zip files that contain a single regular file. if [ -z "$leaveRoot" ]; then shopt -s dotglob - if [ $(ls -d $TMPDIR/* | wc -l) != 1 ]; then + if [ $(ls -d $unpackDir/* | wc -l) != 1 ]; then echo "error: zip file must contain a single directory." exit 1 fi - fn=$(cd "$TMPDIR" && echo *) - mv $TMPDIR/$fn/* "$TMPDIR/" - rmdir "$TMPDIR/$fn" + fn=$(cd "$unpackDir" && echo *) + mv $unpackDir/$fn/* "$unpackDir/" + rmdir "$unpackDir/$fn" fi # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $TMPDIR) + hash=$(nix-hash --type $hashType $hashFormat $unpackDir) if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" $TMPDIR) + finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir) if test -n "$expHash" -a "$expHash" != "$hash"; then echo "hash mismatch for URL \`$url'" diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index bb0d717a5a2e..84439136d49e 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -11,20 +11,21 @@ stdenv.mkDerivation { function copyScript { local name=nix-prefetch-$1; local src=$2; + local wrapArgs="" cp $src $out/bin/$name; for dep in ''${@:3}; do - local exe=$dep/bin; - local wrapArgs="$wrapArgs --prefix PATH : $exe" + wrapArgs="$wrapArgs --prefix PATH : $dep/bin" done + wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" wrapProgram $out/bin/$name $wrapArgs } copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} - copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} ${gnused} + copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} - copyScript "zip" ${./nix-prefetch-zip} ${unzip} ${curl} + copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl} ''; meta = with stdenv.lib; { From 06a07684aa1dd19c5668a9a31d032f7a29340023 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 13 May 2014 19:19:41 -0400 Subject: [PATCH 162/224] Add gox and packer packages --- pkgs/development/compilers/go/gox.nix | 54 ++++ pkgs/development/tools/packer/default.nix | 35 +++ pkgs/development/tools/packer/deps.nix | 307 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 400 insertions(+) create mode 100644 pkgs/development/compilers/go/gox.nix create mode 100644 pkgs/development/tools/packer/default.nix create mode 100644 pkgs/development/tools/packer/deps.nix diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix new file mode 100644 index 000000000000..705cb6e5c28f --- /dev/null +++ b/pkgs/development/compilers/go/gox.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, go, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/gox"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "gox"; + rev = "c7329055e2aeb253a947e5cc876586ff4ca19199"; + sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + ]; + sources = stdenv.mkDerivation rec { + name = "go-deps"; + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); + }; +in + +stdenv.mkDerivation rec { + name = "gox"; + + src = sources; + + propagatedBuildInputs = [ go ]; + + installPhase = '' + ensureDir $out/bin + export GOPATH=$src + go build -v -o $out/bin/gox github.com/mitchellh/gox + ''; + + meta = with lib; { + description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build"; + homepage = https://github.com/mitchellh/gox; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix new file mode 100644 index 000000000000..5cea753dd9c3 --- /dev/null +++ b/pkgs/development/tools/packer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "packer-0.6.0"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ gox ]; + + installPhase = '' + export GOPATH=$src + XC_ARCH=$(go env GOARCH) + XC_OS=$(go env GOOS) + + ensureDir $out/bin + + cd $src/src/github.com/mitchellh/packer + gox \ + -os="''${XC_OS}" \ + -arch="''${XC_ARCH}" \ + -output "$out/bin/packer-{{.Dir}}" \ + ./... + mv $out/bin/packer{*packer*,} + ''; + + meta = with stdenv.lib; { + description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; + homepage = "http://www.packer.io"; + license = licenses.mpl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 000000000000..4c8a376991aa --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,307 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/packer"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "packer"; + rev = "12e28f257f66299e3bb13a053bf06ccd236e7efd"; + sha256 = "1r5j864kr7lx137c23kk5s82znk11hsrgq98zfz5r8sbzq1xpbzw"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "http://code.google.com/p/go.crypto"; + tag = "199"; + sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; + }; + } + { + root = "code.google.com/p/goauth2"; + src = fetchhg { + url = "http://code.google.com/p/goauth2"; + tag = "67"; + sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; + }; + } + { + root = "code.google.com/p/google-api-go-client"; + src = fetchhg { + url = "http://code.google.com/p/google-api-go-client"; + tag = "111"; + sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; + }; + } + { + root = "code.google.com/p/gosshold"; + src = fetchhg { + url = "http://code.google.com/p/gosshold"; + tag = "2"; + sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; + }; + } + { + root = "github.com/ActiveState/tail"; + src = fetchFromGitHub { + owner = "ActiveState"; + repo = "tail"; + rev = "8dcd1ad3e57aa8ce5614a837cbbdb21945fbb55a"; + sha256 = "1jxj576dd7mawawwg5nzwf6k7sks0r3lp2x8f6kxaps50n3k1wiz"; + }; + } + { + root = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + owner = "howeyc"; + repo = "fsnotify"; + rev = "441bbc86b167f3c1f4786afae9931403b99fdacf"; + sha256 = "1v5vrwhmidxjj6sppinyizf85v60zrmn7i6c9xk0pvx6k0kw2mr2"; + }; + } + { + root = "launchpad.net/tomb"; + src = fetchbzr { + url = "https://launchpad.net/tomb"; + revision = "17"; + sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; + }; + } + { + root = "github.com/going/toolkit"; + src = fetchFromGitHub { + owner = "going"; + repo = "toolkit"; + rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80"; + sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "http://code.google.com/p/goprotobuf"; + tag = "246"; + sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; + }; + } + { + root = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + } + { + root = "github.com/kr/pretty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pretty"; + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + } + { + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/kr/pty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + root = "github.com/xiocode/toolkit"; + src = fetchFromGitHub { + owner = "xiocode"; + repo = "toolkit"; + rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5"; + sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + revision = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + } + { + root = "github.com/hashicorp/go-version"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-version"; + rev = "bb92dddfa9792e738a631f04ada52858a139bcf7"; + sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m"; + }; + } + { + root = "github.com/mitchellh/go-fs"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-fs"; + rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761"; + sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b"; + }; + } + { + root = "github.com/mitchellh/go-vnc"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-vnc"; + rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72"; + sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf"; + }; + } + { + root = "github.com/mitchellh/goamz"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "goamz"; + rev = "c3ff5f734c89f1ea1f290c6aadbbceeeb19a623c"; + sha256 = "1nyi1p5yh21r161icnwkcgmj2y38b4m1jis47vvjbqinrp45w1gq"; + }; + } + { + root = "github.com/motain/gocheck"; + src = fetchFromGitHub { + owner = "motain"; + repo = "gocheck"; + rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84"; + sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + { + root = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "mapstructure"; + rev = "743fcf103ac7cdbc159e540d9d0e3a7889b87d68"; + sha256 = "1qqxsnxabd7c04n0ip1wmpr2g913qchqrbmblq0shrf5p1hnszgn"; + }; + } + { + root = "github.com/mitchellh/multistep"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "multistep"; + rev = "162146fc57112954184d90266f4733e900ed05a5"; + sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; + }; + } + { + root = "github.com/mitchellh/osext"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "osext"; + rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702"; + sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; + }; + } + { + root = "github.com/mitchellh/panicwrap"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "panicwrap"; + rev = "1aedff2aaa8b8ff7f65ab58e94ef9f593e2e3bf4"; + sha256 = "05brbpc7kizzbs1a128fmjddh7rdyg0jzzxgbvrl58cgklh4yzaa"; + }; + } + { + root = "github.com/rackspace/gophercloud"; + src = fetchFromGitHub { + owner = "rackspace"; + repo = "gophercloud"; + rev = "2285a429874c1365ef6c6d3ceb08b1d428e26aca"; + sha256 = "0py3h64r4wkl2r9j7xlh81nazpg2b0r5ba9iblh6d1380yk4fa7f"; + }; + } + { + root = "github.com/racker/perigee"; + src = fetchFromGitHub { + owner = "racker"; + repo = "perigee"; + rev = "01db3191866051f2ec854c2d876ac1a179d3049c"; + sha256 = "05pmlgwjynbr59bw50zhrklzhr5pgnij9ym5hqvijjrpw3qd9ivf"; + }; + } + { + root = "github.com/ugorji/go"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + root = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "msgpack"; + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "launchpad.net/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo"; + revision = "2"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + } + { + root = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "bufio"; + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..322f5c111ba6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -329,6 +329,8 @@ let fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); + packer = callPackage ../development/tools/packer { }; + fetchpatch = callPackage ../build-support/fetchpatch { }; fetchsvn = import ../build-support/fetchsvn { @@ -2976,6 +2978,8 @@ let go = go_1_2; + gox = callPackage ../development/compilers/go/gox.nix { }; + gprolog = callPackage ../development/compilers/gprolog { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; From 8ad3254ac5d2e6902bc905a44225b2ead8136d74 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 04:42:37 -0400 Subject: [PATCH 163/224] update serfdom to v0.6.2 --- pkgs/servers/serfdom/default.nix | 144 ++++-------------------- pkgs/servers/serfdom/deps.nix | 185 +++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+), 120 deletions(-) create mode 100644 pkgs/servers/serfdom/deps.nix diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix index 274fc89f94d0..40b41c8f9d39 100644 --- a/pkgs/servers/serfdom/default.nix +++ b/pkgs/servers/serfdom/default.nix @@ -1,126 +1,30 @@ -{ stdenv, fetchurl, fetchgit, fetchhg, go, lib }: +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: -let - goDeps = [ - { - dir = "github.com/hashicorp"; - name = "serf"; - rev = "c5b41a9d1d261135117a8d501d3293efade3cc74"; - sha256 = "a314d3c13fb370842a8f7c6650abfa907b51172a09c64f9184a240fab05b43df"; - fetcher = git; - } - { - dir = "github.com/armon"; - name = "go-metrics"; - rev = "e12c3591b520e819e8234bd585d592774f2b2ad5"; - sha256 = "79476efefb68876fcad7e71e76d95f4a7eece2cfcdc5a9c10f998af3178230ba"; - fetcher = git; - } - { - dir = "github.com/hashicorp"; - name = "logutils"; - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; - sha256 = "184lnn7x1v3xvj6zz1rg9s0252wkkd59kij2iyrrm7y80bym2jys"; - fetcher = git; - } - { - dir = "github.com/hashicorp"; - name = "memberlist"; - rev = "d5be01d1f4d75b086eba4ae808f2767c08cbbf73"; - sha256 = "4ab2b610d439e96c169d9caf9ac0e009d71d3ef9a2fd2c812870b71eb6b27dfc"; - fetcher = git; - } - { - dir = "github.com/ugorji"; - name = "go"; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "128853bcc5f114c300772cbce316b55e84206fa56705c5b9cc94c1693b11ee94"; - fetcher = git; - } - { - dir = "github.com/mitchellh"; - name = "cli"; - rev = "69f0b65ce53b27f729b1b807b88dc88007f41dd3"; - sha256 = "0hnnqd8vg5ca2hglkrj141ba2akdh7crl2lsrgz8d6ipw6asszx3"; - fetcher = git; - } - { - dir = "github.com/armon"; - name = "mdns"; - rev = "8be7e3ac4e941555169a99d01abcabd3c982d87a"; - sha256 = "87cd3a0ada3b094ee8fc4c4742158e0d051cde893da1ea320158a47d6254f69d"; - fetcher = git; - } - { - dir = "github.com/miekg"; - name = "dns"; - rev = "7ebb4c59b39d5984952a355086606dd91f6cfe86"; - sha256 = "8418ad2d27e607cef1dc0003471416294443e467f2de9df135e3a2ab411e2512"; - fetcher = git; - } - { - dir = "github.com/mitchellh"; - name = "mapstructure"; - rev = "57bb2fa7a7e00b26c80e4c4b0d4f15a210d94039"; - sha256 = "13lvd5vw8y6h5zl3samkrb7237kk778cky7k7ys1cm46mfd957zy"; - fetcher = git; - } - { - dir = "github.com/ryanuber"; - name = "columnize"; - rev = "d066e113d6e13232f45bda646a915dffeee7f1a4"; - sha256 = "2aaec396a223fc4b45117a595e74c0a874bd5cd9604c742b8c4747436b4721e9"; - fetcher = git; - } - { - dir = "code.google.com/p"; - name = "go.net"; - rev = "89dbba2db2d4"; - sha256 = "0168inai10nkdrz4g0rjlj8b5v34mv135v8bhyvh501vnqql50jn"; - fetcher = hg; - } - ]; - git = desc: fetchgit { url = "https://${desc.dir}/${desc.name}"; - inherit (desc) rev sha256; }; - hg = desc: fetchhg { url = "https://${desc.dir}/${desc.name}"; - tag = desc.rev; - inherit (desc) sha256; }; - createGoPathCmds = - lib.concatStrings - (map (desc: - let fetched = desc.fetcher desc; in '' - mkdir -p $GOPATH/src/${desc.dir} - ln -s ${fetched} $GOPATH/src/${desc.dir}/${desc.name} - '') goDeps); -in - stdenv.mkDerivation rec { - version = "0.5.0"; - name = "serfdom-${version}"; +stdenv.mkDerivation rec { + version = "0.6.2"; + name = "serfdom-${version}"; - src = fetchurl { - url = "https://github.com/hashicorp/serf/archive/v${version}.tar.gz"; - sha256 = "1p2cpkdx0gck1ypxc98im7gsv3275avpkizhsif3nxvl1xd8g1qp"; - }; + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; - buildInputs = [ go ]; + buildInputs = [ go ]; - buildPhase = '' - mkdir $TMPDIR/go - export GOPATH=$TMPDIR/go - ${createGoPathCmds} - go build -v -o bin/serf - ''; + buildPhase = '' + export GOPATH=$src + go build -v -o serf github.com/hashicorp/serf + ''; - installPhase = '' - ensureDir $out/bin - cp bin/serf $out/bin - ''; + installPhase = '' + ensureDir $out/bin + mv serf $out/bin/serf + ''; - meta = with stdenv.lib; { - description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; - homepage = http://www.serfdom.io/; - license = licenses.mpl20; - maintainers = [ maintainers.msackman ]; - platforms = platforms.linux; - }; - } + meta = with stdenv.lib; { + description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; + homepage = http://www.serfdom.io/; + license = licenses.mpl20; + maintainers = with maintainers; [ msackman cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/serfdom/deps.nix b/pkgs/servers/serfdom/deps.nix new file mode 100644 index 000000000000..d4da74b54767 --- /dev/null +++ b/pkgs/servers/serfdom/deps.nix @@ -0,0 +1,185 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "http://code.google.com/p/go.net"; + tag = "134"; + sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv"; + }; + } + { + root = "code.google.com/p/go.text"; + src = fetchhg { + url = "http://code.google.com/p/go.text"; + tag = "85"; + sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr"; + }; + } + { + root = "github.com/armon/circbuf"; + src = fetchFromGitHub { + owner = "armon"; + repo = "circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + root = "github.com/armon/go-metrics"; + src = fetchFromGitHub { + owner = "armon"; + repo = "go-metrics"; + rev = "02567bbc4f518a43853d262b651a3c8257c3f141"; + sha256 = "08fk3zmw0ywmdfp2qhrpv0vrk1y97hzqczrgr3y2yip3x8sr37ar"; + }; + } + { + root = "github.com/armon/mdns"; + src = fetchFromGitHub { + owner = "armon"; + repo = "mdns"; + rev = "70462deb060d44247356ee238ebafd7699ddcffe"; + sha256 = "0xkm3d0hsixdm1yrkx9c39723kfjkb3wvrzrmx3np9ylcwn6h5p5"; + }; + } + { + root = "github.com/hashicorp/go-syslog"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-syslog"; + rev = "ac3963b72ac367e48b1e68a831e62b93fb69091c"; + sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81"; + }; + } + { + root = "github.com/hashicorp/logutils"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "logutils"; + rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; + sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + }; + } + { + root = "github.com/hashicorp/memberlist"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "memberlist"; + rev = "17d39b695094be943bfb98442a80b082e6b9ac47"; + sha256 = "0nvgjnwmfqhv2wvr77d2q5mq1bfw4xbpil6wgyj4fyrmhsfzrv3g"; + }; + } + { + root = "github.com/hashicorp/serf"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "serf"; + rev = "4232a3f7b52f755084caf6b2cc2789efa2948555"; + sha256 = "1hxxqrjz08882d205ylakhvvwciahiqdzkwi2a7zwrmx6sxna7sr"; + }; + } + { + root = "github.com/miekg/dns"; + src = fetchFromGitHub { + owner = "miekg"; + repo = "dns"; + rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514"; + sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg"; + }; + } + { + root = "github.com/mitchellh/cli"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "cli"; + rev = "8262fe3f76f0da53b5674eb35c8c6436430794c3"; + sha256 = "0pqkxh1q49kkxihggrfjs8174d927g4c5qqx00ggw8sqqsgrw6vn"; + }; + } + { + root = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "mapstructure"; + rev = "6fb2c832bcac61d01212ab1d172f7a14a8585b07"; + sha256 = "0mx855lwhv0rk461wmbnbzbpkhmq5p2ipmrm5bhzimagrr1w17hw"; + }; + } + { + root = "github.com/ryanuber/columnize"; + src = fetchFromGitHub { + owner = "ryanuber"; + repo = "columnize"; + rev = "785d943a7b6886e0bb2f139a60487b823dd8d9de"; + sha256 = "1h3sxzhiwz65vf3cvclirlf6zhdr97v01dpn5cmf3m09rxxpnp3f"; + }; + } + { + root = "github.com/ugorji/go"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "bufio"; + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + } + { + root = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "msgpack"; + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + revision = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + } + { + root = "launchpad.net/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo"; + revision = "2"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} From b6df637e86d2ff0861d38bc25613c0f62dd302c1 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 04:55:46 -0400 Subject: [PATCH 164/224] add etcd package --- pkgs/servers/etcd/default.nix | 30 ++++++++++++++++++ pkgs/servers/etcd/deps.nix | 54 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 86 insertions(+) create mode 100644 pkgs/servers/etcd/default.nix create mode 100644 pkgs/servers/etcd/deps.nix diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix new file mode 100644 index 000000000000..1fb21f2b8ab6 --- /dev/null +++ b/pkgs/servers/etcd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "etcd-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o etcd github.com/coreos/etcd + ''; + + installPhase = '' + ensureDir $out/bin + mv etcd $out/bin/etcd + ''; + + meta = with stdenv.lib; { + description = "A highly-available key value store for shared configuration and service discovery"; + homepage = http://coreos.com/using-coreos/etcd/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 000000000000..e9fd4a50d3e0 --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/etcd"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcd"; + rev = "9970141f76241c909977af7bafe7b6f2c4923de8"; + sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy"; + }; + } + { + root = "github.com/stathat/go"; + src = fetchFromGitHub { + owner = "stathat"; + repo = "go"; + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + } + { + root = "github.com/stretchr/objx"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + root = "github.com/stretchr/testify"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "testify"; + rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; + sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..46ff2ba57ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6636,6 +6636,8 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; + etcd = callPackage ../servers/etcd { }; + ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR16; }; From 70ce3ee861347d05b0f9e96a4f3c508d96e87e58 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 05:03:03 -0400 Subject: [PATCH 165/224] add etcdctl package --- pkgs/development/tools/etcdctl/default.nix | 30 ++++++++++++++++++++++ pkgs/development/tools/etcdctl/deps.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/tools/etcdctl/default.nix create mode 100644 pkgs/development/tools/etcdctl/deps.nix diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix new file mode 100644 index 000000000000..a37ef26f5412 --- /dev/null +++ b/pkgs/development/tools/etcdctl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "etcdctl-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o etcdctl github.com/coreos/etcdctl + ''; + + installPhase = '' + ensureDir $out/bin + mv etcdctl $out/bin + ''; + + meta = with stdenv.lib; { + description = "A simple command line client for etcd"; + homepage = http://coreos.com/using-coreos/etcd/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/etcdctl/deps.nix b/pkgs/development/tools/etcdctl/deps.nix new file mode 100644 index 000000000000..98bdda95a433 --- /dev/null +++ b/pkgs/development/tools/etcdctl/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/etcdctl"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcdctl"; + rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c"; + sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..7ee1a1f4ed3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6642,6 +6642,8 @@ let elasticmq = callPackage ../servers/elasticmq { }; + etcdctl = callPackage ../development/tools/etcdctl { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; From 693bc7d44e26c9bbec020da37e1dfc2efe30e54d Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 05:20:41 -0400 Subject: [PATCH 166/224] add fleet package --- pkgs/servers/fleet/default.nix | 30 ++++++++++++ pkgs/servers/fleet/deps.nix | 81 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 113 insertions(+) create mode 100644 pkgs/servers/fleet/default.nix create mode 100644 pkgs/servers/fleet/deps.nix diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix new file mode 100644 index 000000000000..627c1ff0cf90 --- /dev/null +++ b/pkgs/servers/fleet/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.5.0"; + name = "fleet-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o fleet github.com/coreos/fleet + ''; + + installPhase = '' + ensureDir $out/bin + mv fleet $out/bin + ''; + + meta = with stdenv.lib; { + description = "A distributed init system"; + homepage = http://coreos.com/using-coreos/clustering/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/fleet/deps.nix b/pkgs/servers/fleet/deps.nix new file mode 100644 index 000000000000..d0529db37a2f --- /dev/null +++ b/pkgs/servers/fleet/deps.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/gogoprotobuf"; + src = fetchgit { + url = "https://code.google.com/p/gogoprotobuf"; + rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946"; + sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9"; + }; + } + { + root = "github.com/coreos/etcd"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcd"; + rev = "1359d29fa451b059bb76b51260610d92853e7316"; + sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7"; + }; + } + { + root = "github.com/coreos/fleet"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "fleet"; + rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c"; + sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8"; + }; + } + { + root = "github.com/coreos/raft"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "raft"; + rev = "67dca7288f1665b59860421673d46314f4348e45"; + sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw"; + }; + } + { + root = "github.com/stathat/go"; + src = fetchFromGitHub { + owner = "stathat"; + repo = "go"; + rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; + sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; + }; + } + { + root = "github.com/stretchr/objx"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + root = "github.com/stretchr/testify"; + src = fetchFromGitHub { + owner = "stretchr"; + repo = "testify"; + rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; + sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..1428e2594a41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6653,6 +6653,8 @@ let firebird = callPackage ../servers/firebird { icu = null; }; firebirdSuper = callPackage ../servers/firebird { superServer = true; }; + fleet = callPackage ../servers/fleet { }; + freepops = callPackage ../servers/mail/freepops { }; freeswitch = callPackage ../servers/sip/freeswitch { }; From 1091dde5bb79d3cb2669f5059452ede0b1fde784 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 05:43:17 -0400 Subject: [PATCH 167/224] add nsq package --- pkgs/servers/nsq/default.nix | 37 +++++++++ pkgs/servers/nsq/deps.nix | 134 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 173 insertions(+) create mode 100644 pkgs/servers/nsq/default.nix create mode 100644 pkgs/servers/nsq/deps.nix diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix new file mode 100644 index 000000000000..b1570d96c7b6 --- /dev/null +++ b/pkgs/servers/nsq/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.2.28"; + name = "nsq-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + apps=(nsq_pubsub nsq_stat nsq_tail nsq_to_file nsq_to_http nsq_to_nsq nsqd nsqlookupd) + + mkdir build + + go build -v -o build/nsqadmin github.com/bitly/nsq/nsqadmin + for app in "''${apps[@]}"; do + go build -v -o build/$app github.com/bitly/nsq/apps/$app + done + ''; + + installPhase = '' + ensureDir $out/bin + mv build/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "A realtime distributed messaging platform"; + homepage = http://nsq.io/; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 000000000000..8518ceed9169 --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,134 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "code.google.com/p/snappy-go"; + src = fetchhg { + url = "http://code.google.com/p/snappy-go"; + tag = "14"; + sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; + }; + } + { + root = "github.com/BurntSushi/toml"; + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "toml"; + rev = "f87ce853111478914f0bcffa34d43a93643e6eda"; + sha256 = "0g8203y9ycf34j2q3ymxb8nh4habgwdrjn9vdgrginllx73yq565"; + }; + } + { + root = "github.com/bitly/go-hostpool"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-hostpool"; + rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; + sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44"; + }; + } + { + root = "github.com/bitly/go-nsq"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-nsq"; + rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0"; + sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p"; + }; + } + { + root = "github.com/bitly/go-simplejson"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "go-simplejson"; + rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; + sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi"; + }; + } + { + root = "github.com/bitly/nsq"; + src = fetchFromGitHub { + owner = "bitly"; + repo = "nsq"; + rev = "048691a8242c9ec224fc46bf7d05f321026b69f8"; + sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx"; + }; + } + { + root = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + } + { + root = "github.com/bmizerany/perks"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "perks"; + rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; + sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k"; + }; + } + { + root = "github.com/kr/pretty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pretty"; + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + } + { + root = "github.com/kr/pty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/mreiferson/go-options"; + src = fetchFromGitHub { + owner = "mreiferson"; + repo = "go-options"; + rev = "896a539cd709f4f39d787562d1583c016ce7517e"; + sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17"; + }; + } + { + root = "github.com/mreiferson/go-snappystream"; + src = fetchFromGitHub { + owner = "mreiferson"; + repo = "go-snappystream"; + rev = "97c96e6648e99c2ce4fe7d169aa3f7368204e04d"; + sha256 = "08ylvx9r6b1fi76v6cqjvny4yqsvcqjfsg93jdrgs7hi4mxvxynn"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..c4b9b5d96e9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6715,6 +6715,8 @@ let nsd = callPackage ../servers/dns/nsd { }; + nsq = callPackage ../servers/nsq { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; petidomo = callPackage ../servers/mail/petidomo { }; From f76fbe03e0e6b17f27120adf1f496e332eb680d7 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 05:49:58 -0400 Subject: [PATCH 168/224] add gocode package --- pkgs/development/tools/gocode/default.nix | 29 +++++++++++++++++++++++ pkgs/development/tools/gocode/deps.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/development/tools/gocode/default.nix create mode 100644 pkgs/development/tools/gocode/deps.nix diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix new file mode 100644 index 000000000000..6057c288cf69 --- /dev/null +++ b/pkgs/development/tools/gocode/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gocode"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gocode github.com/nsf/gocode + ''; + + installPhase = '' + ensureDir $out/bin + mv gocode $out/bin + ''; + + meta = with lib; { + description = "An autocompletion daemon for the Go programming language"; + homepage = https://github.com/nsf/gocode; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 000000000000..4fd0578496d4 --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/nsf/gocode"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "gocode"; + rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78"; + sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..5210ee856812 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7494,6 +7494,8 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + gocode = callPackage ../development/tools/gocode { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; From 79e805e281415c076e70ed1b173c1208beb3f4b7 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 23 Jun 2014 06:26:56 -0400 Subject: [PATCH 169/224] add camlistore package --- pkgs/applications/misc/camlistore/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/misc/camlistore/default.nix diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix new file mode 100644 index 000000000000..80d8dd801a9b --- /dev/null +++ b/pkgs/applications/misc/camlistore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, go, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.7"; + name = "camlistore-${version}"; + + src = fetchurl { + url = "https://github.com/bradfitz/camlistore/archive/0.7.tar.gz"; + sha256 = "0lc35x2b9llrnma0m5czivly0c3l4lh3ldw9hwn83lkh8n0bzn11"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + go run make.go + rm bin/README + ''; + + installPhase = '' + ensureDir $out/bin + cp bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content"; + homepage = https://camlistore.org; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782443c13b62..2159d1907cdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8078,6 +8078,8 @@ let calibre = callPackage ../applications/misc/calibre { }; + camlistore = callPackage ../applications/misc/camlistore { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python From 89e6eb41f2857b5d7e9d59a27c7790385fd33290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 12:33:10 +0200 Subject: [PATCH 170/224] aliceml: description improvements Move the (long) description to "longDescription" and add a short description in "description". --- pkgs/development/compilers/aliceml/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 5ea470bfc870..29e95863921c 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -63,8 +63,13 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { + description = "Functional programming language based on Standard ML"; + longDescription = '' + Alice ML is a functional programming language based on Standard ML, + extended with rich support for concurrent, distributed, and constraint + programming. + ''; homepage = http://www.ps.uni-saarland.de/alice/; - description = "Alice ML is a functional programming language based on Standard ML, extended with rich support for concurrent, distributed, and constraint programming."; license = "BSD"; }; } From 5dea7f0ed5af1e865dc6cf4da8230df056ac0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 12:44:21 +0200 Subject: [PATCH 171/224] abiword: fix typo in description (Microsof -> Microsoft) --- pkgs/applications/office/abiword/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0e5a6afcdc5f..d8b010b80f2d 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { ]; meta = { - description = "Word processing program, similar to Microsof Word"; + description = "Word processing program, similar to Microsoft Word"; }; } From ba9254fcf3ae437d369353b7119b6cbbcc23bc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 12:54:46 +0200 Subject: [PATCH 172/224] abiword: add to channel --- pkgs/applications/office/abiword/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index d8b010b80f2d..d9b3627507eb 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation { libgsf enchant wv libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; + homepage = http://www.abisource.com/; + license = licenses.gpl3; + platforms = platforms.linux; }; } From 8be11be953eb81ae321b9b194d51f4c62e353f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:04:06 +0200 Subject: [PATCH 173/224] zziplib: fix description (don't repeat package name) --- pkgs/development/libraries/zziplib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 055a491f4601..dcfaafc2b7d8 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Zziplib, a library to extract data from files archived in a zip file"; + description = "Library to extract data from files archived in a zip file"; longDescription = '' The zziplib library is intentionally lightweight, it offers the ability From 654f9e38e698f51a18b0940e62db6cb679ddc85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:04:57 +0200 Subject: [PATCH 174/224] zynaddsubfx: fix description (capitalize first word) --- pkgs/applications/audio/zynaddsubfx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 378318fbf855..cd30b5b30847 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - description = "high quality software synthesizer"; + description = "High quality software synthesizer"; homepage = http://zynaddsubfx.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; From 52561fb7a815dc5ca77b672c2324b780dcbeb4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:07:28 +0200 Subject: [PATCH 175/224] zsh: improve description Capitalize first word. Wrap overlong longDescription line. --- pkgs/shells/zsh/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 37ffb09288e0..704527d28c7b 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -58,8 +58,15 @@ EOF # XXX: patch zsh to take zwc if newer _or equal_ meta = { - description = "the Z shell"; - longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, zsh most closely resembles ksh but includes many enhancements. Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features."; + description = "The Z shell"; + longDescription = '' + Zsh is a UNIX command interpreter (shell) usable as an interactive login + shell and as a shell script command processor. Of the standard shells, + zsh most closely resembles ksh but includes many enhancements. Zsh has + command line editing, builtin spelling correction, programmable command + completion, shell functions (with autoloading), a history mechanism, and + a host of other features. + ''; license = "MIT-like"; homePage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; From 97d4dec58c17fdc1330228280f53162a00626b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:13:50 +0200 Subject: [PATCH 176/224] zoom: add meta attributes And do some coding style / whitespace clean up. --- pkgs/games/zoom/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index fdf3aa91e2b0..cb9974580d87 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, expat, x11, freetype}: +{ stdenv, fetchurl, perl, expat, x11, freetype }: # !!! assert freetype == xlibs.freetype @@ -10,8 +10,21 @@ stdenv.mkDerivation { sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - buildInputs = [perl expat x11 freetype]; + buildInputs = [ perl expat x11 freetype ]; # Zoom doesn't add the right directory in the include path. - CFLAGS = ["-I" (freetype + "/include/freetype2")]; + CFLAGS = [ "-I" (freetype + "/include/freetype2") ]; + + meta = with stdenv.lib; { + description = "Player for Z-Code, TADS and HUGO stories or games, usually text adventures ('interactive fiction')"; + longDescription = '' + Zoom is a player for Z-Code, TADS and HUGO stories or games. These are + usually text adventures ('interactive fiction'), and were first created + by Infocom with the Zork series of games. Throughout the 80's, Infocom + released many interactive fiction stories before their ambitions to enter + the database market finally brought them low. + ''; + license = licenses.gpl3; + platforms = platforms.linux; + }; } From b5cd66487a558aee149da5de29a57ae9d6bb3c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:26:03 +0200 Subject: [PATCH 177/224] zlib: add description and license info --- pkgs/development/libraries/zlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f45c18dd0f14..0938e2a17a79 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -44,4 +44,9 @@ stdenv.mkDerivation rec { cygwinConfigureEnableShared = true; passthru.version = version; + + meta = with stdenv.lib; { + description = "Lossless data-compression library"; + license = licenses.zlib; + }; } From 9f744961b8c05671e6612d0987ba60537e11a5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:35:08 +0200 Subject: [PATCH 178/224] zip: add meta.description --- pkgs/tools/archivers/zip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 6c485173f858..92d8a22fa476 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { buildInputs = if enableNLS then [ libnatspec ] else []; meta = { + description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; From e395f916075f187265569f90aaa79f14a3597da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:36:21 +0200 Subject: [PATCH 179/224] zile: fix description (don't repeat package name) --- pkgs/applications/editors/zile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 87ea7ee6854e..4166bc1e9e3e 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; meta = { - description = "GNU Zile, a lightweight Emacs clone"; + description = "Lightweight Emacs clone"; longDescription = '' GNU Zile, which is a lightweight Emacs clone. Zile is short From a576a3c3417c4ead63e818cd90f6809a799582ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 13:37:40 +0200 Subject: [PATCH 180/224] zeitgeist: fix description (don't repeat package name) --- pkgs/development/libraries/zeitgeist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 92fbe81a32e9..3ef43baca5ed 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + description = "A service which logs the users's activities and events"; homepage = https://launchpad.net/zeitgeist; - description = "Zeitgeist is a service which logs the users's activities and events"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; From 6edfe3e4705cb846e834ceda7d4f11dd3e1c0542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 23 Jun 2014 15:01:50 +0200 Subject: [PATCH 181/224] Making retroshare bootstrap the DHT fine. --- pkgs/applications/networking/p2p/retroshare/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 4e3f495456cd..a139531b19a6 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation { # Extensions get installed sed -i "s,/usr/lib/retroshare/extensions/,$out/share/retroshare," \ libretroshare/src/rsserver/rsinit.cc + # For bdboot.txt + sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ + libretroshare/src/rsserver/rsinit.cc ''; buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig @@ -36,6 +39,9 @@ stdenv.mkDerivation { # plugins mkdir -p $out/share/retroshare mv $out/lib* $out/share/retroshare + + # BT DHT bootstrap + cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare ''; meta = with stdenv.lib; { From 11d6964c742881eb9825be642f292c5818b16546 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 11 Jun 2014 01:29:56 +0200 Subject: [PATCH 182/224] flashplayer: Update from 11.2.202.359 -> 11.2.202.378 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 378e32c0afb4..438a53b4f8a3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.359"; + version = "11.2.202.378"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "13myq6f999qy1jbgm73gxnadrxdvasi2jiffdyxmwpbwglhhrpka"; + sha256 = "08aw532k8y27s64ffdghz2k4zf0jsz65crvn3i9vxan29064la9c"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "04wh18jbscp7m3drvsxxhp2vjnhww69vw0pgr23hx81ry0ccvb8m"; + sha256 = "1njy2pnhgr2hjz6kp9vl4cgxxszw2k6gmhjz88hx92aijv7s93wz"; } else throw "Flash Player is not supported on this platform"; From b5b8b5247a9cf6a64ff392b4670eb9f0c25d93aa Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 21 Jun 2014 20:32:42 +0200 Subject: [PATCH 183/224] spl, spl.git: Update to 0.6.3 --- pkgs/os-specific/linux/spl/3_12-compat.patch | 429 ------------------ .../os-specific/linux/spl/3_13-compat-1.patch | 61 --- .../os-specific/linux/spl/3_13-compat-2.patch | 168 ------- pkgs/os-specific/linux/spl/default.nix | 8 +- pkgs/os-specific/linux/spl/git.nix | 8 +- 5 files changed, 8 insertions(+), 666 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/3_12-compat.patch delete mode 100644 pkgs/os-specific/linux/spl/3_13-compat-1.patch delete mode 100644 pkgs/os-specific/linux/spl/3_13-compat-2.patch diff --git a/pkgs/os-specific/linux/spl/3_12-compat.patch b/pkgs/os-specific/linux/spl/3_12-compat.patch deleted file mode 100644 index b196098b7df2..000000000000 --- a/pkgs/os-specific/linux/spl/3_12-compat.patch +++ /dev/null @@ -1,429 +0,0 @@ -commit c3d9c0df3ee8d43db22815ebbfbe8b803fa46e46 -Author: Richard Yao -Date: Tue Nov 5 11:35:54 2013 -0500 - - Linux 3.12 compat: New shrinker API - - torvalds/linux@24f7c6 introduced a new shrinker API while - torvalds/linux@a0b021 dropped support for the old shrinker API. - This patch adds support for the new shrinker API by wrapping - the old one with the new one. - - This change also reorganizes the autotools checks on the shrinker - API such that the configure script will fail early if an unknown - API is encountered in the future. - - Support for the set_shrinker() API which was used by Linux 2.6.22 - and older has been dropped. As a general rule compatibility is - only maintained back to Linux 2.6.26. - - Signed-off-by: Richard Yao - Signed-off-by: Brian Behlendorf - Closes zfsonlinux/zfs#1732 - Closes zfsonlinux/zfs#1822 - Closes #293 - Closes #307 - -diff --git a/config/spl-build.m4 b/config/spl-build.m4 -index b0e3348..7d744db 100644 ---- a/config/spl-build.m4 -+++ b/config/spl-build.m4 -@@ -27,8 +27,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_TYPE_ATOMIC64_XCHG - SPL_AC_TYPE_UINTPTR_T - SPL_AC_2ARGS_REGISTER_SYSCTL -- SPL_AC_SET_SHRINKER -- SPL_AC_3ARGS_SHRINKER_CALLBACK -+ SPL_AC_SHRINKER_CALLBACK - SPL_AC_PATH_IN_NAMEIDATA - SPL_AC_TASK_CURR - SPL_AC_CTL_UNNUMBERED -@@ -885,37 +884,18 @@ AC_DEFUN([SPL_AC_2ARGS_REGISTER_SYSCTL], - ]) - ]) - --dnl # --dnl # 2.6.23 API change --dnl # Old set_shrinker API replaced with register_shrinker --dnl # --AC_DEFUN([SPL_AC_SET_SHRINKER], [ -- AC_MSG_CHECKING([whether set_shrinker() available]) -- SPL_LINUX_TRY_COMPILE([ -- #include -- ],[ -- return set_shrinker(DEFAULT_SEEKS, NULL); -- ],[ -- AC_MSG_RESULT([yes]) -- AC_DEFINE(HAVE_SET_SHRINKER, 1, -- [set_shrinker() available]) -- ],[ -- AC_MSG_RESULT([no]) -- ]) --]) -- --dnl # --dnl # 2.6.35 API change, --dnl # Add context to shrinker callback --dnl # --AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK], -- [AC_MSG_CHECKING([whether shrinker callback wants 3 args]) -+AC_DEFUN([SPL_AC_SHRINKER_CALLBACK],[ - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" -+ dnl # -+ dnl # 2.6.23 to 2.6.34 API change -+ dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask) -+ dnl # -+ AC_MSG_CHECKING([whether old 2-argument shrinker exists]) - SPL_LINUX_TRY_COMPILE([ - #include - -- int shrinker_cb(struct shrinker *, int, unsigned int); -+ int shrinker_cb(int nr_to_scan, gfp_t gfp_mask); - ],[ - struct shrinker cache_shrinker = { - .shrink = shrinker_cb, -@@ -924,10 +904,86 @@ AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK], - register_shrinker(&cache_shrinker); - ],[ - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1, -- [shrinker callback wants 3 args]) -+ AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1, -+ [old shrinker callback wants 2 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # 2.6.35 - 2.6.39 API change -+ dnl # ->shrink(struct shrinker *, -+ dnl # int nr_to_scan, gfp_t gfp_mask) -+ dnl # -+ AC_MSG_CHECKING([whether old 3-argument shrinker exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ -+ int shrinker_cb(struct shrinker *, int nr_to_scan, -+ gfp_t gfp_mask); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .shrink = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1, -+ [old shrinker callback wants 3 args]) -+ ],[ -+ AC_MSG_RESULT(no) -+ dnl # -+ dnl # 3.0 - 3.11 API change -+ dnl # ->shrink(struct shrinker *, -+ dnl # struct shrink_control *sc) -+ dnl # -+ AC_MSG_CHECKING( -+ [whether new 2-argument shrinker exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ -+ int shrinker_cb(struct shrinker *, -+ struct shrink_control *sc); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .shrink = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1, -+ [new shrinker callback wants 2 args]) -+ ],[ -+ AC_MSG_RESULT(no) -+ dnl # -+ dnl # 3.12 API change, -+ dnl # ->shrink() is logically split in to -+ dnl # ->count_objects() and ->scan_objects() -+ dnl # -+ AC_MSG_CHECKING( -+ [whether ->count_objects callback exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ -+ unsigned long shrinker_cb( -+ struct shrinker *, -+ struct shrink_control *sc); -+ ],[ -+ struct shrinker cache_shrinker = { -+ .count_objects = shrinker_cb, -+ .scan_objects = shrinker_cb, -+ .seeks = DEFAULT_SEEKS, -+ }; -+ register_shrinker(&cache_shrinker); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK, -+ 1, [->count_objects exists]) -+ ],[ -+ AC_MSG_ERROR(error) -+ ]) -+ ]) -+ ]) - ]) - EXTRA_KCFLAGS="$tmp_flags" - ]) -diff --git a/include/linux/mm_compat.h b/include/linux/mm_compat.h -index cb1bef9..37c9b08 100644 ---- a/include/linux/mm_compat.h -+++ b/include/linux/mm_compat.h -@@ -148,107 +148,167 @@ extern shrink_icache_memory_t shrink_icache_memory_fn; - #endif /* HAVE_SHRINK_ICACHE_MEMORY */ - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Due to frequent changes in the shrinker API the following -+ * compatibility wrappers should be used. They are as follows: -+ * -+ * SPL_SHRINKER_DECLARE is used to declare the shrinker which is -+ * passed to spl_register_shrinker()/spl_unregister_shrinker(). Use -+ * shrinker_name to set the shrinker variable name, shrinker_callback -+ * to set the callback function, and seek_cost to define the cost of -+ * reclaiming an object. -+ * -+ * SPL_SHRINKER_DECLARE(shrinker_name, shrinker_callback, seek_cost); -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE is used when a forward declaration -+ * of the shrinker callback function is required. Only the callback -+ * function needs to be passed. -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE(shrinker_callback); -+ * -+ * SPL_SHRINKER_CALLBACK_WRAPPER is used to declare the callback function -+ * which is registered with the shrinker. This function will call your -+ * custom shrinker which must use the following prototype. Notice the -+ * leading __'s, these must be appended to the callback_function name. -+ * -+ * int __shrinker_callback(struct shrinker *, struct shrink_control *) -+ * SPL_SHRINKER_CALLBACK_WRAPPER(shrinker_callback);a -+ * -+ * -+ * Example: -+ * -+ * SPL_SHRINKER_CALLBACK_FWD_DECLARE(my_shrinker_fn); -+ * SPL_SHRINKER_DECLARE(my_shrinker, my_shrinker_fn, 1); -+ * -+ * static int -+ * __my_shrinker_fn(struct shrinker *shrink, struct shrink_control *sc) -+ * { -+ * if (sc->nr_to_scan) { -+ * ...scan objects in the cache and reclaim them... -+ * } -+ * -+ * ...calculate number of objects in the cache... -+ * -+ * return (number of objects in the cache); -+ * } -+ * SPL_SHRINKER_CALLBACK_WRAPPER(my_shrinker_fn); - */ --#ifdef HAVE_SET_SHRINKER --typedef struct spl_shrinker { -- struct shrinker *shrinker; -- shrinker_t fn; -- int seeks; --} spl_shrinker_t; -- --static inline void --spl_register_shrinker(spl_shrinker_t *ss) --{ -- ss->shrinker = set_shrinker(ss->seeks, ss->fn); --} - --static inline void --spl_unregister_shrinker(spl_shrinker_t *ss) --{ -- remove_shrinker(ss->shrinker); --} -+#define spl_register_shrinker(x) register_shrinker(x) -+#define spl_unregister_shrinker(x) unregister_shrinker(x) - --# define SPL_SHRINKER_DECLARE(s, x, y) \ -- static spl_shrinker_t s = { \ -- .shrinker = NULL, \ -- .fn = x, \ -- .seeks = y \ -- } -- --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(NULL, &sc); \ -+/* -+ * Linux 2.6.23 - 2.6.34 Shrinker API Compatibility. -+ */ -+#if defined(HAVE_2ARGS_OLD_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ - } - --#else -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(int nr_to_scan, unsigned int gfp_mask) - --# define spl_register_shrinker(x) register_shrinker(x) --# define spl_unregister_shrinker(x) unregister_shrinker(x) --# define SPL_SHRINKER_DECLARE(s, x, y) \ -- static struct shrinker s = { \ -- .shrink = x, \ -- .seeks = y \ -- } -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(int nr_to_scan, unsigned int gfp_mask) \ -+{ \ -+ struct shrink_control sc; \ -+ \ -+ sc.nr_to_scan = nr_to_scan; \ -+ sc.gfp_mask = gfp_mask; \ -+ \ -+ return (__ ## fn(NULL, &sc)); \ -+} - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 2.6.35 to 2.6.39 Shrinker API Compatibility. - */ --# if defined(HAVE_SHRINK_CONTROL_STRUCT) --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(struct shrinker *, struct shrink_control *) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(struct shrinker *shrink, struct shrink_control *sc) { \ -- return __ ## fn(shrink, sc); \ -+#elif defined(HAVE_3ARGS_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ -+} -+ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(struct shrinker *, int, unsigned int) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask) \ -+{ \ -+ struct shrink_control sc; \ -+ \ -+ sc.nr_to_scan = nr_to_scan; \ -+ sc.gfp_mask = gfp_mask; \ -+ \ -+ return (__ ## fn(shrink, &sc)); \ - } - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 3.0 to 3.11 Shrinker API Compatibility. - */ --# elif defined(HAVE_3ARGS_SHRINKER_CALLBACK) --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(struct shrinker *, int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(struct shrinker *shrink, int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(shrink, &sc); \ -+#elif defined(HAVE_2ARGS_NEW_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .shrink = x, \ -+ .seeks = y \ -+} -+ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static int fn(struct shrinker *, struct shrink_control *) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static int \ -+fn(struct shrinker *shrink, struct shrink_control *sc) \ -+{ \ -+ return (__ ## fn(shrink, sc)); \ - } - - /* -- * Linux 2.6. - 2.6. Shrinker API Compatibility. -+ * Linux 3.12 and later Shrinker API Compatibility. - */ --# else --# define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -- static int fn(int, unsigned int) --# define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ --static int \ --fn(int nr_to_scan, unsigned int gfp_mask) \ --{ \ -- struct shrink_control sc; \ -- \ -- sc.nr_to_scan = nr_to_scan; \ -- sc.gfp_mask = gfp_mask; \ -- \ -- return __ ## fn(NULL, &sc); \ -+#elif defined(HAVE_SPLIT_SHRINKER_CALLBACK) -+#define SPL_SHRINKER_DECLARE(s, x, y) \ -+static struct shrinker s = { \ -+ .count_objects = x ## _count_objects, \ -+ .scan_objects = x ## _scan_objects, \ -+ .seeks = y \ - } - --# endif --#endif /* HAVE_SET_SHRINKER */ -+#define SPL_SHRINKER_CALLBACK_FWD_DECLARE(fn) \ -+static unsigned long fn ## _count_objects(struct shrinker *, \ -+ struct shrink_control *); \ -+static unsigned long fn ## _scan_objects(struct shrinker *, \ -+ struct shrink_control *) -+ -+#define SPL_SHRINKER_CALLBACK_WRAPPER(fn) \ -+static unsigned long \ -+fn ## _count_objects(struct shrinker *shrink, struct shrink_control *sc)\ -+{ \ -+ int __ret__; \ -+ \ -+ sc->nr_to_scan = 0; \ -+ __ret__ = __ ## fn(NULL, sc); \ -+ \ -+ /* Errors may not be returned and must be converted to zeros */ \ -+ return ((__ret__ < 0) ? 0 : __ret__); \ -+} \ -+ \ -+static unsigned long \ -+fn ## _scan_objects(struct shrinker *shrink, struct shrink_control *sc) \ -+{ \ -+ int __ret__; \ -+ \ -+ __ret__ = __ ## fn(NULL, sc); \ -+ return ((__ret__ < 0) ? SHRINK_STOP : __ret__); \ -+} -+#else -+/* -+ * Linux 2.x to 2.6.22, or a newer shrinker API has been introduced. -+ */ -+#error "Unknown shrinker callback" -+#endif - - #endif /* SPL_MM_COMPAT_H */ diff --git a/pkgs/os-specific/linux/spl/3_13-compat-1.patch b/pkgs/os-specific/linux/spl/3_13-compat-1.patch deleted file mode 100644 index 40946931c802..000000000000 --- a/pkgs/os-specific/linux/spl/3_13-compat-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e96de17d723d6f6c9e2fd04b059b50d4e0bbef0 Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Thu, 8 Aug 2013 04:30:55 -0400 -Subject: [PATCH] Linux 3.13 compat: Remove unused flags variable from - __cv_init() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 4.8.1 complained about an unused flags variable when building -against Linux 2.6.26.8: - -/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c: -In function ‘__cv_init’: -/var/tmp/portage/sys-kernel/spl-9999/work/spl-9999/module/spl/../../module/spl/spl-condvar.c:39:6: -error: variable ‘flags’ set but not used -[-Werror=unused-but-set-variable] - int flags = KM_SLEEP; - ^ - cc1: all warnings being treated as errors - -Additionally, the superfluous code uses a preempt_count variable that is -no longer available on Linux 3.13. Deleting the unnecessary code fixes a -Linux 3.13 compatibility issue. - -Signed-off-by: Richard Yao -Signed-off-by: Brian Behlendorf -Closes #312 ---- - module/spl/spl-condvar.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c -index 283648a..8236412 100644 ---- a/module/spl/spl-condvar.c -+++ b/module/spl/spl-condvar.c -@@ -36,8 +36,6 @@ - void - __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg) - { -- int flags = KM_SLEEP; -- - SENTRY; - ASSERT(cvp); - ASSERT(name == NULL); -@@ -51,12 +49,6 @@ - atomic_set(&cvp->cv_refs, 1); - cvp->cv_mutex = NULL; - -- /* We may be called when there is a non-zero preempt_count or -- * interrupts are disabled is which case we must not sleep. -- */ -- if (current_thread_info()->preempt_count || irqs_disabled()) -- flags = KM_NOSLEEP; -- - SEXIT; - } - EXPORT_SYMBOL(__cv_init); --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/spl/3_13-compat-2.patch b/pkgs/os-specific/linux/spl/3_13-compat-2.patch deleted file mode 100644 index 1f487f042f81..000000000000 --- a/pkgs/os-specific/linux/spl/3_13-compat-2.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 50a0749eba31e821a7edf286f1e3b149f7d13c59 Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Mon, 25 Nov 2013 11:22:33 -0500 -Subject: [PATCH] Linux 3.13 compat: Pass NULL for new delegated inode argument - -This check was originally added for SLES10, a093c6a, to check for -a 'struct vfsmount *' argument which they added. However, since -SLES10 is based on a 2.6.16 kernel which is no longer supported -this functionality was dropped. The checks were refactored to -support Linux 3.13 without concern for historical versions. - -Signed-off-by: Richard Yao -Signed-off-by: Brian Behlendorf -Closes #312 ---- - config/spl-build.m4 | 52 ++++++++++++++++++++++++++++++++++++++++---------- - module/spl/spl-vnode.c | 22 ++++++++++++--------- - 2 files changed, 55 insertions(+), 19 deletions(-) - -diff --git a/config/spl-build.m4 b/config/spl-build.m4 -index 7d744db..8426780 100644 ---- a/config/spl-build.m4 -+++ b/config/spl-build.m4 -@@ -1842,41 +1842,73 @@ AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST], - EXTRA_KCFLAGS="$tmp_flags" - ]) - --dnl # --dnl # SLES API change, never adopted in mainline, --dnl # Third 'struct vfsmount *' argument removed. --dnl # - AC_DEFUN([SPL_AC_2ARGS_VFS_UNLINK], - [AC_MSG_CHECKING([whether vfs_unlink() wants 2 args]) - SPL_LINUX_TRY_COMPILE([ - #include - ],[ -- vfs_unlink(NULL, NULL); -+ vfs_unlink((struct inode *) NULL, (struct dentry *) NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_VFS_UNLINK, 1, - [vfs_unlink() wants 2 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # Linux 3.13 API change -+ dnl # Added delegated inode -+ dnl # -+ AC_MSG_CHECKING([whether vfs_unlink() wants 3 args]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ vfs_unlink((struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode **) NULL); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_3ARGS_VFS_UNLINK, 1, -+ [vfs_unlink() wants 3 args]) -+ ],[ -+ AC_MSG_ERROR(no) -+ ]) -+ - ]) - ]) - --dnl # --dnl # SLES API change, never adopted in mainline, --dnl # Third and sixth 'struct vfsmount *' argument removed. --dnl # - AC_DEFUN([SPL_AC_4ARGS_VFS_RENAME], - [AC_MSG_CHECKING([whether vfs_rename() wants 4 args]) - SPL_LINUX_TRY_COMPILE([ - #include - ],[ -- vfs_rename(NULL, NULL, NULL, NULL); -+ vfs_rename((struct inode *) NULL, (struct dentry *) NULL, -+ (struct inode *) NULL, (struct dentry *) NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_4ARGS_VFS_RENAME, 1, - [vfs_rename() wants 4 args]) - ],[ - AC_MSG_RESULT(no) -+ dnl # -+ dnl # Linux 3.13 API change -+ dnl # Added delegated inode -+ dnl # -+ AC_MSG_CHECKING([whether vfs_rename() wants 5 args]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ vfs_rename((struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode *) NULL, -+ (struct dentry *) NULL, -+ (struct inode **) NULL); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_5ARGS_VFS_RENAME, 1, -+ [vfs_rename() wants 5 args]) -+ ],[ -+ AC_MSG_ERROR(no) -+ ]) - ]) - ]) - -diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c -index 0784ff2..5496067 100644 ---- a/module/spl/spl-vnode.c -+++ b/module/spl/spl-vnode.c -@@ -334,7 +334,11 @@ - if (inode) - ihold(inode); - -+#ifdef HAVE_2ARGS_VFS_UNLINK - rc = vfs_unlink(parent.dentry->d_inode, dentry); -+#else -+ rc = vfs_unlink(parent.dentry->d_inode, dentry, NULL); -+#endif /* HAVE_2ARGS_VFS_UNLINK */ - exit1: - dput(dentry); - } else { -@@ -412,10 +416,10 @@ - - #ifdef HAVE_4ARGS_VFS_RENAME - rc = vfs_rename(old_dir->d_inode, old_dentry, -- new_dir->d_inode, new_dentry); -+ new_dir->d_inode, new_dentry); - #else -- rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt, -- new_dir->d_inode, new_dentry, newnd.nd_mnt); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry, NULL); - #endif /* HAVE_4ARGS_VFS_RENAME */ - exit4: - unlock_rename(new_dir, old_dir); -@@ -478,9 +482,9 @@ - if (inode) - atomic_inc(&inode->i_count); - #ifdef HAVE_2ARGS_VFS_UNLINK -- rc = vfs_unlink(nd.nd_dentry->d_inode, dentry); -+ rc = vfs_unlink(nd.nd_dentry->d_inode, dentry); - #else -- rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.nd_mnt); -+ rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, NULL); - #endif /* HAVE_2ARGS_VFS_UNLINK */ - exit2: - dput(dentry); -@@ -571,11 +575,11 @@ - SGOTO(exit5, rc); - - #ifdef HAVE_4ARGS_VFS_RENAME -- rc = vfs_rename(old_dir->d_inode, old_dentry, -- new_dir->d_inode, new_dentry); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry); - #else -- rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt, -- new_dir->d_inode, new_dentry, newnd.nd_mnt); -+ rc = vfs_rename(old_dir->d_inode, old_dentry, -+ new_dir->d_inode, new_dentry, NULL); - #endif /* HAVE_4ARGS_VFS_RENAME */ - exit5: - dput(new_dentry); --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index e74d0f0ef752..944fb6ff554c 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.2-${kernel.version}"; + name = "spl-0.6.3-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz; - sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz; + sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; }; - patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index ba7ccc7348ee..d3ed285ccfef 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.3pre-${kernel.version}"; + name = "spl-0.6.3-${kernel.version}"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "89aa97059d7ddad668a5118aef7914743162a5e8"; - sha256 = "1x4pba26zbyly8xd9q8s4av9v88ck0n9szxx72wzcn0s25rsyanx"; + rev = "31cb5383bff0fddc5058973e32a6f2c446d45e59"; + sha256 = "0mcivbddms8kbapbs9x6achqyvh5i6h1rd2b3jm8g5yjn0flc5gl"; }; - patches = [ ./install_prefix.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; From 9e1ec18624416fee22474b7f2baf55053bce539e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 21 Jun 2014 20:36:25 +0200 Subject: [PATCH 184/224] zfs, zfs.git: Update to 0.6.3 --- pkgs/os-specific/linux/zfs/3.13-compat.patch | 43 ------- pkgs/os-specific/linux/zfs/default.nix | 11 +- pkgs/os-specific/linux/zfs/gcc-4.8.patch | 114 ----------------- pkgs/os-specific/linux/zfs/git.nix | 8 +- .../linux/zfs/libblkid-1db7b9b.patch | 118 ------------------ 5 files changed, 12 insertions(+), 282 deletions(-) delete mode 100644 pkgs/os-specific/linux/zfs/3.13-compat.patch delete mode 100644 pkgs/os-specific/linux/zfs/gcc-4.8.patch delete mode 100644 pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch diff --git a/pkgs/os-specific/linux/zfs/3.13-compat.patch b/pkgs/os-specific/linux/zfs/3.13-compat.patch deleted file mode 100644 index f89d38f72acc..000000000000 --- a/pkgs/os-specific/linux/zfs/3.13-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 729210564a5325e190fc4fba22bf17bacf957ace Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Mon, 25 Nov 2013 12:21:21 -0500 -Subject: [PATCH] Properly ignore bdi_setup_and_register return value - -This broke compilation against Linux 3.13 and GCC 4.7.3. - -Signed-off-by: Richard Yao -Signed-off-by: Brian Behlendorf -Closes #1906 ---- - config/kernel-bdi-setup-and-register.m4 | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/config/kernel-bdi-setup-and-register.m4 b/config/kernel-bdi-setup-and-register.m4 -index 4196091..cb8ed67 100644 ---- a/config/kernel-bdi-setup-and-register.m4 -+++ b/config/kernel-bdi-setup-and-register.m4 -@@ -1,12 +1,14 @@ - dnl # - dnl # 2.6.34 API change --dnl # The bdi_setup_and_register() helper function is avilable and -+dnl # The bdi_setup_and_register() helper function is available and - dnl # exported by the kernel. This is a trivial helper function but - dnl # using it significantly simplifies the code surrounding setting - dnl # up and tearing down the bdi structure. - dnl # - AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], - [AC_MSG_CHECKING([whether bdi_setup_and_register() is available]) -+ tmp_flags="$EXTRA_KCFLAGS" -+ EXTRA_KCFLAGS="-Wno-unused-result" - ZFS_LINUX_TRY_COMPILE_SYMBOL([ - #include - ], [ -@@ -18,4 +20,5 @@ AC_DEFUN([ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER], - ], [ - AC_MSG_RESULT(no) - ]) -+ EXTRA_KCFLAGS="$tmp_flags" - ]) --- -1.8.5.5 - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f8f3c9ed3165..aec95832d16c 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.2-${kernel.version}"; + name = "zfs-0.6.3-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz; - sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz; + sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./libblkid-1db7b9b.patch ./gcc-4.8.patch ./3.13-compat.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; @@ -28,9 +28,12 @@ stdenv.mkDerivation { ''; configureFlags = '' + --disable-systemd --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --with-spl=${spl}/libexec/spl + --with-dracutdir=$$out/lib/dracut + --with-udevdir=$$out/lib/udev ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/zfs/gcc-4.8.patch b/pkgs/os-specific/linux/zfs/gcc-4.8.patch deleted file mode 100644 index 341360163761..000000000000 --- a/pkgs/os-specific/linux/zfs/gcc-4.8.patch +++ /dev/null @@ -1,114 +0,0 @@ -commit 0f62f3f9abc4bfa0bcafee9bfa3d55e91dcb371d -Author: Brian Behlendorf -Date: Tue Jan 14 09:39:13 2014 -0800 - - Disable GCCs aggressive loop optimization - - GCC >+ 4.8's aggressive loop optimization breaks some of the iterators - over the dn_blkptr[] pseudo-array in dnode_phys. Since dn_blkptr[] is - defined as a single-element array, GCC believes an iterator can only - access index 0 and will unroll the loop into a single iteration. - - One way to resolve the issue would be to cast the array to a pointer - and fix all the iterators that might break. The only loop where it - is known to cause a problem is this loop in dmu_objset_write_ready(): - - for (i = 0; i < dnp->dn_nblkptr; i++) - bp->blk_fill += dnp->dn_blkptr[i].blk_fill; - - In the common case where dn_nblkptr is 3, the loop is only executed a - single time and "i" is equal to 1 following the loop. - - The specific breakage caused by this problem is that the blk_fill of - root block pointers wouldn't be set properly when more than one blkptr - is in use (when no indrect blocks are needed). - - The simple reproducing sequence is: - - zpool create tank /tank.img - zdb -ddddd tank 0 - - Notice that "fill=31", however, there are two L0 indirect blocks with - "F=31" and "F=5". The fill count should be 36 rather than 31. This - problem causes an assert to be hit in a simple "zdb tank" when built - with --enable-debug. - - However, this approach was not taken because we need to be absolutely - sure we catch all instances of this unwanted optimization. Therefore, - the build system has been updated to detect if GCC supports the - aggressive loop optimization. If it does the optimization will be - explicitly disabled using the -fno-aggressive-loop-optimization option. - - Original-fix-by: Tim Chase - Signed-off-by: Tim Chase - Signed-off-by: Brian Behlendorf - Closes #2010 - Closes #2051 - -diff --git a/config/Rules.am b/config/Rules.am -index e3fa5b5..24f9426 100644 ---- a/config/Rules.am -+++ b/config/Rules.am -@@ -1,8 +1,10 @@ - DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h - - AM_LIBTOOLFLAGS = --silent --AM_CFLAGS = -Wall -Wstrict-prototypes --AM_CFLAGS += -fno-strict-aliasing ${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS} -+AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes -+AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE} -+AM_CFLAGS += ${NO_AGGRESSIVE_LOOP_OPTIMIZATIONS} -+AM_CFLAGS += -fno-strict-aliasing - AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT - AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 - AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -diff --git a/config/always-no-aggressive-loop-optimizations.m4 b/config/always-no-aggressive-loop-optimizations.m4 -new file mode 100644 -index 0000000..8f2115a ---- /dev/null -+++ b/config/always-no-aggressive-loop-optimizations.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # Check if gcc supports -fno-aggressive-loop-optimizations -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS], [ -+ AC_MSG_CHECKING([for -fno-aggressive-loop-optimizations support]) -+ -+ saved_flags="$CFLAGS" -+ CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" -+ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])], [ -+ NO_AGGRESSIVE_LOOP_OPTIMIZATIONS=-fno-aggressive-loop-optimizations -+ AC_MSG_RESULT([yes]) -+ ], [ -+ NO_AGGRESSIVE_LOOP_OPTIMIZATIONS= -+ AC_MSG_RESULT([no]) -+ ]) -+ -+ CFLAGS="$saved_flags" -+ AC_SUBST([NO_AGGRESSIVE_LOOP_OPTIMIZATIONS]) -+]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index cbf0ca3..62a9b42 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -104,6 +104,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other - dnl # compiler options are added by the kernel build system. - KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE" -+ KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_AGGRESSIVE_LOOP_OPTIMIZATIONS" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL" - KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" - -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index 005185b..477b916 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -62,6 +62,7 @@ AC_DEFUN([ZFS_AC_DEBUG_DMU_TX], [ - - AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [ - ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE -+ ZFS_AC_CONFIG_ALWAYS_NO_AGGRESSIVE_LOOP_OPTIMIZATIONS - ]) - - AC_DEFUN([ZFS_AC_CONFIG], [ diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index cc75011c7da9..ebbbc994d020 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, kernel, spl_git, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.3pre-${kernel.version}"; + name = "zfs-0.6.3-${kernel.version}"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "de39ec11b885f97e6256324ee89eaf75af9852f6"; - sha256 = "02hrhka9hg0vn4z20x7xzwrkr340pv9qwvwj8phjdm5ln321jh33"; + rev = "07dabd234dd51a1e5adc5bd21cddf5b5fdc70732"; + sha256 = "1yqsfdhyzh33aisfvwqd692n5kfgnlz7yjixd2gqn8vx9bv0dz0b"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation { --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build --with-spl=${spl_git}/libexec/spl + --with-dracutdir=$$out/lib/dracut + --with-udevdir=$$out/lib/udev ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch b/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch deleted file mode 100644 index 894bf395ce85..000000000000 --- a/pkgs/os-specific/linux/zfs/libblkid-1db7b9b.patch +++ /dev/null @@ -1,118 +0,0 @@ -commit 1db7b9be75a225cedb3b7a60028ca5695e5b8346 -Author: Richard Yao -Date: Wed Aug 28 16:17:47 2013 -0400 - - Fix libblkid support - - libblkid support is dormant because the autotools check is broken and - liblkid identifies ZFS vdevs as "zfs_member", not "zfs". We fix that - with a few changes: - - First, we fix the libblkid autotools check to do a few things: - - 1. Make a 64MB file, which is the minimum size ZFS permits. - 2. Make 4 fake uberblock entries to make libblkid's check succeed. - 3. Return 0 upon success to make autotools use the success case. - 4. Include stdlib.h to avoid implicit declration of free(). - 5. Check for "zfs_member", not "zfs" - 6. Make --with-blkid disable autotools check (avoids Gentoo sandbox violation) - 7. Pass '-lblkid' correctly using LIBS not LDFLAGS. - - Second, we change the libblkid support to scan for "zfs_member", not - "zfs". - - This makes --with-blkid work on Gentoo. - - Signed-off-by: Richard Yao - Signed-off-by: Brian Behlendorf - Issue #1751 - -diff --git a/config/user-libblkid.m4 b/config/user-libblkid.m4 -index 276587f..2dd2623 100644 ---- a/config/user-libblkid.m4 -+++ b/config/user-libblkid.m4 -@@ -22,26 +22,45 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - [with_blkid=check]) - - LIBBLKID= -- AS_IF([test "x$with_blkid" != xno], -+ AS_IF([test "x$with_blkid" = xyes], -+ [ -+ AC_SUBST([LIBBLKID], ["-lblkid"]) -+ AC_DEFINE([HAVE_LIBBLKID], 1, -+ [Define if you have libblkid]) -+ ]) -+ -+ AS_IF([test "x$with_blkid" = xcheck], - [ - AC_CHECK_LIB([blkid], [blkid_get_cache], - [ - AC_MSG_CHECKING([for blkid zfs support]) - - ZFS_DEV=`mktemp` -- dd if=/dev/zero of=$ZFS_DEV bs=1024k count=8 \ -+ truncate -s 64M $ZFS_DEV -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=128 conv=notrunc &>/dev/null \ - >/dev/null 2>/dev/null - echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ - dd of=$ZFS_DEV bs=1k count=8 \ - seek=132 conv=notrunc &>/dev/null \ - >/dev/null 2>/dev/null -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=136 conv=notrunc &>/dev/null \ -+ >/dev/null 2>/dev/null -+ echo -en "\x0c\xb1\xba\0\0\0\0\0" | \ -+ dd of=$ZFS_DEV bs=1k count=8 \ -+ seek=140 conv=notrunc &>/dev/null \ -+ >/dev/null 2>/dev/null - -- saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="-lblkid" -+ saved_LIBS="$LIBS" -+ LIBS="-lblkid" - - AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #include -+ #include - #include - ], - [ -@@ -58,10 +77,10 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - return 2; - } - -- if (strcmp(value, "zfs")) { -+ if (strcmp(value, "zfs_member")) { - free(value); - blkid_put_cache(cache); -- return 3; -+ return 0; - } - - free(value); -@@ -82,7 +101,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBBLKID], [ - [--with-blkid given but unavailable])]) - ]) - -- LDFLAGS="$saved_LDFLAGS" -+ LIBS="$saved_LIBS" - ], - [ - AS_IF([test "x$with_blkid" != xcheck], -diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c -index 53609f2..d1fa98e 100644 ---- a/lib/libzfs/libzfs_import.c -+++ b/lib/libzfs/libzfs_import.c -@@ -965,7 +965,7 @@ zpool_find_import_blkid(libzfs_handle_t *hdl, pool_list_t *pools) - goto err_blkid2; - } - -- err = blkid_dev_set_search(iter, "TYPE", "zfs"); -+ err = blkid_dev_set_search(iter, "TYPE", "zfs_member"); - if (err != 0) { - (void) zfs_error_fmt(hdl, EZFS_BADCACHE, - dgettext(TEXT_DOMAIN, "blkid_dev_set_search() %d"), err); From 6ec01b751327895af0363a92364c8d7129f5e627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 14:45:01 +0200 Subject: [PATCH 185/224] zbar: tweak description and add longDescription "Bar code reader" is what they call it on the homepage (http://zbar.sourceforge.net/). --- pkgs/tools/graphics/zbar/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 83c9b1577935..51dcc2a9c808 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -34,7 +34,14 @@ rec { configureFlags = ["--disable-video"]; meta = { - description = "Bar code toolset"; + description = "Bar code reader"; + longDescription = '' + ZBar is an open source software suite for reading bar codes from various + sources, such as video streams, image files and raw intensity sensors. It + supports many popular symbologies (types of bar codes) including + EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR + Code. + ''; maintainers = with a.lib.maintainers; [ raskin From 470f8cccc250ebab59cc76cb7ccdfa596ce694f5 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Mon, 23 Jun 2014 17:12:10 +0300 Subject: [PATCH 186/224] glusterfs: update to 3.5.0 --- pkgs/tools/filesystems/glusterfs/default.nix | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5a09ec2a80b9..1c843a666360 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,25 +1,36 @@ -{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}: +{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, + autoconf, automake, libtool, pkgconfig, zlib, libaio}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.4.3"; + version="3.5.0"; name="${baseName}-${version}"; - hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.3/glusterfs-3.4.3.tar.gz"; - sha256="0j1yvpdb1bydsh3pqlyr23mfvra5bap9rxba910s9cn61mpy99bj"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; + sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; }; buildInputs = [ - fuse bison flex openssl python ncurses readline + fuse bison flex_2_5_35 openssl python ncurses readline + autoconf automake libtool pkgconfig zlib libaio ]; in stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' + ./autogen.sh + ''; configureFlags = [ ''--with-mountutildir="$out/sbin"'' ]; + preInstall = '' + substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out + ''; src = fetchurl { inherit (s) url sha256; }; From f2909d07638cceccb28a32d0ccc957f2b6725448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 16:16:18 +0200 Subject: [PATCH 187/224] dejagnu: fix description (don't repeat package name) --- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index beed6032393f..9e400cc5c62a 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The DejaGNU testing framework"; + description = "Framework for testing other programs"; longDescription = '' DejaGnu is a framework for testing other programs. Its purpose From 460ea9e84163608cb25aba7feed5fb39ba3dfa00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 16:33:37 +0200 Subject: [PATCH 188/224] lftp: update 4.4.16 -> 4.5.2 Changelog: http://lftp.yar.ru/news.html#4.5.2 --- pkgs/tools/networking/lftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 7a369744525c..93b3e778b157 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, xz }: stdenv.mkDerivation rec { - name = "lftp-4.4.16"; + name = "lftp-4.5.2"; src = fetchurl { url = "http://lftp.yar.ru/ftp/${name}.tar.gz"; - sha256 = "1wivcynm4pc18vj4x6r2saczk34ds3slagmz3y3b04rzklplf7s4"; + sha256 = "106llhq9lgvdxlf4r1p94r66fcy5ywfdfvins4dfn9irg0k5gzyv"; }; patches = [ ./no-gets.patch ]; From 3ad289dff967610a31ef5ba982b0e7d3bb2af173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 23 Jun 2014 16:38:05 +0200 Subject: [PATCH 189/224] lftp: remove unused 'xz' expression argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xz used to be in buildInputs but was removed in commit d4d7931a6296cd72d3d5f360d628be86bb62246b (Cleanup: remove obsolete references to ‘xz’, which is in stdenv). --- pkgs/tools/networking/lftp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 93b3e778b157..51ab3478ac93 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, xz }: +{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: stdenv.mkDerivation rec { name = "lftp-4.5.2"; From ffe12f82cee00412231e20d8ddb90ee5d9c2537f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jun 2014 12:14:46 +0200 Subject: [PATCH 190/224] gitignore: result-* and make absolute doc ignores --- .gitignore | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 105e621d7021..d43399383a09 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,9 @@ .*.swp .*.swo result -doc/NEWS.html -doc/NEWS.txt -doc/manual.html -doc/manual.pdf +result-* +/doc/NEWS.html +/doc/NEWS.txt +/doc/manual.html +/doc/manual.pdf .version-suffix From 622ef52b34a50f789130a6f64f6b1266767393fa Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jun 2014 03:29:57 +0200 Subject: [PATCH 191/224] python: zc.recipe.egg for buildout171 and 2 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d4b78e11c89b..4299507a12f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -873,6 +873,7 @@ rec { # A patched version of buildout, useful for buildout based development on Nix zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + zc_recipe_egg = zc_recipe_egg_buildout171; zc_buildout = zc_buildout171; zc_buildout2 = zc_buildout221; zc_buildout221 = buildPythonPackage rec { @@ -927,6 +928,29 @@ rec { }; }; + zc_recipe_egg_fun = { buildout, version, md5 }: buildPythonPackage rec { + inherit version; + name = "zc.recipe.egg-${version}"; + + buildInputs = [ buildout ]; + doCheck = false; + + src = fetchurl { + inherit md5; + url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz"; + }; + }; + zc_recipe_egg_buildout171 = zc_recipe_egg_fun { + buildout = zc_buildout171; + version = "1.3.2"; + md5 = "1cb6af73f527490dde461d3614a36475"; + }; + zc_recipe_egg_buildout2 = zc_recipe_egg_fun { + buildout = zc_buildout2; + version = "2.0.1"; + md5 = "5e81e9d4cc6200f5b1abcf7c653dd9e3"; + }; + bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; From 0e54b7980aeef48994810f95ffcb4fe96decfdd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 23 Jun 2014 17:43:43 +0200 Subject: [PATCH 192/224] go 1.3: doesn't evaluate on freebsd --- pkgs/development/compilers/go/1.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 375a2d1705c6..b9178d5e61c1 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation { description = "The Go Programming language"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [ cstrahan ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } From 70548a6ac2a229bd37879d857ec35c73fec4a2c3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 23 Jun 2014 23:13:50 +0200 Subject: [PATCH 193/224] disable szip for hdf5 because of its unfree nature --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddadce508d8a..b5d4844a6d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1254,7 +1254,9 @@ let hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf5 = callPackage ../tools/misc/hdf5 { }; + hdf5 = callPackage ../tools/misc/hdf5 { + szip = null; + }; heimdall = callPackage ../tools/misc/heimdall { }; From 94deea203566bd88ec1315ede95a4819d12f2976 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 24 Jun 2014 10:52:12 +0200 Subject: [PATCH 194/224] nixos: Add option hardware.sane.configDir --- nixos/modules/services/hardware/sane.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index bbb59312753c..3bf765c6f991 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -34,6 +34,12 @@ in description = "Packages providing extra SANE backends to enable."; }; + hardware.sane.configDir = mkOption { + type = types.string; + default = "${saneConfig}/etc/sane.d"; + description = "The value of SANE_CONFIG_DIR."; + }; + }; @@ -43,7 +49,7 @@ in environment.systemPackages = backends; environment.sessionVariables = { - SANE_CONFIG_DIR = mkDefault "${saneConfig}/etc/sane.d"; + SANE_CONFIG_DIR = config.hardware.sane.configDir; LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; }; services.udev.packages = backends; From 9ff0b303ff4b954748920041b4385ecc7ce1b338 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 24 Jun 2014 11:01:28 +0200 Subject: [PATCH 195/224] elasticsearch: Add option specifying extra command line options --- nixos/modules/services/search/elasticsearch.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 0d604850d42b..3c32e4a3dfe1 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -93,6 +93,14 @@ in { Data directory for elasticsearch. ''; }; + + extraCmdLineOptions = mkOption { + description = "Extra command line options for the elasticsearch launcher"; + default = []; + type = types.listOf types.string; + example = [ "-Djava.net.preferIPv4Stack=true" ]; + }; + }; ###### implementation @@ -104,7 +112,7 @@ in { after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; serviceConfig = { - ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir}"; + ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; PermissionsStartOnly = true; }; From ee8ea41d58bc1ab96929edefbce576b2a52f0a96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Jun 2014 09:25:25 -0400 Subject: [PATCH 196/224] Fix broadcom-sta on linux >= 3.15 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch?view=markup --- ...cfg80211_ibss_joined-channel-parameter.patch | 17 +++++++++++++++++ pkgs/os-specific/linux/broadcom-sta/default.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch new file mode 100644 index 000000000000..5596c0ebcf2e --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/cfg80211_ibss_joined-channel-parameter.patch @@ -0,0 +1,17 @@ +Add channel parameter to cfg80211_ibss_joined call + +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev, + wl_get_assoc_ies(wl); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); ++#else ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, ++ &wl->conf->channel, GFP_KERNEL); ++#endif + set_bit(WL_STATUS_CONNECTED, &wl->status); + wl->profile->active = true; + } diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 5955543f8e1e..1ed13c2e4501 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { patches = [ ./linux-recent.patch ./license.patch + ./cfg80211_ibss_joined-channel-parameter.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; From fd73d2b13b70239d0a69e7e317ce71d2674e024d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Jun 2014 19:08:27 +0200 Subject: [PATCH 197/224] gnupg1: update to version 1.4.17 --- pkgs/tools/security/gnupg1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 362ec3a25bbd..a25ae35b6cc9 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.16"; + name = "gnupg-1.4.17"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv"; + sha256 = "0nvv1bd8v13gh2m1429azws7ks0ix9y1yv87ak9k9i1dsqcrvpg6"; }; buildInputs = [ readline bzip2 ]; From 6ce8f753e0fbeda2e315c6fd9c1fb58fe198db71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Jun 2014 21:04:56 +0200 Subject: [PATCH 198/224] nixos/elasticsearch: add '.' at end of description strings Nixos option descriptions should be full sentences, ending in a full stop. (Package descriptions, on the other hand, should not.) --- nixos/modules/services/search/elasticsearch.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 3c32e4a3dfe1..70254560bd05 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -27,37 +27,37 @@ in { options.services.elasticsearch = { enable = mkOption { - description = "Whether to enable elasticsearch"; + description = "Whether to enable elasticsearch."; default = false; type = types.uniq types.bool; }; host = mkOption { - description = "Elasticsearch listen address"; + description = "Elasticsearch listen address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Elasticsearch port to listen for HTTP traffic"; + description = "Elasticsearch port to listen for HTTP traffic."; default = 9200; type = types.int; }; tcp_port = mkOption { - description = "Elasticsearch port for the node to node communication"; + description = "Elasticsearch port for the node to node communication."; default = 9300; type = types.int; }; cluster_name = mkOption { - description = "Elasticsearch name that identifies your cluster for auto-discovery"; + description = "Elasticsearch name that identifies your cluster for auto-discovery."; default = "elasticsearch"; type = types.str; }; extraConf = mkOption { - description = "Extra configuration for elasticsearch"; + description = "Extra configuration for elasticsearch."; default = ""; type = types.str; example = '' @@ -70,7 +70,7 @@ in { }; logging = mkOption { - description = "Elasticsearch logging configuration"; + description = "Elasticsearch logging configuration."; default = '' rootLogger: INFO, console logger: @@ -95,7 +95,7 @@ in { }; extraCmdLineOptions = mkOption { - description = "Extra command line options for the elasticsearch launcher"; + description = "Extra command line options for the elasticsearch launcher."; default = []; type = types.listOf types.string; example = [ "-Djava.net.preferIPv4Stack=true" ]; From f78ce19d8ca98cf37e25a7e6eb94274b84f4cd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Jun 2014 21:10:22 +0200 Subject: [PATCH 199/224] nixos/elasticsearch: capitalize systemd service description --- nixos/modules/services/search/elasticsearch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 70254560bd05..eeae11dc4ff3 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -107,7 +107,7 @@ in { config = mkIf cfg.enable { systemd.services.elasticsearch = { - description = "Elasticsearch daemon"; + description = "Elasticsearch Daemon"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; From 4def9a762f091ec1fdf048066af3fce75bb5a305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 24 Jun 2014 21:23:14 +0200 Subject: [PATCH 200/224] nixos: add some missing '.' in option descriptions --- nixos/modules/config/krb5.nix | 4 ++-- nixos/modules/programs/atop.nix | 2 +- nixos/modules/services/databases/redis.nix | 24 +++++++++++----------- nixos/modules/tasks/encrypted-devices.nix | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix index bb5a95ebc844..991b5b16cc68 100644 --- a/nixos/modules/config/krb5.nix +++ b/nixos/modules/config/krb5.nix @@ -32,12 +32,12 @@ in kdc = mkOption { default = "kerberos.mit.edu"; - description = "Kerberos Domain Controller"; + description = "Kerberos Domain Controller."; }; kerberosAdminServer = mkOption { default = "kerberos.mit.edu"; - description = "Kerberos Admin Server"; + description = "Kerberos Admin Server."; }; }; diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index e457db22333b..b91bd98047ee 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -22,7 +22,7 @@ in interval = 5; }; description = '' - Parameters to be written to /etc/atoprc + Parameters to be written to /etc/atoprc. ''; }; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 4ef48df9831c..2521e356bf39 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -50,7 +50,7 @@ in user = mkOption { default = "redis"; - description = "User account under which Redis runs"; + description = "User account under which Redis runs."; }; pidFile = mkOption { @@ -60,26 +60,26 @@ in port = mkOption { default = 6379; - description = "The port for Redis to listen to"; + description = "The port for Redis to listen to."; type = with types; int; }; bind = mkOption { default = null; # All interfaces - description = "The IP interface to bind to"; + description = "The IP interface to bind to."; example = "127.0.0.1"; }; unixSocket = mkOption { default = null; - description = "The path to the socket to bind to"; + description = "The path to the socket to bind to."; example = "/var/run/redis.sock"; }; logLevel = mkOption { default = "notice"; # debug, verbose, notice, warning example = "debug"; - description = "Specify the server verbosity level, options: debug, verbose, notice, warning"; + description = "Specify the server verbosity level, options: debug, verbose, notice, warning."; type = with types; string; }; @@ -110,19 +110,19 @@ in dbFilename = mkOption { default = "dump.rdb"; - description = "The filename where to dump the DB"; + description = "The filename where to dump the DB."; type = with types; string; }; dbpath = mkOption { default = "/var/lib/redis"; - description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration"; + description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration."; type = with types; string; }; slaveOf = mkOption { default = null; # { ip, port } - description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave"; + description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave."; example = { ip = "192.168.1.100"; port = 6379; }; }; @@ -154,26 +154,26 @@ in appendFsync = mkOption { default = "everysec"; # no, always, everysec - description = "How often to fsync the append-only log, options: no, always, everysec"; + description = "How often to fsync the append-only log, options: no, always, everysec."; type = with types; string; }; slowLogLogSlowerThan = mkOption { default = 10000; - description = "Log queries whose execution take longer than X in milliseconds"; + description = "Log queries whose execution take longer than X in milliseconds."; example = 1000; type = with types; int; }; slowLogMaxLen = mkOption { default = 128; - description = "Maximum number of items to keep in slow log"; + description = "Maximum number of items to keep in slow log."; type = with types; int; }; extraConfig = mkOption { default = ""; - description = "Extra configuration options for redis.conf"; + description = "Extra configuration options for redis.conf."; type = with types; string; }; }; diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index e80762a170c4..e56549149cb8 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -16,28 +16,28 @@ let enable = mkOption { default = false; type = types.bool; - description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry"; + description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.uniq (types.nullOr types.string); - description = "Location of the backing encrypted device"; + description = "Location of the backing encrypted device."; }; label = mkOption { default = null; example = "rootfs"; type = types.uniq (types.nullOr types.string); - description = "Label of the backing encrypted device"; + description = "Label of the backing encrypted device."; }; keyFile = mkOption { default = null; example = "/root/.swapkey"; type = types.uniq (types.nullOr types.string); - description = "File system location of keyfile"; + description = "File system location of keyfile."; }; }; }; From f4b3bc0334e521f0b6ded89e96126e3b97e49981 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 24 Jun 2014 14:45:07 -0700 Subject: [PATCH 201/224] diffstat: weaken platform requirement This fixes a change made in 3ae765278f0e5d75e3d18ebac29c25780b92e9ee. --- pkgs/tools/text/diffstat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 94c2df9aabe0..e70dfaedddf5 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; homepage = http://invisible-island.net/diffstat/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From 41f5e0121c0a76bf234db1285a02996f9a1a677c Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 24 Jun 2014 23:52:54 +0200 Subject: [PATCH 202/224] syslog-ng: Enable systemd support --- pkgs/tools/system/syslog-ng/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cbffd8648d47..a351c11af01e 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd }: stdenv.mkDerivation { name = "syslog-ng-3.5.4.1"; @@ -8,8 +8,13 @@ stdenv.mkDerivation { sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; }; - buildInputs = [ eventlog pkgconfig glib python ]; - configureFlags = "--enable-dynamic-linking"; + buildInputs = [ eventlog pkgconfig glib python systemd ]; + + configureFlags = [ + "--enable-dynamic-linking" + "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; meta = { homepage = "http://www.balabit.com/network-security/syslog-ng/"; From c1e24abfef0d6d8ac71c7634439f5dfaffdae1ce Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Wed, 25 Jun 2014 01:12:10 +0300 Subject: [PATCH 203/224] Print output of `git describe` in `nix-prefetch-git` I hope it will help make git-packages' versions much nicer It's usually only useful in --deepClone is also specified. --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3574f3b7539b..bd1d8b5c1af0 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -217,7 +217,9 @@ clone_user_rev() { fi;; esac - echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)" + local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1) + echo "git revision is $full_revision" + echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" From 429bdef9bdb34d22ddda2d4291c0ba8adbd7e7c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jun 2014 23:10:20 +0200 Subject: [PATCH 204/224] winetricks: Update to 1199 --- pkgs/misc/emulators/wine/winetricks.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index f47902cd0bf1..3dd3d4bc7311 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -2,13 +2,13 @@ , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1083"; + rev = "1199"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32"; + sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb"; }; buildInputs = [ perl which ]; @@ -28,4 +28,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } - From cc0c93977342fd8a84144bab6b463cde31ff0fe0 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Wed, 25 Jun 2014 02:58:43 +0300 Subject: [PATCH 205/224] jailbreak pipes-text which depends an older pipes-bytestring --- pkgs/development/libraries/haskell/pipes-text/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index 7156b8897893..4b5a7973c525 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors streamingCommons text transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/michaelt/text-pipes"; description = "Text pipes"; From 8e4e15804cca8bf8a641116b0698d09f67e5bd1d Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Wed, 25 Jun 2014 03:02:50 +0300 Subject: [PATCH 206/224] Added haskell packages: hdaemonize, ixset, shellmate, tables and webdriver. --- .../libraries/haskell/hdaemonize/default.nix | 14 ++++++++++ .../libraries/haskell/ixset/default.nix | 14 ++++++++++ .../libraries/haskell/shellmate/default.nix | 14 ++++++++++ .../libraries/haskell/tables/default.nix | 23 ++++++++++++++++ .../libraries/haskell/webdriver/default.nix | 27 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 +++++++ 6 files changed, 102 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hdaemonize/default.nix create mode 100644 pkgs/development/libraries/haskell/ixset/default.nix create mode 100644 pkgs/development/libraries/haskell/shellmate/default.nix create mode 100644 pkgs/development/libraries/haskell/tables/default.nix create mode 100644 pkgs/development/libraries/haskell/webdriver/default.nix diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix new file mode 100644 index 000000000000..203eb33844e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -0,0 +1,14 @@ +{ cabal, extensibleExceptions, filepath, hsyslog, mtl }: + +cabal.mkDerivation (self: { + pname = "hdaemonize"; + version = "0.4.5.0"; + sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w"; + buildDepends = [ extensibleExceptions filepath hsyslog mtl ]; + meta = { + homepage = "http://github.com/madhadron/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix new file mode 100644 index 000000000000..f45e95b5e86f --- /dev/null +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -0,0 +1,14 @@ +{ cabal, safecopy, syb, sybWithClass }: + +cabal.mkDerivation (self: { + pname = "ixset"; + version = "1.0.5"; + sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns"; + buildDepends = [ safecopy syb sybWithClass ]; + meta = { + homepage = "http://happstack.com"; + description = "Efficient relational queries on Haskell sets"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix new file mode 100644 index 000000000000..37383792de1f --- /dev/null +++ b/pkgs/development/libraries/haskell/shellmate/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath, temporary, time, transformers }: + +cabal.mkDerivation (self: { + pname = "shellmate"; + version = "0.1.6"; + sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr"; + buildDepends = [ filepath temporary time transformers ]; + meta = { + homepage = "http://github.com/valderman/shellmate"; + description = "Simple interface for shell scripting in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix new file mode 100644 index 000000000000..f97512c7f7f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/tables/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, cereal, comonad, deepseq, doctest, filepath +, hashable, lens, profunctors, safecopy, transformers +, transformersCompat, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "tables"; + version = "0.4.1"; + sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49"; + buildDepends = [ + binary cereal comonad deepseq hashable lens profunctors safecopy + transformers transformersCompat unorderedContainers + ]; + testDepends = [ + doctest filepath lens transformers unorderedContainers + ]; + meta = { + homepage = "http://github.com/ekmett/tables/"; + description = "In-memory storage with multiple keys using lenses and traversals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix new file mode 100644 index 000000000000..4af61ece80a5 --- /dev/null +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -0,0 +1,27 @@ +{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault +, directoryTree, exceptions, filepath, HTTP, liftedBase +, monadControl, mtl, network, parallel, scientific, temporary, text +, time, transformers, transformersBase, unorderedContainers, vector +, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "webdriver"; + version = "0.5.4"; + sha256 = "0839vw7drjn5iray4ma17f0pfgwx44q10ad8m564jvjgcml4yhvq"; + buildDepends = [ + aeson attoparsec base64Bytestring cond dataDefault directoryTree + exceptions filepath HTTP liftedBase monadControl mtl network + scientific temporary text time transformers transformersBase + unorderedContainers vector zipArchive + ]; + testDepends = [ parallel text ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + 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 608108a18474..5681ecbe2f1f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1066,6 +1066,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HaXml = callPackage ../development/libraries/haskell/HaXml {}; + hdaemonize = callPackage ../development/libraries/haskell/hdaemonize {}; + HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix { @@ -1280,6 +1282,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preprocessorTools = self.preprocessorTools_0_1_3; }; + ixset = callPackage ../development/libraries/haskell/ixset {}; + ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; jack = callPackage ../development/libraries/haskell/jack {}; @@ -1960,6 +1964,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; + shellmate = callPackage ../development/libraries/haskell/shellmate {}; + shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; shelly = self.shelly_1_5_3_1; @@ -2160,6 +2166,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; + tables = callPackage ../development/libraries/haskell/tables {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; tagged = callPackage ../development/libraries/haskell/tagged {}; @@ -2462,6 +2470,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + webdriver = callPackage ../development/libraries/haskell/webdriver {}; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; From f56567ce74d93e7c23d3b42b91feedd6f86f70e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jun 2014 10:51:20 +0200 Subject: [PATCH 207/224] perl: Add 5.20.0 --- .../interpreters/perl/5.20/cpp-precomp.patch | 11 + .../interpreters/perl/5.20/default.nix | 68 +++++ .../interpreters/perl/5.20/ld-shared.patch | 11 + .../interpreters/perl/5.20/no-libutil.patch | 12 + .../interpreters/perl/5.20/no-sys-dirs.patch | 250 ++++++++++++++++++ .../interpreters/perl/5.20/setup-hook.sh | 5 + pkgs/top-level/all-packages.nix | 2 + 7 files changed, 359 insertions(+) create mode 100644 pkgs/development/interpreters/perl/5.20/cpp-precomp.patch create mode 100644 pkgs/development/interpreters/perl/5.20/default.nix create mode 100644 pkgs/development/interpreters/perl/5.20/ld-shared.patch create mode 100644 pkgs/development/interpreters/perl/5.20/no-libutil.patch create mode 100644 pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch create mode 100644 pkgs/development/interpreters/perl/5.20/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch new file mode 100644 index 000000000000..231853fe51a6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch @@ -0,0 +1,11 @@ +--- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 ++++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 +@@ -129,7 +129,7 @@ + + # Avoid Apple's cpp precompiler, better for extensions + if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then +- cppflags="${cppflags} -no-cpp-precomp" ++ #cppflags="${cppflags} -no-cpp-precomp" + + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix new file mode 100644 index 000000000000..d9fb32aa43ea --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl }: + +let + + libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; + +in + +with { + inherit (stdenv.lib) optional optionalString; +}; + +stdenv.mkDerivation rec { + name = "perl-5.20.0"; + + src = fetchurl { + url = "mirror://cpan/src/${name}.tar.gz"; + sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + }; + + patches = + [ # Do not look in /usr etc. for dependencies. + ./no-sys-dirs.patch + ] + ++ optional stdenv.isSunOS ./ld-shared.patch + ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; + + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + # Miniperl needs -lm. perl needs -lrt. + configureFlags = + [ "-de" + "-Dcc=gcc" + "-Uinstallusrbinperl" + "-Dinstallstyle=lib/perl5" + "-Duseshrplib" + "-Dlocincpth=${libc}/include" + "-Dloclibpth=${libc}/lib" + ] + ++ optional (stdenv ? glibc) "-Dusethreads"; + + configureScript = "${stdenv.shell} ./Configure"; + + dontAddPrefix = true; + + enableParallelBuilding = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + ${optionalString stdenv.isArm '' + configureFlagsArray=(-Dldflags="-lm -lrt") + ''} + ''; + + preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + + setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; +} diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/5.20/ld-shared.patch new file mode 100644 index 000000000000..be45230c8a73 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/ld-shared.patch @@ -0,0 +1,11 @@ +--- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 ++++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 +@@ -568,7 +568,7 @@ + # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" + # fi + ldflags="$ldflags -m64" +- lddlflags="$lddlflags -G -m64" ++ lddlflags="$lddlflags -shared -m64" + ;; + *) + getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.20/no-libutil.patch b/pkgs/development/interpreters/perl/5.20/no-libutil.patch new file mode 100644 index 000000000000..68d44612bfe6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-libutil.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 +@@ -1368,7 +1368,7 @@ + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. + libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" +-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch new file mode 100644 index 000000000000..1793273a76f9 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch @@ -0,0 +1,250 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -126,11 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + # Some Linuxes have weird errno.hs which generate +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,25 +150,6 @@ + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -178,32 +159,6 @@ + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + # Are we using ELF? Thanks to Kenneth Albanowski + # for this test. + cat >try.c <<'EOM' +@@ -367,33 +322,6 @@ + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/5.20/setup-hook.sh b/pkgs/development/interpreters/perl/5.20/setup-hook.sh new file mode 100644 index 000000000000..6a144a7f7804 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c1aade131e7..df954e3fae6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3496,6 +3496,8 @@ let fetchurl = fetchurlBoot; }; + perl520 = callPackage ../development/interpreters/perl/5.20 { }; + perl = if system != "i686-cygwin" then perl516 else sysPerl; php = php54; From c11d9daa588f3726bd53dee67600efc4c76777b4 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 25 Jun 2014 13:44:31 +0200 Subject: [PATCH 208/224] syslog-ng: Add perl to buildInputs so perl scripts in output are fixed correctly --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a351c11af01e..9102482d3d63 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: stdenv.mkDerivation { name = "syslog-ng-3.5.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; }; - buildInputs = [ eventlog pkgconfig glib python systemd ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl ]; configureFlags = [ "--enable-dynamic-linking" From 00d9b5dfeb606d08628384f70f32f3f42869b1b6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 25 Jun 2014 14:19:02 +0200 Subject: [PATCH 209/224] Make openjre default jre on darwin, just like jdk. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df954e3fae6b..5860f486fd38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3025,7 +3025,7 @@ let jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk else pkgs.oraclejdk; - jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjre else pkgs.oraclejre; From 37c7d024efd30afd992a5799e42f1f93476ee0d3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 17 Feb 2014 21:37:39 +0000 Subject: [PATCH 210/224] nixos: change EDITOR and PAGER environment variables to mkDefaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Domen Kožar --- nixos/modules/programs/environment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 2ff1db48757d..80c3e83fe812 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -19,8 +19,8 @@ in environment.variables = { LOCATE_PATH = "/var/cache/locatedb"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - PAGER = "less -R"; - EDITOR = "nano"; + PAGER = mkDefault "less -R"; + EDITOR = mkDefault "nano"; }; environment.sessionVariables = From 430448700300c29fe8e09cfcc1b99a576b865229 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Jun 2014 11:14:35 -0700 Subject: [PATCH 211/224] libcroco: weaken platform requirement for building on darwin --- pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix index e5f6a0aa9b8b..1875c1491f96 100644 --- a/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 glib ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } From cda3d5d59ba0d25ac70d76c76b62ebd57116fc18 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Jun 2014 11:14:53 -0700 Subject: [PATCH 212/224] djvu2pdf: new expression --- pkgs/tools/typesetting/djvu2pdf/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/typesetting/djvu2pdf/default.nix diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix new file mode 100644 index 000000000000..67371c5c28fd --- /dev/null +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, pkgconfig, djvulibre, ghostscript }: + +stdenv.mkDerivation rec { + version = "0.9.2"; + name = "djvu2pdf-${version}"; + + src = fetchurl { + url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; + sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"; + }; + + buildInputs = [ pkgconfig djvulibre ghostscript ]; + + meta = { + description = "Creates djvu files from PDF files"; + homepage = http://0x2a.at/s/projects/djvu2pdf; + license = stdenv.lib.licenses.gpl2; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5860f486fd38..e0955c4f6866 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8215,6 +8215,8 @@ let djvulibre = callPackage ../applications/misc/djvulibre { }; + djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; + djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; From 7c85cef85f6f4679ce56f0ff0b959ccc0abec1e3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Jun 2014 11:18:18 -0700 Subject: [PATCH 213/224] dvju2pdf: corrections to the installPhase and dependencies --- pkgs/tools/typesetting/djvu2pdf/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 67371c5c28fd..c7729ac676f8 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"; }; - buildInputs = [ pkgconfig djvulibre ghostscript ]; + buildInputs = [ pkgconfig ]; + propagatedUserEnvPkgs = [ djvulibre ghostscript ]; + + installPhase = '' + ensureDir $out/bin + cp -p djvu2pdf $out/bin + ensureDir $out/man/man1 + cp -p djvu2pdf.1.gz $out/man/man1 + ''; meta = { description = "Creates djvu files from PDF files"; From 1149154e0e26b8acb78ce4c4f1f729d39e9ed1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 30 Mar 2014 15:45:00 +0200 Subject: [PATCH 214/224] openocd: update 0.7.0 -> 0.8.0 * Remove unneeded --enable- configure flags. configure auto selects support for them now (and they're all enabled). * Not everything is auto-detected; I asked on the openocd mailing list and they suggested a set of ./configure flags for a "distro build" (add them). * Remove --enable-ft2232_libftdi because configure says that it's deprecated and we should use libftdi (which we are using when *not* passing --enable-ft2232_libftdi (or --enable-legacy-ft2232_libftdi as the option is now known as)). * Add needed pkgconfig build input. * Udev rules file has been renamed in source archive: openocd.rules => 99-openocd.rules. --- .../tools/misc/openocd/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 36a57e8fe96e..490ed6d1eef5 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,25 +1,36 @@ -{ stdenv, fetchurl, libftdi, libusb1 }: +{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }: + +# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers. +# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to +# configure. stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj"; + sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv"; }; - configureFlags = [ "--enable-ft2232_libftdi" - "--enable-jlink" - "--enable-rlink" - "--enable-ulink" - "--enable-stlink" ]; + buildInputs = [ libftdi libusb1 pkgconfig ]; - buildInputs = [ libftdi libusb1 ]; + configureFlags = [ + "--enable-jtag_vpi" + "--enable-usb_blaster_libftdi" + "--enable-amtjtagaccel" + "--enable-gw16012" + "--enable-presto_libftdi" + "--enable-openjtag_ftdi" + "--enable-oocd_trace" + "--enable-buspirate" + "--enable-sysfsgpio" + "--enable-remote-bitbang" + ]; postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" + ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" ''; meta = { From 32bca3976f0369d1ee8442e307ddcce6368199b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 25 Jun 2014 20:36:16 +0200 Subject: [PATCH 215/224] openocd: update meta attributes * Don't repeat package name in description * Fix longDescription indent * Use licenses.gpl2Plus instead of string literal "GPLv2+" --- .../tools/misc/openocd/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 490ed6d1eef5..ea9278c2b3d0 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -33,22 +33,20 @@ stdenv.mkDerivation rec { ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" ''; - meta = { + meta = with stdenv.lib; { + description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; + longDescription = '' + OpenOCD provides on-chip programming and debugging support with a layered + architecture of JTAG interface and TAP support, debug target support + (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.). Several + network interfaces are available for interactiving with OpenOCD: HTTP, + telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a + "remote target" for source-level debugging of embedded systems using the + GNU GDB program. + ''; homepage = http://openocd.sourceforge.net/; - description = "OpenOCD, an on-chip debugger"; - - longDescription = - '' OpenOCD provides on-chip programming and debugging support with a - layered architecture of JTAG interface and TAP support, debug target - support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, - etc.). Several network interfaces are available for interactiving - with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables - OpenOCD to function as a "remote target" for source-level debugging - of embedded systems using the GNU GDB program. - ''; - - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric bjornfor ]; + platforms = platforms.linux; }; } From ec4cd43ca8da720185b887187468c5c237b93424 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 25 Jun 2014 21:50:16 -0500 Subject: [PATCH 216/224] gitolite: 3.6.1 Signed-off-by: Austin Seipp --- .../version-management/gitolite/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/version-management/gitolite/default.nix diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix new file mode 100644 index 000000000000..8447330ef3c9 --- /dev/null +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, perl, git, fetchgit }: + +stdenv.mkDerivation rec { + name = "gitolite-${version}"; + version = "3.6.1"; + + src = fetchgit { + url = "git://github.com/sitaramc/gitolite"; + rev = "refs/tags/v${version}"; + sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca"; + leaveDotGit = true; + }; + + buildInputs = [ perl git ]; + buildPhase = "true"; + installPhase = '' + mkdir -p $out/bin + substituteInPlace ./install --replace " 2>/dev/null" "" + git tag v${version} # Gitolite requires a tag for the version information :/ + perl ./install -to $out/bin + ''; + + meta = { + description = "Finely-grained git repository hosting"; + homepage = "http://gitolite.com/gitolite/index.html"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0955c4f6866..5e1984e507b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8636,6 +8636,8 @@ let python = python27; }; + gitolite = callPackage ../applications/version-management/gitolite { }; + inherit (gnome3) gitg; giv = callPackage ../applications/graphics/giv { From 3eb2d1e03e7547807558c42c1b416118703f751e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 25 Jun 2014 22:32:45 -0500 Subject: [PATCH 217/224] nixos: add gitolite module Signed-off-by: Austin Seipp --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/gitolite.nix | 66 ++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 nixos/modules/services/misc/gitolite.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f1028a479dff..956215d9a97a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -134,6 +134,7 @@ teamspeak = 124; influxdb = 125; nsd = 126; + gitolite = 127; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13f2656c2873..3bce68670fc7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -147,6 +147,7 @@ ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gpsd.nix + ./services/misc/gitolite.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nix-ssh-serve.nix diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix new file mode 100644 index 000000000000..7e7629c05610 --- /dev/null +++ b/nixos/modules/services/misc/gitolite.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gitolite; + pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey; +in +{ + options = { + services.gitolite = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable gitolite management under the + gitolite user. The Gitolite home + directory is /var/lib/gitolite. After + switching to a configuration with Gitolite enabled, you can + then run git clone + git@host:gitolite-admin.git to manage it further. + ''; + }; + + adminPubkey = mkOption { + type = types.str; + description = '' + Initial administrative public key for Gitolite. This should + be an SSH Public Key. Note that this key will only be used + once, upon the first initialization of the Gitolite user. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.gitolite = { + description = "Gitolite user"; + home = "/var/lib/gitolite"; + createHome = true; + uid = config.ids.uids.gitolite; + useDefaultShell = true; + }; + + systemd.services."gitolite-init" = { + description = "Gitolite initialization"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig.User = "gitolite"; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + + path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ]; + script = '' + cd /var/lib/gitolite + mkdir -p .gitolite/logs + if [ ! -d repositories ]; then + gitolite setup -pk ${pubkeyFile} + fi + gitolite setup # Upgrade if needed + ''; + }; + + environment.systemPackages = [ pkgs.gitolite pkgs.git ]; + }; +} From 13162e8cdb924fc5ea8cd010ebbc85a0a2def607 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 25 Jun 2014 22:55:43 -0500 Subject: [PATCH 218/224] Fix gitolite docs Signed-off-by: Austin Seipp --- nixos/modules/services/misc/gitolite.nix | 2 +- pkgs/applications/version-management/gitolite/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 7e7629c05610..84435f92c11d 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -18,7 +18,7 @@ in directory is /var/lib/gitolite. After switching to a configuration with Gitolite enabled, you can then run git clone - git@host:gitolite-admin.git to manage it further. + gitolite@host:gitolite-admin.git to manage it further. ''; }; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 8447330ef3c9..011b9fc9d048 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; -} \ No newline at end of file +} From b08031ffec4579c000a061e9d214bfd79b10d0d8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 25 Jun 2014 22:06:25 -0700 Subject: [PATCH 219/224] sbcl: use bootstrap binary on darwin --- pkgs/development/compilers/sbcl/bootstrap.nix | 31 +++++++ pkgs/development/compilers/sbcl/default.nix | 91 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 69 insertions(+), 57 deletions(-) create mode 100644 pkgs/development/compilers/sbcl/bootstrap.nix diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix new file mode 100644 index 000000000000..c3335ea6d22b --- /dev/null +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sbcl-bootstrap-${version}"; + version = "1.1.8"; + + src = if stdenv.isDarwin + then fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2; + sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j"; + } + else fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-linux-binary.tar.bz2; + sha256 = "0lh1jglxlfwk4cm6sgwk1jnb6ikhbrkx7p5aha2nbmkd6zl96prx"; + }; + + installPhase = '' + ensureDir $out/bin + cp -p src/runtime/sbcl $out/bin + ensureDir $out/share/sbcl + cp -p output/sbcl.core $out/share/sbcl + ''; + + meta = { + description = "Lisp compiler"; + homepage = "http://www.sbcl.org"; + license = "bsd"; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e1de4c53de50..579d5ec11eb9 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,36 +1,18 @@ -a : -let - fetchurl = a.fetchurl; - s= # Generated upstream information - rec { - baseName="sbcl"; - version="1.2.0"; - name="${baseName}-${version}"; - hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2"; - sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; +{ stdenv, fetchurl, sbclBootstrap, clisp}: + +stdenv.mkDerivation rec { + name = "sbcl-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; + sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; }; - buildInputs = with a; [ - clisp makeWrapper - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; - inherit buildInputs; - configureFlags = []; + buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doPatch" "doBuild" "doInstall" "doWrap"]; - - setVars = a.fullDepEntry ('' - export INSTALL_ROOT=$out - mkdir test-home - export HOME=$PWD/test-home - '') ["minInit"]; - - setVersion = a.fullDepEntry ('' - echo '"${s.version}.nixos"' > version.lisp-expr + patchPhase = '' + echo '"${version}.nixos"' > version.lisp-expr echo " (lambda (features) (flet ((enable (x) @@ -38,14 +20,11 @@ rec { (disable (x) (setf features (remove x features)))) (enable :sb-thread))) " > customize-target-features.lisp - '') ["minInit" "doUnpack"]; - /* SBCL checks whether files are up-to-date in many places.. Unfortunately, same timestamp - is not good enought - */ - doFixNewer = a.fullDepEntry('' pwd + # SBCL checks whether files are up-to-date in many places.. + # Unfortunately, same timestamp is not good enough sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp sed -i src/cold/slam.lisp -e \ @@ -56,13 +35,8 @@ rec { '/date defaulted-fasl/a)' sed -i src/code/target-load.lisp -e \ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - '') ["minInit" "doUnpack"]; - doWrap = a.fullDepEntry ('' - wrapProgram "$out/bin/sbcl" --set "SBCL_HOME" "$out/lib/sbcl" - '') ["minInit" "addInputs"]; - - doFixTests = a.fullDepEntry ('' + # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp @@ -70,24 +44,31 @@ rec { sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - '') ["minInit" "doUnpack"]; + ''; - doBuild = a.fullDepEntry ('' - sh make.sh clisp - '') ["minInit" "doUnpack" "addInputs"]; + preBuild = '' + export INSTALL_ROOT=$out + ensureDir test-home + export HOME=$PWD/test-home + ''; - doInstall = a.fullDepEntry ('' - sh install.sh - '') ["doBuild" "minInit" "addInputs"]; + buildPhase = if stdenv.isLinux + then '' + sh make.sh clisp --prefix=$out + '' + else '' + sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit' + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; - inherit(s) name; - inherit(s) version; meta = { description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = "bsd"; - maintainers = [a.lib.maintainers.raskin]; - platforms = with a.lib.platforms; all; - inherit(s) version; + homepage = http://www.sbcl.org; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e1984e507b2..e6e0b155bbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3291,8 +3291,8 @@ let rust = callPackage ../development/compilers/rust {}; - sbcl = builderDefsPackage (import ../development/compilers/sbcl) { - inherit makeWrapper; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbcl = callPackage ../development/compilers/sbcl { clisp = clisp_2_44_1; }; From 2711f5772c1df0fe17e88975b8a360d4ec73d77a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 26 Jun 2014 00:23:59 -0500 Subject: [PATCH 220/224] gitolite: fix default update hooks Signed-off-by: Austin Seipp --- .../applications/version-management/gitolite/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 011b9fc9d048..2dcb13e5db5e 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -13,9 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ perl git ]; buildPhase = "true"; + + patchPhase = '' + substituteInPlace ./install --replace " 2>/dev/null" "" + substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \ + --replace /usr/bin/perl "/usr/bin/env perl" + substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ + --replace /usr/bin/perl "/usr/bin/env perl" + ''; installPhase = '' mkdir -p $out/bin - substituteInPlace ./install --replace " 2>/dev/null" "" git tag v${version} # Gitolite requires a tag for the version information :/ perl ./install -to $out/bin ''; From 99da7b85cbf72ac50b5217e4c8b06acfd7ef4b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jun 2014 11:04:30 +0200 Subject: [PATCH 221/224] gnupg: security update 2.0.22 -> .24, CVE-2014-4617 Close #3091. --- pkgs/tools/security/gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index f242c3f323ae..9b8d33b6b696 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.22"; + name = "gnupg-2.0.24"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"; + sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r"; }; buildInputs From 0ea84c44451cb299df58c91c1584c6f3b9858da3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 17 Feb 2014 20:29:08 +0000 Subject: [PATCH 222/224] minor fix in documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Domen Kožar --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index 633b6fc05b26..bcaadc7fd977 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -194,7 +194,7 @@ rec { is transformed into - [ { boot = set1; } { boot = mkIf cond set2; services mkIf cond set3; } ]. + [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ]. This transform is the critical step that allows mkIf conditions to refer to the full configuration without creating an infinite From 7f97fafe4fea45958b32a4a587975db827be8bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jun 2014 11:13:56 +0200 Subject: [PATCH 223/224] linux-3.12: security update .22 ->.23, CVE-2014-0206 CC #3090. --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 33bed4213b41..7d5ff606eb98 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.22"; + version = "3.12.23"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54"; + sha256 = "0aa9vnyk4p6hg4fp4rm4a95cn4p16j2dfrhc3cfznpcdkpi5q9m7"; }; features.iwlwifi = true; From 7998a598b65df13624b82fbc6be8efd33da2fb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jun 2014 11:50:15 +0200 Subject: [PATCH 224/224] linux-3.13: remove, as it's vulnerable CC #3090. --- pkgs/os-specific/linux/kernel/linux-3.13.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 10 ---------- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.13.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix deleted file mode 100644 index d84cec235cec..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.13.11"; - extraMeta.branch = "3.13"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6e0b155bbff..403521071e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7238,15 +7238,6 @@ let ]; }; - linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { - inherit fetchurl stdenv perl buildLinux; - kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7411,7 +7402,6 @@ let linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); - linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);