From 5ded1fb645ff6acd687707e1eb404ff6082f9321 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 14 Oct 2012 23:48:46 -0700 Subject: [PATCH 001/249] - icecast-2.3.3, libshout-2.3.1 --- .../libraries/libshout/default.nix | 30 +++++++++++++++++ pkgs/servers/icecast/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/libshout/default.nix create mode 100644 pkgs/servers/icecast/default.nix diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix new file mode 100644 index 000000000000..45528829cc31 --- /dev/null +++ b/pkgs/development/libraries/libshout/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig +, libvorbis, libtheora, speex}: + +# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc + +stdenv.mkDerivation { + name = "libshout-2.3.1"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e"; + }; + + buildInputs = [ libvorbis libtheora speex pkgconfig ]; + + meta = { + description = "icecast 'c' language bindings"; + + longDescription = '' + Libshout is a library for communicating with and sending data to an icecast + server. It handles the socket connection, the timing of the data, and prevents + bad data from getting to the icecast server. + ''; + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + + }; +} diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix new file mode 100644 index 000000000000..24ae245a8a07 --- /dev/null +++ b/pkgs/servers/icecast/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl +, libxml2, libxslt, curl +, libvorbis, libtheora, speex, libkate }: + +stdenv.mkDerivation rec { + name = "icecast-2.3.3"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; + sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + }; + + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + + meta = { + description = "icecast is free server software for streaming multimedia."; + + longDescription = '' + Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 + audio streams. It can be used to create an Internet radio station or a + privately running jukebox and many things in between. It is very versatile in + that new formats can be added relatively easily and supports open standards for + commuincation and interaction. + ''; + + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d6..11dd996f9279 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -907,6 +907,8 @@ let iasl = callPackage ../development/compilers/iasl { }; + icecast = callPackage ../servers/icecast { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -1000,6 +1002,8 @@ let libtirpc = callPackage ../development/libraries/ti-rpc { }; + libshout = callPackage ../development/libraries/libshout { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logcheck = callPackage ../tools/system/logcheck { From 8ba64338f71fc2f60b6c25da2b58ef9c75314290 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 21 Oct 2012 21:59:23 -0700 Subject: [PATCH 002/249] as we dereference a variable in a string, the expression needs to be recursive. --- pkgs/development/libraries/libshout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 45528829cc31..760b8ecce09f 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -3,7 +3,7 @@ # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libshout-2.3.1"; src = fetchurl { From ccfb0562558b87dc39a695da54e5fbc33b552ad8 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 24 Oct 2012 18:15:48 -0700 Subject: [PATCH 003/249] shoutcast support for mpd --- pkgs/servers/mpd/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0c3257d61c37..a5cc810ada8a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -2,16 +2,18 @@ , flacSupport ? true, flac, vorbisSupport ? true, libvorbis , madSupport ? true, libmad, id3tagSupport ? true, libid3tag , mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +, shoutSupport ? true, libshout }: let opt = stdenv.lib.optional; in stdenv.mkDerivation rec { - name = "mpd-0.16.3"; + name = "mpd-0.16.8"; src = fetchurl { url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "1liihxj58f944gapdqg15firl6phbxh3y3vjxq9m8dlvm37pkpsq"; + sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17"; }; + buildInputs = [ pkgconfig glib ] ++ opt alsaSupport alsaLib ++ opt flacSupport flac @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { ++ opt madSupport libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod - ++ opt cueSupport libcue; + ++ opt cueSupport libcue + ++ opt shoutSupport libshout; + configureFlags = '' ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} ${if flacSupport then "--enable-flac" else "--disable-flac"} @@ -28,7 +32,13 @@ stdenv.mkDerivation rec { ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} ${if id3tagSupport then "--enable-id3" else "--disable-id3"} ${if cueSupport then "--enable-cue" else "--disable-cue"} + ${if shoutSupport then "--enable-shout" else "--disable-shout"} ''; + + NIX_LDFLAGS = '' + ${if shoutSupport then "-lshout" else ""} + ''; + meta = { description = "A flexible, powerful daemon for playing music"; longDescription = '' From 6299baeb88cdeaa19275b0a2386e552e6347e93f Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Thu, 15 Nov 2012 23:19:32 +0100 Subject: [PATCH 004/249] Support installing topfind now --- pkgs/development/tools/ocaml/findlib/default.nix | 4 ++-- .../tools/ocaml/findlib/install_topfind.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/ocaml/findlib/install_topfind.patch diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 3170712b9baf..0291e47f6127 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch ]; + patchFlags = "-p0"; dontAddPrefix=true; @@ -24,7 +25,6 @@ stdenv.mkDerivation { -mandir $out/share/man -sitelib $out/lib/ocaml/${ocaml_version}/site-lib -config $out/etc/findlib.conf - -no-topfind ) ''; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch new file mode 100644 index 000000000000..03eefb54cb14 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -0,0 +1,12 @@ +--- src/findlib/Makefile ++++ src/findlib/Makefile +@@ -82,7 +82,7 @@ clean: + install: all + mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" + mkdir -p "$(prefix)$(OCAMLFIND_BIN)" +- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" ++ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ + From 5ff6be922416a738eed6480c24c75309fdb07ef3 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Thu, 15 Nov 2012 23:21:14 +0100 Subject: [PATCH 005/249] Support installing findlib --- pkgs/development/tools/ocaml/findlib/default.nix | 1 - pkgs/development/tools/ocaml/findlib/install_topfind.patch | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 0291e47f6127..aee0040f8159 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; patches = [ ./ldconf.patch ./install_topfind.patch ]; - patchFlags = "-p0"; dontAddPrefix=true; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 03eefb54cb14..4729885bcefe 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,5 +1,5 @@ ---- src/findlib/Makefile -+++ src/findlib/Makefile +--- findlib-1.3.3/src/findlib/Makefile ++++ findlib-1.3.3/src/findlib/Makefile @@ -82,7 +82,7 @@ clean: install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" From 1a948d97a213f46502e5a4210ed8f24d3a389d25 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 20 Nov 2012 13:54:38 +0100 Subject: [PATCH 006/249] fix sort in lists.nix --- pkgs/lib/lists.nix | 2 +- pkgs/lib/tests.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index b9eba9ab4785..ede7018fb236 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -190,7 +190,7 @@ rec { else let part = partition (strictLess (head l)) (tail l); in - qs part.wrong ([(head l)] ++ qs part.right []); + qs part.wrong ([(head l)] ++ qs part.right concat); in qs list []; diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 04acb7632eab..298bdffc3790 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -104,5 +104,10 @@ runTests { ]; expected = true; }; + + testSort = { + expr = sort builtins.lessThan [ 40 2 30 42 ]; + expected = [2 30 40 42]; + }; } From 87144c6aa7117190a66baed62202ba0423591fd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Nov 2012 17:35:22 +0100 Subject: [PATCH 007/249] Agda: the current version supports recent QuickCheck --- pkgs/top-level/haskell-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 97992bd3b1c5..98b4b657a143 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -427,10 +427,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Haskell libraries. - Agda = callPackage ../development/libraries/haskell/Agda { - haskellSrcExts = self.haskellSrcExts_1_11_1; - QuickCheck = self.QuickCheck_2_4_2; - }; + Agda = callPackage ../development/libraries/haskell/Agda {}; accelerate = callPackage ../development/libraries/haskell/accelerate {}; From baa71f8d37d407dbcf7697a102c06e52788cee56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Nov 2012 17:40:19 +0100 Subject: [PATCH 008/249] haskell-testpack: patch to support recent versions of QuickCheck --- .../libraries/haskell/testpack/default.nix | 1 + .../testpack/support-recent-quickcheck.patch | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix index a308594060f2..53aa0ee8613b 100644 --- a/pkgs/development/libraries/haskell/testpack/default.nix +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "2.1.2"; sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif"; buildDepends = [ HUnit mtl QuickCheck random ]; + patches = [ ./support-recent-quickcheck.patch ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck"; diff --git a/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch b/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch new file mode 100644 index 000000000000..f9f060106ff9 --- /dev/null +++ b/pkgs/development/libraries/haskell/testpack/support-recent-quickcheck.patch @@ -0,0 +1,22 @@ +diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs +index 01fac30..0de5526 100644 +--- a/src/Test/HUnit/Tools.hs ++++ b/src/Test/HUnit/Tools.hs +@@ -128,7 +128,7 @@ Often used like this: + > q "Integer -> Int (safe bounds)" prop_integer_to_int_pass] + -} + qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test +-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000}) ++qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest}) + + {- | Run verbose tests. Example: + +@@ -174,7 +174,7 @@ localquickCheckWithResult args p = + Just (rnd,_) -> return rnd + test MkState{ terminal = tm + , maxSuccessTests = maxSuccess args +- , maxDiscardedTests = maxDiscard args ++ , maxDiscardedTests = 20000 + , computeSize = case replay args of + Nothing -> \n d -> (n * maxSize args) + `div` maxSuccess args diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 98b4b657a143..19ef0448cbf8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1607,9 +1607,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; - testpack = callPackage ../development/libraries/haskell/testpack { - QuickCheck = self.QuickCheck_2_4_2; - }; + testpack = callPackage ../development/libraries/haskell/testpack {}; texmath = callPackage ../development/libraries/haskell/texmath {}; From 03abf1abbc73df82dc0d0da9c57c4aee1f06c40c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Nov 2012 17:40:56 +0100 Subject: [PATCH 009/249] git-annex: switch build to GHC 7.4.2 --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9f52871547a4..fe4f101e27c7 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,7 +44,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers From ad928fee30a1e8806fcb38579b65e9dc00196b81 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 21 Nov 2012 21:31:56 +0100 Subject: [PATCH 010/249] Update Oracle JDK to 1.6.0u38b04 --- pkgs/development/compilers/jdk/jdk6-construct.sh | 16 ++++++++-------- pkgs/development/compilers/jdk/jdk6-linux.nix | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/jdk/jdk6-construct.sh b/pkgs/development/compilers/jdk/jdk6-construct.sh index 3e09d4621d63..16ee0f5a2f04 100644 --- a/pkgs/development/compilers/jdk/jdk6-construct.sh +++ b/pkgs/development/compilers/jdk/jdk6-construct.sh @@ -1,9 +1,9 @@ #!/bin/bash # construct.sh # example construction of JRE and JDK directories from the DLJ bundles -# +# # Copyright © 2006 Sun Microsystems, Inc. -# +# # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including @@ -11,10 +11,10 @@ # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: -# +# # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -22,7 +22,7 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# +# # Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot, # and JVM trademarks or registered trademarks of Sun Microsystems, # Inc. in the U.S. and other countries. @@ -43,13 +43,13 @@ getargs() { exit 2 fi # make sure javahome is the JDK - javahome=`echo $undir/*/demo` + javahome=`echo $undir/*/db/demo` if [ ! -d $javahome ]; then echo "${program}: unbundle directory incorrect: $undir" echo " expecting $undir/jdk1.5.0_xx" exit 2 else - javahome=`dirname $javahome` + javahome=$(dirname $(dirname $javahome)) fi # verify JDK dir jdkdirp=`dirname $jdkdir` @@ -106,7 +106,7 @@ linkrel() { if [ $m -lt $c ]; then (( c = m )) fi - for (( i = 0 ; i < c ; i++ )); do + for (( i = 0 ; i < c ; i++ )); do if [ ${targetb[$i]} != ${linkb[$i]} ]; then # echo components differ, stopping break diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index b564d3110144..1491b264c750 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -28,18 +28,18 @@ in stdenv.mkDerivation { name = - if installjdk then "jdk-1.6.0_32b03" else "jre-1.6.0_32b03"; + if installjdk then "jdk-1.6.0_38b04" else "jre-1.6.0_38b04"; src = if stdenv.system == "i686-linux" then fetchurl { - url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-i586-29_feb_2012.bin; - md5 = "7c009afa399476c7d2791386235b8e3b"; + url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-i586-31_oct_2012.bin; + md5 = "0595473ad371981c7faa709798a5f78e"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-amd64-29_feb_2012.bin; - md5 = "7f1a45531a04c372e5660a55c2dfdad8"; + url = http://www.java.net/download/jdk6/6u38/promoted/b04/binaries/jdk-6u38-ea-bin-b04-linux-amd64-31_oct_2012.bin; + md5 = "b98c80a963915de32b1abe02c50385de"; } else abort "jdk requires i686-linux or x86_64 linux"; From c238c192205a29a759a2415412bf0d22c7054000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 22 Nov 2012 00:08:28 +0100 Subject: [PATCH 011/249] Add Bristol: a range of synthesiser, electric piano and organ emulations --- pkgs/applications/audio/bristol/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/bristol/default.nix diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix new file mode 100644 index 000000000000..81d44fdcb74a --- /dev/null +++ b/pkgs/applications/audio/bristol/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: + +stdenv.mkDerivation rec { + name = "bristol-${version}"; + version = "0.60.10"; + + src = fetchurl { + url = "mirror://sourceforge/bristol/${name}.tar.gz"; + sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; + }; + + buildInputs = [ + alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + xlibs.xproto + ]; + + meta = with stdenv.lib; { + description = "A range of synthesiser, electric piano and organ emulations"; + homepage = http://bristol.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 159aee43116e..cd9eed75336e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6635,6 +6635,8 @@ let python = python32; }; + bristol = callPackage ../applications/audio/bristol { }; + bvi = callPackage ../applications/editors/bvi { }; calf = callPackage ../applications/audio/calf { From 7a1629182869594a6ce6002b9966dd59c8db31ad Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 22 Nov 2012 01:05:45 -0500 Subject: [PATCH 012/249] Add rng-tools --- pkgs/tools/security/rng-tools/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/security/rng-tools/default.nix diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix new file mode 100644 index 000000000000..3c99b22c1e14 --- /dev/null +++ b/pkgs/tools/security/rng-tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "rng-tools-4"; + + src = fetchurl { + url = "mirror://sourceforge/gkernel/${name}.tar.gz"; + + sha256 = "15f17j3lxn1v2mhdxvy3pahz41hn1vlnnm81c0qyh19c4bady6xp"; + }; + + meta = { + description = "A random number generator daemon"; + + homepage = http://sourceforge.net/projects/gkernel; + + license = stdenv.lib.licenses.gpl2; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9b058ce905e..ede3e1eb1759 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1417,6 +1417,8 @@ let ripmime = callPackage ../tools/networking/ripmime {}; + rng_tools = callPackage ../tools/security/rng-tools { }; + rsnapshot = callPackage ../tools/backup/rsnapshot { # For the `logger' command, we can use either `utillinux' or # GNU Inetutils. The latter is more portable. From 5c09167b670a55d7092c581cc5d9565cb1629684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Nov 2012 10:54:56 +0100 Subject: [PATCH 013/249] myEnv: making it not to add -rpath /lib NIX_LDFLAGS was left with "-rpath /lib", which is annoying on non-nixos. --- pkgs/misc/my-env/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 990606668fe8..19c105bf4f02 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -95,6 +95,8 @@ mkDerivation { phases= # only do all the setup stuff in nix-support/* set +e + # This prevents having -rpath /lib in NIX_LDFLAGS + export NIX_NO_SELF_RPATH=1 if [[ -z "\$ZSH_VERSION" ]]; then source "$s" else From e72e74dad80a7214bd3ebf27e8b4fe88d6c23be9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 22 Nov 2012 17:30:33 +0400 Subject: [PATCH 014/249] Update Julia to correspond to their changes --- pkgs/development/compilers/julia/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 4fd31d573cef..b8a5a10ec97c 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , tcl, tk } : let realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; - date = "20121106"; + date = "20121122"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,8 +55,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "8f4d073881beb42c9f272b9327efa0a5715bd31c"; - sha256 = "2df2ba800bd4fd9b0297a0b8cff53174a7c05ffbc889a7df5830a014fed8c433"; + rev = "51076ef4c1b269de738b6185865b389601627eb7"; + sha256 = "1hbhxdiymkv0pd4dhr9wbvh1566ivfffhmafsjh8jcwh2f9fz90b"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -84,17 +85,19 @@ stdenv.mkDerivation rec { sed -e 's@ cpp @ gcc -E @g' -i base/Makefile - export LDFLAGS="-L${suitesparse}/lib" + export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" export GLPK_PREFIX="${glpk}/include" mkdir -p "$out/lib" sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}" export dontPatchELF=1 + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" ''; preBuild = '' @@ -104,14 +107,11 @@ stdenv.mkDerivation rec { postInstall = '' ld -E --whole-archive --shared ${suitesparse}/lib/lib*[a-z].a -o "$out"/lib/libsuitesparse-shared.so - for i in umfpack cholmod amd camd colamd ; do + for i in umfpack cholmod amd camd colamd btf cxsparse ldl rbio spqr suitesparseconfig; do ln -s "libsuitesparse-shared.so" "$out/lib/lib$i.so" done ln -s "${lighttpd}/sbin/lighttpd" "$out/sbin/" ln -s "${lighttpd}/lib/"* "$out/lib/" - - cp -r test examples "$out/lib/julia" - ls -R > "$out/ls-R" ''; meta = { From 2da2e5137fc8410512f77cb9a51e83308eea3b29 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Nov 2012 16:55:31 +0100 Subject: [PATCH 015/249] subversion: Update to 1.7.7 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 50a5ae8f6c3d..8e454ad9f8f0 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.5"; + version = "1.7.7"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "05c079762690d5ac1ccd2549742e7ef70fa45cf1"; + sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; }; buildInputs = [ zlib apr aprutil sqlite ] From 50006193779a8bfc288153016e8ac03ccb3f8203 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:32 +0100 Subject: [PATCH 016/249] haskell-SHA: update to version 1.6.1 --- pkgs/development/libraries/haskell/SHA/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index ea353c638038..343412700842 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -1,16 +1,12 @@ -{ cabal, binary, QuickCheck, testFramework -, testFrameworkQuickcheck2 -}: +{ cabal, binary }: cabal.mkDerivation (self: { pname = "SHA"; - version = "1.6.0"; - sha256 = "0i5x2irk08yr4p428wyqvdysz22jqc3q5qn08wc38pw2xhmc0zzk"; + version = "1.6.1"; + sha256 = "1v3a2skkbr64y7x1aqpq1qz03isc42l9hd1viqcsv4qlld595fgx"; isLibrary = true; isExecutable = true; - buildDepends = [ - binary QuickCheck testFramework testFrameworkQuickcheck2 - ]; + buildDepends = [ binary ]; meta = { description = "Implementations of the SHA suite of message digest functions"; license = self.stdenv.lib.licenses.bsd3; From fe2fdc9e9968980d5de3a4e49e438e4c1afdf21e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:32 +0100 Subject: [PATCH 017/249] haskell-binary: update to version 0.6.3.0 --- pkgs/development/libraries/haskell/binary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index 303e67c3b99d..ed2414a500cc 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.6.2.0"; - sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab"; + version = "0.6.3.0"; + sha256 = "0gynhyamhvffy2z88xzi56kf57pd5d6534n7w0m11qq4188w0zai"; meta = { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; From 763739107ec0d295a90ae745abdecce51dc334eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:32 +0100 Subject: [PATCH 018/249] haskell-distributed-process-simplelocalnet: update to version 0.2.0.8 --- .../haskell/distributed-process-simplelocalnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index bb48c394414e..86fa71221954 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.7"; - sha256 = "0jxbxacvdg4pf65s6r48nck45g8dfsarks3m2pdn73gjn4cd81c7"; + version = "0.2.0.8"; + sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0"; isLibrary = true; isExecutable = true; buildDepends = [ From 7f4631412a0ea034e8bc613029b8bde9278a97fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:32 +0100 Subject: [PATCH 019/249] haskell-distributed-process: update to version 0.4.1 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index b38ae0c46c81..6ecd5d578838 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.0.2"; - sha256 = "0wjxai5z6m84blrgic1pd0jgivqcc8ymjya3m0dhqbmsljwh6ynw"; + version = "0.4.1"; + sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f"; isLibrary = true; isExecutable = true; buildDepends = [ From d571a32318aabfa7a5e225a97db837a64f11a22e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:32 +0100 Subject: [PATCH 020/249] haskell-distributed-static: update to version 0.2.1.1 --- .../libraries/haskell/distributed-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index c09558449dfe..9147b724ba22 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.2.1"; - sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc"; + version = "0.2.1.1"; + sha256 = "08y9554x6avjwdmbf33fw1pw1wl8qmgfngmgb6vgad88krnixq1h"; buildDepends = [ binary rank1dynamic ]; meta = { homepage = "http://www.github.com/haskell-distributed/distributed-process"; From 8a37e8c82c58cdb8b05de5474365c23f9dd327dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 021/249] haskell-email-validate: update to version 0.3.2 --- pkgs/development/libraries/haskell/email-validate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 89c5ddb02d72..1b1b4b7348ed 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.2.8"; - sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd"; + version = "0.3.2"; + sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq"; buildDepends = [ parsec ranges ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; From 99cf7cba4b602df8ce20ead503df6179d92c7908 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 022/249] haskell-http-conduit: update to version 1.8.4.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b13926f75278..2240bb56b5a0 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.4"; - sha256 = "1gs4ac5qhrx8xdz4zbhwalkycspl28lkk23m16pdpf2gkmbhh58a"; + version = "1.8.4.1"; + sha256 = "0jrsl8m0r3i1jyhi8qsadv4dhq069v67hlphzm78sfinrd083h8y"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From 37b04ff3a547330a40d140e047049038540b4a34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 023/249] haskell-lens: update to version 3.4 --- pkgs/development/libraries/haskell/lens/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index c849665b1c80..c1de91811320 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,16 +1,16 @@ { cabal, comonad, comonadsFd, comonadTransformers, filepath , hashable, mtl, parallel, semigroups, split, text, transformers -, unorderedContainers, vector, void +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.3"; - sha256 = "0gq24y1727ml5lpr0b67hqw3vwanvx6hpk3lsfx3nk6csscn1lvk"; + version = "3.4"; + sha256 = "19f5kmd6b1jnimvfm56dpgqzhnlpi0anar1ii9am38lg5yaqbgs4"; buildDepends = [ comonad comonadsFd comonadTransformers filepath hashable mtl parallel semigroups split text transformers unorderedContainers - vector void + vector ]; noHaddock = true; meta = { From 4b9cddcd2fa9b71518f7e283fb74178d6b44d0dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 024/249] haskell-network-transport: update to version 0.3.0.1 --- .../libraries/haskell/network-transport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index 813e8372cfc7..eaa41944a6bd 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.3.0"; - sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm"; + version = "0.3.0.1"; + sha256 = "1iijcd864znik83smk1bjidinm199wri5fdyrhnffj0n35knrvas"; buildDepends = [ binary transformers ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; From d7bb7ba8b92d90775f56f9344d35a9b206af509b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 025/249] haskell-rank1dynamic: update to version 0.1.0.2 --- pkgs/development/libraries/haskell/rank1dynamic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index 602f0cc25747..8694d2399b2b 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "rank1dynamic"; - version = "0.1.0.1"; - sha256 = "18rlih5bndlm5v4nnv8g2rgvab5n22vd8mcjd0m4wq8fmqkb3x9d"; + version = "0.1.0.2"; + sha256 = "1341hhbdm6y0mj0qjda0ckqsla51fxiy1yfpbwfvsmpi2bkzgxn6"; buildDepends = [ binary ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; From e6c384e5d34fd61acb43976072723c0a1e2d75ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 16:59:33 +0100 Subject: [PATCH 026/249] haskell-yesod-form: update to version 1.2.0.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 787fa78f828c..4f9e17371657 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.0"; - sha256 = "1p5c75dcbhcc90chwzhsk5sk86x3i2ipz6krrqrkx0zx7ykbf94m"; + version = "1.2.0.1"; + sha256 = "13zfai1r8wvs2gxh6adp5pcnrk0480fx7kp8gwarv68x4hmf0jph"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From ec56583a11578fdf9f603b9104cc3ccd4eaafecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Nov 2012 17:30:21 +0100 Subject: [PATCH 027/249] haskell-lens: the haddock documentation has been fixed --- pkgs/development/libraries/haskell/lens/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index c1de91811320..8e853147a31a 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,7 +12,6 @@ cabal.mkDerivation (self: { parallel semigroups split text transformers unorderedContainers vector ]; - noHaddock = true; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; From 8fd7d5a5fedc7f9b6eda92120cd24c424b0f7bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 22 Nov 2012 23:10:25 +0100 Subject: [PATCH 028/249] pylint: update download URL --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 761f63d4be6d..b864737d1635 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1999,7 +1999,7 @@ let pythonPackages = python.modules // rec { namePrefix = ""; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz"; + url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; }; From 85a33507ea5c5f831d5bf0fcf961fa7de618215b Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 03:38:13 +0100 Subject: [PATCH 029/249] Add GROMACS v4.5.5 --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ++++++++++++++++++ .../molecular-dynamics/gromacs/default.nix | 2 ++ .../molecular-dynamics/gromacs/meta.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +++++++++++ 4 files changed, 70 insertions(+) create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/default.nix create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix new file mode 100644 index 000000000000..0cb9b4c2c65c --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix @@ -0,0 +1,26 @@ + +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + inherit meta; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix new file mode 100644 index 000000000000..ac5628bcdf87 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -0,0 +1,2 @@ + +import ./4.5.5.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix new file mode 100644 index 000000000000..fa6a041f7195 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix @@ -0,0 +1,27 @@ + + + +meta = { + homepage = "www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: www.gromacs.org/About_Gromacs + ''; +}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede3e1eb1759..97f3538d10d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8661,6 +8661,21 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + + ### SCIENCE/MOLECULAR-DYNAMICS + + gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = true; + fftw = fftwSinglePrec; + cmake = cmakeCurses; + }; + + gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + singlePrec = false; + fftw = fftw; + cmake = cmakeCurses; + }; + ### SCIENCE/LOGIC coq = callPackage ../applications/science/logic/coq { From 880ce8da2ebc93842169503db326eb773078c189 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 11:10:30 +0100 Subject: [PATCH 030/249] nxml-mode: Remove This package is now part of Emacs itself. --- pkgs/applications/editors/emacs-modes/nxml/builder.sh | 7 ------- pkgs/applications/editors/emacs-modes/nxml/default.nix | 8 -------- pkgs/top-level/all-packages.nix | 6 ++---- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/nxml/builder.sh delete mode 100644 pkgs/applications/editors/emacs-modes/nxml/default.nix diff --git a/pkgs/applications/editors/emacs-modes/nxml/builder.sh b/pkgs/applications/editors/emacs-modes/nxml/builder.sh deleted file mode 100644 index d2393362ebb6..000000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/emacs/site-lisp -cd $out/emacs/site-lisp -tar xvfz $src -mv nxml-mode-*/* . -rmdir nxml-mode-* diff --git a/pkgs/applications/editors/emacs-modes/nxml/default.nix b/pkgs/applications/editors/emacs-modes/nxml/default.nix deleted file mode 100644 index c8d441475c85..000000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "nxml-mode-20041004"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz; - md5 = "ac137024cf337d6f11d8ab278d39b4db"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede3e1eb1759..4bdf9f47d140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6900,8 +6900,6 @@ let notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; - nxml = callPackage ../applications/editors/emacs-modes/nxml { }; - # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); @@ -6916,8 +6914,8 @@ let proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { texLive = pkgs.texLiveAggregationFun { - paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; - }; + paths = [ pkgs.texLive pkgs.texLiveCMSuper ]; + }; }; quack = callPackage ../applications/editors/emacs-modes/quack { }; From e31cd88d9ed83f38fe7a17d8421817afa5f48595 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 11:11:01 +0100 Subject: [PATCH 031/249] nvidia-x11: Update to 310.19 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 12 +++++------- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index ace9d50cdeec..124c8955e26d 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -28,8 +28,8 @@ installPhase() { # Install libGL and friends. mkdir -p $out/lib - cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/ - + cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau_nvidia* tls $out/lib/ + ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1 ln -snf libGL.so.$versionNumber $out/lib/libGL.so @@ -37,18 +37,16 @@ installPhase() { ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 - ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 ln -snf libcuda.so.1 $out/lib/libcuda.so ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - + if test -z "$libsOnly"; then - + # Install the kernel module. mkdir -p $out/lib/modules/$kernelVersion/misc cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc @@ -74,7 +72,7 @@ installPhase() { patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done - + # Header files etc. mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9a6a23500beb..5583d123cfec 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.60"; in +let versionNumber = "310.19"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0h64wxivh4kmqqhyklvkfwy9nxddqhc0whrw1skpczyjblr2ranr"; + sha256 = "0bqcg2zlp42msz1pghrpmjy6bw1abm6xxh129m8pz80ydb085l45"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1jkgvpd7c760bn34zvq6iinidmbmn70ymh635c3sy9nnx2gr2f7m"; + sha256 = "0wjwm8m6hakr22xn2fm59abr1by65p987h7jgaa8q5zvmzgrxd87"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 410b72e8070e0de87249d928d25774fbf27e5d8d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 23 Nov 2012 14:20:48 +0100 Subject: [PATCH 032/249] Add jsontool 5.1.1 (node.js package) --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 291108c3f6d9..907f747ef7e2 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -494,6 +494,19 @@ let self = { ]; }; + "jsontool" = self."jsontool-*"; + + "jsontool-*" = self.buildNodePackage rec { + name = "jsontool-5.1.1"; + src = fetchurl { + url = "http://registry.npmjs.org/jsontool/-/${name}.tgz"; + sha256 = "f7c12a0de635905f8134dfc8385f237135494d8c99fc0a5f112ee9735c2b6d05"; + }; + deps = [ + + ]; + }; + "knox" = self."knox-*"; "knox-*" = self.buildNodePackage rec { From 28801904912c796e5fde9b541260b9c9e00ead82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 23 Nov 2012 15:04:21 +0100 Subject: [PATCH 033/249] valgrind: updating to bugfix release 3.8.1 --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a5042ffc7d46..c437d171aa91 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { - name = "valgrind-3.8.0"; + name = "valgrind-3.8.1"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px"; + sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7"; }; # Perl is needed for `cg_annotate'. From 7bdcb521b27b460c3c1a8fac327bffae3f72be7a Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:29:17 +0100 Subject: [PATCH 034/249] Update based on comments to pull request --- .../molecular-dynamics/gromacs/4.5.5.nix | 26 ---------- .../molecular-dynamics/gromacs/default.nix | 49 ++++++++++++++++++- .../molecular-dynamics/gromacs/meta.nix | 27 ---------- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 50 insertions(+), 56 deletions(-) delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix delete mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/meta.nix diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix b/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix deleted file mode 100644 index 0cb9b4c2c65c..000000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/4.5.5.nix +++ /dev/null @@ -1,26 +0,0 @@ - -{ stdenv, fetchurl, cmake, - singlePrec ? true, - fftw -}: - - -let meta = import ./meta.nix; -in - -stdenv.mkDerivation { - name = "gromacs-4.5.5"; - - src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; - }; - - buildInputs = [cmake fftw]; - - cmakeFlags = '' - ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} - ''; - - inherit meta; -} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ac5628bcdf87..d6fe326a9d17 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,2 +1,49 @@ -import ./4.5.5.nix +{ stdenv, fetchurl, cmake, + singlePrec ? true, + fftw +}: + + +let meta = import ./meta.nix; +in + +stdenv.mkDerivation { + name = "gromacs-4.5.5"; + + src = fetchurl { + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; + md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + }; + + buildInputs = [cmake fftw]; + + cmakeFlags = '' + ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} + ''; + + meta = { + homepage = "http://www.gromacs.org"; + licence = "GPLv2"; + description = "The GROMACS molecular dynamics software package"; + longDescription = '' + GROMACS is a versatile package to perform molecular dynamics, + i.e. simulate the Newtonian equations of motion for systems + with hundreds to millions of particles. + + It is primarily designed for biochemical molecules like + proteins, lipids and nucleic acids that have a lot of + complicated bonded interactions, but since GROMACS is + extremely fast at calculating the nonbonded interactions (that + usually dominate simulations) many groups are also using it + for research on non-biological systems, e.g. polymers. + + GROMACS supports all the usual algorithms you expect from a + modern molecular dynamics implementation, (check the online + reference or manual for details), but there are also quite a + few features that make it stand out from the competition. + + See: http://www.gromacs.org/About_Gromacs for details. + ''; + }; +} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix b/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix deleted file mode 100644 index fa6a041f7195..000000000000 --- a/pkgs/applications/science/molecular-dynamics/gromacs/meta.nix +++ /dev/null @@ -1,27 +0,0 @@ - - - -meta = { - homepage = "www.gromacs.org"; - licence = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; - longDescription = '' - GROMACS is a versatile package to perform molecular dynamics, - i.e. simulate the Newtonian equations of motion for systems - with hundreds to millions of particles. - - It is primarily designed for biochemical molecules like - proteins, lipids and nucleic acids that have a lot of - complicated bonded interactions, but since GROMACS is - extremely fast at calculating the nonbonded interactions (that - usually dominate simulations) many groups are also using it - for research on non-biological systems, e.g. polymers. - - GROMACS supports all the usual algorithms you expect from a - modern molecular dynamics implementation, (check the online - reference or manual for details), but there are also quite a - few features that make it stand out from the competition. - - See: www.gromacs.org/About_Gromacs - ''; -}; \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78dc5c8776eb..342b7e7af9cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8668,11 +8668,11 @@ let cmake = cmakeCurses; }; - gromacsDouble = callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = false; fftw = fftw; cmake = cmakeCurses; - }; + }); ### SCIENCE/LOGIC From cba15c96f6813c6c15961236602619fab67ca1ed Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:45:19 +0100 Subject: [PATCH 035/249] fix skipped indentation --- .../applications/science/molecular-dynamics/gromacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d6fe326a9d17..ea4855e26d76 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { reference or manual for details), but there are also quite a few features that make it stand out from the competition. - See: http://www.gromacs.org/About_Gromacs for details. + See: http://www.gromacs.org/About_Gromacs for details. ''; }; } From 06c522f7391df7ea8e8707f1f15af18300d287a1 Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Fri, 23 Nov 2012 15:46:49 +0100 Subject: [PATCH 036/249] remove reference to meta.nix --- .../science/molecular-dynamics/gromacs/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index ea4855e26d76..c687fd5908c4 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -5,9 +5,6 @@ }: -let meta = import ./meta.nix; -in - stdenv.mkDerivation { name = "gromacs-4.5.5"; From c9baa28fef45b247614d664d4e4a26cdde1fd424 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 14:05:42 +0100 Subject: [PATCH 037/249] Remove Firefox 15 --- .../networking/browsers/firefox/15.0.nix | 179 ------------------ pkgs/top-level/all-packages.nix | 7 - pkgs/top-level/release.nix | 1 - 3 files changed, 187 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/15.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix deleted file mode 100644 index cb79f4422eb7..000000000000 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ /dev/null @@ -1,179 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "15.0.1"; - - xulVersion = "15.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # disabled for the moment because our Cairo is too old - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - preConfigure = - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - #installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - rm xulrunner - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip pysqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - makeFlags = [ - "SYSTEM_LIBXUL=1" - ]; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bdf9f47d140..0110f4bfa591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7029,13 +7029,6 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; - - firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; }); - firefox16Pkgs = callPackage ../applications/networking/browsers/firefox/16.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index caf5bd8aafaf..1f65b22abf60 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -354,7 +354,6 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox15Pkgs.firefox = linux; firefox16Pkgs.firefox = linux; gnome = { From d4e3064669f1f79023cb8fcfc171f654aff1eb16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 15:57:02 +0100 Subject: [PATCH 038/249] firefox: Add 17.0 --- .../networking/browsers/firefox/17.0.nix | 185 ++++++++++++++++++ pkgs/development/libraries/nspr/default.nix | 4 +- pkgs/top-level/all-packages.nix | 7 + pkgs/top-level/release.nix | 1 + 4 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/17.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/17.0.nix b/pkgs/applications/networking/browsers/firefox/17.0.nix new file mode 100644 index 000000000000..30cd54b9d43d --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/17.0.nix @@ -0,0 +1,185 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "17.0"; + + xulVersion = "17.0"; # this attribute is used by other packages + + + src = fetchurl { + urls = [ + # It is better to use this url for official releases, to take load off Mozilla's ftp server. + "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + # Fall back to this url for versions not available at releases.mozilla.org. + "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + ]; + sha1 = "4f5f175c1662d67f70e78403607d8eda600efd8b"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + #"--enable-profiling" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 77003961fd92..928e9723e081 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.9.3"; in +let version = "4.9.4"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1igkfb7dm3fd59swa5m961rgc53z98l3jadk42c4yy76b85z78ww"; + sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l"; }; preConfigure = "cd mozilla/nsprpub"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0110f4bfa591..eb6876ff61f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7036,6 +7036,13 @@ let firefox16Wrapper = lowPrio (wrapFirefox { browser = firefox16Pkgs.firefox; }); + firefox17Pkgs = callPackage ../applications/networking/browsers/firefox/17.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 1f65b22abf60..b09deca1350c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -355,6 +355,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox16Pkgs.firefox = linux; + firefox17Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 9ba89899d5e22e5f11a9d2081bb420d9fefca9f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 16:28:32 +0100 Subject: [PATCH 039/249] thunderbird: Update to 17.0 --- .../networking/mailreaders/thunderbird/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1d5bcfa5b9bb..a1fc52337edc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "16.0.2"; in +let version = "17.0"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; + sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8"; }; enableParallelBuilding = true; @@ -50,6 +50,7 @@ stdenv.mkDerivation { "--disable-webm" "--disable-tests" "--enable-calendar" + "--disable-ogg" ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; From 148f8d2c21387f9561c4a0e0cf9927bacee9eb5a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 16:40:37 +0100 Subject: [PATCH 040/249] nano: Update to 2.2.6 Also enable all features that were disabled (mouse support!). This adds a whopping 48 KB to the binary. --- pkgs/applications/editors/nano/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 974ced7d2b18..15cdadb04f53 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -2,27 +2,16 @@ stdenv.mkDerivation (rec { pname = "nano"; - version = "2.2.3"; + version = "2.2.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2"; + sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"; }; - + buildInputs = [ ncurses gettext ]; - - configureFlags = '' - --disable-browser - --disable-help - --disable-justify - --disable-mouse - --disable-operatingdir - --disable-speller - --disable-tabcomp - --disable-wrapping - ''; meta = { homepage = http://www.nano-editor.org/; From ef51f327fe3fcc78055ae700e077ae67d86704f2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 23 Nov 2012 19:59:19 +0100 Subject: [PATCH 041/249] nxml-mode: remove from release as well --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 3201afb44a05..4098086c2f77 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -217,6 +217,5 @@ with (import ./release-lib.nix); ecb = linux; emacsw3m = linux; emms = linux; - nxml = all; }; } )) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b09deca1350c..98de86369c55 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -346,7 +346,6 @@ with (import ./release-lib.nix); ecb = linux; emacsw3m = linux; emms = linux; - nxml = all; }; emacs23Packages = emacs22Packages // { From 0dc8926b06bfc433417811edd28e472bf18d4814 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Fri, 23 Nov 2012 22:31:51 +0300 Subject: [PATCH 042/249] applications/networking/instant-messengers/mcabber: Updated to 0.10.1. --- .../instant-messengers/mcabber/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index dd5a3dc8b9ee..cae0213c6be2 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: stdenv.mkDerivation { - name = "mcabber-0.9.9"; + name = "mcabber-0.10.1"; src = fetchurl { - url = http://mirror.mcabber.com/files/mcabber-0.9.9.tar.bz2; - sha256 = "2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1"; + url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2"; + sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; }; - meta = { homepage = "http://mirror.mcabber.com/"; + meta = { homepage = "http://mcabber.com/"; description = "Small Jabber console client"; }; - buildInputs = [openssl ncurses pkgconfig glib]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth]; configureFlags = "--with-openssl=${openssl}"; } From 0bf71add7818e885a0cbf93f3b853a7a57a57d56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 21:31:23 +0100 Subject: [PATCH 043/249] sane-backends: update snapshot to version: 1.0.22.git20121123 --- pkgs/misc/sane-backends/snapshot.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix index 636ae37ec05b..8b74db5df44d 100644 --- a/pkgs/misc/sane-backends/snapshot.nix +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null -, gt68xxFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: let - firmware = gt68xxFirmware {inherit fetchurl;}; + firmware = gt68xxFirmware { inherit fetchurl; }; in -assert hotplugSupport -> stdenv.system == "i686-linux"; +assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.22.git201111204"; - + name = "sane-backends-1.0.22.git20121123"; + src = fetchurl { - url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz; - sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47"; + url = "http://www.sane-project.org/snapshots/sane-backends-git20121123.tar.gz"; + sha256 = "d13a8c9e85af52f7be2e45c70cb93a76ec04b76e7fc983809e7d70389b6e7ae5"; }; - + udevSupport = hotplugSupport; buildInputs = if libusb != null then [libusb] else []; @@ -26,7 +25,7 @@ stdenv.mkDerivation { ''; preInstall = - if gt68xxFirmware != null then + if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name else ""; From 6287f78dcff446228e2e8ed874fe64d9ddfc8855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 22:18:36 +0100 Subject: [PATCH 044/249] gocr: update to version 0.49 --- pkgs/applications/graphics/gocr/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4b2ebceda47e..ec0f9ef835cf 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,14 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gocr-0.44"; + name = "gocr-0.49"; src = fetchurl { - url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; - sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0"; + url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; meta = { + homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 0a6914a1ffdcde487460f54508409384d09c340a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 22:22:52 +0100 Subject: [PATCH 045/249] gocr: fix path to 'wish' in gocr.tcl --- pkgs/applications/graphics/gocr/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index ec0f9ef835cf..0e8f860c5101 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, tk }: stdenv.mkDerivation rec { name = "gocr-0.49"; @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; + postInstall = '' + sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl + ''; + meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; From 3667144395e8f3e1a1acd47b5c5af5859bcb3ff5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 23:20:55 +0100 Subject: [PATCH 046/249] xsane: build with snapshot version of the sane backends The last release of that code is ancient. Not sure what these SANE guys are doing. Anyway, the current Git snapshot works just fine for me. --- 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 eb6876ff61f0..d0e862c5f405 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9067,6 +9067,7 @@ let xsane = callPackage ../misc/xsane { libpng = libpng12; + saneBackends = saneBackendsSnapshot; }; yafc = callPackage ../applications/networking/yafc { }; From 4199b9e80a0cbdfba039e4fa311035e6bbdeb8ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Nov 2012 23:21:15 +0100 Subject: [PATCH 047/249] all-packages.nix: strip trailing whitespace --- 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 d0e862c5f405..2a7200498489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6563,7 +6563,7 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - abcde = callPackage ../applications/audio/abcde { + abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; }; From d50712e376c2b01a6c2771f19206a11e7e8715ca Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 25 Nov 2012 13:00:12 +0100 Subject: [PATCH 048/249] Add despotify --- .../libraries/despotify/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/despotify/default.nix diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix new file mode 100644 index 000000000000..13732d34e093 --- /dev/null +++ b/pkgs/development/libraries/despotify/default.nix @@ -0,0 +1,34 @@ +{ + stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, + libtool, ncurses, glibc +}: + +stdenv.mkDerivation rec { + + name = "despotify"; + + src = fetchsvn { + url = "https://despotify.svn.sourceforge.net/svnroot/despotify"; + rev = "521"; + }; + + buildInputs = [ + openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc + ]; + + configurePhase = "cd src"; + + installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install"; + + meta = { + description = "Open source Spotify client and library"; + longDescription = '' + despotify is a open source implementation of the Spotify API. This + package provides both a library and a few already quite useful, + proof-of-concept clients. + ''; + homepage = "http://despotify.se"; + license = stdenv.lib.licenses.bsd2; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a7200498489..30f6d5ab1a88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -614,6 +614,8 @@ let desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; + despotify = callPackage ../development/libraries/despotify { }; + dev86 = callPackage ../development/compilers/dev86 { /* Using GNU Make 3.82 leads to this: make[4]: *** No rule to make target `__ldivmod.o)' From ee6f7e294eaa5c907e57a7c9079d8008645d0de3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:55:54 +0100 Subject: [PATCH 049/249] zathura: Update to 0.2.1 (also update plugins to latest) --- pkgs/applications/misc/girara/default.nix | 4 ++-- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/default.nix | 2 +- pkgs/applications/misc/zathura/djvu/default.nix | 4 ++-- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++-- pkgs/applications/misc/zathura/ps/default.nix | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 2fa36b33eb06..73db728b1a63 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.1.2"; + name = "girara-0.1.4"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 0c58965fc19f..6c3ff038c74a 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.2.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef"; + sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790"; }; buildInputs = [ pkgconfig gtk girara gettext ]; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index b5ba4f9ada75..5ed445b6984d 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -13,7 +13,7 @@ rec { zathuraWrapper = stdenv.mkDerivation rec { - name = "zathura-0.1.2"; + name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ zathura_pdf_poppler diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c4656e732364..bddb3471bfe6 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.1.1"; + name = "zathura-djvu-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172"; + sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 17e00b4e6220..e0fcb0573a48 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: stdenv.mkDerivation rec { - name = "zathura-pdf-poppler-0.1.1"; + name = "zathura-pdf-poppler-0.2.1"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7"; + sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd"; }; buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index ae9aeee7715e..7f70eb952e11 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.1.0"; + name = "zathura-ps-0.2.0"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789"; + sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414"; }; buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ]; From b47b2e4f0b98172891f2fedc3234b3952eb7018d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:57:58 +0100 Subject: [PATCH 050/249] notmuch: sha256 was wrong --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c518f0430ff3..9d7126452c9a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9"; + sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; From d9e097875c89a0fe958e85806ccfa1a660a386e0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:58:25 +0100 Subject: [PATCH 051/249] pythonPackages.flake8: Update to 1.6.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b864737d1635..cfccd5b803e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.5"; + name = "flake8-1.6.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "525be5c7fcaf85f6819c77752cb2ee72"; + md5 = "abfdbb25d37c28e9da05f1b5c3596d1a"; }; doCheck = false; From 61d6ab05c506fd5b74ec1ed924ea11ab8d38204e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 18:59:38 +0100 Subject: [PATCH 052/249] boost: wrong unpacking command --- pkgs/development/libraries/boost/1.52-headers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix index b89273fdd305..72a4b419f2d5 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost ''; meta = { From fdf3ff7a21c5d0b5c45bc889ea1d3a33f9b48c7b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Nov 2012 19:20:06 +0100 Subject: [PATCH 053/249] pythonPackages.turses: update to 0.2.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfccd5b803e7..ddd25ad03b2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2774,11 +2774,11 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.8"; + name = "turses-0.2.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "fbbc0ca93324535bcafa8434395caded8047e40c25d7a4004806415dd6ca023f"; + sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ]; From f8f54dc8d358963deaf1521f68d2c3d01fb6d664 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:57:49 +0400 Subject: [PATCH 054/249] Allow to skip more options to update-walker in simple cases. Now just an URL can work if everything is set up in default way --- .../upstream-updater/update-walker.sh | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index ce0e1403f2ed..78c61dd2b82a 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -3,6 +3,7 @@ own_dir="$(cd "$(dirname "$0")"; pwd)" CURRENT_URL= +NEED_TO_CHOOSE_URL=1 url () { CURRENT_URL="$1" @@ -45,12 +46,14 @@ matching_links () { link () { CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked by: $*" echo "URL: $CURRENT_URL" >&2 } version_link () { CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" + unset NEED_TO_CHOOSE_URL echo "Linked version by: $*" echo "URL: $CURRENT_URL" >&2 } @@ -86,6 +89,23 @@ ensure_target () { [ -z "$CURRENT_TARGET" ] && target default.nix } +ensure_name () { + [ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")" + echo "Resulting name: $CURRENT_NAME" +} + +ensure_choice () { + [ -n "NEED_TO_CHOOSE_URL" ] && { + version_link '[.]tar[.]([^./])+$' + unset NEED_TO_CHOOSE_URL + } + [ -z "$CURRENT_URL" ] && { + echo "Error: empty CURRENT_URL" + echo "Error: empty CURRENT_URL" >&2 + exit 1 + } +} + hash () { CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")" } @@ -183,9 +203,11 @@ do_overwrite () { process_config () { CONFIG_DIR="$(directory_of "$1")" - source "$CONFIG_DIR/$(basename "$1")" BEGIN_EXPRESSION='# Generated upstream information'; + source "$CONFIG_DIR/$(basename "$1")" + ensure_name retrieve_version + ensure_choice ensure_version ensure_target update_found && do_overwrite "$CURRENT_TARGET" From 7333c01dbab997ba1fbedcf48e394e597383e64d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Nov 2012 23:58:04 +0400 Subject: [PATCH 055/249] Update Compiz --- .../window-managers/compiz/bcop.nix | 17 ------ .../window-managers/compiz/ccsm.nix | 31 ---------- .../window-managers/compiz/config-python.nix | 20 ------- .../window-managers/compiz/core.nix | 40 ------------- .../window-managers/compiz/default.nix | 51 ++++++++++++++++ .../window-managers/compiz/default.upstream | 1 + .../compiz/gdk-deprecated.patch | 14 ----- .../compiz/libcompizconfig.nix | 22 ------- .../compiz/plugindir-core.patch | 39 ------------- .../compiz/plugindir-libcompizconfig.patch | 39 ------------- .../window-managers/compiz/plugins-extra.nix | 30 ---------- .../window-managers/compiz/plugins-main.nix | 22 ------- .../compiz/wallpaper-maxpect.patch | 58 ------------------- .../tools/misc/intltool/default.nix | 30 ++++++++++ .../tools/misc/intltool/default.upstream | 1 + pkgs/top-level/all-packages.nix | 18 ++---- 16 files changed, 88 insertions(+), 345 deletions(-) delete mode 100644 pkgs/applications/window-managers/compiz/bcop.nix delete mode 100644 pkgs/applications/window-managers/compiz/ccsm.nix delete mode 100644 pkgs/applications/window-managers/compiz/config-python.nix delete mode 100644 pkgs/applications/window-managers/compiz/core.nix create mode 100644 pkgs/applications/window-managers/compiz/default.nix create mode 100644 pkgs/applications/window-managers/compiz/default.upstream delete mode 100644 pkgs/applications/window-managers/compiz/gdk-deprecated.patch delete mode 100644 pkgs/applications/window-managers/compiz/libcompizconfig.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-core.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch delete mode 100644 pkgs/applications/window-managers/compiz/plugins-extra.nix delete mode 100644 pkgs/applications/window-managers/compiz/plugins-main.nix delete mode 100644 pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch create mode 100644 pkgs/development/tools/misc/intltool/default.nix create mode 100644 pkgs/development/tools/misc/intltool/default.upstream diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix deleted file mode 100644 index 254393d4c7fc..000000000000 --- a/pkgs/applications/window-managers/compiz/bcop.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxslt }: - -stdenv.mkDerivation rec { - name = "compiz-bcop-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2"; - sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk"; - }; - - buildInputs = [ pkgconfig libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Code generator for Compiz plugins"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix deleted file mode 100644 index 0406a170d190..000000000000 --- a/pkgs/applications/window-managers/compiz/ccsm.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, intltool, gtk -, python, pygtk, pygobject, pycairo, compizconfig_python }: - -stdenv.mkDerivation rec { - name = "ccsm-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2"; - sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6"; - }; - - buildInputs = [ makeWrapper python intltool gtk ]; - - buildPhase = "python setup.py build --prefix=$out"; - - pythonDeps = [ pygtk pygobject pycairo compizconfig_python ]; - - installPhase = - '' - python setup.py install --prefix=$out - - wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \ - "$(toPythonPath "$pythonDeps $out")" - ''; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz settings manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix deleted file mode 100644 index 4de7fb41a488..000000000000 --- a/pkgs/applications/window-managers/compiz/config-python.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib -, python, pyrex }: - -stdenv.mkDerivation rec { - name = "compizconfig-python-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2"; - sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37"; - }; - - buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ]; - - NIX_LDFLAGS = "-lcompizconfig"; - - meta = { - homepage = http://www.compiz.org/; - description = "Python interface to the Compiz configuration"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix deleted file mode 100644 index d4a5b79b7fb3..000000000000 --- a/pkgs/applications/window-managers/compiz/core.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt -, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }: - -let version = "0.8.6"; in - -stdenv.mkDerivation { - name = "compiz-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2"; - sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4"; - }; - - patches = - [ # Allow the path to the Compiz plugin library and metadata - # directories to be overriden through $COMPIZ_PLUGINDIR and - # $COMPIZ_METADATADIR, respectively. - ./plugindir-core.patch - - # Fix compilation with recent GTK versions. - ./gdk-deprecated.patch - ]; - - buildInputs = - [ intltool pkgconfig libpng glib - gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2 - ]; - - propagatedBuildInputs = - [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender - xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama - libstartup_notification mesa libxml2 libxslt - ]; - - meta = { - homepage = http://www.compiz.org/; - description = "A compositing window manager"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix new file mode 100644 index 000000000000..63a1894f9b6b --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, cmake, pkgconfig +, libXrender, renderproto, gtk, libwnck, pango, cairo +, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm +, libstartup_notification, libpthreadstubs, libxcb, intltool +, ORBit2, libXau +, dbus, dbus_glib, librsvg, mesa +, libXdmcp, libnotify, python +, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus +, xdg_utils +, gettext, boost, pyrex +}: +let + s = # Generated upstream information + rec { + baseName="compiz"; + version="0.9.8.6"; + name="compiz-0.9.8.6"; + hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; + sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; + }; + buildInputs = [cmake pkgconfig + libXrender renderproto gtk libwnck pango cairo + GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification + libpthreadstubs libxcb intltool + ORBit2 libXau + dbus dbus_glib librsvg mesa + libXdmcp libnotify python + hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus + xdg_utils + gettext boost pyrex + ]; + in +stdenv.mkDerivation rec { + inherit (s) name version; + src = fetchurl { + inherit (s) url sha256; + }; + inherit buildInputs; + + NIX_CFLAGS_COMPILE=" -Wno-error "; + + meta = { + description = "Compoziting window manager"; + homepage = "http://launchpad.net/compiz/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + inherit (s) version; + }; +} diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream new file mode 100644 index 000000000000..b7fc98bd1263 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/default.upstream @@ -0,0 +1 @@ +url https://launchpad.net/compiz/+download diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch deleted file mode 100644 index d80a5514ee9d..000000000000 --- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 -@@ -31,10 +31,6 @@ - #include - #include - --#ifndef GDK_DISABLE_DEPRECATED --#define GDK_DISABLE_DEPRECATED --#endif -- - #ifndef GTK_DISABLE_DEPRECATED - #define GTK_DISABLE_DEPRECATED - #endif diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix deleted file mode 100644 index 51d459e7a366..000000000000 --- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }: - -stdenv.mkDerivation rec { - name = "libcompizconfig-0.8.4"; - - src = fetchurl { - url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2"; - sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1"; - }; - - patches = - [ # See ./core.nix. - ./plugindir-libcompizconfig.patch - ]; - - buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Compiz configuration library"; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch deleted file mode 100644 index 5a242e66088f..000000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-core.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c ---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200 -@@ -146,7 +146,7 @@ - compAddMetadataFromFile (CompMetadata *metadata, - const char *file) - { -- char *home; -+ char *home, *metadatadir; - Bool status = FALSE; - - home = getenv ("HOME"); -@@ -163,7 +163,10 @@ - } - } - -- status |= addMetadataFromFilename (metadata, METADATADIR, file); -+ metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ status |= addMetadataFromFilename (metadata, metadatadir, file); - if (!status) - { - compLogMessage ("core", CompLogLevelWarn, -diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c ---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200 -@@ -579,7 +579,10 @@ - } - } - -- status = (*loaderLoadPlugin) (p, PLUGINDIR, name); -+ plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ -+ status = (*loaderLoadPlugin) (p, plugindir, name); - if (status) - return p; - diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch deleted file mode 100644 index 207816a3c518..000000000000 --- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp ---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200 -+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200 -@@ -3004,7 +3004,10 @@ - } - } - -- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR); -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ -+ loadPluginFromXMLFile (context, xmlName, metadatadir); - free (xmlName); - } - -@@ -3031,7 +3034,10 @@ - free (homeplugins); - } - } -- loadPluginsFromXMLFiles (context, (char *)METADATADIR); -+ -+ char *metadatadir = getenv("COMPIZ_METADATADIR"); -+ if (!metadatadir) metadatadir = METADATADIR; -+ loadPluginsFromXMLFiles (context, metadatadir); - - if (home && strlen (home)) - { -@@ -3043,7 +3049,10 @@ - free (homeplugins); - } - } -- loadPluginsFromName (context, (char *)PLUGINDIR); -+ -+ char *plugindir = getenv("COMPIZ_PLUGINDIR"); -+ if (!plugindir) plugindir = PLUGINDIR; -+ loadPluginsFromName (context, plugindir); - } - - static void diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix deleted file mode 100644 index 8852ebd474ed..000000000000 --- a/pkgs/applications/window-managers/compiz/plugins-extra.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-extra-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1"; - }; - - patches = - [ # Support scaling wallpapers to the maximum size while still - # respecting the aspect ratio. - ./wallpaper-maxpect.patch - ]; - - NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz"; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Extra plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix deleted file mode 100644 index ea1c01e7414b..000000000000 --- a/pkgs/applications/window-managers/compiz/plugins-main.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop -, getopt, libjpeg, cairo, pango, gnome }: - -let version = "0.8.6"; in - -stdenv.mkDerivation rec { - name = "compiz-plugins-main-${version}"; - - src = fetchurl { - url = "http://releases.compiz.org/${version}/${name}.tar.bz2"; - sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36"; - }; - - buildInputs = - [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ]; - - meta = { - homepage = http://www.compiz.org/; - description = "Main plugins for Compiz"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch deleted file mode 100644 index 8130dff1dba4..000000000000 --- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in ---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200 -+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200 -@@ -24,7 +24,7 @@ - <_long>Image position. - int - 0 -- 4 -+ 5 - - 0 - <_name>Scale and Crop -@@ -45,6 +45,10 @@ - 4 - <_name>Center Tiled - -+ -+ 5 -+ <_name>Centered Maxpect -+ - -