From 0703250f64e473f71ab6966f5879788d71dfc3bb Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 21 Apr 2013 20:47:43 -0700 Subject: [PATCH 01/80] Update gnutls to 3.1.10. --- pkgs/development/libraries/gnutls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index c1dab82e37a..ba441b1082b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.1.3"; + name = "gnutls-3.1.10"; src = fetchurl { - url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw"; + url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz"; + sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk"; }; # Note: GMP is a dependency of Nettle, whose public headers include From b6e7d865251da67399203a9cd48917dae1584603 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 23 Apr 2013 14:30:57 +0300 Subject: [PATCH 02/80] Lighttpd: Enable SSL With this patch support for SSL is compiled into lighttpd. IMO encryption is in most use cases important, therefore SSL support should be build in. This would simplify the setup of a standard web application a lot. SSL support of lighttpd is documented at http://redmine.lighttpd.net/projects/1/wiki/Docs_SSL --- pkgs/servers/http/lighttpd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 66bc45de942..463840fcf4c 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }: +{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file, openssl }: stdenv.mkDerivation { name = "lighttpd-1.4.32"; @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k"; }; - buildInputs = [ pcre libxml2 zlib attr bzip2 which file ]; + buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]; + + configureFlags = "--with-openssl --with-openssl-libs=${openssl}"; preConfigure = '' sed -i "s:/usr/bin/file:${file}/bin/file:g" configure From 73b4546fa80caacc2cad8f4d697ab5906d456ba6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:40:14 +0200 Subject: [PATCH 03/80] haskell-shakespeare-css: disable Haddock generation to fix the build --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 486b8a1cc27..55927455b78 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; From 471362de9532c5e73c90e3f62cf7bfe7d8779eb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 13:16:44 +0200 Subject: [PATCH 04/80] haskell-crypto-conduit: jailbreak to fix build with recent version of crypto-api --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index eca7e52fe90..183dd4a9228 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { skein transformers ]; doCheck = false; + jailbreak = true; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From ac09077e0cbc25a723c304746fde7aec54d29e66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 13:19:25 +0200 Subject: [PATCH 05/80] haskell-crypto-conduit: revert "jailbreak to fix build with recent version of crypto-api" This reverts commit 471362de9532c5e73c90e3f62cf7bfe7d8779eb3. Accidentally committed in the wrong branch. --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 183dd4a9228..eca7e52fe90 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -12,7 +12,6 @@ cabal.mkDerivation (self: { skein transformers ]; doCheck = false; - jailbreak = true; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From a62266a1d769b6f8e3fd5aa4029cad8f0eea688b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 13:20:21 +0200 Subject: [PATCH 06/80] haskell-shakespeare-css: revert "disable Haddock generation to fix the build" This reverts commit 73b4546fa80caacc2cad8f4d697ab5906d456ba6. Accidentally committed in the wrong branch. --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 55927455b78..486b8a1cc27 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -6,7 +6,6 @@ cabal.mkDerivation (self: { sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; - noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; From d062ce9eef68d06c582b2a62717becf232a3a689 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:35:24 +0200 Subject: [PATCH 07/80] haskell-ghc-heap-view: update to version 0.5 --- .../libraries/haskell/ghc-heap-view/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 6213734881d..87339145d6d 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, binary, transformers }: cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.4.2.0"; - sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp"; - buildDepends = [ transformers ]; + version = "0.5"; + sha256 = "00sibiqq95xnjpf9gy0dajvpmmz3rxvi3lhm56vfds7ddnyxpv0c"; + buildDepends = [ binary transformers ]; meta = { description = "Extract the heap representation of Haskell values and thunks"; license = self.stdenv.lib.licenses.bsd3; From 6b1b5a27a372387ba79c62131acf85116a4a86f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:35:24 +0200 Subject: [PATCH 08/80] haskell-http-reverse-proxy: update to version 0.1.1.5 --- .../libraries/haskell/http-reverse-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 8378a3dd921..26c38bfc4e2 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.4"; - sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd"; + version = "0.1.1.5"; + sha256 = "1qay03qjkqlb5s7mawxqxp4i1skpshqfdiabxmcwrj15jlbwakgf"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network From a18f94381e0c1d1e5da0c5663073de90ef6890b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:35:24 +0200 Subject: [PATCH 09/80] haskell-mainland-pretty: update to version 0.2.6 --- .../development/libraries/haskell/mainland-pretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 21110ffdbe7..db03a6022db 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.5"; - sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x"; + version = "0.2.6"; + sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; From d61a37871f489d54141c139ee6ea1d8d715cdc31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:35:24 +0200 Subject: [PATCH 10/80] haskell-shakespeare-js: update to version 1.1.4 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 12a48605d03..d492b6d2505 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.3"; - sha256 = "091yygp2gfp290m76iwpjddzgn7qjq1h5f8ma8sd3lvy6pv2pzcz"; + version = "1.1.4"; + sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { From e21708320c6af3d4acc13e6b0f68c46455b25841 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:35:25 +0200 Subject: [PATCH 11/80] haskell-shakespeare: update to version 1.0.5 --- .../libraries/haskell/shakespeare/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 302a6720de4..d90812c21cd 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,16 +1,13 @@ -{ cabal, fetchurl, hspec, parsec, text }: +{ cabal, hspec, parsec, systemFileio, systemFilepath, text, time }: cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.4"; - sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; - buildDepends = [ parsec text ]; - testDepends = [ hspec parsec text ]; - patchFlags = "-p2"; - patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch"; - sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq"; - }) - ]; + version = "1.0.5"; + sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf"; + buildDepends = [ parsec systemFileio systemFilepath text time ]; + testDepends = [ + hspec parsec systemFileio systemFilepath text time + ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; From e0b57c9fb91be00f7e1026a9afe82b90d1ac8ba4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 11:48:31 +0200 Subject: [PATCH 12/80] ghc: bump HEAD compiler to version 7.7 --- pkgs/development/compilers/ghc/head.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8258ac27419..035ebc8b268 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20130223"; + version = "7.7"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1naw6x1mjij10h9k4biard2pkzi6zml26vv4h34asprv0h6ymdbg"; + sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { DYNAMIC_BY_DEFAULT = NO ''; + # The tarball errorneously contains an executable that doesn't work in + # Nix. Deleting it will cause the program to be re-built locally. + postUnpack = '' + rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants + ''; + preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure From 944ae2e5ff8ef7973b4a417e3d3b551eba9704e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 15:03:46 +0200 Subject: [PATCH 13/80] pkgs/build-support/cabal: disable split-objects for GHC 7.7 builds to work around broken compiler --- pkgs/build-support/cabal/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 7706e849f50..ca985181a53 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -96,7 +96,9 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion; jailbreak = false; # pass the '--enable-split-objs' flag to cabal in the configure stage - enableSplitObjs = !stdenv.isDarwin; # http://hackage.haskell.org/trac/ghc/ticket/4013 + enableSplitObjs = !( stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 + || stdenv.lib.versionOlder "7.6.99" ghc.ghcVersion # -fsplit-ojbs is broken in 7.7 snapshot + ); # pass the '--enable-tests' flag to cabal in the configure stage # and run any regression test suites the package might have From cd470bc2967eb83663eccec14e501d3dfeff1e5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Apr 2013 15:04:02 +0200 Subject: [PATCH 14/80] idris: drop obsolete package, it doesn't compile anywhere --- pkgs/development/compilers/idris/default.nix | 25 -------------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/compilers/idris/default.nix diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix deleted file mode 100644 index 982f43ec2e9..00000000000 --- a/pkgs/development/compilers/idris/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec -, split, transformers -}: - -cabal.mkDerivation (self: { - pname = "idris"; - version = "0.9.7"; - sha256 = "0y3rnxbs2s7kxlzlc347vwpylw2p0pdz50zgkyii21gd6klqvd45"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - binary Cabal filepath haskeline mtl parsec split transformers - ]; - buildTools = [ happy ]; - meta = { - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3248742b205..ec6fe741394 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2060,8 +2060,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); flapjax = callPackage ../development/compilers/flapjax {}; - idris = callPackage ../development/compilers/idris {}; - pakcs = callPackage ../development/compilers/pakcs {}; # Development tools. From 3328807f41e62440e5c4544837aea272c0b3daa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:25 +0200 Subject: [PATCH 15/80] haskell-byteorder: update to version 1.0.4 --- pkgs/development/libraries/haskell/byteorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index d3af223418b..8addc3cc628 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "byteorder"; - version = "1.0.3"; - sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; + version = "1.0.4"; + sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x"; meta = { homepage = "http://community.haskell.org/~aslatter/code/byteorder"; description = "Exposes the native endianness or byte ordering of the system"; From 01f0df87020a3f994c6e2bee73383b06d153e947 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:25 +0200 Subject: [PATCH 16/80] haskell-crypto-api: update to version 0.12 --- pkgs/development/libraries/haskell/crypto-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 402e80f6c34..a888b0e6242 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.11"; - sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy"; + version = "0.12"; + sha256 = "09ra5bz2s5n2zq57n6ylsj7a482bsxpxhybmp04g796h87xgy7xs"; buildDepends = [ cereal entropy tagged transformers ]; jailbreak = true; meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; + homepage = "https://github.com/TomMD/crypto-api"; description = "A generic interface for cryptographic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2483ac2d12e1bfb76c57fde1bd31fb9fd72b58f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:25 +0200 Subject: [PATCH 17/80] haskell-fsnotify: update to version 0.0.11 --- pkgs/development/libraries/haskell/fsnotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 1d86fa26d7b..ac489da34d9 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.0.8"; - sha256 = "05vfiddp5m28rm02ci7fcfg1zgw5ydj084173mpp1w124bfqf940"; + version = "0.0.11"; + sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; testDepends = [ Cabal Glob hinotify hspec QuickCheck random systemFileio @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { ]; doCheck = false; meta = { - description = "Cross platform library for file creation, modification, and deletion notification"; + description = "Cross platform library for file change notification"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.simons ]; From 61687cebf9467e495d937cea01e329725b218a4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:25 +0200 Subject: [PATCH 18/80] haskell-lifted-base: update to version 0.2.0.4 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index bd3dd503245..05f8f008f86 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.0.3"; - sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx"; + version = "0.2.0.4"; + sha256 = "0ljqa56gd4760x7x32v75n6a4h8f03p2g4xajaj3917w4w2rf5rp"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; From 264e30a52150475477872f564523c242a5574052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:26 +0200 Subject: [PATCH 19/80] haskell-monad-control: update to version 0.3.2.1 --- pkgs/development/libraries/haskell/monad-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index aa794357b9f..4b6431f678c 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.2"; - sha256 = "1gw1g89cjr993kcxjd1lvj94klrb8hsxn0yzyl1gmfk4273z39pa"; + version = "0.3.2.1"; + sha256 = "17wfdg3a2kkx1jwh7gfgbyx4351b420krsf8syb8l9xrl9gdz5a3"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; From 5d0660ede6893546687fef427d4655175d1c3e72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:26 +0200 Subject: [PATCH 20/80] haskell-resourcet: update to version 0.4.7.1 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 2421b64b374..aca334e20b2 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.7"; - sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8"; + version = "0.4.7.1"; + sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; From 58104ec26bf506dea8231f5853c68cf681c35371 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:26 +0200 Subject: [PATCH 21/80] haskell-shakespeare-css: update to version 1.0.4 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 486b8a1cc27..1b2964951e7 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.3"; - sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; + version = "1.0.4"; + sha256 = "1vh1n1lhhga6y4p7rphyhxpdkg7igkskvh0jmwkg3m4x3jq8g9jg"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From 7d383131903cc6d36fd3715e2c6efe7c823de858 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:26 +0200 Subject: [PATCH 22/80] haskell-uuid: update to version 1.2.11 --- pkgs/development/libraries/haskell/uuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index b8c72a4251e..a1dbdf2f88d 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.10"; - sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6"; + version = "1.2.11"; + sha256 = "0fr91w8jahb7ryhgl8dm6w8jg9sykn3m1jnfvyrfdpkpwkc0kpxx"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random From 131bba507f14563eee6b895684c8876e1e43ddab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:18:26 +0200 Subject: [PATCH 23/80] haskell-warp: update to version 1.3.8.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 043a9a925bf..fcc9dcc3ecc 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.8"; - sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l"; + version = "1.3.8.1"; + sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 6080adb28e57438c797a69c90881edae993ad6d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:20:13 +0200 Subject: [PATCH 24/80] release-haskell.nix: run test builds of fsnotify with all GHC versions --- pkgs/top-level/release-haskell.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 291f87f5074..048113ff323 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -57,8 +57,8 @@ mapHaskellTestOn { AspectAG = default; async = default ++ latest; attempt = default; - attoparsecEnumerator = default; attoparsec = default; + attoparsecEnumerator = default; authenticate = default; base64Bytestring = default; baseUnicodeSymbols = default; @@ -67,8 +67,8 @@ mapHaskellTestOn { binaryShared = default; bitmap = default; bktrees = default; - blazeBuilderEnumerator = default; blazeBuilder = default; + blazeBuilderEnumerator = default; blazeHtml = default; blazeTextual = default; bloomfilter = default; @@ -153,11 +153,12 @@ mapHaskellTestOn { filestore = default; fingertree = default; flexibleDefaults = default; + fsnotify = all; funcmp = all; gamma = default; gdiff = default; - ghcEvents = default; ghc = default; + ghcEvents = default; ghcMod = default ++ latest; ghcMtl = default; ghcPaths = default; @@ -187,8 +188,8 @@ mapHaskellTestOn { haskeline = default; haskellLexer = default; haskellPlatform = allBut ghc763; - haskellSrcExts = default; haskellSrc = all; + haskellSrcExts = default; haskellSrcMeta = default; HaXml = default; haxr = default; @@ -224,10 +225,10 @@ mapHaskellTestOn { HStringTemplate = default ++ latest; hsyslog = all; html = all; + HTTP = all; httpConduit = default; httpDate = default; httpdShed = default; - HTTP = all; httpTypes = default; HUnit = all; hxt = default; @@ -313,8 +314,8 @@ mapHaskellTestOn { pwstoreFast = default; QuickCheck2 = default; QuickCheck = all; - randomFu = default; random = default ++ latest; + randomFu = default; randomShuffle = default; randomSource = default; RangedSets = default; @@ -378,11 +379,11 @@ mapHaskellTestOn { text = all; thLift = default; timeplot = default; - tlsExtra = default; tls = default; + tlsExtra = default; + transformers = all; transformersBase = default; transformersCompat = default; - transformers = all; tuple = default; typeLlevelNaturalNumber = default; uniplate = default; @@ -406,16 +407,16 @@ mapHaskellTestOn { vectorSpace = default; vty = default; waiAppStatic = default; - waiExtra = default; wai = default; + waiExtra = default; waiLogger = default; warp = default; - wlPprintExtras = default; wlPprint = default ++ latest; + wlPprintExtras = default; wlPprintTerminfo = default; wxcore = default; - wxdirect = default; wx = default; + wxdirect = default; X11 = default; xhtml = all; xmlConduit = default; @@ -424,14 +425,14 @@ mapHaskellTestOn { xmlTypes = default; xmobar = default ++ latest; xmonadContrib = default ++ latest; - xmonadExtras = default ++ latest; xmonad = default ++ latest; + xmonadExtras = default ++ latest; xssSanitize = default; yesodAuth = default; yesodCore = default; + yesod = default; yesodDefault = default; yesodForm = default; - yesod = default; yesodJson = default; yesodPersistent = default; yesodStatic = default; @@ -439,8 +440,8 @@ mapHaskellTestOn { zeromqHaskell = default; zipArchive = default; zipper = default; + zlib = all; zlibBindings = default; zlibEnum = default; - zlib = all; } From 79fd846654818295c535c5094dc56fc10ee2088a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 12:27:15 +0200 Subject: [PATCH 25/80] release-haskell.nix: fsnotify won't build with ghc 6.x --- pkgs/top-level/release-haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 048113ff323..efd0b4569f8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -153,7 +153,7 @@ mapHaskellTestOn { filestore = default; fingertree = default; flexibleDefaults = default; - fsnotify = all; + fsnotify = [ ghc704 ghc742 ghc763 ]; funcmp = all; gamma = default; gdiff = default; From f0d5323e5f426d98ec1f3351401aba91d2c1cb73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 11:40:14 +0200 Subject: [PATCH 26/80] haskell-shakespeare-css: disable Haddock generation to fix the build --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1b2964951e7..f78a5af4767 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1vh1n1lhhga6y4p7rphyhxpdkg7igkskvh0jmwkg3m4x3jq8g9jg"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; From 12f6308a0160520c7f9fa9ae5ff4ab8fcbd6c3a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Apr 2013 13:16:44 +0200 Subject: [PATCH 27/80] haskell-crypto-conduit: jailbreak to fix build with recent version of crypto-api --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index eca7e52fe90..6dcd25e761e 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { skein transformers ]; doCheck = false; + patchPhase = '' + sed -i -e 's|crypto-api >= 0.9 && < 0.12|crypto-api >= 0.9|' crypto-conduit.cabal + ''; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From a8d1e3622f0b73ec027df7c8dced0a508ed9b8ed Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 24 Apr 2013 16:21:27 +0300 Subject: [PATCH 28/80] Google killed my old email --- pkgs/lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 4c47ee85f47..6d026efa005 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -30,7 +30,7 @@ neznalek = "Vladimír Čunát "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; - phreedom = "Evgeny Egorochkin "; + phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; qknight = "Joachim Schiele "; From b4687c696616a451af0557f3b31bf3fa2ed73ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 24 Apr 2013 22:40:19 +0400 Subject: [PATCH 29/80] tahoe-lafs: update to 1.9.2 I had to update a python package too (foolscap) --- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 0c04d76e23f..277e95eac96 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -8,15 +8,15 @@ # some loss of functionality because of it. let - name = "tahoe-lafs-1.8.3"; + name = "tahoe-lafs-1.9.2"; in buildPythonPackage { inherit name; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2"; - sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2"; + sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4"; }; # The patch doesn't apply cleanly to the current version. @@ -37,7 +37,7 @@ buildPythonPackage { -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g" sed -i "src/allmydata/util/iputil.py" \ - -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g" + -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around # that. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02c34964c5a..91118684474 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1645,11 +1645,11 @@ pythonPackages = python.modules // rec { foolscap = buildPythonPackage (rec { - name = "foolscap-0.6.1"; + name = "foolscap-0.6.4"; src = fetchurl { url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5"; + sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl"; }; propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; From 7894a6fa2754d5e7761ca35e80949cf1027a7f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 24 Apr 2013 23:46:09 +0200 Subject: [PATCH 30/80] systemd: patch hardcoded "/bin/cat" in systemd-cat Without this patch, systemd-cat doesn't work here: $ echo "hello world" | systemd-cat Failed to execute process: No such file or directory --- pkgs/os-specific/linux/systemd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3f95aee77be..35b35d4e6fa 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { '' # FIXME: patch this in systemd properly (and send upstream). # FIXME: use sulogin from util-linux once updated. - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ --replace /sbin/fsck ${utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ --replace /sbin/sulogin ${sysvtools}/sbin/sulogin done From ee322d440cf6ea1499b7c0ef04f311c41e572374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 25 Apr 2013 08:19:55 +0200 Subject: [PATCH 31/80] openscad: bump to 2013.01 Bump to latest release. Use tarball instead of git. --- .../applications/graphics/openscad/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9343f3ec135..53fe68f9fa9 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,19 +1,15 @@ -{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp }: stdenv.mkDerivation rec { - version = "git-20121213"; + version = "2013.01"; name = "openscad-${version}"; - # src = fetchurl { - # url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; - # sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; - # }; - src = fetchgit { - url = "https://github.com/openscad/openscad.git"; - rev = "c0612a9ed0899c96963e04c848a59b0164a689a2"; - sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2"; - }; + + src = fetchurl { + url = "https://openscad.googlecode.com/files/${name}.src.tar.gz"; + sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f"; + }; buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr]; From 9f04208116d21dc7e2e542ccfd3b4433cfd96610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 25 Apr 2013 08:20:49 +0200 Subject: [PATCH 32/80] openscad: add longDescription and license longDescription is taken from openscad homepage. --- pkgs/applications/graphics/openscad/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 53fe68f9fa9..1f1bc052a6f 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -22,7 +22,19 @@ stdenv.mkDerivation rec { meta = { description = "3D parametric model compiler"; + longDescription = '' + OpenSCAD is a software for creating solid 3D CAD objects. It is free + software and available for Linux/UNIX, MS Windows and Mac OS X. + + Unlike most free software for creating 3D models (such as the famous + application Blender) it does not focus on the artistic aspects of 3D + modelling but instead on the CAD aspects. Thus it might be the + application you are looking for when you are planning to create 3D models of + machine parts but pretty sure is not what you are looking for when you are more + interested in creating computer-animated movies. + ''; homepage = "http://openscad.org/"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; From 7c3c839fb6d7368409c6a5684088499fc46a58d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 25 Apr 2013 08:28:54 +0200 Subject: [PATCH 33/80] openscad: compile the correct version number The default version info that is compiled into openscad is the build date(!). Force the version to the actual release version instead. --- pkgs/applications/graphics/openscad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 1f1bc052a6f..64cbdb0ca9a 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configurePhase = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " - qmake PREFIX="$out" + qmake PREFIX="$out" VERSION=${version} ''; doCheck = false; From 423e5c7594b308cf9f54b036db0b3861b598e46e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 34/80] haskell-NumInstances: update to version 1.3 --- pkgs/development/libraries/haskell/NumInstances/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 24f056af5ce..1e55feeb989 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.2"; - sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59"; + version = "1.3"; + sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh"; meta = { + homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 676b08d848e49298688d4450f9b1c924c40d9db4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 35/80] haskell-crypto-conduit: update to version 0.5.2 --- .../libraries/haskell/crypto-conduit/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 6dcd25e761e..b7624499dd3 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -4,17 +4,14 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.1"; - sha256 = "04z8z7bipa40xnjr8civ1sj3df2iyvlv929ibkrdqv87gj0qv2dp"; + version = "0.5.2"; + sha256 = "0ncqwr2a9nxl6q7qys9gb5db62lx622g5db1xhpfni045x324kbz"; buildDepends = [ cereal conduit cryptoApi transformers ]; testDepends = [ cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec skein transformers ]; doCheck = false; - patchPhase = '' - sed -i -e 's|crypto-api >= 0.9 && < 0.12|crypto-api >= 0.9|' crypto-conduit.cabal - ''; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From 3ed1c87790b4e7e56095ecdf79d168b1f18feebc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 36/80] haskell-http-reverse-proxy: update to version 0.1.1.6 --- .../libraries/haskell/http-reverse-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 26c38bfc4e2..3ed061ba115 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.5"; - sha256 = "1qay03qjkqlb5s7mawxqxp4i1skpshqfdiabxmcwrj15jlbwakgf"; + version = "0.1.1.6"; + sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network From 45afb3f6a6ea9cce531270286f65ec83a72d8017 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 37/80] haskell-shakespeare-css: update to version 1.0.5.1 --- .../libraries/haskell/shakespeare-css/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index f78a5af4767..3e9a5fb250c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.4"; - sha256 = "1vh1n1lhhga6y4p7rphyhxpdkg7igkskvh0jmwkg3m4x3jq8g9jg"; + version = "1.0.5.1"; + sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; - noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; From c8219429b6979f385e5adf808d50d520584616f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 38/80] haskell-unordered-containers: update to version 0.2.3.1 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 4c3fbbc2e52..df0be2ea477 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.3.0"; - sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; + version = "0.2.3.1"; + sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework From ca7d0792a08f149477613cd0d7041fec33dca228 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 39/80] haskell-yesod-static: update to version 1.1.2.3 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 59c2167dc5e..ef919fc1721 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2.2"; - sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671"; + version = "1.1.2.3"; + sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai From 06eaec3c6877a749144994679400ca9b16959992 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 09:05:38 +0200 Subject: [PATCH 40/80] haskell-yesod: update to version 1.1.9.3 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 1a956f84ca9..09b0f9e2a16 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.9.2"; - sha256 = "1rv9mk842b9qwdzal9y5cn2z5z2rl6490600jg1xbsg0x0nl7hdj"; + version = "1.1.9.3"; + sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41"; isLibrary = true; isExecutable = true; buildDepends = [ From 873af26e531a0ac3a2704b7c0518f53ab5211546 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 11:11:56 +0200 Subject: [PATCH 41/80] haskell-diagrams: jailbreak to fix build with recent NumInstances library --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 01561f426c5..1e1174ad303 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { diagramsContrib diagramsCore diagramsLib diagramsSvg ]; noHaddock = true; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; From 63655c8fd82d2c1eded497508fb08bfd8a848c2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Apr 2013 13:35:37 +0200 Subject: [PATCH 42/80] haskell-diagrams-lib: jailbreak to fix build with recent NumInstances library --- pkgs/development/libraries/haskell/diagrams/lib.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index ae466ad2623..fc99e80ddad 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; From 47a14e3d36a32d386d042962e16af115676b2686 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 25 Apr 2013 22:35:34 +0200 Subject: [PATCH 43/80] google-talk-plugin: Update to version 3.17.0.0. Signed-off-by: aszlig --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 365fd1e2613..8cc62aa02db 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; # Use the following to determine the current upstream version: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "3.10.2.0"; + version = "3.17.0.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr"; + sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj"; + sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc"; } else throw "Google Talk does not support your platform."; From e7b1dfdc393eb6a94b8486ed2981948ffc5f5c09 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 26 Apr 2013 08:04:37 +0200 Subject: [PATCH 44/80] chromium: Update beta and dev channels to latest. This updates the channels to the following new versions: beta: 27.0.1453.47 -> 27.0.1453.65 (builds fine, tested) dev: 27.0.1453.47 -> 28.0.1485.0 (builds fine, tested) As we now don't have any version below 26, this update drops all references to all older versions as well. In addition to that, the /usr/bin/gcc reference from: third_party/WebKit/Source/core/core.gyp/core.gyp Can now - starting at version 28 - be found in: third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 27 +++++++------------ .../networking/browsers/chromium/sources.nix | 12 ++++----- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a4f71ffcb25..682de909067 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -13,13 +13,7 @@ , gcc, bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, mesa -, protobuf - -# dependencies for v25 only -, libvpx - -# dependencies for >= v26 -, speechd, libXdamage +, protobuf, speechd, libXdamage # dependencies for >= v27 , libXtst @@ -69,7 +63,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; # http://crbug.com/143623 - use_system_protobuf = post25; + use_system_protobuf = true; use_system_harfbuzz = false; use_system_icu = false; @@ -77,9 +71,6 @@ let use_system_skia = false; use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = false; - } // optionalAttrs pre26 { - use_system_libvpx = true; - use_system_protobuf = true; }; defaultDependencies = [ @@ -90,10 +81,10 @@ let libusb1 libexif ]; - pre26 = versionOlder sourceInfo.version "26.0.0.0"; pre27 = versionOlder sourceInfo.version "27.0.0.0"; - post25 = !pre26; + pre28 = versionOlder sourceInfo.version "28.0.0.0"; post26 = !pre27; + post27 = !pre28; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -116,14 +107,12 @@ in stdenv.mkDerivation rec { krb5 glib gtk dbus_glib libXScrnSaver libXcursor mesa - pciutils protobuf + pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt ++ optional pulseSupport pulseaudio - ++ optional pre26 libvpx - ++ optionals post25 [ speechd libXdamage ] ++ optional post26 libXtst; opensslPatches = optional useOpenSSL openssl.patches; @@ -138,9 +127,11 @@ in stdenv.mkDerivation rec { sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString post25 '' + '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp + third_party/WebKit/Source/${if post27 + then "core/core.gyp/core.gyp" + else "WebCore/WebCore.gyp/WebCore.gyp"} ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b1f145bbbe8..0e041ee9518 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "27.0.1453.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; - sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; + version = "28.0.1485.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz"; + sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9"; }; beta = { - version = "27.0.1453.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; - sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; + version = "27.0.1453.65"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz"; + sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb"; }; stable = { version = "26.0.1410.63"; From 008bb6935cddd3708ac4caf3360afb603ee5b4fa Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 26 Apr 2013 09:12:35 +0200 Subject: [PATCH 45/80] update kernels 3.0, 3.2, 3.4, 3.8 and 3.9-rc --- pkgs/os-specific/linux/kernel/linux-3.0.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/linux-3.8.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.9.nix | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index fc681e03ebd..42c89217ba3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.74"; + version = "3.0.75"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x"; + sha256 = "08b4ibyxihsy36n0grg08iywxi23f29s15l3h0sa1dssxxhr1kf9"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 7703b4b4cfb..ef62fae3f52 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.43"; + version = "3.2.44"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz"; - sha256 = "0cg88mdlqs7zj2ndj4i9hmvmxasmgv2fqlpzr87qm7bqkmmb6p58"; + sha256 = "1rlv4j0y75ymj74vwdd2m0z3jzn5lxk1g4cliqmambhycg5jxlb0"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index ed13c282639..0bfb4cc8482 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.4.41"; + version = "3.4.42"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22"; + sha256 = "189rpb5jd073x0fhkh1yqmgg759lpmdj0ldysq57sibs4prb0km2"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 3ec9ab18155..00f2fedbedf 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -252,7 +252,7 @@ in import ./generic.nix ( rec { - version = "3.8.8"; + version = "3.8.9"; testing = false; preConfigure = '' @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0idybkn574hkb8xp2zs3ahkvmy98qwx4599lanskzq2nfrd065kc"; + sha256 = "0r0ffgg79za0y0mhbb2178w7rd1iwlv894hq2aq0an0v9bi3h6wg"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 0b621dec6c5..3e1ad6aed4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -252,8 +252,8 @@ in import ./generic.nix ( rec { - version = "3.9-rc7"; - modDirVersion = "3.9.0-rc7"; + version = "3.9-rc8"; + modDirVersion = "3.9.0-rc8"; testing = true; preConfigure = '' @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0bl58byszb3pg5dplzc19kgx7gif5cnbfykqqp1jmskpxzf1splx"; + sha256 = "0lhi0v57sx7wyba1y4g2vij44rk0fc2ph0p3yybjrg6ljij8yb9b"; }; config = configWithPlatform stdenv.platform; From 70735b11a587154c6b5386bc02af8cd5f802977e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 10:40:28 +0200 Subject: [PATCH 46/80] haskell-ghc-heap-view: update to version 0.5.0.1 --- pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 87339145d6d..6e7450d099a 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.5"; - sha256 = "00sibiqq95xnjpf9gy0dajvpmmz3rxvi3lhm56vfds7ddnyxpv0c"; + version = "0.5.0.1"; + sha256 = "1zqzv6r4nkzam51bb6pp2i1kkzhx5mnaqcn8wzr0hxbi5lc1088h"; buildDepends = [ binary transformers ]; meta = { description = "Extract the heap representation of Haskell values and thunks"; From 9c2c0c58d4349b4f08c2487600787788fc9ef5e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 10:40:28 +0200 Subject: [PATCH 47/80] haskell-github: update to version 0.7.0 --- pkgs/development/libraries/haskell/github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 890636e2150..78711cc7c44 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.6.0"; - sha256 = "1bg443rhh57p10q9dwx4aa2964qwg00swmdlvh1r72c343lrv1gj"; + version = "0.7.0"; + sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure HTTP httpConduit httpTypes network text time unorderedContainers vector From 472cb836d81219be4266177387dae6621b7a284f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 10:40:28 +0200 Subject: [PATCH 48/80] haskell-io-choice: update to version 0.0.3 --- pkgs/development/libraries/haskell/io-choice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index e085cebcef5..f48db1d12be 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.2"; - sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f"; + version = "0.0.3"; + sha256 = "1dfl6n3r8hifl9rli2qvwgichz3h7nxq0v6m1k29vb8dv35ldsd8"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; From a5606a1d9a096d5910b4a3d86b0a4adcd99dc0f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Apr 2013 11:09:13 +0200 Subject: [PATCH 49/80] pakcs: Disable in Hydra because the build doesn't terminate It appears to loop saying: ERROR: load_files/2: No permission to load source `/tmp/nix-build-pakcs-1.10.0.drv-1/pakcs/lib/.curry/pakcs/Prelude.pl' (Non-module file already loaded into module prologbasics; trying to load into user) http://hydra.nixos.org/build/4760096 --- pkgs/development/compilers/pakcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 817559ffecc..7f4ae9646af 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; - description = "an implementation of the multi-paradigm declarative language Curry"; + description = "An implementation of the multi-paradigm declarative language Curry"; license = stdenv.lib.licenses.bsd3; longDescription = '' @@ -77,6 +77,6 @@ stdenv.mkDerivation { ''; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = stdenv.lib.platforms.linux; + #platforms = stdenv.lib.platforms.linux; }; } From 06d02090d2bc9181e29cdc689933e88383b0878f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 12:51:46 +0200 Subject: [PATCH 50/80] bup: enable Hydra builds --- pkgs/tools/backup/bup/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index bdc2f832ff3..e683df5a7fe 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -52,5 +52,8 @@ stdenv.mkDerivation { Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images. ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; }; } From 492645a34775b8de55dcd0e3409300aa8f44024e Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 26 Apr 2013 15:21:56 +0400 Subject: [PATCH 51/80] zathura: fix missing [/bin/]file issue --- pkgs/applications/misc/zathura/core/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index a3726fd460d..e5eae771d8b 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5"; }; - buildInputs = [ pkgconfig gtk girara gettext ]; + buildInputs = [ pkgconfig gtk girara gettext makeWrapper ]; # Bug in zathura build system: we should remove empty manfiles in order them # to be compiled properly @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; + postInstall = '' + wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin" + ''; + meta = { homepage = http://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; From a2af6241ad1807fe38d6a5cb54ff2286788b2767 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 26 Apr 2013 10:14:07 +0200 Subject: [PATCH 52/80] update jquery-ui --- pkgs/development/libraries/javascript/jquery-ui/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index 2334a04f9b8..409c9d7456b 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.8.10"; + name = "jquery-ui-1.10.2"; src = fetchurl { url = "http://jqueryui.com/download/${name}.custom.zip"; - sha256 = "0yglab9zmxr1il2rmxxd7gycpfaavgpi03h8nc5b2yx2kz80jlik"; + sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl"; }; - sourceRoot = "."; - buildInputs = [ unzip ]; installPhase = From 607437122b7ca494528017319b0b07a8d2365885 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Apr 2013 11:22:13 +0200 Subject: [PATCH 53/80] dhcpcd: Update to 5.6.8 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 6ed89adee6e..9b3b6238420 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.6.7"; + name = "dhcpcd-5.6.8"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h"; + sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; }; configureFlags = "--sysconfdir=/etc"; From 678e983f5e8ed5e68584ce97a8715b749e9f34ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 26 Apr 2013 17:06:20 +0400 Subject: [PATCH 54/80] Adding reaver-wps. --- pkgs/tools/networking/reaver-wps/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/reaver-wps/default.nix diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix new file mode 100644 index 00000000000..a057985b48c --- /dev/null +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libpcap, sqlite }: + +stdenv.mkDerivation rec { + name = "reaver-wps-1.4"; + + src = fetchurl { + url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz; + sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd"; + }; + + buildInputs = [ libpcap sqlite ]; + + prePatch = '' + cd src + ''; + + preInstall = '' + ensureDir $out/bin + ''; + + meta = { + description = "Brute force attack against Wifi Protected Setup"; + homepage = http://code.google.com/p/reaver-wps; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d32d23ef05..ba4959b78ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1483,6 +1483,8 @@ let rtmpdump = callPackage ../tools/video/rtmpdump { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; From 2451e405c25bf3429569ab12eb498d97e7eb03e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 22:39:20 +0200 Subject: [PATCH 55/80] filezilla: update build to latest version of sqlite --- pkgs/applications/networking/ftp/filezilla/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 43ee98b55dc..5d682de5979 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }: +{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }: let version = "3.6.0.2"; in stdenv.mkDerivation { @@ -12,9 +12,9 @@ stdenv.mkDerivation { configureFlags = [ "--disable-manualupdatecheck" ]; - - buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ]; - + + buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; + meta = { homepage = "http://filezilla-project.org/"; description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more."; From 41dc6930cde29a42423bad78dd337d54937b2dbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 22:40:29 +0200 Subject: [PATCH 56/80] filezilla: cosmetic changes to meta section --- pkgs/applications/networking/ftp/filezilla/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5d682de5979..540d7e617e4 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -17,7 +17,14 @@ stdenv.mkDerivation { meta = { homepage = "http://filezilla-project.org/"; - description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more."; + description = "Graphical FTP, FTPS and SFTP client"; license = "GPLv2"; + + longDescription = '' + FileZilla Client is a free, open source FTP client. It supports + FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available + under many platforms, binaries for Windows, Linux and Mac OS X are + provided. + ''; }; } From 00101b66fed722abeda8af0a4f15383115df30c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 22:40:40 +0200 Subject: [PATCH 57/80] filezilla: strip trailing whitespace --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 540d7e617e4..24fdd105341 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -3,12 +3,12 @@ let version = "3.6.0.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; - + src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk"; }; - + configureFlags = [ "--disable-manualupdatecheck" ]; From 319ac481b8f5c939b26d7ac8df22e5d55d92643f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2013 22:46:45 +0200 Subject: [PATCH 58/80] sqlite: clean up - Add version 3.7.14.1 again, so that we can work around issues caused by the recent 3.7.16.1 update. - Drop obsolete version 3.6.x. - Consistently use the sqlite version number to name the file of the expression. --- .../sqlite/{3.6.x.nix => 3.6.23.1.nix} | 0 .../development/libraries/sqlite/3.7.14.1.nix | 24 +++++++++++++++++++ .../sqlite/{default.nix => 3.7.16.1.nix} | 0 .../sqlite/{full.nix => 3.7.9-full.nix} | 0 pkgs/top-level/all-packages.nix | 12 ++++++---- 5 files changed, 31 insertions(+), 5 deletions(-) rename pkgs/development/libraries/sqlite/{3.6.x.nix => 3.6.23.1.nix} (100%) create mode 100644 pkgs/development/libraries/sqlite/3.7.14.1.nix rename pkgs/development/libraries/sqlite/{default.nix => 3.7.16.1.nix} (100%) rename pkgs/development/libraries/sqlite/{full.nix => 3.7.9-full.nix} (100%) diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.6.23.1.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.6.x.nix rename to pkgs/development/libraries/sqlite/3.6.23.1.nix diff --git a/pkgs/development/libraries/sqlite/3.7.14.1.nix b/pkgs/development/libraries/sqlite/3.7.14.1.nix new file mode 100644 index 00000000000..be3a24c1e4c --- /dev/null +++ b/pkgs/development/libraries/sqlite/3.7.14.1.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, readline ? null, ncurses ? null }: + +assert readline != null -> ncurses != null; + +stdenv.mkDerivation { + name = "sqlite-3.7.14.1"; + + src = fetchurl { + url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz; + sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc"; + }; + + buildInputs = [ readline ncurses ]; + + configureFlags = "--enable-threadsafe"; + + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; + LDFLAGS = if readline != null then "-lncurses" else ""; + + meta = { + homepage = http://www.sqlite.org/; + description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; + }; +} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/3.7.16.1.nix similarity index 100% rename from pkgs/development/libraries/sqlite/default.nix rename to pkgs/development/libraries/sqlite/3.7.16.1.nix diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/3.7.9-full.nix similarity index 100% rename from pkgs/development/libraries/sqlite/full.nix rename to pkgs/development/libraries/sqlite/3.7.9-full.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba4959b78ff..8856e99fc8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3054,7 +3054,7 @@ let autoconf = callPackage ../development/tools/misc/autoconf { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - + autocutsel = callPackage ../tools/X11/autocutsel{ }; automake = automake112x; @@ -4998,21 +4998,23 @@ let srtp = callPackage ../development/libraries/srtp {}; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { + sqlite_3_7_16_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.1.nix { readline = null; ncurses = null; }); - sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix { + sqlite_3_7_14_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.1.nix { readline = null; ncurses = null; - }; + }); + + sqlite = sqlite_3_7_16_1; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; }); - sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/full.nix { + sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix { inherit readline ncurses; }); From 197ca4d67745a9bc83cd3d9ed86f70ea930166dd Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 27 Apr 2013 18:43:43 +0200 Subject: [PATCH 59/80] add bittorrent sync --- .../networking/bittorrentsync/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/networking/bittorrentsync/default.nix diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix new file mode 100644 index 00000000000..65a60b88477 --- /dev/null +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, patchelf }: + +# this package contains the daemon version of bittorrent sync + +# it's unfortunately closed source. + +let + # TODO: arm, ppc, osx + + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "i386" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" + else if stdenv.system == "i686-linux" then "ld-linux.so.2" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + version = "1.0.116"; + sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i" + else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + +in stdenv.mkDerivation { + name = "btsync-bin-${version}"; + src = fetchurl { + # TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868 + url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz"; + inherit sha256; + }; + + sourceRoot = "."; + + installPhase = '' + ensureDir "$out/bin/" + cp -r "btsync" "$out/bin/" + + patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ + "$out/bin/btsync" + ''; + + buildInputs = [ patchelf ]; + + meta = { + homepage = "http://labs.bittorrent.com/experiments/sync.html"; + description = "Automatically sync files via secure, distributed technology."; + license = stdenv.lib.licenses.unfreeRedistributable; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8856e99fc8a..4d71965b532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7815,6 +7815,8 @@ let st = callPackage ../applications/misc/st { }; + bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; + dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; From cbf9bbd5f46c84ef52fd5ee15d3716f3c8f6609c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 27 Apr 2013 22:36:03 +0200 Subject: [PATCH 60/80] sqlite: downgrade from version 3.7.16.1 to 3.7.14.1 The recent sqlite update broke -- among other things -- the Hydra regression test suite. Until these issues have been resolved, we stick to the older reliable version. --- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/perl-packages.nix | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d71965b532..8fa3a721df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4998,6 +4998,8 @@ let srtp = callPackage ../development/libraries/srtp {}; + # This version breaks the DBIxClass library and the Hydra regression + # test suite. These issues need further investigation. sqlite_3_7_16_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.1.nix { readline = null; ncurses = null; @@ -5008,7 +5010,7 @@ let ncurses = null; }); - sqlite = sqlite_3_7_16_1; + sqlite = sqlite_3_7_14_1; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a795769fadb..500719fde2c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1552,8 +1552,6 @@ rec { }; buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; - # !!! tests broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html - doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; From c4d1f2481e9923c88cb25fbe45928a084f1d63df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 27 Apr 2013 23:16:13 +0200 Subject: [PATCH 61/80] haskell-MonadRandom: update to version 0.1.9 --- .../development/libraries/haskell/MonadRandom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index c276e1eac80..70430f9f3c7 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, random }: +{ cabal, mtl, random, transformers }: cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.8"; - sha256 = "1zin7qyv86gza60q6a6r8az2dwxm80wh23idvmjapgbjn2kfvfim"; - buildDepends = [ mtl random ]; + version = "0.1.9"; + sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz"; + buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; license = "unknown"; From a3810f2595051bffc0bdbaf45cd6b925a1bdd0f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 27 Apr 2013 23:16:13 +0200 Subject: [PATCH 62/80] haskell-skein: update to version 1.0.2 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index f7b3bbd5c41..7bf7f845762 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.1"; - sha256 = "1mvyq6wp03fs6sjppgalaacargvi69yf5d59k473pgr1g89v4ni1"; + version = "1.0.2"; + sha256 = "1wzy586lcr0pxsdf4lvqhbzq8bsm26gm71jlmv64i22f99n5s9h2"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; From 699d6a0bdee7a1bc698d834fe853f6133c118cc6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Apr 2013 13:30:13 +0300 Subject: [PATCH 63/80] Fix incorrect attribute name --- 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 8fa3a721df8..66d47f13d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -822,7 +822,7 @@ let uni2ascii = callPackage ../tools/text/uni2ascii { }; - g500-control = callPackage ../tools/misc/g500-control { }; + g500control = callPackage ../tools/misc/g500-control { }; gawk = callPackage ../tools/text/gawk { }; From b2ad60553b4b487638719601475e3d363c771708 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Apr 2013 13:39:45 +0300 Subject: [PATCH 64/80] Revert "Fix incorrect attribute name" This reverts commit 699d6a0bdee7a1bc698d834fe853f6133c118cc6. --- 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 66d47f13d14..8fa3a721df8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -822,7 +822,7 @@ let uni2ascii = callPackage ../tools/text/uni2ascii { }; - g500control = callPackage ../tools/misc/g500-control { }; + g500-control = callPackage ../tools/misc/g500-control { }; gawk = callPackage ../tools/text/gawk { }; From b4fd5fdd831e566a71758bdceeaccd3d5941a1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 29 Apr 2013 13:44:23 +0400 Subject: [PATCH 65/80] gdb: update to 7.6 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index a9b3dec5092..45bd988a471 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.5.1"; + basename = "gdb-7.6"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7"; + md5 = "fda57170e4d11cdde74259ca575412a8"; }; # I think python is not a native input, but I leave it From 27b3ab6a8d298aace4213e0385876c4170f411fd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Apr 2013 13:54:22 -0400 Subject: [PATCH 66/80] Make it possible to enable vbox extension pack easily from nixpkgs config Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fa3a721df8..c305d0e7c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,6 +6086,7 @@ let virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; + enableExtensionPack = config.virtualbox.enableExtensionPack or false; }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; From c60a1f67ccc902c182a71c6d498de83ff6078c55 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 29 Apr 2013 14:25:25 -0400 Subject: [PATCH 67/80] Add doxypy nixpkg Signed-off-by: Shea Levy --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91118684474..8ff21b68dbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1476,6 +1476,22 @@ pythonPackages = python.modules // rec { }; }; + doxypy = buildPythonPackage rec { + name = "doxypy-0.4.2"; + + src = fetchurl { + url = "http://code.foosel.org/files/${name}.tar.gz"; + sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g"; + }; + + meta = { + homepage = http://code.foosel.org/doxypy; + description = "An input filter for Doxygen"; + }; + + doCheck = false; + }; + dtopt = buildPythonPackage rec { name = "dtopt-0.1"; From abae82950ed5549d7e13936aab0d43f4b3389ae5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Apr 2013 20:56:52 +0200 Subject: [PATCH 68/80] sqlite 3.6.23.1: Remove (unused) --- .../development/libraries/sqlite/3.6.23.1.nix | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/3.6.23.1.nix diff --git a/pkgs/development/libraries/sqlite/3.6.23.1.nix b/pkgs/development/libraries/sqlite/3.6.23.1.nix deleted file mode 100644 index 6a1c02dede1..00000000000 --- a/pkgs/development/libraries/sqlite/3.6.23.1.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, readline ? null, ncurses ? null }: - -assert readline != null -> ncurses != null; - -stdenv.mkDerivation { - name = "sqlite-3.6.23.1"; - - src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz"; - sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h"; - }; - - buildInputs = [readline ncurses]; - configureFlags = "--enable-threadsafe"; - - NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1"; - NIX_CFLAGS_LINK = if readline != null then "-lncurses" else ""; - - meta = { - homepage = http://www.sqlite.org/; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - }; -} From 61ec5a1ca4a85343b5db692d708b663da7b26c14 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Apr 2013 20:58:05 +0200 Subject: [PATCH 69/80] DBI: Update to 1.625 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 500719fde2c..d53f430c326 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1532,10 +1532,10 @@ rec { }; DBI = buildPerlPackage { - name = "DBI-1.616"; + name = "DBI-1.625"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.616.tar.gz; - sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz; + sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w"; }; meta = { homepage = http://dbi.perl.org/; From 50c9c1c9381a350a4204fd71a07664be1788caad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Apr 2013 20:59:17 +0200 Subject: [PATCH 70/80] sqlite: Update to 3.7.16.2 --- .../libraries/sqlite/{3.7.16.1.nix => 3.7.16.2.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/development/libraries/sqlite/{3.7.16.1.nix => 3.7.16.2.nix} (79%) diff --git a/pkgs/development/libraries/sqlite/3.7.16.1.nix b/pkgs/development/libraries/sqlite/3.7.16.2.nix similarity index 79% rename from pkgs/development/libraries/sqlite/3.7.16.1.nix rename to pkgs/development/libraries/sqlite/3.7.16.2.nix index 08d0396a53d..231f4e5d69c 100644 --- a/pkgs/development/libraries/sqlite/3.7.16.1.nix +++ b/pkgs/development/libraries/sqlite/3.7.16.2.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.16.1"; + name = "sqlite-3.7.16.2"; src = fetchurl { - url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz; - sha1 = "b0d9b3e2ca3c50f72e5921e9532130787871b7ae"; + url = http://www.sqlite.org/2013/sqlite-autoconf-3071602.tar.gz; + sha1 = "85bf857cf86f34831d55d7ba97606dba581b8d62"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c305d0e7c4d..65359a2d238 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4998,9 +4998,7 @@ let srtp = callPackage ../development/libraries/srtp {}; - # This version breaks the DBIxClass library and the Hydra regression - # test suite. These issues need further investigation. - sqlite_3_7_16_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.1.nix { + sqlite_3_7_16_2 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.2.nix { readline = null; ncurses = null; }); From 9c8923b5e6d2954661127cef8fc574318b7283c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Apr 2013 00:01:17 +0200 Subject: [PATCH 71/80] sqlite: Don't include the last component of the version in the filenames SQLite point releases are conservative, so we don't need to refer to SQLite versions at this level of precision. --- .../libraries/sqlite/{3.7.14.1.nix => 3.7.14.nix} | 0 .../libraries/sqlite/{3.7.16.2.nix => 3.7.16.nix} | 0 pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/sqlite/{3.7.14.1.nix => 3.7.14.nix} (100%) rename pkgs/development/libraries/sqlite/{3.7.16.2.nix => 3.7.16.nix} (100%) diff --git a/pkgs/development/libraries/sqlite/3.7.14.1.nix b/pkgs/development/libraries/sqlite/3.7.14.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.7.14.1.nix rename to pkgs/development/libraries/sqlite/3.7.14.nix diff --git a/pkgs/development/libraries/sqlite/3.7.16.2.nix b/pkgs/development/libraries/sqlite/3.7.16.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.7.16.2.nix rename to pkgs/development/libraries/sqlite/3.7.16.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65359a2d238..12a78aa1af6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4998,17 +4998,17 @@ let srtp = callPackage ../development/libraries/srtp {}; - sqlite_3_7_16_2 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.2.nix { + sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { readline = null; ncurses = null; }); - sqlite_3_7_14_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.1.nix { + sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { readline = null; ncurses = null; }); - sqlite = sqlite_3_7_14_1; + sqlite = sqlite_3_7_14; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; From 1e316e8eac4cb2826113f7fe4099e35fe0a6c35b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Apr 2013 00:05:27 +0200 Subject: [PATCH 72/80] sqlite: Make 3.7.16 the default again I've fixed the Hydra problem and the DBIx::Class issue is only a problem in its test suite, apparently. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12a78aa1af6..47ea7f612f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5008,7 +5008,7 @@ let ncurses = null; }); - sqlite = sqlite_3_7_14; + sqlite = sqlite_3_7_16; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d53f430c326..bfbeeee57fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1552,6 +1552,8 @@ rec { }; buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; + # !!! tests broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html + doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; From ef6fc4a3456bcae4371dc07c7ca6c86fcd2a90eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Apr 2013 00:17:18 +0200 Subject: [PATCH 73/80] nixUnstable: Update to 1.5.2pre3091_772b709 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index fe409526e71..d66a156c33e 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.2pre3082_2398417"; + name = "nix-1.5.2pre3091_772b709"; src = fetchurl { - url = "http://hydra.nixos.org/build/4480483/download/5/${name}.tar.xz"; - sha256 = "efea03fd9e15f52564ecfe6942bf9e8a757ef2e83b6ad9832f214342b2cbba83"; + url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz"; + sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd"; }; nativeBuildInputs = [ perl pkgconfig ]; From 2f036a21d7fa969697cabee338b39d2ca3096cb4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Apr 2013 09:16:24 +0200 Subject: [PATCH 74/80] mkvtoolnix: upgrade to 6.2.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c2563b5e298..7d2eb514c94 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -4,7 +4,6 @@ , libvorbis , file , boost -, lzo , xdg_utils , expat , wxGTK @@ -16,14 +15,14 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.1.0"; + name = "mkvtoolnix-6.2.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x"; + sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn"; }; - buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; + buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' From b18c7b5891f741cb369530fa777c0d7e7628f335 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Apr 2013 09:22:59 +0200 Subject: [PATCH 75/80] linux-3.8: upgrade to 3.8.10 --- pkgs/os-specific/linux/kernel/linux-3.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 00f2fedbedf..a8dacfda4a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -252,7 +252,7 @@ in import ./generic.nix ( rec { - version = "3.8.9"; + version = "3.8.10"; testing = false; preConfigure = '' @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0r0ffgg79za0y0mhbb2178w7rd1iwlv894hq2aq0an0v9bi3h6wg"; + sha256 = "0nhjprr1yvkb9fvyjxxdds0j71vidpbqqnmrf0cym3a4l3fxqj5p"; }; config = configWithPlatform stdenv.platform; From d8489d37edbc738cccbe72be5d70721b0df0d6e4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Apr 2013 09:25:06 +0200 Subject: [PATCH 76/80] linux-3.9: upgrade to 3.9.0 --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 3e1ad6aed4e..764395d2642 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -252,9 +252,9 @@ in import ./generic.nix ( rec { - version = "3.9-rc8"; - modDirVersion = "3.9.0-rc8"; - testing = true; + version = "3.9"; + modDirVersion = "3.9.0"; + testing = false; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0lhi0v57sx7wyba1y4g2vij44rk0fc2ph0p3yybjrg6ljij8yb9b"; + sha256 = "0ha5ym9ssvz14kb8w6zksk4s867mmd07dkfp5kg7iisxxrj3xg30"; }; config = configWithPlatform stdenv.platform; From bfc245f7defc3d5a70e3c12dedfb5640e516b383 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Apr 2013 09:25:56 +0200 Subject: [PATCH 77/80] linux-3.9: no longer marked as RC, updated "latest" reference. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47ea7f612f3..68805e9137f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5968,8 +5968,7 @@ let ]; }; - # low-priority because it is RC - linux_3_9 = lowPrio (makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { + linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ @@ -5979,7 +5978,7 @@ let kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; - }); + }; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6100,8 +6099,9 @@ let linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); + linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_8; + linuxPackages_latest = pkgs.linuxPackages_3_9; # The current default kernel / kernel modules. linux = linuxPackages.kernel; From d4ac42ae114e6a47e1d7474c6aa886d891ac64cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 30 Apr 2013 11:58:07 +0400 Subject: [PATCH 78/80] Adding go 1.1 beta --- pkgs/development/compilers/go/1.1.nix | 94 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 96 insertions(+) create mode 100644 pkgs/development/compilers/go/1.1.nix diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix new file mode 100644 index 00000000000..f0e5ea23958 --- /dev/null +++ b/pkgs/development/compilers/go/1.1.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: + +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.1beta2"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.1beta2.src.tar.gz; + sha1 = "70d7642a6ea065a23458b9ea28e370b19912e52d"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + # 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 = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # 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} + # The os test wants to read files in an existing path. Just it don't 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 hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # Disable a failing icmp test + sed -i '/ip[46]:icmp.*nil/d' src/pkg/net/ipraw_test.go + ''; + + patches = [ ./cacert.patch ]; + + GOOS = "linux"; + GOARCH = 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"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go \ + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} + done + + # 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; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68805e9137f..76de4b6090a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2502,6 +2502,8 @@ let go = callPackage ../development/compilers/go { }; + go_1_1 = lowPrio (callPackage ../development/compilers/go/1.1.nix { }); + gprolog = callPackage ../development/compilers/gprolog { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; From f912d96147f4acd5f2995856f85c8a78b9053e0c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 30 Apr 2013 11:59:47 +0300 Subject: [PATCH 79/80] Virtuoso: upgrade to 6.1.6 --- pkgs/servers/sql/virtuoso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 6d732fde182..9453b8d2cdb 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.5"; + name = "virtuoso-opensource-6.1.6"; src = fetchurl { url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; - sha256 = "02aax76f51ya5slp1slv4r1ihcb7zpb040n33b581g8n1ppgj2ps"; + sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; buildInputs = [ libxml2 openssl readline gawk ]; From b8eaa5d3eb7e23628c3856e3ee4d302e6fe8ee97 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 30 Apr 2013 13:02:50 +0300 Subject: [PATCH 80/80] Qt4.8: upgrade to 4.8.4 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ee449f6471b..ab9cd43d63b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; -let v = "4.8.3"; in +let v = "4.8.4"; in # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0a67riy4i0xj6j7vmckd0nakras3rl3rzx0r83h1p1i4z5s2kxzi"; + sha256 = "0w1j16q6glniv4hppdgcvw52w72gb2jab35ylkw0qjn5lj5y7c1k"; }; patches =