diff options
Diffstat (limited to 'pkgs')
39 files changed, 337 insertions, 327 deletions
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 7a1d24844b6..a409ba1f28b 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,23 +2,19 @@ , libxslt, lv2, pkgconfig, premake, xlibs }: let - rev = "7815b3545978e"; + rev = "99efbf0b"; in stdenv.mkDerivation rec { name = "distrho-${rev}"; src = fetchgit { - url = "git://distrho.git.sf.net/gitroot/distrho/distrho"; + url = "https://github.com/falkTX/DISTRHO.git"; inherit rev; - sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844"; + sha256 = "ed26a6edca19ebb8260b3dc042f69c32162e1d91179fb9d22da42ec7131936f9"; }; patchPhase = '' - sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile - sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile - sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \ - -i ports/hybridreverb2/source/SystemConfig.cpp - sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf + sed -e "s#@./scripts#sh scripts#" -i Makefile ''; buildInputs = [ @@ -31,9 +27,6 @@ stdenv.mkDerivation rec { sh ./scripts/premake-update.sh linux make standalone make lv2 - - # generate lv2 ttl - sh scripts/generate-ttl.sh ''; installPhase = '' @@ -41,12 +34,6 @@ stdenv.mkDerivation rec { cp bin/standalone/* $out/bin/ mkdir -p $out/lib/lv2 cp -a bin/lv2/* $out/lib/lv2/ - - # HybridReverb2 data - mkdir -p $out/etc/HybridReverb2 - cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/ - mkdir -p $out/share - cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/ ''; meta = with stdenv.lib; { @@ -55,8 +42,8 @@ stdenv.mkDerivation rec { longDescription = '' Includes: 3BandEQ bitmangler drowaudio-distortion drowaudio-flanger - drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay - TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim + drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter + TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim Wolpertinger argotlunar capsaicin drowaudio-distortionshaper drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index fa201d20c3f..5dd993b0ef8 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ # Fix for building on GCC 4.3. (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; + url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch"; sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; }) ]; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index d81033a5913..1471abe287a 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.1rc1"; + version = "${majorVersion}.1"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2"; - sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv"; + sha256 = "0mm7nvdd85p6b26jwshy2dhicf0b06mb5lrl564i3c5q7jgs1vll"; }; preConfigure = '' diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index 05fb6704d3b..498b0244b87 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -let +let isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; in stdenv.mkDerivation ( { @@ -15,7 +15,12 @@ stdenv.mkDerivation ( { # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841 ./max-long.patch ] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] ); - + + # The test programs stress, randgen, fib, and testsafio all fail with + # segmentation faults when compiled with GCC 4.8.x, and the code itself many + # warnings, complaining "cast from pointer to integer of different size". + # This looks really bad. I leave the test suite enabled, because those issue + # feel too serious to just ignore. doCheck = true; meta = { @@ -23,4 +28,4 @@ stdenv.mkDerivation ( { license = "LGPL"; description = "Library for manipulation of term data structures in C"; }; -} // ( if isMingw then { dontStrip = true; } else {}) ) +} // ( if isMingw then { dontStrip = true; } else {}) ) diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index 16facf73f9f..c1689817dcc 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { extensibleExceptions filepath HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index f9053fa3174..df9f7f5865f 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.2"; - sha256 = "0vn7c569akyabij2bh9myyvnx08w67dwdvx5g5q36b3ixzp0lrg4"; + version = "0.10.3"; + sha256 = "1cglfbkmgbsv3k32vdfg4xk6b5g5c2z8pm0xgbmdb4bbg765lrh6"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index efea0bb0d8a..eca7e52fe90 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,15 +1,15 @@ -{ cabal, cereal, conduit, cryptoApi, cryptocipher, cryptohash -, hspec, skein, transformers +{ cabal, cereal, conduit, cryptoApi, cryptocipher +, cryptohashCryptoapi, hspec, skein, transformers }: cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.0"; - sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92"; + version = "0.5.1"; + sha256 = "04z8z7bipa40xnjr8civ1sj3df2iyvlv929ibkrdqv87gj0qv2dp"; buildDepends = [ cereal conduit cryptoApi transformers ]; testDepends = [ - cereal conduit cryptoApi cryptocipher cryptohash hspec skein - transformers + cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec + skein transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix new file mode 100644 index 00000000000..e21e026080b --- /dev/null +++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, cryptoApi, cryptohash, tagged }: + +cabal.mkDerivation (self: { + pname = "cryptohash-cryptoapi"; + version = "0.1.0"; + sha256 = "06b62ddwx2mp71dzaj8h88vw2c6nv3rj8n6d3d9vmqa7cws3mjkx"; + buildDepends = [ cereal cryptoApi cryptohash tagged ]; + meta = { + homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi"; + description = "Crypto-api interfaces for cryptohash"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 77a1ecd9ff4..1ce1a46fc40 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.8.4"; - sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn"; + version = "0.9.0"; + sha256 = "0ipzrp83pz33qc7gmn9bmhbmc1f0hfvagyfr5bnmhgrh6lgy9s7l"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index ce81a4c6832..4f50ab44950 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -26,6 +26,9 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text time ]; doCheck = false; + patchPhase = '' + sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix index 3a47f2a39c9..8f00f5fb48b 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix @@ -7,7 +7,7 @@ cabal.mkDerivation (self : { pname = "haskell-platform"; version = "2010.2.0.0"; src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz"; sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0"; }; propagatedBuildInputs = [ @@ -21,4 +21,3 @@ cabal.mkDerivation (self : { maintainers = [self.stdenv.lib.maintainers.andres]; }; }) - diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index fec3f5dccf4..b65abe6aa3e 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "hopenssl"; - version = "1.6.1"; - sha256 = "75ba42c5e9b02c09057c5aa25f577bdfe5214533fbd2921ac555897ade85958a"; + version = "1.6.2"; + sha256 = "0b9xdm7jgkadx53vwszjnisyblzsqk99s3zqppgp0iqqf9955s4w"; buildDepends = [ mtl ]; extraLibraries = [ openssl ]; meta = { - homepage = "http://gitorious.org/hopenssl"; + homepage = "http://github.com/peti/hopenssl"; description = "FFI bindings to OpenSSL's EVP digest interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index 3880537e7ea..1d823d6f840 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.5"; - sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; + version = "1.7.6"; + sha256 = "0v4c6ljrzc7680i85wyxq7fkfs2j00941ps3rn8r16x3x2r8di04"; buildDepends = [ mtl parsec ]; testDepends = [ doctest hspec parsec ]; meta = { - homepage = "http://gitorious.org/hsemail"; + homepage = "http://github.com/peti/hsemail"; description = "Internet Message Parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index bd517ababa6..9e2f6188761 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.5.2"; - sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8"; + version = "1.5.3"; + sha256 = "138qjfw3kq87dvmb2ig1nsnrjpyqayvbqrjkmswn0sg8qh5cgbgb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time transformers ]; - doCheck = self.stdenv.system == "x86_64-linux"; + doCheck = false; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; diff --git a/pkgs/development/libraries/haskell/polyparse/1.7.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix deleted file mode 100644 index b27dc9cc695..00000000000 --- a/pkgs/development/libraries/haskell/polyparse/1.7.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, text }: - -cabal.mkDerivation (self: { - pname = "polyparse"; - version = "1.7"; - sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b"; - buildDepends = [ text ]; - meta = { - homepage = "http://code.haskell.org/~malcolm/polyparse/"; - description = "A variety of alternative parser combinator libraries"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/polyparse/1.8.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index a0ee0e199bb..a0ee0e199bb 100644 --- a/pkgs/development/libraries/haskell/polyparse/1.8.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.4.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix deleted file mode 100644 index ab8dc18ad0a..00000000000 --- a/pkgs/development/libraries/haskell/primitive/0.4.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.4.1"; - sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Wrappers for primitive operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/primitive/0.5.nix b/pkgs/development/libraries/haskell/primitive/0.5.nix deleted file mode 100644 index 2a7ce3532d4..00000000000 --- a/pkgs/development/libraries/haskell/primitive/0.5.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.5"; - sha256 = "0m2gv7lac7q24cy02bbc7hq41awjxzs8dcjc6j2nv8xiq14cp3mk"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Primitive memory-related operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index c187854be06..12a48605d03 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.2.1"; - sha256 = "049nn0p236wbm2majkih87n2c7h65xrnf6gydsi7najxccjl7y8z"; + version = "1.1.3"; + sha256 = "091yygp2gfp290m76iwpjddzgn7qjq1h5f8ma8sd3lvy6pv2pzcz"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 4b8a29b6abf..3c300cdea03 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.3.1"; - sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; + version = "1.0.4"; + sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; buildDepends = [ parsec text ]; testDepends = [ hspec parsec text ]; meta = { diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index fef81d92212..2b37be487e6 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "streamproc"; - version = "1.6"; - sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws"; + version = "1.6.2"; + sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; meta = { - homepage = "http://gitorious.org/streamproc"; + homepage = "http://github.com/peti/streamproc"; description = "Stream Processer Arrow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 46a53a88d8a..3b1e5ba0b77 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch?revision=1.1; + url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch"; sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f"; }) ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index f416a7a113e..75792578879 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.0-7899-g34f8464"; + name = "gnulib-0.0-7901-g076ac82"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "34f84640cd015eee3d9aed3b1eddf6f361576890"; - sha256 = "9267827d6b3f0eb97957eae7851afd4e5ac8aa714a83e3be52e7b660cc27851d"; + rev = "076ac82d1d7f4df54630f1b4917b3c14f227f032"; + sha256 = "023q3gqjrs8zdk31d81d3bcv9n5770nns0h5vq31saa5391qbpvn"; }; buildPhase = ":"; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 31cbb94c729..ae7ded65655 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.48"; - sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr"; + version = "1.49"; + sha256 = "1zrxgaw1lqnnyk4xd0skdc72yq3xfx3vfg1sfgrs3235njraa20i"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index ef1e7e781fa..e2f6c693298 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [m4 bison flex gettext bzip2]; buildInputs = [zlib bzip2]; + configureFlags = "--disable-werror"; + crossAttrs = { - /* Having bzip2 will harm, because anything using elfutils + /* Having bzip2 will harm, because anything using elfutils as buildInput cross-building, will not be able to run 'bzip2' */ propagatedBuildInputs = [ zlib.crossDrv ]; @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { cp version.h $out/include ''; }; - + dontAddDisableDepTrack = true; meta = { diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 751941bdfc1..0c7e46ae074 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,56 +1,39 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.57beta8" a; - buildInputs = with a; [ - libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2 - pkgconfig - ]; - -in -rec { +{ stdenv, fetchurl, libX11, xproto, gd, SDL, SDL_image, SDL_mixer, zlib +, libxml2, pkgconfig, curl, cmake, libzip }: + +stdenv.mkDerivation { + name = "openlierox-0.58rc3"; + src = fetchurl { - url = "http://downloads.sourceforge.net/project/openlierox/openlierox/OpenLieroX%200.57%20Beta8/OpenLieroX_0.57_beta8.src.tar.bz2"; - sha256 = "1a3p03bi5v2mca7323mrckab9wsj83fjfcr6akrh9a6nlljcdn8d"; + url = "mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2"; + sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z"; }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doInstall"]; - - setParams = a.noDepEntry ('' - export SYSTEM_DATA_DIR="$out/share" - export BIN_DIR="$out/bin" - export DOC_DIR="$out/share/doc" - export PIXMAP_DIR="$out/share/pixmap" - - export HAWKNL_BUILTIN=1 - export LIBZIP_BUILTIN=1 - export X11=1 - export DEBUG=1 - ''); - - doBuild=a.fullDepEntry ('' - sed -re 's/ -1/ 255 /g' -i *.sh - - source functions.sh - export INCLUDE_PATH=$(echo $NIX_CFLAGS_COMPILE | grep_param -I) - - bash compile.sh - '') ["doUnpack" "addInputs" "setParams"]; - - doInstall = a.fullDepEntry ('' - mkdir -p $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR - bash install.sh - '') ["doBuild" "addInputs" "setParams" "defEnsureDir"]; - - name = "openlierox-" + version; + NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; + + # The breakpad fails to build on x86_64, and it's only to report bugs upstream + cmakeFlags = [ "-DBREAKPAD=0" ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DSYSTEM_DATA_DIR=$out/share" + ''; + + patchPhase = '' + sed -i s,curl/types.h,curl/curl.h, include/HTTP.h src/common/HTTP.cpp + ''; + + installPhase = '' + ensureDir $out/bin $out/share/OpenLieroX + cp bin/* $out/bin + cp -R ../share/gamedir/* $out/share/OpenLieroX + ''; + + buildInputs = [ libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2 + pkgconfig curl cmake libzip ]; + meta = { + homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; - maintainers = [ - ]; + license = "LGPLv2+"; }; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 5c0f48b2901..4ea4152e30d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap"; }; - patches = [ ./vpnc.patch ]; + patches = [ ./vpnc.patch ./no-werror.patch ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/iproute/no-werror.patch b/pkgs/os-specific/linux/iproute/no-werror.patch new file mode 100644 index 00000000000..593b56b8de0 --- /dev/null +++ b/pkgs/os-specific/linux/iproute/no-werror.patch @@ -0,0 +1,12 @@ +diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile +--- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200 ++++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200 +@@ -30,7 +30,7 @@ + HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 +-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes ++WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition + + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 4f68048be67..9aaea16262e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.71"; + version = "3.0.72"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1qavk6kp84h02bs0clhpri148lfj7zdzj7jjy07vw0h48lmj1405"; + sha256 = "17whpcxibn6z1i1zjwx0vim33al9vgjp3jlvmam06qlxrl4i2q6w"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 2223f14b043..b7ae959fa1b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.4.38"; + version = "3.4.39"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1j3389frp98f7l4l4mp1lyw5g1g9yll6fayiyz7dsnx8fkxsga4h"; + sha256 = "16k1ssink1ka3593vgr1nzywc8laag58k0qz4hx0ad0sa0f7kz38"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index d0926f267ea..d69738a25b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -252,7 +252,7 @@ in import ./generic.nix ( rec { - version = "3.8.5"; + version = "3.8.6"; testing = false; preConfigure = '' @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "17w9qprk8ixjc6w0qk2p2jgqfxhmw4b9xss1iar5d9kbrc4nw6qz"; + sha256 = "036i1hx2b49ssymw3xv73dz628n5yxbsngbfvsp4l7ww6brria5g"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index b349ab617ac..22aba3e156f 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -11,7 +11,7 @@ rec { sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4"; }; - configureFlags = ["--enable-ipv6"]; + configureFlags = ["--enable-ipv6" "--disable-strict-error-checking"]; meta = { description = "http-proxy"; @@ -27,7 +27,6 @@ rec { url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2; sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35"; }; - configureFlags = ["--enable-ipv6"]; }; squid32 = squid30.merge rec { @@ -36,7 +35,6 @@ rec { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; }; - configureFlags = ["--enable-ipv6"]; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; }; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 7062053703e..bdc2f832ff3 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -6,26 +6,21 @@ assert par2Support -> par2cmdline != null; with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25git20121224"; + name = "bup-0.25-rc1-107-g96c6fa2"; src = fetchgit { url = "https://github.com/bup/bup.git"; - sha256 = "f0e0c835ab83f00b28920d493e4150d2247113aad3a74385865c2a8c6f1ba7b8"; - rev = "458e92da32ddd3c18fc1c3e52a76e9f0b48b832f"; + rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; - nativeBuildInputs = [ pandoc perl makeWrapper ]; - buildInputs = [ python git ]; - - postInstall = optionalString (elem stdenv.system platforms.linux) '' - wrapProgram $out/bin/bup --prefix PYTHONPATH : \ - ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} - ''; + nativeBuildInputs = [ pandoc perl makeWrapper ]; patchPhase = '' - for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do + substituteInPlace Makefile --replace "-Werror" "" + for f in "cmd/"* "lib/tornado/"* "lib/tornado/test/"* "t/"* wvtest.py main.py; do + test -f $f || continue substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" @@ -33,6 +28,8 @@ stdenv.mkDerivation { substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" ''; + dontAddPrefix = true; + makeFlags = [ "MANDIR=$(out)/share/man" "DOCDIR=$(out)/share/doc/bup" @@ -40,11 +37,20 @@ stdenv.mkDerivation { "LIBDIR=$(out)/lib/bup" ]; + postInstall = optionalString (elem stdenv.system platforms.linux) '' + wrapProgram $out/bin/bup --prefix PYTHONPATH : \ + ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} + ''; + meta = { - description = '' + homepage = "https://github.com/bup/bup"; + description = "efficient file backup system based on the git packfile format"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images. ''; - homepage = "https://github.com/bup/bup"; }; } diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a187dd9d6b2..4f4931e004f 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; - + src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; md5 = "cd3f3eb54446be6003156158d51f4884"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { # shell. KDE uses this to allow rebooting into a non-default # entry. (fetchurl { - url = http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/grub/grub-0.97-once.patch?revision=1.3; + url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch"; sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8"; }) - + ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # Autoconf/automake required for the splashimage patch. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aa676fe9af..d1f9449f57a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4734,11 +4734,7 @@ let openldap = callPackage ../development/libraries/openldap { }; - openlierox = builderDefsPackage ../games/openlierox { - inherit (xlibs) libX11 xproto; - inherit gd SDL SDL_image SDL_mixer zlib libxml2 - pkgconfig; - }; + openlierox = callPackage ../games/openlierox { }; libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { opensc = opensc_0_11_7; @@ -5561,9 +5557,7 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; - psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { - postgresql = postgresql91; - }; + psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { inherit xmpppy pythonIRClib python makeWrapper; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bdd875f0df5..8933176ac96 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -162,7 +162,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alex = self.alex_3_0_5; # 7.6 ok haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok - primitive = self.primitive_0_5_0_1; # semi-official, but specified + primitive = self.primitive_0_5_0_1; # semi-official, but specified }; haskellPlatformArgs_2012_4_0_0 = self : { @@ -669,6 +669,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {}; + cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; @@ -973,10 +975,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; - graphviz = callPackage ../development/libraries/haskell/graphviz { - fgl = self.fgl_5_4_2_4; - polyparse = self.polyparse_1_7; - }; + graphviz = callPackage ../development/libraries/haskell/graphviz {}; groupoids = callPackage ../development/libraries/haskell/groupoids {}; @@ -1459,14 +1458,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pgm = callPackage ../development/libraries/haskell/pgm {}; - polyparse_1_7 = callPackage ../development/libraries/haskell/polyparse/1.7.nix {}; - polyparse_1_8 = callPackage ../development/libraries/haskell/polyparse/1.8.nix {}; - polyparse = self.polyparse_1_8; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { - postgresql = pkgs.postgresql91; + inherit (pkgs) postgresql; }; postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {}; @@ -1477,8 +1474,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); punycode = callPackage ../development/libraries/haskell/punycode {}; - primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; - primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive = self.primitive_0_5_0_1; @@ -1952,9 +1947,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xdgBasedir = callPackage ../development/libraries/haskell/xdg-basedir {}; - xdot = callPackage ../development/libraries/haskell/xdot { - polyparse = self.polyparse_1_7; - }; + xdot = callPackage ../development/libraries/haskell/xdot {}; xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2856ae88e37..4091ecda584 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1519,7 +1519,7 @@ rec { DBDPg = import ../development/perl-modules/DBD-Pg { inherit stdenv fetchurl buildPerlPackage DBI; - postgresql = pkgs.postgresql92; + inherit (pkgs) postgresql; }; DBFile = import ../development/perl-modules/DB_File { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9bf9a3fabe..b36b8a8362c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21,11 +21,16 @@ pythonPackages = python.modules // rec { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; + } + ../development/python-modules/generic/wrap.sh; # specials + offlineDistutils = import ../development/python-modules/offline-distutils { + inherit (pkgs) stdenv; + inherit python; + }; + recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; @@ -41,11 +46,6 @@ pythonPackages = python.modules // rec { inherit python setuptools; }; - offlineDistutils = import ../development/python-modules/offline-distutils { - inherit (pkgs) stdenv; - inherit python; - }; - # packages defined elsewhere ipython = import ../shells/ipython { @@ -317,51 +317,18 @@ pythonPackages = python.modules // rec { }); awscli = buildPythonPackage rec { - name = "awscli-0.5.0"; + name = "awscli-0.8.3"; namePrefix = ""; src = fetchurl { - url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; - sha256 = "0smgcisl2p7p2y2i299x7g271kdmgs0hnzngw5030phvh0lq202i"; + url = https://github.com/aws/aws-cli/archive/0.8.3.tar.gz; + sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; }; - propagatedBuildInputs = [ argparse botocore ]; + propagatedBuildInputs = [ argparse botocore colorama ]; }; - logilab_astng = buildPythonPackage rec { - name = "logilab-astng-0.24.1"; - - src = fetchurl { - url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; - sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; - }; - - propagatedBuildInputs = [ logilab_common ]; - }; - - - beets = buildPythonPackage rec { - name = "beets-1.0.0"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; - md5 = "88ad09a93aa0d69ce813205cf23b2a6c"; - }; - - # tests depend on $HOME setting - configurePhase = "export HOME=$TMPDIR"; - - propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ]; - - meta = { - homepage = http://beets.radbox.org; - description = "Music tagger and library organizer"; - license = pkgs.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.iElectric ]; - }; - }; - beautifulsoup = buildPythonPackage (rec { name = "beautifulsoup-3.2.1"; @@ -400,6 +367,52 @@ pythonPackages = python.modules // rec { }; }); + + beaker = buildPythonPackage rec { + name = "Beaker-1.6.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; + md5 = "c2e102870ed4c53104dec48ceadf8e9d"; + }; + + buildInputs = [ sqlalchemy pycryptopp nose mock webtest ]; + + # http://hydra.nixos.org/build/4511591/log/raw + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + platforms = stdenv.lib.platforms.all; + }; + }; + + + beets = buildPythonPackage rec { + name = "beets-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; + md5 = "88ad09a93aa0d69ce813205cf23b2a6c"; + }; + + # tests depend on $HOME setting + configurePhase = "export HOME=$TMPDIR"; + + propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ]; + + meta = { + homepage = http://beets.radbox.org; + description = "Music tagger and library organizer"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { name = "boto-1.9b"; @@ -455,14 +468,14 @@ pythonPackages = python.modules // rec { botocore = buildPythonPackage rec { - name = "botocore-0.5.2"; + name = "botocore-0.8.3"; src = fetchurl { - url = https://github.com/boto/botocore/archive/0.5.2.tar.gz; - sha256 = "18073mydin0mwk1d7vdlmsiz3rvhjzxkaaqrmxw440acbipnngq2"; + url = https://github.com/boto/botocore/archive/0.8.3.tar.gz; + sha256 = "0dbm2clrh7zs4brqqj3xssz3nymdg24ff2lww27s3wliirwqdiv1"; }; - propagatedBuildInputs = [ dateutil requests014 ]; + propagatedBuildInputs = [ dateutil requests jmespath ]; meta = { homepage = https://github.com/boto/botocore; @@ -629,6 +642,27 @@ pythonPackages = python.modules // rec { }; }); + + colorama = buildPythonPackage rec { + name = "clientform-0.2.10"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz"; + md5 = "308c6e38917bdbfc4d3b0783c614897d"; + }; + + propagatedBuildInputs = [ clientform ]; + + doCheck = false; + + meta = { + homepage = http://code.google.com/p/colorama/; + license = "bsd"; + description = "Cross-platform colored terminal text"; + }; + }; + + coilmq = buildPythonPackage (rec { name = "coilmq-0.6.1"; @@ -848,6 +882,42 @@ pythonPackages = python.modules // rec { }; + evdev = buildPythonPackage rec { + version = "0.3.2"; + name = "evdev-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; + sha256 = "07gmynz764sln2sq18aafx13yawkv5nkqrkk06rj71sq71fsr9h9"; + }; + + buildInputs = [ pkgs.linuxHeaders ]; + + patchPhase = "sed -e 's#/usr/include/linux/input.h#${pkgs.linuxHeaders}/include/linux/input.h#' -i setup.py"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Provides bindings to the generic input event interface in Linux"; + homepage = http://pythonhosted.org/evdev; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu ]; + }; + }; + + + logilab_astng = buildPythonPackage rec { + name = "logilab-astng-0.24.1"; + + src = fetchurl { + url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; + sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; + }; + + propagatedBuildInputs = [ logilab_common ]; + }; + + peppercorn = buildPythonPackage rec { name = "peppercorn-0.4"; @@ -905,16 +975,15 @@ pythonPackages = python.modules // rec { }; - pyramid_jinja2 = buildPythonPackage rec { - name = "pyramid_jinja2-1.6"; + pyramid_beaker = buildPythonPackage rec { + name = "pyramid_beaker-0.7"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyramid_jinja2/${name}.zip"; - md5 = "b7df1ab97f90f39529d27ba6da1f6b1c"; + url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz"; + md5 = "acb863517a98b90b5f29648ce55dd563"; }; - buildInputs = [ pkgs.unzip webtest ]; - propagatedBuildInputs = [ jinja2 pyramid ]; + propagatedBuildInputs = [ beaker pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -923,15 +992,16 @@ pythonPackages = python.modules // rec { }; - pyramid_beaker = buildPythonPackage rec { - name = "pyramid_beaker-0.7"; + pyramid_jinja2 = buildPythonPackage rec { + name = "pyramid_jinja2-1.6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz"; - md5 = "acb863517a98b90b5f29648ce55dd563"; + url = "http://pypi.python.org/packages/source/p/pyramid_jinja2/${name}.zip"; + md5 = "b7df1ab97f90f39529d27ba6da1f6b1c"; }; - propagatedBuildInputs = [ beaker pyramid ]; + buildInputs = [ pkgs.unzip webtest ]; + propagatedBuildInputs = [ jinja2 pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -940,15 +1010,16 @@ pythonPackages = python.modules // rec { }; - pyramid_tm = buildPythonPackage rec { - name = "pyramid_tm-0.7"; + pyramid_exclog = buildPythonPackage rec { + name = "pyramid_exclog-0.6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz"; - md5 = "6dc917d262c69366630c542bd21859a3"; + url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz"; + md5 = "5c18706f5500605416afff311120c933"; }; - propagatedBuildInputs = [ transaction pyramid ]; + propagatedBuildInputs = [ pyramid ]; + meta = { maintainers = [ stdenv.lib.maintainers.garbas @@ -959,16 +1030,15 @@ pythonPackages = python.modules // rec { }; - pyramid_exclog = buildPythonPackage rec { - name = "pyramid_exclog-0.6"; + pyramid_tm = buildPythonPackage rec { + name = "pyramid_tm-0.7"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz"; - md5 = "5c18706f5500605416afff311120c933"; + url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz"; + md5 = "6dc917d262c69366630c542bd21859a3"; }; - propagatedBuildInputs = [ pyramid ]; - + propagatedBuildInputs = [ transaction pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.garbas @@ -979,19 +1049,14 @@ pythonPackages = python.modules // rec { }; - beaker = buildPythonPackage rec { - name = "Beaker-1.6.4"; + repoze_lru = buildPythonPackage rec { + name = "repoze.lru-0.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; - md5 = "c2e102870ed4c53104dec48ceadf8e9d"; + url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz"; + md5 = "9f6ab7a4ff871ba795cadf56c20fb0f0"; }; - buildInputs = [ sqlalchemy pycryptopp nose mock webtest ]; - - # http://hydra.nixos.org/build/4511591/log/raw - doCheck = false; - meta = { maintainers = [ stdenv.lib.maintainers.garbas @@ -1002,6 +1067,7 @@ pythonPackages = python.modules // rec { }; + repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; @@ -1019,20 +1085,22 @@ pythonPackages = python.modules // rec { }; - repoze_lru = buildPythonPackage rec { - name = "repoze.lru-0.4"; + rtmidi = buildPythonPackage rec { + version = "0.3a"; + name = "rtmidi-${version}"; src = fetchurl { - url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz"; - md5 = "9f6ab7a4ff871ba795cadf56c20fb0f0"; + url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2"; + sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6"; }; - meta = { - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - platforms = stdenv.lib.platforms.all; + buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; + + meta = with stdenv.lib; { + description = "A Python wrapper for the RtMidi C++ library written with Cython"; + homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; }; }; @@ -1840,6 +1908,24 @@ pythonPackages = python.modules // rec { }; + jmespath = buildPythonPackage rec { + name = "jmespath-0.0.1"; + + src = fetchurl { + url = "https://github.com/boto/jmespath/archive/0.0.1.tar.gz"; + sha256 = "1a5d62qbgfjbaw8wgkfh78gairnpy6bbdsygwm1prqwap1kyq6ch"; + }; + + propagatedBuildInputs = [ ply ]; + + meta = { + homepage = "https://github.com/boto/jmespath"; + description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; + license = "BSD"; + }; + }; + + pylast = buildPythonPackage rec { name = "pylast-${version}"; version = "0.5.11"; @@ -2531,11 +2617,11 @@ pythonPackages = python.modules // rec { }) else null; ply = buildPythonPackage (rec { - name = "ply-3.2"; + name = "ply-3.4"; src = fetchurl { url = "http://www.dabeaz.com/ply/${name}.tar.gz"; - sha256 = "10z4xq8lc8c21v4g7z3zpnvpqbc0vidigrck1kqhwgkqi4gh0kfj"; + sha256 = "0sslnbpws847r1j1f41fjpn76w0asywfqgxwzyjrvmmxnw8myhxg"; }; meta = { @@ -3607,20 +3693,6 @@ pythonPackages = python.modules // rec { }; }; - requests014 = buildPythonPackage rec { - name = "requests-0.14.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - md5 = "3de30600072cbc7214ae342d1d08aa46"; - }; - - meta = { - description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; - homepage = http://docs.python-requests.org/en/latest/; - }; - }; - reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.13"; @@ -4307,10 +4379,10 @@ pythonPackages = python.modules // rec { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.8.4"; + name = "virtualenv-1.9.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "1c7e56a7f895b2e71558f96e365ee7a7"; + md5 = "07e09df0adfca0b2d487e39a4bf2270a"; }; patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 516141fa003..88a56a515c4 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -40,7 +40,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; dhcp = linux; diffutils = all; e2fsprogs = linux; - emacs23 = gtkSupported; + emacs24 = gtkSupported; enscript = all; file = all; findutils = all; @@ -202,11 +202,4 @@ with import ./release-lib.nix { inherit supportedSystems; }; tools = linux; }; - emacs23Packages = { - bbdb = linux; - cedet = linux; - ecb = linux; - emacsw3m = linux; - emms = linux; - }; } )) |