From c5bc23a2596d1952623a56218ad991ec91823a0b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 22:21:39 +0000 Subject: [PATCH 001/515] vagrant: add expression --- pkgs/development/tools/vagrant/default.nix | 84 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/tools/vagrant/default.nix diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix new file mode 100644 index 00000000000..64822a08d07 --- /dev/null +++ b/pkgs/development/tools/vagrant/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv +, libxml2, libxslt }: + +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "vagrant-1.3.5"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb; + sha256 = "0wfdz1r6i6acdrqb22n21iijz57ywjh4wd3fggcj65c0dvs0czfv"; + } + else + fetchurl { + url = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_i686.deb; + sha256 = "0dq1ha278mjca1kdhijs6wzs61npvv1knvahnbiihxmhjsx5d9ih"; + }; + + meta = with stdenv.lib; { + description = "A tool for building complete development environments"; + homepage = http://vagrantup.com; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; + }; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x ${src} . + ''; + + buildPhase = false; + + installPhase = '' + sed -i "s|/opt|$out/opt|" usr/bin/vagrant + + # overwrite embedded binaries + + # curl: curl + rm opt/vagrant/embedded/bin/curl + ln -s ${curl}/bin/curl opt/vagrant/embedded/bin + + # libarchive: bsdtar, bsdcpio + rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} + ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin + ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin + + # openssl: c_rehash, openssl + rm opt/vagrant/embedded/bin/{c_rehash,openssl} + ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin + ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin + + # ruby: erb, gem, irb, rake, rdoc, ri, ruby, testrb + rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby,testrb} + ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin + ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin + ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin + ln -s ${rubyLibs.rake}/bin/rake opt/vagrant/embedded/bin + ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin + ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin + ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin + ln -s ${ruby}/bin/testrb opt/vagrant/embedded/bin + + # libiconv: iconv + rm opt/vagrant/embedded/bin/iconv + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + + # libxml: xml2-config, xmlcatalog, xmllint + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} + ln -s ${libxml2}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2}/bin/xmllint opt/vagrant/embedded/bin + + # libxslt: xslt-config, xsltproc + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} + ln -s ${libxslt}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt}/bin/xsltproc opt/vagrant/embedded/bin + + mkdir -p "$out" + cp -r opt "$out" + cp -r usr/bin "$out" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bef1cff60ed..1a567d98cf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3805,6 +3805,8 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; + vagrant = callPackage ../development/tools/vagrant { }; + gdb = callPackage ../development/tools/misc/gdb { hurd = gnu.hurdCross; inherit (gnu) mig; From 3cff0a80149003620405d841d441119a64936e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 5 Nov 2013 23:11:57 +0100 Subject: [PATCH 002/515] ntopng: new package ntopng is a high-speed web-based traffic analysis and flow collection tool. ntopng => ntop next generation. http://www.ntop.org/products/ntop/ --- ...-Undo-weird-modification-of-data_dir.patch | 24 +++++++++ ...ement-to-have-writeable-callback-dir.patch | 29 +++++++++++ pkgs/tools/networking/ntopng/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 106 insertions(+) create mode 100644 pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch create mode 100644 pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch create mode 100644 pkgs/tools/networking/ntopng/default.nix diff --git a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch b/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch new file mode 100644 index 00000000000..8bec643c6e5 --- /dev/null +++ b/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch @@ -0,0 +1,24 @@ +From d0c56a14e0432faca1e9438b84e5e4090d293bb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= +Date: Tue, 3 Dec 2013 20:42:24 +0000 +Subject: [PATCH 1/2] Undo weird modification of data_dir + +--- + Prefs.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Prefs.cpp b/Prefs.cpp +index b4fde5f..ca04ca1 100644 +--- a/Prefs.cpp ++++ b/Prefs.cpp +@@ -408,7 +408,6 @@ int Prefs::checkOptions() { + ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create log %s", path); + } + +- free(data_dir); data_dir = strdup(ntop->get_install_dir()); + docs_dir = ntop->getValidPath(docs_dir); + scripts_dir = ntop->getValidPath(scripts_dir); + callbacks_dir = ntop->getValidPath(callbacks_dir); +-- +1.8.4.3 + diff --git a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch new file mode 100644 index 00000000000..99467c37126 --- /dev/null +++ b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch @@ -0,0 +1,29 @@ +From d77b42003d13e2775be3255a26f380d6ccda8042 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= +Date: Tue, 3 Dec 2013 21:10:06 +0000 +Subject: [PATCH 2/2] Remove requirement to have writeable callback dir + +* ntopng doesn't write anything to the callback dir +* it seems to be a copy-paste leftover error from data_dir a couple of + lines above +--- + Ntop.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Ntop.cpp b/Ntop.cpp +index 2fb027b..0b4881b 100644 +--- a/Ntop.cpp ++++ b/Ntop.cpp +@@ -114,8 +114,7 @@ void Ntop::registerPrefs(Prefs *_prefs) { + } + + if(stat(prefs->get_callbacks_dir(), &statbuf) +- || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */ +- || (!(statbuf.st_mode & S_IWRITE)) /* It's not writable */) { ++ || (!(statbuf.st_mode & S_IFDIR))) { /* It's not a directory */ + ntop->getTrace()->traceEvent(TRACE_ERROR, "Invalid directory %s specified", + prefs->get_callbacks_dir()); + exit(-1); +-- +1.8.4.3 + diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix new file mode 100644 index 00000000000..e4f59a98cf0 --- /dev/null +++ b/pkgs/tools/networking/ntopng/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite +, which }: + +# ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ +# directory. + +stdenv.mkDerivation rec { + name = "ntopng-1.1_6932"; + + src = fetchurl { + url = "mirror://sourceforge/ntop/files/ntopng/${name}.tgz"; + sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr"; + }; + + patches = [ + ./0001-Undo-weird-modification-of-data_dir.patch + ./0002-Remove-requirement-to-have-writeable-callback-dir.patch + ]; + + buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which ]; + + preBuild = '' + sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ + -e "s|/usr/local|$out|g" \ + -e "s|/bin/rm|rm|g" \ + -i Makefile + + sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ + -e "s|/usr/local|$out|g" \ + -e "s|/opt/local|/non-existing-dir|g" \ + -i configure + + sed -e "s|/usr/local|$out|g" \ + -i Ntop.cpp + + sed -e "s|\(#define CONST_DEFAULT_DATA_DIR\).*|\1 \"/var/lib/ntopng\"|g" \ + -e "s|\(#define CONST_DEFAULT_DOCS_DIR\).*|\1 \"$out/share/ntopng/httpdocs\"|g" \ + -e "s|\(#define CONST_DEFAULT_SCRIPTS_DIR\).*|\1 \"$out/share/ntopng/scripts\"|g" \ + -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \ + -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \ + -i ntop_defines.h + ''; + + meta = with stdenv.lib; { + description = "High-speed web-based traffic analysis and flow collection tool"; + homepage = http://www.ntop.org/products/ntop/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db76a4e5506..bd8b06c8c03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1448,6 +1448,8 @@ let ntop = callPackage ../tools/networking/ntop { }; + ntopng = callPackage ../tools/networking/ntopng { }; + ntp = callPackage ../tools/networking/ntp { }; numdiff = callPackage ../tools/text/numdiff { }; From 9474fbae65556933538076709332f11d40234b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 5 Dec 2013 22:21:12 +0100 Subject: [PATCH 003/515] nixos: add ntopng service ntopng is a high-speed web-based traffic analysis and flow collection tool. Enable it by adding this to configuration.nix: services.ntopng.enable = true; Open a browser at http://localhost:3000 and login with the default username/password: admin/admin. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/ntopng.nix | 116 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 nixos/modules/services/networking/ntopng.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 078ea225e16..684850df2ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -170,6 +170,7 @@ ./services/networking/minidlna.nix ./services/networking/nat.nix ./services/networking/networkmanager.nix + ./services/networking/ntopng.nix ./services/networking/ntpd.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix new file mode 100644 index 00000000000..156a6b32a6a --- /dev/null +++ b/nixos/modules/services/networking/ntopng.nix @@ -0,0 +1,116 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + cfg = config.services.ntopng; + redisCfg = config.services.redis; + + configFile = if cfg.configText != "" then + pkgs.writeText "ntopng.conf" '' + ${cfg.configText} + '' + else + pkgs.writeText "ntopng.conf" '' + ${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)} + --http-port=${toString cfg.http-port} + --redis=localhost:${toString redisCfg.port} + ${cfg.extraConfig} + ''; + +in + +{ + + options = { + + services.ntopng = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable ntopng, a high-speed web-based traffic analysis and flow + collection tool. + + With the default configuration, ntopng monitors all network + interfaces and displays its findings at http://localhost:${toString + cfg.http-port}. Default username and password is admin/admin. + + See the ntopng(8) manual page and http://www.ntop.org/products/ntop/ + for more info. + + Note that enabling ntopng will also enable redis (key-value + database server) for persistent data storage. + ''; + }; + + interfaces = mkOption { + default = [ "any" ]; + example = [ "eth0" "wlan0" ]; + type = types.listOf types.str; + description = '' + List of interfaces to monitor. Use "any" to monitor all interfaces. + ''; + }; + + http-port = mkOption { + default = 3000; + type = types.uniq types.int; + description = '' + Sets the HTTP port of the embedded web server. + ''; + }; + + configText = mkOption { + default = ""; + example = '' + --interface=any + --http-port=3000 + --disable-login + ''; + type = types.lines; + description = '' + Overridable configuration file contents to use for ntopng. By + default, use the contents automatically generated by NixOS. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Configuration lines that will be appended to the generated ntopng + configuration file. Note that this mechanism does not work when the + manual option is used. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + # ntopng uses redis for data storage + services.redis.enable = true; + + # nice to have manual page and ntopng command in PATH + environment.systemPackages = [ pkgs.ntopng ]; + + systemd.services.ntopng = { + description = "Ntopng Network Monitor"; + requires = [ "redis.service" ]; + after = [ "network.target" "redis.service" ]; + wantedBy = [ "multi-user.target" ]; + preStart = "mkdir -p /var/lib/ntopng/"; + serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}"; + unitConfig.Documentation = "man:ntopng(8)"; + }; + + # ntopng drops priveleges to user "nobody" and that user is already defined + # in users-groups.nix. + }; + +} From 36cb2af0570889d57364b3b71f5526a536d41485 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Fri, 6 Dec 2013 21:23:03 +0100 Subject: [PATCH 004/515] calibre: upgrade 1.13.0 -> 1.14.0 Signed-off-by: Moritz Ulrich --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 41f4b4f0904..6c007aadd32 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.13.0"; + name = "calibre-1.14.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj"; + sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6"; }; inherit python; From ea20904aefbb7a5bd865abd23b850ccb82e36342 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 12:52:18 +0100 Subject: [PATCH 005/515] cabal: add support for the enableStaticLibrary flag to enable/disable building of static libraries Disabling static libraries is supported only in GHC 7.7 or later. --- pkgs/build-support/cabal/default.nix | 9 +++++++++ pkgs/top-level/haskell-packages.nix | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 9b6d8c4e80e..14bd01c7346 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -4,6 +4,7 @@ , enableLibraryProfiling ? false , enableSharedLibraries ? false , enableSharedExecutables ? false +, enableStaticLibraries ? true , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version }: @@ -25,6 +26,9 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version; # Our GHC 6.10.x builds do not provide sharable versions of their core libraries. assert enableSharedLibraries -> versionOlder "6.12" ghc.version; +# Our GHC 6.10.x builds do not provide sharable versions of their core libraries. +assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; + { mkDerivation = args : # arguments for the individual package, can modify the defaults @@ -128,6 +132,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version; # and run any regression test suites the package might have doCheck = enableCheckPhase; + # pass the '--enable-library-vanilla' flag to cabal in the + # configure stage to enable building shared libraries + inherit enableStaticLibraries; + # pass the '--enable-shared' flag to cabal in the configure # stage to enable building shared libraries inherit enableSharedLibraries; @@ -140,6 +148,7 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version; (enableFeature self.enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature self.enableSharedLibraries "shared") + (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 40446bcd366..87b99ddf5d9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -63,6 +63,7 @@ , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version +, enableStaticLibraries ? true }: # We redefine callPackage to take into account the new scope. The optional @@ -113,10 +114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # packages. It isn't the Cabal library, which is spelled "Cabal". cabal = callPackage ../build-support/cabal { - inherit enableLibraryProfiling; - inherit enableSharedLibraries; - inherit enableSharedExecutables; - inherit enableCheckPhase; + inherit enableLibraryProfiling enableCheckPhase + enableStaticLibraries enableSharedLibraries enableSharedExecutables; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; }; From ebdff3841aa5d2fe145b2ff5074c0a23f2657ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 17 Nov 2013 13:09:01 +0100 Subject: [PATCH 006/515] haskell: Propagate cabal dependencies to user env Before this commit, if a haskell library X depends on Y, and X was added to systemPackages, only X would be available in the user environment. Y would not be avialable, which causes X to be broken. This commit solves the issue by setting propagatedUserEnvPkgs to all packages X depends on when X is a library. --- pkgs/build-support/cabal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 14bd01c7346..b17f720e561 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -46,6 +46,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; x : (removeAttrs x internalAttrs) // { buildInputs = filter (y : ! (y == null)) x.buildInputs; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; + propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; }; @@ -96,6 +97,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; # have to check for its existence propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else []; + # By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because + # GHC also needs all dependencies to be available. + propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else []; + # library directories that have to be added to the Cabal files extraLibDirs = []; From 6b5f1f35fbf68beee4d81556331892e3ba659e3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:57:47 +0100 Subject: [PATCH 007/515] haskell-errorcall-eq-instance: add version 0.1.0 --- .../haskell/errorcall-eq-instance/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix new file mode 100644 index 00000000000..e3bfa5c569e --- /dev/null +++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "errorcall-eq-instance"; + version = "0.1.0"; + sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; + testDepends = [ hspec QuickCheck ]; + meta = { + description = "An orphan Eq instance for ErrorCall"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87b99ddf5d9..af706d02774 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -966,6 +966,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x erf = callPackage ../development/libraries/haskell/erf {}; + errorcallEqInstance = callPackage ../development/libraries/haskell/errorcall-eq-instance {}; + errors = callPackage ../development/libraries/haskell/errors {}; either = callPackage ../development/libraries/haskell/either {}; From 6ea83a9a66a930f98ed7521ad2b05f75f2be520f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:19 +0100 Subject: [PATCH 008/515] haskell-case-insensitive: update to version 1.1.0.2 --- .../haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix} (84%) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix similarity index 84% rename from pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix rename to pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix index 4f63796850a..5fd438e320d 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.1.0.1"; - sha256 = "1hwkdkpr88r3s7c8w1msw1pawz8cfi0lwj1z9dcsp0xs788yzapp"; + version = "1.1.0.2"; + sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af706d02774..a8e563c79cb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_4; attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -686,8 +686,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_2; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; From 1d56cb64a825e38a7448af16cb0b1adc102acae9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:47 +0100 Subject: [PATCH 009/515] haskell-http-client-*: new packages --- .../haskell/http-client-conduit/default.nix | 14 ++++++++++ .../haskell/http-client-multipart/default.nix | 19 +++++++++++++ .../haskell/http-client-tls/default.nix | 17 ++++++++++++ .../libraries/haskell/http-client/default.nix | 27 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++ 5 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/haskell/http-client-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-multipart/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-tls/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client/default.nix diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix new file mode 100644 index 00000000000..df4b49b47f3 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, conduit, httpClient, resourcet, transformers }: + +cabal.mkDerivation (self: { + pname = "http-client-conduit"; + version = "0.2.0.0"; + sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + buildDepends = [ conduit httpClient resourcet transformers ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Frontend support for using http-client with conduit"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix new file mode 100644 index 00000000000..068efdcb543 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, filepath, httpClient, httpTypes, mimeTypes +, random, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "http-client-multipart"; + version = "0.2.0.0"; + sha256 = "1bahkysh771p3mrfan1gmm6jyx62w3k57ba4rsnx7h1gwbilm878"; + buildDepends = [ + blazeBuilder filepath httpClient httpTypes mimeTypes random text + transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Generate multipart uploads for http-client"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix new file mode 100644 index 00000000000..5056a94c5d9 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -0,0 +1,17 @@ +{ cabal, connection, dataDefault, hspec, httpClient, httpTypes +, network, tls +}: + +cabal.mkDerivation (self: { + pname = "http-client-tls"; + version = "0.2.0.0"; + sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + buildDepends = [ connection dataDefault httpClient network tls ]; + testDepends = [ hspec httpClient httpTypes ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the connection package and tls library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix new file mode 100644 index 00000000000..fd40ca88e1d --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -0,0 +1,27 @@ +{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie +, dataDefault, deepseq, failure, hspec, httpTypes, monadControl +, network, publicsuffixlist, text, time, transformers, zlib +, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "http-client"; + version = "0.2.0.1"; + sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + buildDepends = [ + base64Bytestring blazeBuilder caseInsensitive cookie dataDefault + deepseq failure httpTypes network publicsuffixlist text time + transformers zlibBindings + ]; + testDepends = [ + base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq + failure hspec httpTypes monadControl network text time transformers + zlib zlibBindings + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a8e563c79cb..244ca770c5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1222,6 +1222,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; + httpClient = callPackage ../development/libraries/haskell/http-client {}; + + httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {}; + + httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {}; + + httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From 38ff6648470e3e72e400adde61b6a01e863f3603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:59:50 +0100 Subject: [PATCH 010/515] haskell-parsers: update to version 0.10.1.2 --- .../libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix} (83%) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix similarity index 83% rename from pkgs/development/libraries/haskell/parsers/0.10.1.1.nix rename to pkgs/development/libraries/haskell/parsers/0.10.1.2.nix index db79c81a62d..0f9c5f6634e 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.10.1.1"; - sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a"; + version = "0.10.1.2"; + sha256 = "1malfr2ls7f6di2rj2jcyxyqvjz0vb3p3v06j0r9if1bkjfzfp2j"; buildDepends = [ charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 244ca770c5a..6351ea3bcb0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1706,8 +1706,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {}; - parsers = self.parsers_0_10_1_1; + parsers_0_10_1_2 = callPackage ../development/libraries/haskell/parsers/0.10.1.2.nix {}; + parsers = self.parsers_0_10_1_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 375c13622e7c44d504842779e0253096b444a02c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:01:16 +0100 Subject: [PATCH 011/515] haskell-text: update to version 1.0.0.0 --- .../libraries/haskell/text/1.0.0.0.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/text/1.0.0.0.nix diff --git a/pkgs/development/libraries/haskell/text/1.0.0.0.nix b/pkgs/development/libraries/haskell/text/1.0.0.0.nix new file mode 100644 index 00000000000..fe740864970 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/1.0.0.0.nix @@ -0,0 +1,22 @@ +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "text"; + version = "1.0.0.0"; + sha256 = "13i7xn5xl8lc5hcd08i4n0qp9rx51588jnjn4c68gp87vw1gwvjn"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6351ea3bcb0..ed7dddae7f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_0_11_3_1; + text = self.text_1_0_0_0; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; @@ -2155,7 +2155,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text = self.text_0_11_3_1; + text_1_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {}; + text = self.text_1_0_0_0; textFormat = callPackage ../development/libraries/haskell/text-format {}; From 367b119971fad6314b642c41e8ea6d9216439b85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:02:23 +0100 Subject: [PATCH 012/515] haskell-pretty-show: update to version 1.6.2 --- .../libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} | 7 ++++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} (75%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix similarity index 75% rename from pkgs/development/libraries/haskell/pretty-show/1.6.1.nix rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix index dc31b452a1b..ea3b7ed27cb 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix +++ b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix @@ -1,12 +1,13 @@ -{ cabal, filepath, haskellLexer }: +{ cabal, filepath, happy, haskellLexer }: cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.6.1"; - sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0"; + version = "1.6.2"; + sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellLexer ]; + buildTools = [ happy ]; meta = { homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived `Show` instances and generic inspection of values"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed7dddae7f6..f7f2bd9d03b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,8 +1772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {}; - prettyShow = self.prettyShow_1_6_1; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; From 37d68e69a0803050450a70d0bd6e5fba57cb5c85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:02 +0100 Subject: [PATCH 013/515] haskell-pretty-show: remove obsolete version 1.2 --- .../libraries/haskell/pretty-show/1.2.nix | 16 ---------------- .../pretty-show/{1.6.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{1.6.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a0..00000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/1.6.2.nix rename to pkgs/development/libraries/haskell/pretty-show/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f7f2bd9d03b..f34386fa180 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,9 +1771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; - prettyShow = self.prettyShow_1_6_2; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; From c0fc46516dd29dff46edcd19843cdcb566969273 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 014/515] haskell-github-backup: update to version 1.20131203 --- .../git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 0752504278b..e7501baf9b4 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20131101"; - sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; + version = "1.20131203"; + sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba"; isLibrary = false; isExecutable = true; buildDepends = [ From a91e1a6f85e1021ddedbcfbfe8a6fd3febc0bf49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 015/515] haskell-DAV: update to version 0.5 --- .../development/libraries/haskell/DAV/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c330f082e89..c24ceacc021 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,18 @@ -{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase -, mtl, network, optparseApplicative, resourcet, transformers -, xmlConduit, xmlHamlet +{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens +, liftedBase, mtl, network, optparseApplicative, resourcet +, transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4.1"; - sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; + version = "0.5"; + sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpConduit httpTypes lens liftedBase mtl network - optparseApplicative resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpClient httpConduit httpTypes lens liftedBase + mtl network optparseApplicative resourcet transformers xmlConduit + xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; From 82e26eb2a430ac918d2f9264ab73bd4be6b25500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 016/515] haskell-JuicyPixels: update to version 3.1.2 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index b2947318a1f..485a80dadb3 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.1.1"; - sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph"; + version = "3.1.2"; + sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From 5afde208e98a40f501025c344d4f6f3612b8237d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 017/515] haskell-authenticate-oauth: update to version 1.4.0.8 --- .../libraries/haskell/authenticate-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 2ddd7c05ee9..15c8267ca3e 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.7"; - sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g"; + version = "1.4.0.8"; + sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; buildDepends = [ base64Bytestring blazeBuilder blazeBuilderConduit conduit cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl From 5b61f54e0972637c697ea1548c6ee493c1e3b756 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 018/515] haskell-base-compat: update to version 0.3.0 --- pkgs/development/libraries/haskell/base-compat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index ca208b7c1a3..6ce94b0d6c0 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -1,9 +1,10 @@ -{ cabal, hspec, setenv }: +{ cabal, errorcallEqInstance, hspec, setenv }: cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.2.1"; - sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43"; + version = "0.3.0"; + sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i"; + buildDepends = [ errorcallEqInstance ]; testDepends = [ hspec setenv ]; meta = { description = "A compatibility layer for base"; From c22384263d9b5297cf89121ef7b4d7c9df347a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 019/515] haskell-blaze-html: update to version 0.6.1.2 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index ec21e3fcd84..7d799c2ebf6 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.6.1.1"; - sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc"; + version = "0.6.1.2"; + sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework From 4d90e5aa3afce3056a4b8c207c2c729d6398ca19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 020/515] haskell-blaze-markup: update to version 0.5.1.6 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 0c544119d5f..23ea971922b 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.5.1.5"; - sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74"; + version = "0.5.1.6"; + sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm"; buildDepends = [ blazeBuilder text ]; testDepends = [ blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit From 695c2a345b8f26632607422697be84eaf7df1bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 021/515] haskell-cmdargs: update to version 0.10.6 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1814ab99784..ba8793ebb45 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.5"; - sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h"; + version = "0.10.6"; + sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From c9ecf30aac0e11c0394d5bc99464d2ed9f580656 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 022/515] haskell-crypto-pubkey-types: update to version 0.4.1 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index e4234d1d4cd..ba5007e789f 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.0"; - sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl"; + version = "0.4.1"; + sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From fa254e5565fd07dcf0b6846a05599936ed20fb3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 023/515] haskell-crypto-pubkey: update to version 0.2.3 --- .../libraries/haskell/crypto-pubkey/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index aa400c736cb..d3355f4c85c 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,14 +5,15 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.2"; - sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f"; + version = "0.2.3"; + sha256 = "198gpaxlcqkp6wa5cwwnlzdxnrs7j6h7zyizczd4imwbpl0gd2mk"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; testDepends = [ - byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 + byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; From a438e431b36194a105758744e52781e8ac949623 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 024/515] haskell-errors: update to version 1.4.4 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 1b0bc4282a7..1b091d871bb 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.3"; - sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm"; + version = "1.4.4"; + sha256 = "1mhh5xna5nppqg8aw93iil7nsnpx5j6r21a12bx4mmip8nzr6480"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { From b9f4a63413549154679e2bb6a88b65589464092f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 025/515] haskell-fast-logger: update to version 2.0.0 --- .../libraries/haskell/fast-logger/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index fb8714f3e85..ee51859404c 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,11 +1,10 @@ -{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime -}: +{ cabal, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.3.3"; - sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh"; - buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; + version = "2.0.0"; + sha256 = "0a2pmdj2q1mlpkwjszlb4gp6xk2bn8540cqhwjya55arx6rj9vs7"; + buildDepends = [ blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { description = "A fast logging system"; From fee913a3efc290b36873f6230e25cba28face186 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 026/515] haskell-ghc-vis: update to version 0.7.2 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 04af52f2679..bfedbdb776d 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.1"; - sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa"; + version = "0.7.2"; + sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot From 8198b87947ff14e02108f81cb1c1e2f7a3994f51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 027/515] haskell-glade: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/glade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 7c49b956aa9..30711083d2c 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "glade"; - version = "0.12.1"; - sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; + version = "0.12.5.0"; + sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr"; buildDepends = [ glib gtk ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From e979b49dd595dcd3766fdc5891124d53d30dd6c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 028/515] haskell-hakyll: update to version 4.4.2.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 424860c4677..f7f318e502a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.1.2"; - sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y"; + version = "4.4.2.0"; + sha256 = "10rkqnrj9gi4h25wfh1w4giqiir2d63vb85ysbxpc97rkbz3fwsg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal - ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; From dffb56d5d298a8c7ad1a99d26d191115e945fc34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 029/515] haskell-hamlet: update to version 1.1.7.5 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b64668b4366..89513e372ea 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.4"; - sha256 = "01sgd4p2d4irphgpvr7waag6jn8y329yj9zdjswrqklyygpp98hj"; + version = "1.1.7.5"; + sha256 = "1ph92n5l63qr5hpjcvl37j1w857dwwzzgsxn8mdadi2pz35lxm82"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 322a1d40f7fe31b22c85ad2dd5bb8951e3f24741 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 030/515] haskell-hexpat: update to version 0.20.5 --- pkgs/development/libraries/haskell/hexpat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 03aa9c16ed2..edded9b7698 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.4"; - sha256 = "09ixvwgrr1046v806d23ngdhc8xqkf0yadzlbwxcy228ka13xwdw"; + version = "0.20.5"; + sha256 = "09p8mh2b76ymgfv64zpddywdf34n7b78agri6kjnhls0xsk8260a"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; From fcb89f41c6b91d30df4c33824f1cfdf84f84e961 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 031/515] haskell-hjsmin: update to version 0.1.4.4 --- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 5980141526b..008c1766b94 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.3"; - sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl"; + version = "0.1.4.4"; + sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048"; buildDepends = [ blazeBuilder languageJavascript text ]; testDepends = [ blazeBuilder Cabal HUnit languageJavascript QuickCheck From ee04bc15d022a79df473dbeecf5c097b336956ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 032/515] haskell-hoogle: update to version 4.2.24 --- .../libraries/haskell/hoogle/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 498e71d06d1..fb4c33d7337 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,14 +1,13 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive -, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec -, hspecExpectations, httpTypes, HUnit, parsec, random, safe -, systemFileio, tagsoup, text, time, transformers, uniplate, wai -, warp +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, random, safe, tagsoup, text, time, transformers, uniplate +, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.23"; - sha256 = "1ykjf0w6c3pzsrzdhxs53nxj84aj2px3gpfc8f53dmgqv3wkyii7"; + version = "4.2.24"; + sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,9 +15,7 @@ cabal.mkDerivation (self: { deepseq filepath haskellSrcExts httpTypes parsec random safe tagsoup text time transformers uniplate wai warp ]; - testDepends = [ - conduit hspec hspecExpectations HUnit systemFileio transformers - ]; + testDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 7053a3f96a6d03e16f3efe50dfdacb5ecc9a1c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 033/515] haskell-hspec-expectations: update to version 0.5.0.1 --- .../libraries/haskell/hspec-expectations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 789ff5d7b2a..5a146265751 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.3.3"; - sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k"; + version = "0.5.0.1"; + sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; doCheck = false; From 6f776d29c5119e4116fd59bec09f0b3ef290d880 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 034/515] haskell-hspec-meta: update to version 1.8.1 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index d409501d706..5374ed7cd80 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.7.2"; - sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj"; + version = "1.8.1"; + sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w"; isLibrary = true; isExecutable = true; buildDepends = [ From bb371962ced717ca4adab49a81c8dd46599ac051 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 035/515] haskell-hspec: update to version 1.8.1.1 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 57dab8852fd..10994799c43 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.7.2.1"; - sha256 = "12khyg6ixk2rkbvxjbi210w57cais1s142v337kpcp3dfk6440bk"; + version = "1.8.1.1"; + sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb"; isLibrary = true; isExecutable = true; buildDepends = [ From 3cb9b9cb3651949fba13a751dcc880b65cd109d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 036/515] haskell-http-conduit: update to version 2.0.0.1 --- .../haskell/http-conduit/default.nix | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index f0c559839e0..403fdbe59b7 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,31 +1,30 @@ { cabal, asn1Data, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, certificate, conduit -, cookie, cprngAes, dataDefault, deepseq, failure, filepath, hspec -, httpTypes, HUnit, liftedBase, mimeTypes, monadControl, mtl -, network, networkConduit, publicsuffixlist, random, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, wai, warp, zlibConduit +, connection, cookie, cprngAes, dataDefault, deepseq, failure +, filepath, hspec, httpClient, httpClientConduit +, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase +, mimeTypes, monadControl, mtl, network, networkConduit +, publicsuffixlist, random, regexCompat, resourcet, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String +, void, wai, warp, warpTls, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.5.2"; - sha256 = "0andx8ggcwcd39z10yh5j0rmn7ypypgfzaaibbbh2rhp5v28932b"; + version = "2.0.0.1"; + sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; buildDepends = [ - asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath httpTypes liftedBase mimeTypes - monadControl mtl network publicsuffixlist random regexCompat - resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void zlibConduit + conduit httpClient httpClientConduit httpClientTls httpTypes + liftedBase resourcet transformers ]; testDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath hspec httpTypes HUnit liftedBase mimeTypes + caseInsensitive certificate conduit connection cookie cprngAes + dataDefault deepseq failure filepath hspec httpClient + httpClientMultipart httpTypes HUnit liftedBase mimeTypes monadControl mtl network networkConduit publicsuffixlist random regexCompat resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void wai warp zlibConduit + transformersBase utf8String void wai warp warpTls zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; From 4675b82d642864895fa9dcbe8a9bd02b799dc114 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 037/515] haskell-http-reverse-proxy: update to version 0.3.0 --- .../haskell/http-reverse-proxy/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a4f458f8395..f745554e489 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,17 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, transformers, wai -, waiLogger, warp, word8 +, dataDefault, hspec, httpClient, httpConduit, httpTypes +, liftedBase, monadControl, network, networkConduit, resourcet +, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1.1"; - sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; + version = "0.3.0"; + sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; buildDepends = [ basicPrelude blazeBuilder caseInsensitive conduit dataDefault - httpConduit httpTypes liftedBase monadControl network - networkConduit text wai waiLogger warp word8 + httpClient httpTypes liftedBase monadControl network networkConduit + resourcet text wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network From ae925636bd09101f455c2e87761091d1093582de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 038/515] haskell-http-types: update to version 0.8.3 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index c099709e0da..ed24e1ede74 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.2"; - sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1"; + version = "0.8.3"; + sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { From 012a7209e58e73a754e4f86927c0280da23530bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 039/515] haskell-language-ecmascript: update to version 0.15.4 --- .../libraries/haskell/language-ecmascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 458916df9d1..77165ef104d 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.3"; - sha256 = "0ircm20nf321awl0gvy0vh3jplfwpd700br67f0i97rifxx2v40c"; + version = "0.15.4"; + sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7"; buildDepends = [ dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint ]; From 3c5e50828aaa32a82576ce149a1e79549dfd9339 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 040/515] haskell-lens: update to version 3.10.0.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 60aa29ac089..fff7f1cc583 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.10"; - sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y"; + version = "3.10.0.1"; + sha256 = "0ar19ls0w1x1cnl6aj5qvrlyhfk51v8czahq4k861666rzglqd28"; buildDepends = [ bifunctors comonad contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel From 832a6b45d6980f5f0680720c1f868dd510fe0bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 041/515] haskell-linear: update to version 1.3.1.1 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index feeeaed3be5..99f5de71b61 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.3.1"; - sha256 = "1s07qbdi12rc4djk4s0ds5sh79qcqfmgrbwfj1ygskq3ra88qqsa"; + version = "1.3.1.1"; + sha256 = "174pqqc2gx8aigm51hfg7di35qbx65sgcqv6y1p25c2853g9h97y"; buildDepends = [ binary distributive hashable reflection semigroupoids semigroups tagged transformers unorderedContainers vector From 012480b9f4597f80ef1d63f36127ab227d21abf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 042/515] haskell-monad-logger: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 0b92ca0bb90..83cd57ce39b 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.2.0"; - sha256 = "0pgjayx6h1zqadqrzaf36070kir7qlinha9h4bf532lfx5yc1yxg"; + version = "0.3.3.1"; + sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase From 3df57554b5fc4fcdb26050b8562da60ab25916b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 043/515] haskell-pandoc: update to version 1.12.2.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b5ccc95bd3f..01ce4cc5bfb 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.12.1"; - sha256 = "0csyrcfdqv2mc7ngn63lan3c1dd6zy0pb24k0z1lsraqlmmw76nf"; + version = "1.12.2.1"; + sha256 = "1xyvhfsz0cy5f7cwpz4kl0l87vylb8860c06wvk49z9fh2xkg6lf"; isLibrary = true; isExecutable = true; buildDepends = [ From 01a828cbf99608b25396aa1a1f2e9dae69da56f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 044/515] haskell-quickcheck-instances: update to version 0.3.4 --- .../libraries/haskell/quickcheck-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 647e08718a8..0b29a55ce5f 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.3"; - sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72"; + version = "0.3.4"; + sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1"; buildDepends = [ QuickCheck text time ]; meta = { homepage = "https://github.com/aslatter/qc-instances"; From 7cc0bad3a45a556f13dd06468f8a8e30102a0032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 045/515] haskell-reducers: update to version 3.10.1.1 --- pkgs/development/libraries/haskell/reducers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index ea1049d2b40..bc1bf72beea 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.10.1"; - sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz"; + version = "3.10.1.1"; + sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers From 42f3190cf8614afa8cb8ac757804d992e05fe2b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 046/515] haskell-scotty: update to version 0.6.0 --- pkgs/development/libraries/haskell/scotty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index ad932df1ac7..3f50ed38152 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.5.0"; - sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc"; + version = "0.6.0"; + sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat resourcet text transformers wai waiExtra warp ]; meta = { - homepage = "https://github.com/ku-fpg/scotty"; + homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 8a347b892bb748d6d2052412300adef27f7bd6ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 047/515] haskell-semigroups: update to version 0.12.1 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index f1bc7259b79..a0e79c459d9 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.12"; - sha256 = "0wk8hxak4dl8nbdif4f8z9gvr5bqm95inrvrcrb6ryaxichrn432"; + version = "0.12.1"; + sha256 = "0jxgd487d99cc721wyaxvazphlv567hbb57vdfjn4hq9ly4w464q"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From f664af533756b5293e2f6defd3f162565fe885f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 048/515] haskell-shakespeare-css: update to version 1.0.6.5 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 03b6b057cd1..7dedf465f65 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.4"; - sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4"; + version = "1.0.6.5"; + sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From d7588eae7925e49a30ee920021aaac9ae4a90972 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 049/515] haskell-shakespeare-i18n: update to version 1.0.0.5 --- .../libraries/haskell/shakespeare-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index b7710d7c3d5..5d7cb8c4abe 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.4"; - sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l"; + version = "1.0.0.5"; + sha256 = "0f6i9pxr1lmqwcarb48swhrgab8hpkr46cv16psmbq67dr6h1dgf"; buildDepends = [ parsec shakespeare text ]; testDepends = [ hspec text ]; meta = { From d20feb0efc1e0dde7cfc1c7b471d63673c0f3028 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 050/515] haskell-shakespeare-text: update to version 1.0.0.10 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index ec60c0375b0..feadafeb29f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.9"; - sha256 = "1rh1dwmc7xam76isa6cwc25rcricakc7ay54hz01fpiy059imx52"; + version = "1.0.0.10"; + sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { From de2c3ff933ef2afa2de916890db301c52352d568 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 051/515] haskell-shakespeare: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 8b5de8ec76b..f3891e554dd 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.2.0.2"; - sha256 = "1vp7zskxrjxcznj1d0nx9iqkfvwa9xwpbxq46z054bizqfkri96c"; + version = "1.2.0.3"; + sha256 = "1mhycaw8qa4j7q5jing3hbx5vwwa0h4iv41fsx6xibz3y7lpqgmz"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time From 6ff4ebca323d7b15a2ac97f87c5b7123e500b5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 052/515] haskell-smallcheck: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index df2517a01ac..ef8f0e5e5ba 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.1"; - sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8"; + version = "1.1.0.1"; + sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From 8cdd84fac24ecb6e1c721429288e170d0039d9c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 053/515] haskell-snap: update to version 0.13.1.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 63103471ac2..3f4751113be 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.1.1"; - sha256 = "0nak84xwrfvdcb2ngq71qy8h0h1ih3wifnkgwxabhjbrqmd7ma0x"; + version = "0.13.1.2"; + sha256 = "19s7v9wc988yxynwqdhrhncz8vn9ic6d95gwfi1m0gpxxk5qlzzz"; isLibrary = true; isExecutable = true; buildDepends = [ From b1c6aabdb16fa26b1f2ece03bddaa1d9df310cde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 054/515] haskell-tasty-ant-xml: update to version 1.0.0.2 --- .../development/libraries/haskell/tasty-ant-xml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index baabf323723..3d68e823275 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.1"; - sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj"; + version = "1.0.0.2"; + sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; meta = { homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework."; + description = "Render tasty output to XML for Jenkins"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; From 5fb617876d605c91f586b429752eef840eb71a3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 055/515] haskell-tasty: update to version 0.4.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index c2c05a68f07..9ad53093c68 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.1.1"; - sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w"; + version = "0.4.2"; + sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From 710790a7042968ba5b1374cb73bf3cd2cc21f2be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 056/515] haskell-vector-algorithms: update to version 0.6.0.1 --- .../libraries/haskell/vector-algorithms/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index dc8c9dd35ba..74b098a3a7f 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,10 +1,13 @@ -{ cabal, primitive, vector }: +{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.4.2"; - sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64"; - buildDepends = [ primitive vector ]; + version = "0.6.0.1"; + sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl mwcRandom primitive vector ]; + testDepends = [ QuickCheck vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; From ca19f496b85aaf58dc40e2f375b5c18a7f5d0e6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 057/515] haskell-wai-app-static: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index d88eb2df0bc..3bcf63e1796 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.3"; - sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f"; + version = "2.0.0"; + sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate From 40a309e038d39cca527548e9f8a20c5afef59170 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 058/515] haskell-wai-extra: update to version 2.0.0.1 --- .../libraries/haskell/wai-extra/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7e3424713e0..d3b83587965 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,23 +1,23 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, fastLogger, hspec, httpTypes, HUnit, liftedBase, network +, resourcet, stringsearch, text, time, transformers, void, wai +, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.6"; - sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k"; + version = "2.0.0.1"; + sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit dataDefault dateCache fastLogger httpTypes - liftedBase network resourcet stringsearch text time transformers - void wai waiLogger word8 zlibConduit + caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase + network resourcet stringsearch text time transformers void wai + waiLogger word8 zlibConduit ]; testDepends = [ blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit - text transformers wai waiTest zlib zlibBindings + resourcet text transformers wai waiTest zlib zlibBindings ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 350a1e1c968061b3760008c47e5e2392c621c0fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 059/515] haskell-wai-handler-launch: update to version 2.0.0 --- .../libraries/haskell/wai-handler-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index c4d22a66e00..3ba78e16251 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "1.3.1.5"; - sha256 = "1iz36j7lzl5c9b2hacxv4v5gfzkfvgj7hlb5xz4r14ca4w5fzzfj"; + version = "2.0.0"; + sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai warp zlibConduit From eb16c02c56b878376f4620286f4eb57a2bf3f210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 060/515] haskell-wai-logger: update to version 2.0.1 --- .../libraries/haskell/wai-logger/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index fc958c2576b..98b0cdee39c 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache -, doctest, fastLogger, httpTypes, network, wai, waiTest +{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest +, fastLogger, httpTypes, network, unixTime, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.2"; - sha256 = "0las9jb8cxdsyh1mnrhx48yfbjw5f2x4hhmivhmhzb6qgxnbvma9"; + version = "2.0.1"; + sha256 = "1v8n7m314a12421gn10i8vz3nk9sak635dq4nq389sij8w1ihjkw"; buildDepends = [ - blazeBuilder byteorder caseInsensitive dateCache fastLogger - httpTypes network wai + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + unixTime wai ]; testDepends = [ doctest waiTest ]; meta = { From 059978b4742aedce62be389372101e381630cecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 061/515] haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index bbc1ed1d136..9cae0a85d6c 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.1.1"; - sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2"; + version = "2.0.0.1"; + sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai From ad818c12a695ce61103b0cf660d2654f3fb50dfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 062/515] haskell-wai: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 0fff9096cb0..4273e408a7f 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.1"; - sha256 = "1m8z1jc4fvq8rw9vk1x5sy73dbmiifa41973x84i51vsibyaqhgb"; + version = "2.0.0"; + sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From d6377fa89563810a7c609f7dffc4b4e351b759e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 063/515] haskell-warp-tls: update to version 2.0.0 --- pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 5b1456c0c48..b99c5214120 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "1.4.2"; - sha256 = "05mbf73859n2ns3bdnw24i7vygr4kysyxfq0xdkmmrd47fh3k9r6"; + version = "2.0.0"; + sha256 = "1dfwid6h7yl4v66as166ppbivzafh5wkkrbsvaaar6l3xd9kg211"; buildDepends = [ certificate conduit cprngAes cryptocipher cryptoRandomApi network networkConduit pem tls tlsExtra transformers wai warp From 27bdaa32690b828e5c86755e2baed986596b516a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 064/515] haskell-warp: update to version 2.0.0.1 --- .../libraries/haskell/warp/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 100dbbd7024..15dd0ec15ec 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,23 +1,23 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit -, liftedBase, network, networkConduit, QuickCheck, simpleSendfile -, transformers, unixCompat, void, wai +, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate +, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck +, simpleSendfile, time, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.10.1"; - sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v"; + version = "2.0.0.1"; + sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpAttoparsec httpTypes liftedBase network networkConduit + httpAttoparsec httpDate httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; testDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network - networkConduit QuickCheck simpleSendfile transformers unixCompat - void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest + hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit + liftedBase network networkConduit QuickCheck simpleSendfile time + transformers unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 8d8db388d91c49ebc8534c4dfdc2d61771a5efb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 065/515] haskell-wl-pprint-extras: update to version 3.5 --- .../libraries/haskell/wl-pprint-extras/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 77670b4f117..dd32750ffe9 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -1,10 +1,13 @@ -{ cabal, nats, semigroupoids, semigroups, text, utf8String }: +{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework +, testFrameworkHunit, text, utf8String +}: cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.4"; - sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy"; + version = "3.5"; + sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; From 73a20b0473f7aff5132a189e6220fe38840c9470 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 066/515] haskell-wl-pprint-terminfo: update to version 3.7 --- .../libraries/haskell/wl-pprint-terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index d2bd35eebd4..989d56afd7d 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.6"; - sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg"; + version = "3.7"; + sha256 = "01lzk8wfynb98ks8a0gvj8qffi50zlfaywlc9axr6j7h8rrblnm3"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; From a18328c0b6107af70f997e5e1157b57406efdbb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 067/515] haskell-xdot: update to version 0.2.4.1 --- pkgs/development/libraries/haskell/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index f7a2b731d03..7119705b357 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4"; - sha256 = "0723drp9zs3hrayld99j4fniyvm65fz19hkk4001vpvgjw27dfja"; + version = "0.2.4.1"; + sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; From 4923a984a57088451ab46a29ea056cf8f062b3c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 068/515] haskell-xml-conduit: update to version 1.1.0.9 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 3f97a028729..28a5beb966f 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.8"; - sha256 = "06if4mbrbcsjhk7hj3616fhgfh0rlsj95jblsbxq2drb4bn56r39"; + version = "1.1.0.9"; + sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault deepseq failure From 3517ae882948351a6883030a10855797ece06873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 069/515] haskell-xml-hamlet: update to version 0.4.0.6 --- pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index e2719984708..885620f0648 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.5"; - sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5"; + version = "0.4.0.6"; + sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { From c333429da943e049d882d4bf4a1057a30b6bf3cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 070/515] haskell-yesod-auth: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index bdc29993919..87cbe9f3d43 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.3"; - sha256 = "1hnppb36acr18prra702r9hdbs803zfvaj8krq4idlvwb6g7l0d8"; + version = "1.2.4"; + sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From c2f98216f8a80bdf989f8b00299b3dbd78ea1cef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 071/515] haskell-yesod-bin: update to version 1.2.5.1 --- .../libraries/haskell/yesod-bin/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index c93c76ee3fa..dbee52da868 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit +, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit , httpReverseProxy, httpTypes, liftedBase, network, networkConduit , optparseApplicative, parsec, projectTemplate, resourcet , shakespeare, shakespeareCss, shakespeareJs, shakespeareText @@ -10,17 +10,18 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.4.1"; - sha256 = "18wzxalgiffdjz6x5vxmhksscy5531plgyjkv705kf5vaw6v6rlr"; + version = "1.2.5.1"; + sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed - filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes - liftedBase network networkConduit optparseApplicative parsec - projectTemplate resourcet shakespeare shakespeareCss shakespeareJs - shakespeareText split systemFileio systemFilepath tar text time - transformers unixCompat unorderedContainers wai warp yaml zlib + attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault + fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy + httpTypes liftedBase network networkConduit optparseApplicative + parsec projectTemplate resourcet shakespeare shakespeareCss + shakespeareJs shakespeareText split systemFileio systemFilepath tar + text time transformers unixCompat unorderedContainers wai warp yaml + zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From c1f1d00bce88843c884950c95852f129c5bfa4a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 072/515] haskell-yesod-core: update to version 1.2.6.1 --- .../libraries/haskell/yesod-core/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 789d158fa6c..86b2eec8945 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -4,21 +4,22 @@ , httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec , pathPieces, QuickCheck, random, resourcet, safe, shakespeare , shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, vector, wai, waiExtra, waiTest -, warp, yesodRoutes +, transformers, transformersBase, unixCompat, vector, wai, waiExtra +, waiLogger, waiTest, warp, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.5"; - sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9"; + version = "1.2.6.1"; + sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault failure fastLogger hamlet httpTypes liftedBase monadControl monadLogger parsec pathPieces random resourcet safe shakespeare shakespeareCss shakespeareI18n shakespeareJs text time transformers - transformersBase vector wai waiExtra warp yesodRoutes + transformersBase unixCompat vector wai waiExtra waiLogger warp + yesodRoutes ]; testDepends = [ blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase From 7a7b9e515b09505f19e4eccdfaee65f0b4ed3cc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 073/515] haskell-yesod-persistent: update to version 1.2.2 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 2c6b6f96fbc..a3740629150 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.1"; - sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc"; + version = "1.2.2"; + sha256 = "0pi7r6mf8ikd76cwdpjzb1lf73jc3f0ji3xximmg25q8lwcjygq5"; buildDepends = [ blazeBuilder conduit liftedBase persistent persistentTemplate poolConduit resourcet transformers yesodCore From 91e2d2bf9b6362a0e9e8afaaec6aa4d50dcc8daa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 074/515] haskell-yesod-routes: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 4cbb865c906..d651e90a8a7 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.1"; - sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z"; + version = "1.2.0.2"; + sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From 48958dac0611b3bb5e68878e2be6afe40e9470a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 075/515] haskell-yesod-static: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c1f3c4ea873..c29cbe75974 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.1.1"; - sha256 = "009p6hq6hwmvji40yqv97v1sfwdfh44pasp68cxw05czhcwwcacv"; + version = "1.2.2"; + sha256 = "06abyfmqzv6aap0ww7vkw4j6xv6dkivn0g7wx59j2l54dfqrjifr"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes From 5e5855d95ca2d0c104d7903344d0d53ce3a378db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 076/515] haskell-yesod: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 9f416ad27f9..b4e935428b2 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.3"; - sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3"; + version = "1.2.4"; + sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers From a47b25da5b4e1fab275a34f6c097bc66da47072f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 077/515] haskell-keter: update to version 1.1.0.1 --- .../tools/haskell/keter/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index c3f242bc434..53e2c5a7419 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,25 +1,27 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive -, conduit, dataDefault, filepath, fsnotify, httpConduit -, httpReverseProxy, httpTypes, liftedBase, mtl, network -, networkConduit, networkConduitTls, random, regexTdfa, stm -, systemFileio, systemFilepath, tar, text, time, transformers -, unixCompat, unixProcessConduit, unorderedContainers, vector, wai -, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib +, conduit, dataDefault, filepath, fsnotify, httpClient +, httpClientConduit, httpConduit, httpReverseProxy, httpTypes +, liftedBase, mtl, network, networkConduit, networkConduitTls +, random, regexTdfa, stm, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unixProcessConduit +, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp +, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.0.1.2"; - sha256 = "1rk0sf6riyb6r1sz0jkvwwj1yyxwjxgafpidp9rqwm8wnqyx6hh8"; + version = "1.1.0.1"; + sha256 = "04hvwfs1dskaxl1fw29lf52389hy1yr3hwd05bl294zgfh995i0s"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async attoparsec blazeBuilder caseInsensitive conduit - dataDefault filepath fsnotify httpConduit httpReverseProxy - httpTypes liftedBase mtl network networkConduit networkConduitTls - random regexTdfa stm systemFileio systemFilepath tar text time - transformers unixCompat unixProcessConduit unorderedContainers - vector wai waiAppStatic waiExtra warp warpTls yaml zlib + dataDefault filepath fsnotify httpClient httpClientConduit + httpConduit httpReverseProxy httpTypes liftedBase mtl network + networkConduit networkConduitTls random regexTdfa stm systemFileio + systemFilepath tar text time transformers unixCompat + unixProcessConduit unorderedContainers vector wai waiAppStatic + waiExtra warp warpTls yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From fbdbe45393966eb4babd5ff305fce134b807149b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 14:23:56 +0100 Subject: [PATCH 078/515] haskell-pretty-show: the build requires happy version 1.19.x. --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f34386fa180..f77199bd8af 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,7 +1771,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; + prettyShow = callPackage ../development/libraries/haskell/pretty-show { + happy = self.happy_1_19_2; + }; punycode = callPackage ../development/libraries/haskell/punycode {}; From 9fcd7a8994206536ca0e48a9a2fb64df2bdf7ecf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 19:37:17 +0100 Subject: [PATCH 079/515] haskell-warp: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/warp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 15dd0ec15ec..0b6d3403c46 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { liftedBase network networkConduit QuickCheck simpleSendfile time transformers unixCompat void wai ]; + doCheck = false; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; From b2770afe611a0430872a25f014dd564aea7e9dc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 23:01:48 +0100 Subject: [PATCH 080/515] haskell-cmdargs: work around broken tarball on Hackage --- pkgs/development/libraries/haskell/cmdargs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index ba8793ebb45..1bd39a387bb 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; + patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; From d0ebac24e9a668c20f04466bc56de095496fc602 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 01:10:40 +0100 Subject: [PATCH 081/515] Update Haddock to version 2.13.2.1 (in ghc-head environment). --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f77199bd8af..1b6d333705b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; - haddock = self.haddock_2_13_2; + haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_2; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; From e810997859191f9643a01affe9dae1c19f718743 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:40:15 +0100 Subject: [PATCH 082/515] haskell-http-client: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index fd40ca88e1d..3658bc6bf8d 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { failure hspec httpTypes monadControl network text time transformers zlib zlibBindings ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; From 9a7c392af3cd690df8546859f1767fe0e8b7687e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:47:53 +0100 Subject: [PATCH 083/515] haskell-http-client-tls: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client-tls/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5056a94c5d9..f92ddcd7d55 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; From d231aca644ec56bea8f1a45f0d7e6b3f45521bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:02:59 +0100 Subject: [PATCH 084/515] haskell-parsec: update to version 3.1.4 --- .../libraries/haskell/parsec/3.1.4.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.4.nix diff --git a/pkgs/development/libraries/haskell/parsec/3.1.4.nix b/pkgs/development/libraries/haskell/parsec/3.1.4.nix new file mode 100644 index 00000000000..82032dda61c --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.1.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "parsec"; + version = "3.1.4"; + sha256 = "0milmi4q5jdcmmwjqa4lcs1vcw5frkrlrxc8q17lkas3p2m10kh5"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + description = "Monadic parser combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1b6d333705b..2e8e5c741ba 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,7 +158,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_3; + parsec = self.parsec_3_1_4; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; regexBase = self.regexBase_0_93_2; @@ -1701,8 +1701,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; + parsec_3_1_4 = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_3; + parsec3 = self.parsec_3_1_4; parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; From e9848e3b792cedbe8cebb26b05f565252dce3c25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 085/515] haskell-cmdargs: update to version 0.10.7 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1bd39a387bb..7678849930e 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.6"; - sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; + version = "0.10.7"; + sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; - patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; From 00b20b6caf51b9f98fa3521a5dd0dd6d6ec714eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 086/515] haskell-haskell-names: update to version 0.3.2.2 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 7e6619d4f35..b77cd134dc8 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.1"; - sha256 = "1ddixm37y1wkqsrs4cxvnmjczapwq1n67xg5rhkj0k7d04c8agha"; + version = "0.3.2.2"; + sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass From 55ed7d9466b634cb8df5fe99b8f02dab1a1c120e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 087/515] haskell-hoogle: update to version 4.2.25 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index fb4c33d7337..40d47542114 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.24"; - sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; + version = "4.2.25"; + sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; isLibrary = true; isExecutable = true; buildDepends = [ From a21f8721c4a6d8af300ef2e2ff414da35e2c7dd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 088/515] haskell-persistent-template: update to version 1.2.0.5 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index c3bb228933d..e54ebce9676 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.4"; - sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf"; + version = "1.2.0.5"; + sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; From 702370e3cdd228f060009528a99bbc4c8b5f14df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 089/515] haskell-shakespeare-css: update to version 1.0.6.6 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 7dedf465f65..853a6294131 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.5"; - sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; + version = "1.0.6.6"; + sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From cd3a9434fee4c8c50688a5542ec418b89995e1f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 090/515] haskell-unix-process-conduit: update to version 0.2.2.1 --- .../libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 1f04d939d9c..8470a2d3f82 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2"; - sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6"; + version = "0.2.2.1"; + sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { From 3242e0d495d3ff12d30c229ba3d2807f61f1e83b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 091/515] haskell-wai-app-static: update to version 2.0.0.1 --- .../libraries/haskell/wai-app-static/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 3bcf63e1796..a6b8eeb4058 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,18 +1,18 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed -, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio -, systemFilepath, text, time, transformers, unixCompat -, unorderedContainers, wai, waiTest, zlib +, filepath, hspec, httpDate, httpTypes, mimeTypes, network +, systemFileio, systemFilepath, text, time, transformers +, unixCompat, unorderedContainers, wai, waiTest, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0"; - sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; + version = "2.0.0.1"; + sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate - httpTypes mimeTypes systemFileio systemFilepath text time + cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath + httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat unorderedContainers wai zlib ]; testDepends = [ From 9d38ae8bcf7168987b99e07369fb43ccb47d5975 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:10:50 +0100 Subject: [PATCH 092/515] haskell-http-conduit: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 403fdbe59b7..30dacc9b6b1 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void wai warp warpTls zlibConduit ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 12a3008d4c0683818976508f62bf10eb205d80cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:46:18 +0100 Subject: [PATCH 093/515] haskell-http-reverse-proxy: disable test suite to fix the build See issue . --- .../development/libraries/haskell/http-reverse-proxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index f745554e489..a8e0afc786e 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { blazeBuilder conduit hspec httpConduit httpTypes liftedBase network networkConduit transformers wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; From c9a52836c83d8e455092e0a1e210f59aec22c077 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:18:54 +0100 Subject: [PATCH 094/515] haskell-pretty-show: resurrect version 1.2, which is required to build hledger on old versions of GHC This reverts commit 54bfef6fc3d88eabfbd17c440c906170f7bc00ef. --- .../libraries/haskell/pretty-show/1.2.nix | 16 ++++++++++++++++ .../pretty-show/{default.nix => 1.6.2.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{default.nix => 1.6.2.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 00000000000..545816a57a0 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ cabal, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellLexer ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived Show instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/default.nix rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e8e5c741ba..5e4488add3f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,9 +1772,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show { + prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix { happy = self.happy_1_19_2; }; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; From 0262a86ad1ae97d792c73f221994873b03973d7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 095/515] haskell-blaze-builder: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 36b8f57cc40..51dda936687 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.3.0"; - sha256 = "0j6nrwcnpcr7c17cxw3v85m19q8z91wb6jir8c6kls5m321hwd63"; + version = "0.3.3.2"; + sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From d5a0a812ddb993ea2a3816d42dd8ec08516d3fbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 096/515] haskell-digestive-functors-heist: update to version 0.8.3.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 91d1bf0bcbc..f83488b850d 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.1.0"; - sha256 = "0f9nhfy8rc1w9nnhq1yf9y2kwxlb9b6v8y1jz5q3lrpb1cnq31j0"; + version = "0.8.3.0"; + sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; From 6e0f60a5395fa1e453607046bab60dd4f559de1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 097/515] haskell-digestive-functors-snap: update to version 0.6.0.1 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index f23ee6d0691..6b20ed6ae89 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.6.0.0"; - sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88"; + version = "0.6.0.1"; + sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 7534476fada3910714ab740e7535be42c3f4dbb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 098/515] haskell-digestive-functors: update to version 0.6.1.1 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 1d3f31e5568..2207f18c35c 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.0"; - sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; + version = "0.6.1.1"; + sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; buildDepends = [ mtl text ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit From c97000f77c068c8aecbc73d2ac4d4deb07f92771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 099/515] haskell-hoogle: update to version 4.2.26 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 40d47542114..70c8ecb249d 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.25"; - sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; + version = "4.2.26"; + sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380"; isLibrary = true; isExecutable = true; buildDepends = [ From 9d3022ec35305d8ff2b5a60496828153190f29e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 100/515] haskell-http-client: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 3658bc6bf8d..2724b27673d 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.1"; - sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + version = "0.2.0.2"; + sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time From 66bd60896df4343c2e7b1e1e8fffb9d6dc6b5052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 101/515] haskell-http-conduit: update to version 2.0.0.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 30dacc9b6b1..b041957e555 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.1"; - sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; + version = "2.0.0.2"; + sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers From e51fe9c496cab1f236129768d07592f54316eb44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 102/515] haskell-path-pieces: update to version 0.1.3.1 --- pkgs/development/libraries/haskell/path-pieces/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index cdfe320a060..b2952748843 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.3"; - sha256 = "03x9kfcaz1zsdpdzs05pcl0hv4hffgsl2js8xiy5slba6n841v4l"; + version = "0.1.3.1"; + sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; buildDepends = [ text time ]; testDepends = [ hspec HUnit QuickCheck text ]; meta = { From 303ce435511963cb83e517f3049f1b956f01762f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 103/515] haskell-persistent-template: update to version 1.2.0.6 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index e54ebce9676..9dc42ea5e39 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.5"; - sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; + version = "1.2.0.6"; + sha256 = "1vkrxf2dabk9z0igfbvb2ib2bxcxi5af2vpxllv74cbjz9r6ip3s"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; From 878227d7aa7383bf8a0daeaeeae7614673c50ea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:39:20 +0100 Subject: [PATCH 104/515] haskell-ListLike: jailbreak to fix the build with text 1.x --- pkgs/development/libraries/haskell/ListLike/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index d8e1e0c6f42..973fca3fb99 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; + jailbreak = true; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; From 5afc2d5cf323cf40bbce5c8978c3e35e751d6740 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 105/515] haskell-http-client: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 2724b27673d..221d82033bc 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.2"; - sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; + version = "0.2.0.3"; + sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time From 8248ffc9e4681bf67b9db11ba491b964208eb5ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 106/515] haskell-lifted-async: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index 8fbfd1f51b0..fa48f289a4c 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.1.0"; - sha256 = "09ns06qgnwls6zcqsjvr7ykhpr1w12vq49ix4bkqriarl1q3ap7b"; + version = "0.1.0.1"; + sha256 = "03b89cixfin7ksdjh12g0pfrmgzw9mnx6nyvywv3rjc1sra3b8f0"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ HUnit liftedBase monadControl mtl testFramework testFrameworkHunit From 49536b487f7448bc93e2ab37b120251a0b888dc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 107/515] haskell-tasty-ant-xml: update to version 1.0.0.4 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 3d68e823275..4d90d51fceb 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.2"; - sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; + version = "1.0.0.4"; + sha256 = "09qgakwqaqgppplxybkgyhyryxrw1pwlgkiqpixrqqhjans3z0hn"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; From bf34b53746231b553c3c163b77207f367683eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 108/515] haskell-tasty-golden: update to version 2.2.0.1 --- pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index 2f27e50d8f9..14c64223939 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2"; - sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb"; + version = "2.2.0.1"; + sha256 = "0zr8ikg1j1nc29b6i23wb7zwbq0kmvjry7a1a6ldnz4p13m05q6d"; buildDepends = [ filepath mtl optparseApplicative tagged tasty temporary ]; From 28ba549fa8b02de5c16da37f8fc205e64230ced9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 109/515] haskell-tasty: update to version 0.5.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 9ad53093c68..8153eb9f6a7 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.2"; - sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; + version = "0.5.1"; + sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From e32ee4acf9f5fd8b8fadcfb92d2bde3993cfae9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 110/515] haskell-vault: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 3f284284444..8786838ab3d 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.3.0.2"; - sha256 = "1m9vanwzlw61fbdcy7qvv2prmbax5y9dsl52dldcf5zr7vip2hpb"; + version = "0.3.0.3"; + sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5"; buildDepends = [ hashable unorderedContainers ]; jailbreak = true; meta = { From 4df80c3c2edc1b709423c3b00b293e22968178bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 111/515] haskell-warp: update to version 2.0.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0b6d3403c46..04fb88de0d6 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.0.1"; - sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; + version = "2.0.1"; + sha256 = "1sgsiw75xm3b1bv0cnpkx6vn6k0r1an3c94xw5bab4h7blb9jk4a"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpDate httpTypes liftedBase network networkConduit From 43070fe84f2d70de650987de5e92248290d9152d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 112/515] haskell-yesod-platform: update to version 1.2.5 --- .../haskell/yesod-platform/default.nix | 77 ++++++++++--------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 7d56ca1142c..ee9cd3b1fd3 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -2,56 +2,59 @@ , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie -, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash -, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault -, dataDefaultClass, dataDefaultInstancesBase +, certificate, cipherAes, cipherRc4, clientsession, conduit +, connection, controlMonadLoop, cookie, cprngAes, cryptoApi +, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi +, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist -, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate -, entropy, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit -, httpAttoparsec, httpConduit, httpDate, httpTypes -, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph -, monadControl, monadLogger, networkConduit, pathPieces, pem -, persistent, persistentTemplate, poolConduit, primitive -, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs -, shakespeareText, silently, simpleSendfile, skein, socks -, stringsearch, systemFileio, systemFilepath, tagged, tagsoup -, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat -, unorderedContainers, utf8Light, utf8String, vector, void, wai -, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 -, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth -, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic -, yesodTest, zlibBindings, zlibConduit +, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy +, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin +, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient +, httpClientConduit, httpClientTls, httpConduit, httpDate +, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes +, mmorph, monadControl, monadLogger, monadLoops, networkConduit +, pathPieces, pem, persistent, persistentTemplate, poolConduit +, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast +, quickcheckIo, resourcePool, resourcet, safe, securemem +, semigroups, setenv, SHA, shakespeare, shakespeareCss +, shakespeareI18n, shakespeareJs, shakespeareText, silently +, simpleSendfile, skein, socks, stmChans, stringsearch +, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit +, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers +, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra +, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes +, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm +, yesodPersistent, yesodRoutes, yesodStatic, yesodTest +, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.4.4"; - sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji"; + version = "1.2.5"; + sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes - cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers - cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault - dataDefaultClass dataDefaultInstancesBase - dataDefaultInstancesContainers dataDefaultInstancesDlist - dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy - failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec - hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate - httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph - monadControl monadLogger networkConduit pathPieces pem persistent - persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + clientsession conduit connection controlMonadLoop cookie cprngAes + cryptoApi cryptoCipherTypes cryptoConduit cryptohash + cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandom cssText dataDefault dataDefaultClass + dataDefaultInstancesBase dataDefaultInstancesContainers + dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist + emailValidate entropy failure fastLogger fileEmbed + filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit + httpAttoparsec httpClient httpClientConduit httpClientTls + httpConduit httpDate httpTypes languageJavascript liftedBase + mimeMail mimeTypes mmorph monadControl monadLogger monadLoops + networkConduit pathPieces pem persistent persistentTemplate + poolConduit primitive processConduit publicsuffixlist pureMD5 pwstoreFast quickcheckIo resourcePool resourcet safe securemem semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs shakespeareText silently simpleSendfile skein socks - stringsearch systemFileio systemFilepath tagged tagsoup + stmChans stringsearch systemFileio systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra transformersBase unixCompat unorderedContainers utf8Light utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit From 6cd149f2a975e9db3716bc5aa0e95674064bef0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 21:47:39 +0100 Subject: [PATCH 113/515] hoogle: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/hoogle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 70c8ecb249d..b461b5a1fd4 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { tagsoup text time transformers uniplate wai warp ]; testDepends = [ filepath ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 48f24712dca6859a4f66dcb46c5b5056a12f0ef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 23:20:23 +0100 Subject: [PATCH 114/515] Fix a lots of evaluation errors on Hydra. --- pkgs/development/libraries/haskell/HFuse/default.nix | 2 +- pkgs/development/libraries/haskell/alsa-core/default.nix | 2 +- pkgs/development/libraries/haskell/alsa-pcm/default.nix | 2 +- .../libraries/haskell/gloss-accelerate/default.nix | 1 + .../libraries/haskell/gloss-raster-accelerate/default.nix | 1 + pkgs/development/libraries/imlib2/default.nix | 6 +++--- pkgs/development/libraries/json-c/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/tools/X11/bgs/default.nix | 7 +++---- pkgs/tools/backup/bup/default.nix | 3 +-- pkgs/tools/networking/pdsh/default.nix | 2 +- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- pkgs/tools/typesetting/lhs2tex/default.nix | 1 + 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 9d37b580d80..2012739afb4 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/toothbrush/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index 140d554e88c..f38082fba88 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 3d1091f2702..39123a176dc 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix index c4a31d541b5..2c53925f975 100644 --- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Extras to interface Gloss and Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix index 7ed70bc092c..db5b62169c4 100644 --- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel rendering of raster images using Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d77e2052f81..b1c154badd8 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "imlib2-1.4.5"; - + src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; meta = { - platforms = stdenv.lib.platforms.gnu; # random choice + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 7953b04183a..78100521584 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { and parse JSON formatted strings back into the C representation of JSON objects. ''; - platforms = platforms.linux; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index fcaf95672e1..81878917384 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.libmng.com; license = "zlib/libpng"; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ca1db137206..f57ee931faf 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 0c6951aa3e7..ed700fa6356 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -14,11 +14,10 @@ stdenv.mkDerivation rec { preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; - meta = { + meta = { description = "Extremely fast and small background setter for X"; license = "MIT"; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [pSub]; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [pSub]; }; } - diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 54b089bd08e..d1748cc252e 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation { Capable of doing *fast* incremental backups of virtual machine images. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 80fc075107c..d6952b8e375 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 723741b2c83..8a5eb6ad759 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + hydraPlatforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ec1c9021522..ade7fd202d5 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 7d5ab6167c866c98ad6014429ce034de98e3b3f9 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 11 Dec 2013 13:05:07 +0800 Subject: [PATCH 115/515] renpy: update to 6.16.3 --- .../interpreters/renpy/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index f7d8b93f966..60884fce69d 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -3,11 +3,19 @@ }: stdenv.mkDerivation { - name = "renpy-6.15.5"; + name = "renpy-6.16.3"; + + meta = { + description = "Ren'Py Visual Novel Engine"; + homepage = "http://renpy.org/"; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; src = fetchurl { - url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2"; - sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60"; + url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2"; + sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn"; }; buildInputs = [ @@ -34,16 +42,8 @@ stdenv.mkDerivation { makeWrapper ${python}/bin/python $out/bin/renpy \ --set PYTHONPATH $program_PYTHONPATH \ --set RENPY_BASE $out/share/renpy \ - --set RENPY_LESS_UPDATES 1 \ --add-flags "-O $out/share/renpy/renpy.py" ''; NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}"; - - meta = { - description = "Ren'Py Visual Novel Engine"; - homepage = "http://renpy.org/"; - license = "MIT"; - platforms = stdenv.lib.platforms.linux; - }; } From 6ba2d327b6d17237f6272546bc4fe65281534b07 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 15:44:54 +0200 Subject: [PATCH 116/515] amsn: update from 0.98.4 to 0.98.9 --- .../networking/instant-messengers/amsn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index fc7906b3e40..37c0b4a694d 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: stdenv.mkDerivation { - name = "amsn-0.98.4"; + name = "amsn-0.98.9"; src = fetchurl { - url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz; - sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx"; + url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz; + sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; From 96f551a8f96e1bc28c36528e180277dbd772a633 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 17:03:58 +0200 Subject: [PATCH 117/515] libgtop: update from 2.28.4 to 2.28.5 --- pkgs/development/libraries/libgtop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index b592f458c6c..b9ae43a7c8b 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool }: stdenv.mkDerivation { - name = "libgtop-2.28.4"; + name = "libgtop-2.28.5"; src = fetchurl { - url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.4.tar.xz; - sha256 = "1n71mg82k8m7p6kh06vgb1hk4y9cqwk1lva53pl7w9j02pyrqqdn"; + url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.5.tar.xz; + sha256 = "0hik1aklcn79irgw1xf7d6cfkw8hzmy46r9jyfhp32aawisc24n8"; }; propagatedBuildInputs = [ glib ]; From 3b3e7e8f25c8cf7fca5ebba9af690288ac6e4023 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 17:10:46 +0200 Subject: [PATCH 118/515] gnome.gvfs: update from 1.14.1 to 1.14.2 --- pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix index 9e7949047c7..a2044d1b270 100644 --- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix @@ -3,11 +3,11 @@ , udev, avahi, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "gvfs-1.14.1"; + name = "gvfs-1.14.2"; src = fetchurl { url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a"; + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; }; buildInputs = From d706aab747c1b7e2e5d26d0870c165219c1bcbcd Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 18:30:42 +0200 Subject: [PATCH 119/515] diffstat: update from 1.45 to 1.58 --- pkgs/tools/text/diffstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index d1d366ba599..6bbf1a9a8c7 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,11 +1,11 @@ {fetchurl, stdenv}: stdenv.mkDerivation rec { - name = "diffstat-1.45"; + name = "diffstat-1.58"; src = fetchurl { url = "ftp://invisible-island.net/diffstat/"+ name +".tgz"; - md5 = "cfe06ffcdbeaaa2fd296db867157ef78"; + sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs"; }; meta = { From b7a9e1a9982d4f63508db872a93e0ca5e4935a52 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sat, 7 Dec 2013 00:13:35 -0500 Subject: [PATCH 120/515] Add shellinabox --- pkgs/servers/shellinabox/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/shellinabox/default.nix diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix new file mode 100644 index 00000000000..49d7810a3c2 --- /dev/null +++ b/pkgs/servers/shellinabox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pam, openssl, openssh }: + +stdenv.mkDerivation { + name = "shellinabox-2.14"; + + src = fetchurl { + url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz"; + sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781"; + }; + buildInputs = [pam openssl openssh]; + + # Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place. + preConfigure = '' + substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" "" + substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" + ''; + meta = { + homepage = https://code.google.com/p/shellinabox; + description = "Web based AJAX terminal emulator"; + license = "GPLv2"; + maintainers = [stdenv.lib.maintainers.tomberek]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f9f1ccf047..4a2b66bb29b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1776,6 +1776,8 @@ let shebangfix = callPackage ../tools/misc/shebangfix { }; + shellinabox = callPackage ../servers/shellinabox { }; + siege = callPackage ../tools/networking/siege {}; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; From db426d4601be0279cdb0cecb311a09dee8227b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 11 Dec 2013 12:00:05 +0100 Subject: [PATCH 121/515] k3d: fix changed URL/patch --- pkgs/applications/graphics/k3d/debian-patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix index fe1289f1441..cf6b47ee959 100644 --- a/pkgs/applications/graphics/k3d/debian-patches.nix +++ b/pkgs/applications/graphics/k3d/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15"; + prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18"; in [ { @@ -9,6 +9,6 @@ in } { url = "${prefix}/k3d_gtkmm224.patch"; - sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5"; + sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji"; } ] From 900786ab3732caa371cbfbce49fcf59cb075da58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Dec 2013 12:08:12 +0100 Subject: [PATCH 122/515] Fix more evaluation errors on Hydra. --- pkgs/development/libraries/libdaemon/default.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 2 +- pkgs/tools/misc/direnv/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index f9666ccf4dd..58c150a22d6 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 0ef70a197d6..171a6202e73 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { interfaces for other technical domains. ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 5588fe3d647..2850c35b720 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; homepage = http://direnv.net; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.zimbatm ]; }; } From 4855b0a22eb957740e7c1e0ead39ca3984f98d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 11 Dec 2013 12:13:24 +0100 Subject: [PATCH 123/515] dragonegg: fix build via update to 3.3 --- pkgs/development/compilers/llvm/dragonegg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix index 42d337b8eac..737b9533a08 100644 --- a/pkgs/development/compilers/llvm/dragonegg.nix +++ b/pkgs/development/compilers/llvm/dragonegg.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, llvm, gmp, mpfr, mpc}: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.3"; name = "dragonegg-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/${name}.src.tar.gz"; - sha256 = "0jfxhqy3177drlvzgp6m0kwnbfyzrd4vzidnxjhck8a7a69a26bg"; + sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri"; }; # The gcc the plugin will be built for (the same used building dragonegg) From 9e329b9fd1437724e30d4ae1fa5290aaa1e62fe6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 11 Dec 2013 16:37:08 +0400 Subject: [PATCH 124/515] Fix a minor bug in fsg --- pkgs/games/fsg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 7a9dc110540..a4579ad2ae3 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { sed -e ' s@currentProbIndex != 100@0@; ' -i MainFrame.cpp + sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp ''; installPhase = '' From f329865aa26fa1ebc90d1901b2e0d9883d8c59d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Dec 2013 12:55:55 +0100 Subject: [PATCH 125/515] apr: Update to 1.5.0 --- pkgs/development/libraries/apr/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 1893a2c9413..e248dbd649e 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl }: -let - inherit (stdenv.lib) optionals; -in - stdenv.mkDerivation rec { - name = "apr-1.4.8"; + name = "apr-1.5.0"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41"; + md5 = "cc93bd2c12d0d037f68e21cc6385dc31"; }; - patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; configureFlags = # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + enableParallelBuilding = true; + meta = { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } From f74ca42ba6daee4558b6708c36d46baaa81f5db4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Dec 2013 14:28:37 +0100 Subject: [PATCH 126/515] linux: Update to 3.4.73 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e7405c522a6..4cf3229f6fd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.71"; + version = "3.4.73"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0l9bv40mwk45ccmb2pfy574h6zrclrz5vhvmnn61q3z16j269dpp"; + sha256 = "052g799pq6k0xzs231n3502bsv0k9ap3q8clxpyzyila8sx4rll7"; }; features.iwlwifi = true; From f7b256a221c2bf12c17685b533cf443a1b1b8c1b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 11 Dec 2013 15:32:27 +0100 Subject: [PATCH 127/515] Add initial configuration for Google Compute Engine --- .../virtualisation/google-compute-config.nix | 5 + .../virtualisation/google-compute-image.nix | 158 ++++++++++++++++++ 2 files changed, 163 insertions(+) create mode 100644 nixos/modules/virtualisation/google-compute-config.nix create mode 100644 nixos/modules/virtualisation/google-compute-image.nix diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix new file mode 100644 index 00000000000..9e6be93b6d9 --- /dev/null +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -0,0 +1,5 @@ +{ config, pkgs, modulesPath, ... }: + +{ + imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ]; +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix new file mode 100644 index 00000000000..edf10c0e504 --- /dev/null +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -0,0 +1,158 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +{ + imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; + + system.build.googleComputeImage = + pkgs.vmTools.runInLinuxVM ( + pkgs.runCommand "google-compute-image" + { preVM = + '' + mkdir $out + diskImage=$out/disk.raw + truncate $diskImage --size 10G + mv closure xchg/ + ''; + + postVM = + '' + PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin + pushd $out + tar -Szcf disk.raw.tar.gz disk.raw + rm $out/disk.raw + popd + ''; + + buildInputs = [ pkgs.utillinux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; + } + '' + # Create partition table + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G + ${pkgs.parted}/sbin/parted /dev/vda print + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + + mkdir /mnt + mount /dev/vda1 /mnt + + # The initrd expects these directories to exist. + mkdir /mnt/dev /mnt/proc /mnt/sys + + mount --bind /proc /mnt/proc + mount --bind /dev /mnt/dev + mount --bind /sys /mnt/sys + + # Copy all paths in the closure to the filesystem. + storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) + + mkdir -p /mnt/nix/store + echo "copying everything (will take a while)..." + cp -prd $storePaths /mnt/nix/store/ + + # Register the paths in the Nix database. + printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ + chroot /mnt ${config.nix.package}/bin/nix-store --load-db + + # Create the system profile to allow nixos-rebuild to work. + chroot /mnt ${config.nix.package}/bin/nix-env \ + -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} + + # `nixos-rebuild' requires an /etc/NIXOS. + mkdir -p /mnt/etc + touch /mnt/etc/NIXOS + + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + + # Install a configuration.nix. + mkdir -p /mnt/etc/nixos /mnt/boot/grub + cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix + + # Generate the GRUB menu. + ln -s vda /dev/sda + chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + + umount /mnt/proc /mnt/dev /mnt/sys + umount /mnt + '' + ); + + fileSystems."/".label = "nixos"; + + boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; + boot.initrd.kernelModules = [ "virtio_scsi" ]; + + # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.timeout = 0; + + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; + + # Allow root logins only using the SSH key that the user specified + # at instance creation time. + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; + + # Force getting the hostname from Google Compute. + networking.hostName = mkDefault ""; + + # Always include cryptsetup so that NixOps can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + # Prevent logging in as root without a password. This doesn't really matter, + # since the only PAM services that allow logging in with a null + # password are local ones that are inaccessible on Google Compute machines. + security.initialRootPassword = "!"; + + # Configure default metadata hostnames + networking.extraHosts = '' + 169.254.169.254 metadata.google.internal metadata + ''; + + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9GBbtWUTDacovm2O6qDw/SsmUmwYBu3k+6kx8/Xv7IJK5uqxhNTBc0MfADBV6EMZVDkaw+rDeRvcDuEzz2r/CP/x1vVDiwWYjyU2uOZEHFKh15W/1qC9fwBIikcbgm+8R33kmpFr9AChP4KWR+4T3jf0AYknZ3pbZ5GPCTWmWeOR4PVhtusDt0/cfWrENrA0mFo37xohn5lFsbrJ5/rMuhWglTuHIQFGwECqbYPvyxDLZxAfqg1Wc1AJAW8xRuJafvPyuxsj+qJu+MfKpAcxSoXDtldPxCFF6e/4j0Ey/kz435fJS/AjSJwmeurOQ/vB+tm2Db1wLWc1669S46Kl rbvermaa@propowerrrr"]; + + # fetch authorized keys for root user + systemd.services.fetch-root-authorized-keys = + { description = "Fetch authorized_keys for root user."; + + wantedBy = [ "multi-user.target" ]; + before = [ "sshd.service" ]; + after = [ "network.target" ]; + + path = [ pkgs.curl ]; + script = + '' + # Don't download the SSH key if it has already been downloaded + if ! [ -e /root/.ssh/authorized_keys ]; then + echo "obtaining SSH key..." + mkdir -p /root/.ssh + curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then + cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub + if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then + cat /root/key.pub >> /root/.ssh/authorized_keys + echo "new key added to authorized_keys" + fi + chmod 600 /root/.ssh/authorized_keys + rm -f /root/key.pub /root/authorized-keys-metadata + fi + fi + ''; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + }; + + +} From ee8a58a72f8c39096e2dc19bb8ddba673616b7c6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 11 Dec 2013 16:18:12 +0100 Subject: [PATCH 128/515] Remove a hardcoded SSH public key from the Google Compute image. --- nixos/modules/virtualisation/google-compute-image.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index edf10c0e504..3254d64b284 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -121,8 +121,6 @@ with pkgs.lib; 169.254.169.254 metadata.google.internal metadata ''; - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9GBbtWUTDacovm2O6qDw/SsmUmwYBu3k+6kx8/Xv7IJK5uqxhNTBc0MfADBV6EMZVDkaw+rDeRvcDuEzz2r/CP/x1vVDiwWYjyU2uOZEHFKh15W/1qC9fwBIikcbgm+8R33kmpFr9AChP4KWR+4T3jf0AYknZ3pbZ5GPCTWmWeOR4PVhtusDt0/cfWrENrA0mFo37xohn5lFsbrJ5/rMuhWglTuHIQFGwECqbYPvyxDLZxAfqg1Wc1AJAW8xRuJafvPyuxsj+qJu+MfKpAcxSoXDtldPxCFF6e/4j0Ey/kz435fJS/AjSJwmeurOQ/vB+tm2Db1wLWc1669S46Kl rbvermaa@propowerrrr"]; - # fetch authorized keys for root user systemd.services.fetch-root-authorized-keys = { description = "Fetch authorized_keys for root user."; From 14018c2de1a1b4244fda239ee318f0b5d81dea57 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Dec 2013 21:14:17 +0100 Subject: [PATCH 129/515] fail2ban: Fix preStart action Creating /run/fail2ban didn't work since it didn't have write permission to /run. Now it does. Reported by Thomas Bereknyei. --- nixos/modules/services/security/fail2ban.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 395a5df8af0..ae1fd22d23e 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -106,7 +106,7 @@ in serviceConfig = { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f"; ReadOnlyDirectories = "/"; - ReadWriteDirectories = "/run/fail2ban /var/tmp"; + ReadWriteDirectories = "/run /var/tmp"; CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; }; From 3e06d3da1db823a598925aee0f94180bbff73029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 12 Dec 2013 00:32:13 +0100 Subject: [PATCH 130/515] dmidecode: set meta.platforms to linux --- pkgs/os-specific/linux/dmidecode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 40564f9f95a..19d4092ba78 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { makeFlags = "prefix=$(out)"; - meta = { + meta = with stdenv.lib; { homepage = http://www.nongnu.org/dmidecode/; description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; + platforms = platforms.linux; }; } From b95f7102eea4f00dd723671fca29041c461efb9b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:52:31 +0200 Subject: [PATCH 131/515] flpsed: update from 0.7.0 to 0.7.1 --- pkgs/applications/editors/flpsed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 15605218b74..a18bfd8b2c6 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, fltk13, ghostscript}: stdenv.mkDerivation { - name = "flpsed-0.7.0"; + name = "flpsed-0.7.1"; src = fetchurl { - url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz"; - sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62"; + url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz"; + sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3"; }; buildInputs = [ fltk13 ghostscript ]; From c584ac123f716f52fb0779a3b66b84c514126a02 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:57:03 +0200 Subject: [PATCH 132/515] fping: update from 3.4 to 3.8 --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 4bda944c68a..10f31fb8297 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.4"; + name = "fping-3.8"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "1zkawlk6lcqw6nakqnl3v0x1cwnxrx2lmg9q6j76mw9i96pjh9fl"; + sha256 = "04iwj4x3wns09wp777mb3kwfi7ypb4m9m73p0s2y699px77hcx67"; }; meta = { From c8f28ec7e32619103232af7d19e11e21d22a24a1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:58:18 +0200 Subject: [PATCH 133/515] geany: update from 1.23 to 1.23.1 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e7c8e276d27..d7ed048cdaa 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: let - version = "1.23"; + version = "1.23.1"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d"; + sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8"; }; buildInputs = [ gtk2 which pkgconfig intltool ]; From 57826becead63ab9fe0245ec5f0912fb3bbc5175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:01:00 +0200 Subject: [PATCH 134/515] gengetopt: update from 2.22.5 to 2.22.6 --- pkgs/development/tools/misc/gengetopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index dc7a467fb0c..d0efe4e6249 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gengetopt-2.22.5"; + name = "gengetopt-2.22.6"; src = fetchurl { url = "mirror://gnu/gengetopt/${name}.tar.gz"; - sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv"; + sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h"; }; doCheck = true; From 143dcc1123dbb7cacb221a01073355e28f8516b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:06:26 +0200 Subject: [PATCH 135/515] geos: update from 3.3.8 to 3.4.2 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 56c3c3e7a2b..d1695f295fc 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -10,11 +10,11 @@ composableDerivation.composableDerivation {} rec { # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - name = "geos-3.3.8"; + name = "geos-3.4.2"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b"; + sha256 = "0lvcs8x9as5jlxilykgg3i4220x8m4z59b2ngfapl219gvgvzs0m"; }; enableParallelBuilding = true; From b35d255286a0240b0fe37f038f31b65ea8e8d505 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:10:58 +0200 Subject: [PATCH 136/515] gkrellm: update from 2.3.4 to 2.3.5 --- pkgs/applications/misc/gkrellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index af10ca9800d..3b8f8b1cc68 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }: stdenv.mkDerivation rec { - name = "gkrellm-2.3.4"; + name = "gkrellm-2.3.5"; src = fetchurl { url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2"; - sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl"; + sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; }; buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]; From 8cfaf0697c841c0dd8dcd540bac4e6cd17782eff Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:13:44 +0200 Subject: [PATCH 137/515] global: update from 6.2.2 to 6.2.9 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 91cf2be4f73..d1cd59d8828 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtool, ncurses }: stdenv.mkDerivation rec { - name = "global-6.2.2"; + name = "global-6.2.9"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "0a41d3wc22f05fqi5zpx1r22annsi4whdkjdmw50nidjca1vq5pj"; + sha256 = "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q"; }; buildInputs = [ libtool ncurses ]; From 510100344efb9ce96e799dc06eb1a74d208e40b3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:15:58 +0200 Subject: [PATCH 138/515] glpk: update from 4.47 to 4.52.1 --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index edfbc0e86d7..eb653591005 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.47"; + name = "glpk-4.52.1"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63"; + sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j"; }; doCheck = true; From e0ae2b01e615551164314468beda62f91921d8f7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:20:20 +0200 Subject: [PATCH 139/515] gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10 --- .../tools/documentation/gnome-doc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 374002e8d6c..b653c705478 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -2,11 +2,11 @@ , makeWrapper, pythonPackages }: stdenv.mkDerivation { - name = "gnome-doc-utils-0.20.7"; + name = "gnome-doc-utils-0.20.10"; src = fetchurl { - url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz; - sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q"; + url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz; + sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; configureFlags = "--disable-scrollkeeper"; From 687a074979f50b7025d21e8cbdd4e8ef05b5c8a4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:23:06 +0200 Subject: [PATCH 140/515] gnonlin: update from 0.10.15 to 0.10.17 --- pkgs/development/libraries/gstreamer/gnonlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index ca386b15f0e..820e8eb07c9 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }: stdenv.mkDerivation rec { - name = "gnonlin-0.10.15"; + name = "gnonlin-0.10.17"; src = fetchurl { urls = [ "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0"; + sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; }; buildInputs = [ gst_plugins_base gstreamer pkgconfig ]; From f453b1fd03eaea85871274d50339625433b9cc6b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:24:44 +0200 Subject: [PATCH 141/515] gnuvd: update from 1.0.10 to 1.0.12 --- pkgs/tools/misc/gnuvd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 122694af456..359f04673ea 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gnuvd-1.0.10"; + name = "gnuvd-1.0.12"; src = fetchurl { - url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.10.tar.gz ; - sha256 = "07mlynarcaal74ibbpqrsd982jmw6xfwgvcp9n6191d4h56a000s"; + url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; meta = { From bf05b39cd53147f869607370caab3e2d585e1e42 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 11 Dec 2013 22:00:31 +0200 Subject: [PATCH 142/515] gptfdisk: fix maintainers --- pkgs/tools/system/gptfdisk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 7c8c2ec09ed..817e3015efe 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.rodsbooks.com/gdisk/; - maintainers = stdenv.lib.maintainers.shlevy; + maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; From 1cedd2647f8d3baf3bc5bd1bf306d4c9097a660b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:26:11 +0200 Subject: [PATCH 143/515] autopanosiftc: update from 2.5.0 to 2.5.1 --- pkgs/applications/graphics/autopanosiftc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index a27d982ce8b..be3cfc5935c 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: stdenv.mkDerivation { - name = "autopano-sift-C-2.5.0"; + name = "autopano-sift-C-2.5.1"; src = fetchurl { - url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz; - sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3"; + url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz; + sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; From b376a50dc52c2d12f81004e7c835938a3d97e218 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:30:14 +0200 Subject: [PATCH 144/515] autossh: update from 1.4b to 1.4c --- pkgs/tools/networking/autossh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 0c32b1c1240..94c466612ef 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation { - name = "autossh-1.4b"; + name = "autossh-1.4c"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz"; - md5 = "8f9aa006f6f69e912d3c2f504622d6f7"; + url = "http://www.harding.motd.ca/autossh/autossh-1.4c.tgz"; + sha256 = "07gxqxfsk24msd0py0hirvmlblh9iyxkcrq86bwbsils81mbmjkg"; }; buildInputs = [ openssh ]; From 233118579400d89af0674ac11aa0bb9f920734e7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:34:12 +0200 Subject: [PATCH 145/515] qbittorrent: update from 3.1.2 to 3.1.3 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 5aff37580d3..0ba160c8a91 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "qbittorrent-3.1.2"; + name = "qbittorrent-3.1.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y"; + sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww"; }; buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar From 85372d5fba8cbe85326801a336f5919e0ed64d27 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 12 Dec 2013 11:04:38 +0800 Subject: [PATCH 146/515] add ranger 1.6.1 --- pkgs/applications/misc/ranger/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/ranger/default.nix diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix new file mode 100644 index 00000000000..5f75c05a68f --- /dev/null +++ b/pkgs/applications/misc/ranger/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, python, fetchurl }: + +buildPythonPackage { + name = "ranger-1.6.1"; + + meta = { + description = "File manager with minimalistic curses interface"; + homepage = "http://ranger.nongnu.org/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz"; + sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc"; + }; + + doCheck = false; + + propagatedBuildInputs = with python.modules; [ curses ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f9f1ccf047..5ada4859ac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1672,6 +1672,8 @@ let radvd = callPackage ../tools/networking/radvd { }; + ranger = callPackage ../applications/misc/ranger { }; + privateer = callPackage ../games/privateer { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; From 6129be5a7a471e47fa79a14c1d2683273d712770 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Wed, 11 Dec 2013 23:17:53 -0500 Subject: [PATCH 147/515] Correct web-skip value to match behavior of checkip.dyndns.com --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 62709a040a1..c53cb68fb75 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -86,7 +86,7 @@ in }; web = mkOption { - default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ; + default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ; description = ""; }; From 4c1981c4e0b016db127e86eacff7e8d5269ef898 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 12 Dec 2013 09:33:57 +0200 Subject: [PATCH 148/515] Revert "virtuoso: update from 6.1.6 to 6.1.7" Upstream KDE advises against 6.1.7 for now This reverts commit 7c19a2213fe578a73994455bff650eaf7c0a4d3b. --- pkgs/servers/sql/virtuoso/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 83ad717c0d3..9453b8d2cdb 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.7"; + name = "virtuoso-opensource-6.1.6"; src = fetchurl { url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; - sha256 = "0zxaf6i93jnh9lmgxxlb3jddp9ianil0szazfb6mrnqh13liwb68"; + sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; buildInputs = [ libxml2 openssl readline gawk ]; From 8c2dd86fe282adc473590c5ba09ee6d96f27717f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 10:37:29 +0100 Subject: [PATCH 149/515] Manual: Fix typo Fixes #1363. --- nixos/doc/manual/development.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml index cbf7ff8902f..be1cbc97d5e 100644 --- a/nixos/doc/manual/development.xml +++ b/nixos/doc/manual/development.xml @@ -494,7 +494,7 @@ module writers. - + This set defines files in /etc. A typical use is: From 61d346eaaf6327cba260a0d1c67112dbe37ad4cf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 12 Dec 2013 12:48:09 +0100 Subject: [PATCH 150/515] Google Compute image: fix punctuation in description, give disk image proper name with version and revision. --- nixos/modules/virtualisation/google-compute-image.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 3254d64b284..098c9ede853 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -11,7 +11,7 @@ with pkgs.lib; { preVM = '' mkdir $out - diskImage=$out/disk.raw + diskImage=$out/$diskImageBase truncate $diskImage --size 10G mv closure xchg/ ''; @@ -20,11 +20,11 @@ with pkgs.lib; '' PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin pushd $out - tar -Szcf disk.raw.tar.gz disk.raw - rm $out/disk.raw + tar -Szcf $diskImageBase.tar.gz $diskImageBase + rm $out/$diskImageBase popd ''; - + diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; buildInputs = [ pkgs.utillinux pkgs.perl ]; exportReferencesGraph = [ "closure" config.system.build.toplevel ]; @@ -121,9 +121,8 @@ with pkgs.lib; 169.254.169.254 metadata.google.internal metadata ''; - # fetch authorized keys for root user systemd.services.fetch-root-authorized-keys = - { description = "Fetch authorized_keys for root user."; + { description = "Fetch authorized_keys for root user"; wantedBy = [ "multi-user.target" ]; before = [ "sshd.service" ]; From 38a0e6dfd583d00edc5d8caedbbee86761ed8af1 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 12 Dec 2013 14:11:24 +0100 Subject: [PATCH 151/515] lispPackages: Fix Github URIs. Signed-off-by: Moritz Ulrich --- pkgs/development/lisp-modules/lisp-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 015d5fccdc3..f7d6dd2676d 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -23,7 +23,7 @@ let lispPackages = rec { description = "X11 bindings for Common Lisp"; deps = []; src = pkgs.fetchgit { - url = "https://github.com/sharplispers/clx/"; + url = "https://github.com/sharplispers/clx.git"; rev = "e2b762ac93d78d6eeca4f36698c8dfd1537ce998"; sha256 = "0jcrmlaayz7m8ixgriq7id3pdklyk785qvpcxdpcp4aqnfiiqhij"; }; @@ -64,7 +64,7 @@ let lispPackages = rec { description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; deps = [alexandria cl-unification esrap iterate]; src = pkgs.fetchgit { - url = "https://github.com/fb08af68/esrap-peg"; + url = "https://github.com/fb08af68/esrap-peg.git"; sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1"; rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8''; @@ -92,7 +92,7 @@ let lispPackages = rec { description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; deps = [alexandria]; src = pkgs.fetchgit { - url = "https://github.com/scymtym/esrap"; + url = "https://github.com/scymtym/esrap.git"; sha256 = "c56616ac01be0f69e72902f9fd830a8af2c2fa9018b66747a5da3988ae38817f"; rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26''; From 0e18b7cd9707240287f17b530c99aa5368c14b0b Mon Sep 17 00:00:00 2001 From: Chong Li Date: Wed, 11 Dec 2013 21:12:40 +0100 Subject: [PATCH 152/515] Switched xbmc to pythonFull. Fixes python plugin errors. --- pkgs/applications/video/xbmc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 59537c7dce0..691b41dc6e3 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper -, pkgconfig, cmake, gnumake, yasm, python +, pkgconfig, cmake, gnumake, yasm, pythonFull , boost, avahi, libdvdcss, lame , gettext, pcre, yajl, fribidi , openssl, gperf, tinyxml2, taglib, libssh, swig, jre @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - pkgconfig cmake gnumake yasm python + pkgconfig cmake gnumake yasm pythonFull boost libmicrohttpd gettext pcre yajl fribidi openssl gperf tinyxml2 taglib libssh swig jre @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${python}/bin" \ + --prefix PATH ":" "${pythonFull}/bin" \ --prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \ --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ From e69887ea67297b99f3c89f58fc2486c2e0dd1cfc Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 12 Dec 2013 18:49:14 +0100 Subject: [PATCH 153/515] LISP: Don't build/download texlive for every lispPackage. Signed-off-by: Moritz Ulrich --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f9f1ccf047..d995a9ef792 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6021,7 +6021,9 @@ let ### DEVELOPMENT / LISP MODULES - asdf = callPackage ../development/lisp-modules/asdf {}; + asdf = callPackage ../development/lisp-modules/asdf { + texLive = null; + }; clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; wrapLisp = lisp: clwrapperFunction {lisp=lisp;}; lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{ From a42508a8ba3f0cba2b62c138f242461e302e96df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 12 Dec 2013 13:10:30 -0500 Subject: [PATCH 154/515] Add function to call a function with a cross-product of lists of arguments Signed-off-by: Shea Levy --- lib/lists.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/lists.nix b/lib/lists.nix index d6e8628f03a..561a657264b 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -225,4 +225,10 @@ in rec { deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; + crossLists = f: xss: + let + argss = fold (l: argss: + concatMap (arg: map (args: [ arg ] ++ args) argss) l + ) [[]] xss; + in map (args: foldl (f: arg: f arg) f args) argss; } From a2c48451a25ca95d82090c3e5e8134dd3a923c97 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Thu, 12 Dec 2013 19:41:51 +0100 Subject: [PATCH 155/515] enabled introspection for clutter,cogl and json-glib --- pkgs/development/libraries/clutter/default.nix | 8 +++++--- pkgs/development/libraries/cogl/default.nix | 7 +++++-- pkgs/development/libraries/json-glib/default.nix | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 33bc196143b..df3ffc8f60f 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: +, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, +gobjectIntrospection +}: stdenv.mkDerivation { name = "clutter-1.8.2"; @@ -12,10 +14,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib + atk json_glib gobjectIntrospection ]; - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK meta = { description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index abb92f7b08b..b02319fd3e8 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite , libXdamage, libintlOrEmpty -, pangoSupport ? true, pango, cairo }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = " --enable-introspection " ; + propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage +gobjectIntrospection ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 8ca1445b1f6..005b9fac2e5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; }; + configureflags= " --with-introspection " ; + propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection]; meta = { homepage = http://live.gnome.org/JsonGlib; From 3c5971692a0edd8867b1c6f91598e0c403bf1376 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 12 Dec 2013 14:01:48 -0500 Subject: [PATCH 156/515] Simplify crossLists Signed-off-by: Shea Levy --- lib/lists.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/lists.nix b/lib/lists.nix index 561a657264b..71a89702796 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -225,10 +225,5 @@ in rec { deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; - crossLists = f: xss: - let - argss = fold (l: argss: - concatMap (arg: map (args: [ arg ] ++ args) argss) l - ) [[]] xss; - in map (args: foldl (f: arg: f arg) f args) argss; + crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; } From dbfeebeef74a8ef5b13424985f7e05d1d841e51e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 22:26:57 +0200 Subject: [PATCH 157/515] libzip: update from 0.10 to 0.11.1, potentially fixes CVE-2012-1162, CVE-2012-1163 --- pkgs/development/libraries/libzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 48ef55892c8..914157c7a0c 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.10"; + name = "libzip-0.11.1"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp"; + sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy"; }; propagatedBuildInputs = [ zlib ]; From 8264cb98ae14305e6f89728cacd3ea88064c24ca Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:46:12 +0200 Subject: [PATCH 158/515] perlPackages.HTTPBody: update from 1.17 to 1.19, potentially fixes CVE-2013-4407 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05a6aec35a2..c683a91e468 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4008,10 +4008,10 @@ rec { }; HTTPBody = buildPerlPackage { - name = "HTTP-Body-1.17"; + name = "HTTP-Body-1.19"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.17.tar.gz; - sha256 = "1476zdcg1cdal3ik6ccwm3rqfgsdac6b63f92wmipvn8lkjdl70k"; + url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.19.tar.gz; + sha256 = "0ahhksj0zg6wq6glpjkxdr3byd5riwvq2f5aw21n1jcsl71nll01"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ HTTPMessage ]; From aef9ae72d014bb40dd1ffaab72485321c7d9c706 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:50:47 +0200 Subject: [PATCH 159/515] bogofilter: update from 1.1.7 to 1.2.4, potentially fixes CVE-2012-5468 --- pkgs/tools/misc/bogofilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 3d9287a9b8c..2ec7f433596 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,10 +1,10 @@ {fetchurl, stdenv, flex, bdb}: stdenv.mkDerivation rec { - name = "bogofilter-1.1.7"; + name = "bogofilter-1.2.4"; src = fetchurl { url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; - sha256 = "0ahi3pxv9v6yjjpfyr0x7fch4c4jdikshrcx86q0j8s2rhv94snm"; + sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; }; # FIXME: We would need `pax' as a "propagated build input" (for use From 22840f80487d8531728fafd3fc3b1d9256142573 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:55:06 +0200 Subject: [PATCH 160/515] libgcrypt: update from 1.5.2 to 1.5.3, potentially fixes CVE-2013-4242 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index cb60355ef55..997e9cfc5b8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation (rec { - name = "libgcrypt-1.5.2"; + name = "libgcrypt-1.5.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4"; + sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; }; propagatedBuildInputs = [ libgpgerror ]; From 22eabfcc025992ad340124fbdf72ce8fc1940ac3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:00:48 +0200 Subject: [PATCH 161/515] libproxy: update from 0.4.7 to 0.4.11, potentially fixes CVE-2012-4504 --- pkgs/development/libraries/libproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 8461bfef439..68c3ac5130d 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, zlib}: stdenv.mkDerivation rec { - name = "libproxy-0.4.7"; + name = "libproxy-0.4.11"; src = fetchurl { url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; - sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g"; + sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw"; }; buildInputs = [cmake zlib]; } From 36677bbe869c7738a04540a01bd89c82da112dba Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:08:33 +0200 Subject: [PATCH 162/515] smbldaptools: update from 0.9.7 to 0.9.10, potentially fixes CVE-2012-0961, CVE-2013-1051 --- pkgs/tools/networking/smbldaptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 962799117a0..74e8a530560 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}: let - version = "0.9.7"; + version = "0.9.10"; in stdenv.mkDerivation { name = "smbldap-tools-${version}"; src = fetchurl { url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz"; - sha256 = "0y1k2j5qjxy66yvl36adbp9m1brapiz9ycaisdyy6093xvw1nh7j"; + sha256 = "19hsvslfs61pk9nhyqdkd68gc95z26kpkmsj10b8zvzlhqmwdvy4"; }; buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ]; From ec833696392789e4b6016292892c19dc77d9286f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:10:35 +0200 Subject: [PATCH 163/515] subversionClient: update from 1.7.13 to 1.7.14, potentially fixes CVE-2013-4558 --- 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 bdf34cdba9a..1af54994fd1 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.13"; + version = "1.7.14"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "844bb756ec505edaa12b9610832bcd21567139f1"; + sha256 = "038jbcpwm083abp0rvk0fhnx65kp9mz1qvzs3f83ig8fxcvqzb64"; }; buildInputs = [ zlib apr aprutil sqlite ] From ed9ce850fd317e38295b7a441c580f9678b51ca6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:39:20 +0200 Subject: [PATCH 164/515] policycoreutils: update from 2.2.4 to 2.2.5 --- pkgs/os-specific/linux/policycoreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 5c7e704390b..063f89edaa2 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.2.4"; + version = "2.2.5"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "08zpd2a2j45j1qkmq9sz084r2xr0fky1cnld45sn8w5xgdw8k81n"; + sha256 = "1i0chc3km3wdgzrd556mmhvsglydxrimclnn77s73wy2qfl51y5v"; }; patchPhase = '' From d9f3dab48ebe4614f1813229071eb05578511046 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 12 Dec 2013 20:27:07 -0800 Subject: [PATCH 165/515] Firefox 26.0. (Doesn't build.) --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 1f37911b832..a48535b9b32 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "25.0.1"; + firefoxVersion = "26.0"; - xulVersion = "25.0.1"; # this attribute is used by other packages + xulVersion = "26.0"; # this attribute is used by other packages src = fetchurl { @@ -29,7 +29,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3"; + sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5"; }; commonConfigureFlags = From 8ddc7b8db26747ef7f0554fa486ba044150ae742 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 13 Dec 2013 00:11:52 -0800 Subject: [PATCH 166/515] firefox: Hack to get it to compile. --- .../networking/browsers/firefox/default.nix | 1 + .../networking/browsers/firefox/xpidl.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/xpidl.patch diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a48535b9b32..49c1e5951b6 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -143,6 +143,7 @@ rec { patches = [ ./disable-reporter.patch # fixes "search box not working when built on xulrunner" + ./xpidl.patch ]; propagatedBuildInputs = [xulrunner]; diff --git a/pkgs/applications/networking/browsers/firefox/xpidl.patch b/pkgs/applications/networking/browsers/firefox/xpidl.patch new file mode 100644 index 00000000000..e6a6b4d8264 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/xpidl.patch @@ -0,0 +1,11 @@ +--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 08:07:53.000000000 -0800 ++++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-12 23:38:39.697318563 -0800 +@@ -421,7 +421,7 @@ + def _handle_idl_manager(self, manager): + build_files = self._purge_manifests['xpidl'] + +- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done', ++ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done', + 'xpt/.mkdir.done'): + build_files.add(p) + From 3c677fde651aa07e310fe351b84f7737c9f51bf7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:32:36 +0100 Subject: [PATCH 167/515] ati-drivers: fix aticonfig segmentation fault Fix aticonfig tool by setting libXinerama to LD_LIBRARY_PATH --- pkgs/os-specific/linux/ati-drivers/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index ab95accd749..51430f6e4eb 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patchPhase = "patch -p0 < ${./gentoo-patches.patch}"; buildInputs = - [ xlibs.libXext xlibs.libX11 + [ xlibs.libXext xlibs.libX11 xlibs.libXinerama xlibs.libXrandr which imake makeWrapper patchelf unzip @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { "${xorg.libXrender}/lib" "${xorg.libXext}/lib" "${xorg.libX11}/lib" + "${xorg.libXinerama}/lib" ]; # without this some applications like blender don't start, but they start From 698860bf7cd0b85f4d4e0a019ac96da26a23455b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:38:09 +0100 Subject: [PATCH 168/515] nginx: add headers more nginx module --- pkgs/servers/http/nginx/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 86b22ab5a18..fe0681448e3 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat , rtmp ? false , fullWebDAV ? false -, syslog ? false}: +, syslog ? false +, moreheaders ? false}: let version = "1.4.4"; @@ -27,6 +28,12 @@ let rev = "165affd9741f0e30c4c8225da5e487d33832aca3"; sha256 = "14dkkafjnbapp6jnvrjg9ip46j00cr8pqc2g7374z9aj7hrvdvhs"; }; + + moreheaders-ext = fetchgit { + url = https://github.com/agentzh/headers-more-nginx-module.git; + rev = "refs/tags/v0.23"; + sha256 = "12pbjgsxnvcf2ff2i2qdn39q4cm5czlgrng96j8ml4cgxvnbdh39"; + }; in stdenv.mkDerivation rec { @@ -49,7 +56,8 @@ stdenv.mkDerivation rec { # "--with-http_perl_module" ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" - ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; + ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}" + ++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" From 1b019fe39fbc9638cf616698cbe7fe7fe4d85c36 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:41:22 +0100 Subject: [PATCH 169/515] nginx: enable ipv6 and spdy --- pkgs/servers/http/nginx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 86b22ab5a18..d29518d710e 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -40,11 +40,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-http_ssl_module" + "--with-http_spdy_module" "--with-http_xslt_module" "--with-http_sub_module" "--with-http_dav_module" "--with-http_gzip_static_module" "--with-http_secure_link_module" + "--with-ipv6" # Install destination problems # "--with-http_perl_module" ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" From c2f385cf4acd1dadca8a780935a99c0ea0d8fba3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:44:51 +0100 Subject: [PATCH 170/515] dhcpcd: make dhcpcd work in linux containers --- pkgs/tools/networking/dhcpcd/default.nix | 2 ++ .../dhcpcd/lxc_ro_promote_secondaries.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 9b3b6238420..ad0b62d19f8 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; }; + patches = [ ./lxc_ro_promote_secondaries.patch ]; + configureFlags = "--sysconfdir=/etc"; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch new file mode 100644 index 00000000000..066ea67db9e --- /dev/null +++ b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch @@ -0,0 +1,12 @@ +diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c +--- dhcpcd-6.1.0-old/if-linux.c 2013-09-20 12:27:24.000000000 +0200 ++++ dhcpcd-6.1.0/if-linux.c 2013-12-13 09:50:24.183694744 +0100 +@@ -86,7 +86,7 @@ if_init(struct interface *iface) + + fp = fopen(path, "w"); + if (fp == NULL) +- return errno == ENOENT ? 0 : -1; ++ return (errno == ENOENT || errno == EROFS) ? 0 : -1; + n = fprintf(fp, "1"); + fclose(fp); + return n == -1 ? -1 : 0; From 24e2ef512682a4c86c9b2f22c3412fbf74639cea Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 10:05:36 +0100 Subject: [PATCH 171/515] memcached: set uid to make it work with #1076 --- nixos/modules/misc/ids.nix | 1 + nixos/modules/services/databases/memcached.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index ccd75d5b915..6f2666e4ae5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -108,6 +108,7 @@ haproxy = 97; mongodb = 98; openldap = 99; + memcached = 100; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index a0e264f2299..505253229c9 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -68,8 +68,9 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers = singleton + users.extraUsers.memcached = { name = cfg.user; + uid = config.ids.uids.memcached; description = "Memcached server user"; }; From c53d8c81f5025a9a182c7843f3595ea0d9484957 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 13 Dec 2013 11:13:23 +0200 Subject: [PATCH 172/515] pycrypto: remove version 2.5 since it's vulnerable to CVE-2012-2417, CVE-2013-1445 --- .../python-modules/pycrypto/2.5.nix | 29 ------------------- pkgs/top-level/python-packages.nix | 5 ---- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/development/python-modules/pycrypto/2.5.nix diff --git a/pkgs/development/python-modules/pycrypto/2.5.nix b/pkgs/development/python-modules/pycrypto/2.5.nix deleted file mode 100644 index de192c64b72..00000000000 --- a/pkgs/development/python-modules/pycrypto/2.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage, gmp }: - -buildPythonPackage rec { - name = "pycrypto-2.5"; - namePrefix = ""; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz"; - md5 = "783e45d4a1a309e03ab378b00f97b291"; - }; - - buildInputs = [ python gmp ]; - - buildPhase = - '' - python ./setup.py build_ext --library-dirs=${gmp}/lib - ''; - -# installPhase = -# '' -# python ./setup.py install --prefix=$out -# ''; - - meta = { - homepage = "http://www.pycrypto.org/"; - description = "Python Cryptography Toolkit"; - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baf5003ccda..5b44dff89bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,11 +96,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage; }; - pycrypto25 = import ../development/python-modules/pycrypto/2.5.nix { - inherit (pkgs) fetchurl stdenv gmp; - inherit python buildPythonPackage; - }; - pygobject = import ../development/python-modules/pygobject { inherit (pkgs) stdenv fetchurl pkgconfig glib; inherit python; From faf82de7d2e80aac1c3acf0c8ddf383c2450f15a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 10:15:35 +0100 Subject: [PATCH 173/515] cgminer: update to 3.7.2 --- pkgs/applications/misc/cgminer/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 4ae404a002f..54650d395c2 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -1,19 +1,22 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake, - curl, ncurses, amdappsdk, amdadlsdk, xorg }: + curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }: stdenv.mkDerivation rec { - version = "2.11.4"; + version = "3.7.2"; name = "cgminer-${version}"; src = fetchgit { url = "https://github.com/ckolivas/cgminer.git"; - rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715"; - sha256 = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a"; + rev = "refs/tags/v3.7.2"; + sha256 = "0hl71328l19rlclajb6k9xsqybm2ln8g44p788gijpw4laj9yli6"; }; - buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ]; + buildInputs = [ + autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk + xorg.libX11 xorg.libXext xorg.libXinerama jansson + ]; configureScript = "./autogen.sh"; - configureFlags = "--enable-scrypt"; + configureFlags = "--enable-scrypt --enable-opencl"; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; preConfigure = '' @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { ''; postBuild = '' - gcc api-example.c -I compat/jansson -o cgminer-api + gcc api-example.c -o cgminer-api ''; postInstall = '' From 2e094898950c625cbc11be06997023e4248bc453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 13 Dec 2013 11:16:40 +0100 Subject: [PATCH 174/515] Adding Apache Thrift. --- pkgs/development/libraries/thrift/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/thrift/default.nix diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix new file mode 100644 index 00000000000..2b555db3282 --- /dev/null +++ b/pkgs/development/libraries/thrift/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf, +libtool, pkgconfig, bison, flex }: + +stdenv.mkDerivation { + name = "thrift-0.9.1"; + + # I take git, because the tarball is broken. + # http://stackoverflow.com/questions/18643642/libtool-error-building-thrift-0-9-1-on-ubuntu-13-04 + src = fetchgit { + url = "https://git-wip-us.apache.org/repos/asf/thrift.git"; + rev = "ff980c1432936c6bc897c60469ab05b5e0c6cb5e"; + md5 = "466aca9e43e43df868f4385af50e32f6"; + }; + + enableParallelBuilding = true; + buildInputs = [ boost zlib libevent openssl python automake autoconf libtool + pkgconfig bison flex ]; + + preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out"; + + meta = { + homepage = http://thrift.apache.org/; + license = "ASL2.0"; + description = "Library for scalable cross-language services"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d995a9ef792..be875c2a88e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5779,6 +5779,8 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; + thrift = callPackage ../development/libraries/thrift { }; + tinyxml = tinyxml2; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; From 6ffa9261f95c06ee039ab8813f6790cd80babec5 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Fri, 13 Dec 2013 10:41:38 +0100 Subject: [PATCH 175/515] tmpwatch: Add package. --- pkgs/tools/misc/tmpwatch/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/misc/tmpwatch/default.nix diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix new file mode 100644 index 00000000000..2257fb50293 --- /dev/null +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "tmpwatch-2.11"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2"; + sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; + }; + + meta = { + homepage = https://fedorahosted.org/tmpwatch/; + description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; + licence = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be875c2a88e..a81c58d55c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1893,6 +1893,8 @@ let tinc = callPackage ../tools/networking/tinc { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; + tmux = callPackage ../tools/misc/tmux { }; tor = callPackage ../tools/security/tor { }; From 8f583cced9baffd717309f685714db799dea687c Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 22 May 2013 18:25:30 +0200 Subject: [PATCH 176/515] photivo: Add photivo photo processor / RAW development laboratory. --- .../graphics/graphicsmagick/default.nix | 4 ++-- pkgs/applications/graphics/photivo/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/photivo/default.nix diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 1f795a800ff..536249e70a6 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz -, libX11}: +, libX11, quantumdepth ? 8}: let version = "1.3.18"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x"; }; - configureFlags = "--enable-shared"; + configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth; buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix new file mode 100644 index 00000000000..257ee681db6 --- /dev/null +++ b/pkgs/applications/graphics/photivo/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16, + lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }: + +stdenv.mkDerivation rec { + name = "photivo-2013-05-20"; + + src = fetchhg { + url = "http://code.google.com/p/photivo/"; + tag = "6256ff175312"; + sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a81c58d55c7..427c73d23f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7933,6 +7933,8 @@ let fftw = fftwSinglePrec; }; + photivo = callPackage ../applications/graphics/photivo { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; @@ -8095,6 +8097,7 @@ let }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; + graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix { libpng = libpng12; From 492c4838b267187ee93b42d8d55fdffecb75abb6 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 29 Apr 2013 22:19:58 +0200 Subject: [PATCH 177/515] perl-DBD-mysql: Update to 4.023 (.013 fails to build). --- pkgs/development/perl-modules/DBD-mysql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index c2bf899a9cd..a7464893cbb 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, DBI, mysql}: buildPerlPackage { - name = "DBD-mysql-4.013"; + name = "DBD-mysql-4.023"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.013.tar.gz; - sha256 = "074jm3fd9bi9am4i8alwim5i7a4gl07hzjy7a7hfdj9awbd0w9x9"; + url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.023.tar.gz; + sha256 = "0j4i0i6apjwx5klk3wigh6yysssn7bs6p8c5sh31m6qxsbgyk9xa"; }; buildInputs = [mysql] ; From c5927837413edd3d738cfc500e0988125ee6495a Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Thu, 16 May 2013 06:53:49 +0200 Subject: [PATCH 178/515] stepmania: A dance (rhythm) game in the spirit of DDR. --- pkgs/games/stepmania/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/games/stepmania/default.nix diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix new file mode 100644 index 00000000000..130f1f905a4 --- /dev/null +++ b/pkgs/games/stepmania/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchhg, zlib, bzip2, pkgconfig, alsaLib, pulseaudio, libmad, libtheora, + libvorbis, libpng, libjpeg, mesa, gtk, ffmpeg, automake, autoconf, glew }: + +stdenv.mkDerivation rec { + name = "stepmania-5"; + + src = fetchhg { + url = "https://code.google.com/p/sm-ssc/"; + # revision = "5fdf515a180e"; + sha256 = "05v19giq7d956islr2r8350zfwc4h8sq89xlj93ccii8rp94cvvf"; + }; + + buildInputs = [ zlib bzip2 pkgconfig alsaLib pulseaudio libmad libtheora + libvorbis libpng libjpeg mesa gtk ffmpeg automake autoconf glew ]; + + preConfigure = "./autogen.sh"; + postInstall = '' + mv "$out/stepmania 5/"* $out/ + rmdir "$out/stepmania 5" + mkdir -p $out/bin + echo "#\!/bin/sh" > $out/bin/stepmania + echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib' >> $out/bin/stepmania + echo "exec $out/stepmania" >> $out/bin/stepmania + chmod +x $out/bin/stepmania + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 427c73d23f6..f82bcb442f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5743,6 +5743,8 @@ let stlink = callPackage ../development/tools/misc/stlink { }; + stepmania = callPackage ../games/stepmania {}; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; From f9d66c239eb112619654ee2b831f78749d12bcef Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Tue, 28 May 2013 10:08:39 +0200 Subject: [PATCH 179/515] lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno files. --- .../tools/analysis/lcov/default.nix | 7 +- .../tools/analysis/lcov/find-source.patch | 84 ------------------- 2 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 pkgs/development/tools/analysis/lcov/find-source.patch diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 21064ebe870..a8d376ef23c 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,16 +1,15 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "lcov-1.9"; + name = "lcov-1.10"; src = fetchurl { url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "1jhs1x2qy5la5gpdfl805zm11rsz6anla3b0wffk6wq79xfi4zn3"; + sha256 = "13xq2ln4jjasslqzzhr5g11q1c19gwpng1jphzbzmylmrjz62ila"; }; patches = - [ ./find-source.patch ] - ++ (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch); + (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch); preBuild = '' makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man) diff --git a/pkgs/development/tools/analysis/lcov/find-source.patch b/pkgs/development/tools/analysis/lcov/find-source.patch deleted file mode 100644 index 428ae399d4e..00000000000 --- a/pkgs/development/tools/analysis/lcov/find-source.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- lcov-1.8/bin/geninfo 2010-01-29 11:14:46.000000000 +0100 -+++ lcov-1.8/bin/geninfo 2010-04-18 23:33:43.000000000 +0200 -@@ -51,6 +51,7 @@ - - use strict; - use File::Basename; -+use Cwd qw(abs_path); - use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir - splitpath rel2abs/; - use Getopt::Long; -@@ -95,6 +96,7 @@ sub match_filename($@); - sub solve_ambiguous_match($$$); - sub split_filename($); - sub solve_relative_path($$); -+sub find_source_file($$); - sub read_gcov_header($); - sub read_gcov_file($); - sub info(@); -@@ -964,7 +966,7 @@ sub process_dafile($$) - - if (defined($source)) - { -- $source = solve_relative_path($base_dir, $source); -+ $source = find_source_file($base_dir, $source); - } - - # gcov will happily create output even if there's no source code -@@ -981,18 +983,9 @@ sub process_dafile($$) - die("ERROR: could not read source file $source\n"); - } - -- @matches = match_filename(defined($source) ? $source : -- $gcov_file, keys(%{$instr})); -+ next if ! -r $source; - -- # Skip files that are not mentioned in the graph file -- if (!@matches) -- { -- warn("WARNING: cannot find an entry for ".$gcov_file. -- " in $graph_file_extension file, skipping ". -- "file!\n"); -- unlink($gcov_file); -- next; -- } -+ @matches = ($source); - - # Read in contents of gcov file - @result = read_gcov_file($gcov_file); -@@ -1242,6 +1235,25 @@ sub solve_relative_path($$) - } - - -+sub find_source_file($$) -+{ -+ my ($base_dir, $source) = @_; -+ my $dir = $base_dir; -+ -+ # Hack to make absolute paths work on Nixpkgs coverage -+ # reports. The source is in /nix/store//.build/. -+ $source = $1 if $source =~ /^\/.*\/\.build\/(.*)$/; -+ -+ while (!-e "$dir/$source") { -+ $dir = $dir . "/.."; -+ if (length $dir > 1000) { -+ return "$base_dir/$source"; -+ } -+ } -+ return abs_path("$dir/$source"); -+} -+ -+ - # - # match_filename(gcov_filename, list) - # -@@ -1918,7 +1930,7 @@ sub process_graphfile($$) - - # Get path to data file in absolute and normalized form (begins with /, - # contains no more ../ or ./) -- $graph_filename = solve_relative_path($cwd, $graph_filename); -+ $graph_filename = find_source_file($cwd, $graph_filename); - - # Get directory and basename of data file - ($graph_dir, $graph_basename) = split_filename($graph_filename); - From 0be455e0e4318bf74f81eab3fe7c82fc909b2a09 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 14:48:49 +0200 Subject: [PATCH 180/515] youtubeDL: update from 2013.12.08.1 to 2013.12.11.2 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 77d7efdb5f6..01ef17845c4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.08.1"; + version = "2013.12.11.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq"; + sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq"; }; buildInputs = [ python ]; From 3f21eaf705569d4e673d3cf6549fe787db3b1c6c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 16:14:57 +0200 Subject: [PATCH 181/515] cppunit: update from 1.12.0 to 1.12.1 --- pkgs/development/libraries/cppunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 2504f87a230..596720c542c 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cppunit-1.12.0"; + name = "cppunit-1.12.1"; src = fetchurl { - url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz; - sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; + url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz; + sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c"; }; meta = { From bb108be59cb7f0790dba060841ce03a7c2d1a4c7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 16:21:40 +0200 Subject: [PATCH 182/515] yajl: update from 2.0.1 to 2.0.4 --- pkgs/development/libraries/yajl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index e58c6dcba12..afcbcafab11 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation { - name = "yajl-2.0.1"; + name = "yajl-2.0.4"; src = fetchurl { - url = http://github.com/lloyd/yajl/tarball/2.0.1; + url = http://github.com/lloyd/yajl/tarball/2.0.4; name = "yajl-2.0.1.tar.gz"; - sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; + sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; }; buildInputs = [ cmake ruby ]; From ffb359cb57e26214559e7feaa810fc0563b7c1d9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:27:49 +0100 Subject: [PATCH 183/515] nmap: update to 6.40. close #1368. --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 2280ff3cfbe..73b6f660bf9 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nmap-5.50"; + name = "nmap-6.40"; src = fetchurl { url = "http://nmap.org/dist/${name}.tar.bz2"; - sha256 = "aa044113caa47e172c154daed73afc70ffa18d359eb47c22a9ea85ffcb14ffb8"; + sha256 = "491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401"; }; patches = [ ./zenmap.patch ]; From 28455d2388d0f01ac6e503090dad9b67ed68df50 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:37:04 +0200 Subject: [PATCH 184/515] libyaml: update from 0.1.3 to 0.1.4 --- pkgs/development/libraries/libyaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 50bc4019df6..cf687c97243 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libyaml-0.1.3"; + name = "libyaml-0.1.4"; src = fetchurl { - url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz; - sha256 = "a8bbad7e5250b3735126b7e3bd9f6fce9db19d6be7cc13abad17a24b59ec144a"; + url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz; + sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v"; }; meta = { From f717d1468cd3a709c239b771227c4b22ed6aecee Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:38:42 +0200 Subject: [PATCH 185/515] libwpg: update from 0.2.1 to 0.2.2 --- pkgs/development/libraries/libwpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 18a8e49beea..f71cc965472 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib }: stdenv.mkDerivation rec { - name = "libwpg-0.2.1"; + name = "libwpg-0.2.2"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d"; + sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl"; }; buildInputs = [ libwpd zlib ]; From 0aa3ff47e27bb650848d79b4ab7421c15c3cf9ab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:40:20 +0200 Subject: [PATCH 186/515] libwpd: update from 0.9.5 to 0.9.9 --- pkgs/development/libraries/libwpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3df58615aa6..830890fad56 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }: stdenv.mkDerivation rec { - name = "libwpd-0.9.5"; + name = "libwpd-0.9.9"; src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; - sha256 = "1qvmnszql8c900py83wrxnj2pyyy4107scdhvmhapp4gpmccmg7f"; + sha256 = "1cn2z89yzsz8k6xjl02jdfhm0pkarw3yxj9ijnz5dx7h1v5g87dr"; }; buildInputs = [ glib libgsf libxml2 zlib ]; From 05e8d1187f49a182028b8441a5b3c2da13967bec Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:41:58 +0200 Subject: [PATCH 187/515] libvolume_id: update from 0.81.0 to 0.81.1 --- pkgs/os-specific/linux/libvolume_id/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 3deaa7097c4..0a52df0bee7 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libvolume_id-0.81.0"; + name = "libvolume_id-0.81.1"; src = fetchurl { - url = http://www.marcuscom.com/downloads/libvolume_id-0.81.0.tar.bz2; - sha256 = "1dpmp1kb40kb1jxj6flpi37wy789wf91dm4bax6jspd1jdc6hsrg"; + url = http://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; + sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; preBuild = " From d466259fd88aa448d32af47145ba19ac383b6b11 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:46:34 +0200 Subject: [PATCH 188/515] libviper: update from 1.4.5 to 1.4.6 --- pkgs/development/libraries/libviper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index b292580e705..f82581b1097 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}: stdenv.mkDerivation rec { - name = "libviper-1.4.5"; + name = "libviper-1.4.6"; src = fetchurl { url = "mirror://sourceforge/libviper/${name}.tar.gz"; - sha256 = "1lryqv9xfsshx8x8c858h8fmsi2fkja0mhw415wa2bj9cqyb8byz"; + sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc"; }; patchPhase = '' From f1103684b4dddbf2729104c190bb95225060c4ef Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:47:21 +0200 Subject: [PATCH 189/515] libunibreak: update from 1.0 to 1.1 --- pkgs/development/libraries/libunibreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 5fb8622d1e0..bf4d07c51cf 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libunibreak-${version}"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz"; - sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25"; + sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; }; meta = with stdenv.lib; { From 27d28a2e759f91ef0af7cc1a735ddbb07941227b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:49:44 +0200 Subject: [PATCH 190/515] libtasn1: update from 2.13 to 2.14 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ad5783ae4f8..42fa2578062 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.13"; + name = "libtasn1-2.14"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "14asfhi35pwc67v7abbwim344h444237bjaqp92gwhhx7m44cvm5"; + sha256 = "0m1x2p04xpacl18dzv1hmsm2fk97gi167ra5h4kmjy16436kcadw"; }; doCheck = true; From 649fb3bd6ad8834b2c4d75794e295b32a8a31a3d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:52:34 +0200 Subject: [PATCH 191/515] libsodium: update from 0.4.3 to 0.4.5 --- pkgs/development/libraries/libsodium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e8124c2643a..754893894b6 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-0.4.3"; + name = "libsodium-0.4.5"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; + sha256 = "0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; }; NIX_LDFLAGS = "-lssp"; From ee95dbde4d02c8b380b4c587dc8ed5afc1cf9728 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:56:00 +0200 Subject: [PATCH 192/515] libnova: update from 0.12.1 to 0.12.3 --- pkgs/development/libraries/libnova/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 28decb9cfca..b56697865a7 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnova-0.12.1"; + name = "libnova-0.12.3"; src = fetchurl { url = "mirror://sourceforge/libnova/${name}.tar.gz"; - sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; + sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; }; meta = { From fd78d4d3890df8bf8e6d74d964750000da9d9118 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:57:47 +0200 Subject: [PATCH 193/515] libidn: update from 1.25 to 1.28 --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 1bd8aaca9dc..da8a7d50b67 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.25"; + name = "libidn-1.28"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "05j7qcj7gb791k6ya2pwr7cq9yxgi0bjqiiwf9yq6pbai8r2brkz"; + sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx"; }; doCheck = ! stdenv.isDarwin; From faa3c3c00b47ea729026172cd0a6b918fb868ef1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:58:45 +0200 Subject: [PATCH 194/515] libgsf: update from 1.14.26 to 1.14.28 --- pkgs/development/libraries/libgsf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9253468b8df..0c79b20b564 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,11 +4,11 @@ with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.26"; + name = "libgsf-1.14.28"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; + sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a"; }; nativeBuildInputs = [ pkgconfig intltool ]; From ba166470ce46d7cdd750e2f3b133cc388f21ad29 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:03:31 +0200 Subject: [PATCH 195/515] newt: update from 0.52.14 to 0.52.15 --- pkgs/development/libraries/newt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 743314d1815..d9369d59c7b 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, slang, popt }: stdenv.mkDerivation rec { - name = "newt-0.52.14"; + name = "newt-0.52.15"; src = fetchurl { url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz"; - sha256 = "13lp815zwldbw917wxmjy90gp608n3zlk4p3ybfqh0x6p9c4y3zp"; + sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs"; }; patchPhase = '' From 7456615f2ea2fce1ffbf99741bf1e2956c578746 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:05:10 +0200 Subject: [PATCH 196/515] opendkim: update from 2.4.2 to 2.4.3 --- pkgs/development/libraries/opendkim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 62a343d8efc..5dfd87c4d84 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, openssl, libmilter}: stdenv.mkDerivation rec { - name = "opendkim-2.4.2"; + name = "opendkim-2.4.3"; src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; - sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk"; + sha256 = "01h97h012gcp8rimjbc9mrv4759cnw4flb42ddiady1bmb2p7vy3"; }; configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; From f5d3be98f6df61d139b5b56ec66518cbf3aa7389 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:07:29 +0200 Subject: [PATCH 197/515] openresolv: update from 3.5.4 to 3.5.6 --- pkgs/tools/networking/openresolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 2879c5cc1a1..3271941f884 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openresolv-3.5.4"; + name = "openresolv-3.5.6"; src = fetchurl { url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; - sha256 = "0in40iha4ghk12lr2p65v0by3h0jp7qsdajmj4vm7iis0plzr4db"; + sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv"; }; configurePhase = From b637ff684ceb02448562c3921067e14e80454837 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:11:45 +0200 Subject: [PATCH 198/515] perlPackages.AnyEvent: update from 7.04 to 7.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c683a91e468..41bdd2d51f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -107,10 +107,10 @@ rec { }; AnyEvent = buildPerlPackage { - name = "AnyEvent-7.04"; + name = "AnyEvent-7.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz; - sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.05.tar.gz; + sha256 = "0022y5xbn3dn5x0q1kzvx15icf3g1cqqljrfhyriy794a42fply6"; }; meta = { maintainers = with maintainers; [ ocharles ]; From 8e87742d76eb081f9445a10bc3155e44d5610ee2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:13:03 +0200 Subject: [PATCH 199/515] perlPackages.ArrayCompare: update from 1.16 to 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 41bdd2d51f0..79b36f64269 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -195,10 +195,10 @@ rec { }; ArrayCompare = buildPerlPackage { - name = "Array-Compare-1.16"; + name = "Array-Compare-1.18"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz; - sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.18.tar.gz; + sha256 = "0zbvr1bj9bp836b3g9s32193vvn53d03xv0zn317hz247skn15lh"; }; }; From 37f46f652905628ea699364c79b7d0a6fec43a3b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:13:57 +0200 Subject: [PATCH 200/515] perlPackages.Autobox: update from 2.79 to 2.82 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79b36f64269..57f5866bd28 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -250,10 +250,10 @@ rec { autobox = pkgs.perlPackages.Autobox; Autobox = buildPerlPackage { - name = "autobox-2.79"; + name = "autobox-2.82"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.79.tar.gz; - sha256 = "8acc8c4a69e1bbb05304d0832d483a07258597529072d869b5960193a2ab950f"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.82.tar.gz; + sha256 = "0w008z8ych54czr6drmhqrrvikcfhra6ig3v1fhk36apq64p9k1p"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { From becb8cda725601b5bb5fcfc266844f0913b9f594 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:15:13 +0200 Subject: [PATCH 201/515] perlPackages.CGISession: update from 4.46 to 4.48 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57f5866bd28..d5871b3d8a2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -997,10 +997,10 @@ rec { }; CGISession = buildPerlPackage rec { - name = "CGI-Session-4.46"; + name = "CGI-Session-4.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; - sha256 = "c04b725be6a1b9bf22387cc6427eb951408ccba1c52471a43a80306f31e68e1b"; + sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; buildInputs = [ DBFile ]; }; From 9872cea479e7a020329b097a998ee53acc9e39ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:16:14 +0200 Subject: [PATCH 202/515] perlPackages.CPANMetaRequirements: update from 2.122 to 2.125 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d5871b3d8a2..4d16aacb48c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1543,10 +1543,10 @@ rec { }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.122"; + name = "CPAN-Meta-Requirements-2.125"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz; - sha256 = "1fq2blw9ynja34fm9ck24m3qcpyk0hp25dhxvgs01k7yz64ryffh"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz; + sha256 = "1d6sryjkk52n4m8h7l0jc4hr9xrq2d02l8clzm48rq1h6j6q49hq"; }; buildInputs = [ TestMore ]; meta = { From 154b473eb4639cefd323718e747ed08e6467b0e6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:17:50 +0200 Subject: [PATCH 203/515] perlPackages.ClassAccessorGrouped: update from 0.10009 to 0.10010 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d16aacb48c..bab715d06ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1052,10 +1052,10 @@ rec { }; ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10009"; + name = "Class-Accessor-Grouped-0.10010"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10009.tar.gz; - sha256 = "1cs6wvng9xxhmrps7qb7ccxswqkqskwj862dp4fqfra14aprlg4c"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10010.tar.gz; + sha256 = "1hlfjfhagsksskv01viq1z14wlr0i4xl3nvznvq1qrnqwqxs4qi1"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; From 7e60697ea9cc0e987db6fc27c3d7b85ac2ada66e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:18:57 +0200 Subject: [PATCH 204/515] perlPackages.ConfigAny: update from 0.23 to 0.24 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bab715d06ed..eb25bbd39c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1348,10 +1348,10 @@ rec { }; ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.23"; + name = "Config-Any-0.24"; src = fetchurl { url = "mirror://cpan/modules/by-module/Config/${name}.tar.gz"; - sha256 = "17k62vdq3wr7m397ginp8525nqmlcjsmlqqpvnnfm3sr5vcxhjgz"; + sha256 = "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi"; }; }; From 160daf8cef68896d01fc4142f40ce1e388dd1bd2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:19:39 +0200 Subject: [PATCH 205/515] perlPackages.ConfigGeneral: update from 2.51 to 2.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb25bbd39c6..df53f56f9cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1369,10 +1369,10 @@ rec { }; ConfigGeneral = buildPerlPackage { - name = "Config-General-2.51"; + name = "Config-General-2.52"; src = fetchurl { - url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.51.tar.gz; - sha256 = "1khby072f10jbml0dlh82bg1s91ph8z6xa9bpk0l180q936k1xcg"; + url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.52.tar.gz; + sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr"; }; meta = { license = "perl"; From 18a348a2da179afb16704f7cbe732fddaa4ec3ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:20:52 +0200 Subject: [PATCH 206/515] perlPackages.SetScalar: update from 1.25 to 1.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df53f56f9cf..8e6dd5181e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7072,10 +7072,10 @@ rec { }; SetScalar = buildPerlPackage { - name = "Set-Scalar-1.25"; + name = "Set-Scalar-1.26"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.25.tar.gz; - sha256 = "1kbfy97j4cg0pprk8sgsh1fd505mdffn1jr9qbdmwqma8x4qvv7m"; + url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.26.tar.gz; + sha256 = "121r9n8lqk081vjzn9ppm4zklz1l0c0v0ab94c05y5vrsn5l0zl8"; }; meta = { license = "perl"; From 0ec8915c50156cad3783b9a717e6c8dc001d415d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:21:43 +0200 Subject: [PATCH 207/515] perlPackages.StringFlogger: update from 1.101243 to 1.101244 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e6dd5181e0..bf760e04394 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7347,10 +7347,10 @@ rec { }; StringFlogger = buildPerlPackage { - name = "String-Flogger-1.101243"; + name = "String-Flogger-1.101244"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101243.tar.gz; - sha256 = "05e3f55198e96d56d27867b81c244d801a5d85e5b19b7acc3352993aefbd29fd"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101244.tar.gz; + sha256 = "0cx3d85sz1dqjvbczpf9wx0i1b05jwbxcg7lpq5qygdkblq85nzd"; }; propagatedBuildInputs = [ JSON ParamsUtil SubExporter ]; meta = { From 0fb5aab661e0e0499ac55ee46ba2b70866bfc27b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:22:18 +0200 Subject: [PATCH 208/515] perlPackages.StringFormatter: update from 0.102082 to 0.102084 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf760e04394..0bcc8ec68ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7369,10 +7369,10 @@ rec { }; StringFormatter = buildPerlPackage { - name = "String-Formatter-0.102082"; + name = "String-Formatter-0.102084"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102082.tar.gz; - sha256 = "93d787dd8f13832a3683d219e086eaf4eb6c5391e396bfcc364c414423b0051a"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; + sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ ParamsUtil SubExporter ]; meta = { From db01357a11fe83462a440241de7f9df2061cc71e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:23:03 +0200 Subject: [PATCH 209/515] perlPackages.StringTruncate: update from 1.100600 to 1.100601 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0bcc8ec68ef..36d99ae4f35 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7426,10 +7426,10 @@ rec { }; StringTruncate = buildPerlPackage { - name = "String-Truncate-1.100600"; + name = "String-Truncate-1.100601"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100600.tar.gz; - sha256 = "e2665f82254a05b2a43c51bb8244661130ad9e052d4d8423b2ce2e9549c0bb5c"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100601.tar.gz; + sha256 = "1mas04qa6sj6x34mid8i6swddcnb3c9zfkgkd72kvz5zip2f4f24"; }; propagatedBuildInputs = [ SubExporter SubInstall ]; meta = { From 038d1b91f31b5424ef34851f412b44f7e5e8cf68 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:24:36 +0200 Subject: [PATCH 210/515] perlPackages.TemplateToolkit: update from 2.24 to 2.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36d99ae4f35..397b841f1cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7795,10 +7795,10 @@ rec { }; TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.24"; + name = "Template-Toolkit-2.25"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.24.tar.gz; - sha256 = "1j01kpsdpwxrwbsz2y1d8xyyliw9l23g0f3jigxvgxs9qal4m0rq"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.25.tar.gz; + sha256 = "048yg07j48rix3cly13j5wzms7kd5argviicj0kwykb004xpc8zl"; }; propagatedBuildInputs = [ AppConfig ]; meta = { From e1f980d99f1489b819433511b36997fc6ace6bd1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:25:42 +0200 Subject: [PATCH 211/515] perlPackages.TestVersion: update from 1.002001 to 1.002004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 397b841f1cc..6d5967e2adb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8768,10 +8768,10 @@ rec { }; TestVersion = buildPerlPackage { - name = "Test-Version-1.002001"; + name = "Test-Version-1.002004"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002001.tar.gz; - sha256 = "84e741a1b9196b41130a7ec3f07b94e0e97e7e3f8abfb65e599f2760e01202ad"; + url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002004.tar.gz; + sha256 = "1lvg1p6i159ssk5br5qb3gvrzdg59wchd97z7j44arnlkhfvwhgv"; }; buildInputs = [ TestException TestRequires TestTester ]; propagatedBuildInputs = [ FileFindRulePerl ]; From 755439bbf77a75c1572c5cba7e027f3ff0592182 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:27:05 +0200 Subject: [PATCH 212/515] perlPackages.TimeHiRes: update from 1.9725 to 1.9726 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d5967e2adb..30667d9d255 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8895,10 +8895,10 @@ rec { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9725"; + name = "Time-HiRes-1.9726"; src = fetchurl { url = "mirror://cpan/modules/by-module/Time/${name}.tar.gz"; - sha256 = "0fr7zkc55kazcjxdkrcjgimic8xpk6imxkckdpjlggjpkggv76f0"; + sha256 = "17hhd53p72z08l1riwz5f6rch6hngby1pympkla5miznn7cjlrpz"; }; }; From cfc84230eb35294d99826bbae142af1abfc15b1a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:31:52 +0200 Subject: [PATCH 213/515] python33Packages.manuel: update from 1.6.0 to 1.6.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b44dff89bc..89ebe453cf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3364,11 +3364,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { manuel = buildPythonPackage rec { name = "manuel-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; - md5 = "53d6a6905301a20f6095e41d11968fff"; + sha256 = "1h35ys31zkjd9jssqn9lzwmw8s17ikr4jn2xp5zby1v771ibbbqr"; }; propagatedBuildInputs = [ six zope_testing ]; From 1937d842033167a1511763c8a5e220cd2f772343 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 21:46:00 +0000 Subject: [PATCH 214/515] anki: update from 2.0.18 to 2.0.20 Signed-off-by: Moritz Ulrich --- pkgs/games/anki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index d574f9c860f..e039291882c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "anki-2.0.18"; + name = "anki-2.0.20"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j"; + sha256 = "1w274g7as458bfkh86635p04fimvmkn70j8qy9m6nl2xwjaq8nhm"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] From a398237f37fa5497ac2e8237af4c1cb43f5706f1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:16:27 +0200 Subject: [PATCH 215/515] lsscsi: update from 0.24 to 0.27 --- pkgs/os-specific/linux/lsscsi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 886f6c799a4..70e82662b41 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "lsscsi-0.24"; + name = "lsscsi-0.27"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.24.tgz"; - sha256 = "0c718w80vi9a0w48q8xmlnbyqzxfd8lax5dcbqg8gvg4l2zaba2c"; + url = "http://sg.danny.cz/scsi/lsscsi-0.27.tgz"; + sha256 = "1d6rl2jwpd6zlqymmp9z4ri5j43d44db2s71j0v0rzs1nbvm90kb"; }; preConfigure = '' From 1485941a562a770e7a8fec5285892dc530727ab8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:30:29 +0200 Subject: [PATCH 216/515] pgf1: update from 1.10 to 1.18 --- pkgs/tools/typesetting/tex/pgf/1.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 91948f995a0..032d9b5520e 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pgf-1.10"; + name = "pgf-1.18"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-1.10.tar.gz; - sha256 = "1y605wmjxryphh0y5zgzvdq6xjxb2bjb95j36d4wg1a7n93ksswl"; + url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; + sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; buildPhase = "true"; From ea11828d4440e55b6c70eaff7d99fb0446addae3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:33:10 +0200 Subject: [PATCH 217/515] pwgen: update from 2.05 to 2.06 --- pkgs/tools/security/pwgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index ef91e69428a..be96510eca0 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pwgen-2.05"; + name = "pwgen-2.06"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz; - sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8"; + url = mirror://sourceforge/pwgen/pwgen-2.06.tar.gz; + sha256 = "0m1lhkcyizisksr1vlqysjkickrca9qwqkkx6vkv4zhg7ag8qnb1"; }; meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; From 209ff52d0b699f82bd6d4045e53eb94995d2ed2f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:36:24 +0200 Subject: [PATCH 218/515] stalonetray: update from 0.8.0 to 0.8.1 --- pkgs/applications/window-managers/stalonetray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 143e45b5484..fdb81a88b15 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="stalonetray"; - version="0.8.0"; + version="0.8.1"; name="${baseName}-${version}"; url="mirror://sourceforge/${baseName}/${name}.tar.bz2"; - hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka"; + hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll"; }; in rec { From 904ee6d5d209301cd1df2db23fcb6f519c783041 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:41:47 +0200 Subject: [PATCH 219/515] re2c: update from 0.13.5 to 0.13.6 --- pkgs/development/tools/parsing/re2c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index e603768b8cc..00b32bed44e 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl }: stdenv.mkDerivation { - name = "re2c-0.13.5"; + name = "re2c-0.13.6"; src = fetchurl { - url = mirror://sourceforge/re2c/re2c/0.13.5/re2c-0.13.5.tar.gz; - sha256 = "1336c54b3cacjxg3grxdraq6a00yidr04z90605fhxglk89rbagk"; + url = mirror://sourceforge/re2c/re2c/0.13.6/re2c-0.13.6.tar.gz; + sha256 = "1h3na1zacw3166k6wkdjzjs67frjca9wj07wgfas56c7m8wk0ilf"; }; meta = { From 48949544e5bef27244c7f446f77fbe5dc8e28326 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:44:09 +0200 Subject: [PATCH 220/515] xlsfonts: update from 1.0.2 to 1.0.4 --- pkgs/applications/misc/xlsfonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 879f5ae568c..71d0a39296e 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -4,11 +4,11 @@ {stdenv, fetchurl, libX11, pkgconfig}: stdenv.mkDerivation rec { - name = "xlsfonts-1.0.2"; + name = "xlsfonts-1.0.4"; src = fetchurl { url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc"; + sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8"; }; buildInputs = [libX11 pkgconfig]; From 75bef13fca9ebd2e6a7c569f064a61fd3d54c084 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:46:44 +0200 Subject: [PATCH 221/515] xfsprogs: update from 3.1.8 to 3.1.11 --- pkgs/tools/filesystems/xfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 229802d1d78..400890e95f3 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtool, gettext, libuuid }: stdenv.mkDerivation rec { - name = "xfsprogs-3.1.8"; + name = "xfsprogs-3.1.11"; src = fetchurl { urls = [ "ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}.tar.gz" "ftp://oss.sgi.com/projects/xfs/previous/${name}.tar.gz" ]; - sha256 = "1aryr6w76hyc1dznfzk0sc5rlr914rr0zh15vyclj1s86wp9wh3l"; + sha256 = "1gnnyhy3khl08a24c5y0pyakz6nnwkiw1fc6rb0r1j5mfw0rix5d"; }; patchPhase = '' From 537a5d4b7011a4588afb1a7ee80035fca6abb67c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 04:36:56 +0200 Subject: [PATCH 222/515] gdb: update from 7.6.1 to 7.6.2 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 8df9f71c181..d67407eb03d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.6.1"; + basename = "gdb-7.6.2"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "fbc4dab4181e6e9937075b43a4ce2732"; + sha256 = "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig"; }; # I think python is not a native input, but I leave it From 07d7a5d78672631c202cf6659ff2322e0852f575 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 04:40:53 +0200 Subject: [PATCH 223/515] jflex: update from 1.4.1 to 1.4.3 --- pkgs/development/libraries/java/jflex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 4d0eda22c5b..5e54e800f55 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "jflex-1.4.1"; + name = "jflex-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = http://jflex.de/jflex-1.4.1.tar.gz; - md5 = "9e4be6e826e6b344e84c0434d6fd4b46"; + url = http://jflex.de/jflex-1.4.3.tar.gz; + sha256 = "0sm74sgjvw01fsiqr5q9ipbm8rfyihf6yn00dqymhyc3wmbhr517"; }; } From a23acb830a3c676d6f553f14ed798a799de88765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Dec 2013 11:26:38 +0100 Subject: [PATCH 224/515] python-pycollada: new package pycollada is a python library for reading and writing collada documents. collada is an open file format (XML based) for 3D applications. Filename extension is .dae (digital asset exchange). --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89ebe453cf4..37be149fc1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1113,6 +1113,30 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + pycollada = buildPythonPackage rec { + name = "pycollada-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz"; + md5 = "5d0f00c035491b945cdccdfd8a698ad2"; + }; + + # pycollada-0.4 needs python-dateutil==1.5 + buildInputs = [ dateutil_1_5 numpy ]; + + # Some tests fail because they refer to test data files that don't exist + # (upstream packaging issue) + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library for reading and writing collada documents"; + homepage = http://pycollada.github.io/; + license = "BSD"; # they don't specify which BSD variant + platforms = platforms.unix; + maintainers = [ maintainers.bjornfor ]; + }; + }; + pycparser = buildPythonPackage rec { name = "pycparser-2.10"; From 4353a1a8738b892aec3783456d103f36f76cb004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Dec 2013 11:35:43 +0100 Subject: [PATCH 225/515] freecad: add matplotlib and pycollada dependencies When FreeCAD is started it prints that it's missing matplotlib and pycollada: $ FreeCAD [...] matplotlib not found, Plot module will be disabled pycollada not found, collada support will be disabled. The closure size of freecad is currently at 1.9 GiB. Adding these two deps increase it to 2.0 GiB. Reflow the expression function argument list. --- pkgs/applications/graphics/freecad/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 340c9d0a69e..37265c954e8 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, -boost, zlib, -python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: +{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts +, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper +, matplotlib, pycollada }: stdenv.mkDerivation rec { name = "freecad-${version}"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ]; + zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib + pycollada + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56082067656..916cc21564a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7984,6 +7984,7 @@ let freecad = callPackage ../applications/graphics/freecad { opencascade = opencascade_6_5; + inherit (pythonPackages) matplotlib pycollada; }; freemind = callPackage ../applications/misc/freemind { From d4f47af75aebc1f24b664a7f9d6246bad1f374a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 13:26:50 +0100 Subject: [PATCH 226/515] haskell-quickcheck-io: this package needs recent versions of QuickCheck and HUnit --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5e4488add3f..e8fac4ab52e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1828,7 +1828,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; - quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; + quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; From 8d52c9066e0e124ec8c28f436b6359e2b01c2acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 14 Dec 2013 14:22:29 +0100 Subject: [PATCH 227/515] python-pycollada: set meta.platforms to only linux, darwin It doesn't build on the BSDs (or actually, it's dependencies). --- 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 37be149fc1b..33d4f5734e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1132,7 +1132,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "Python library for reading and writing collada documents"; homepage = http://pycollada.github.io/; license = "BSD"; # they don't specify which BSD variant - platforms = platforms.unix; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; }; From 2f69aaf72144e7daffa56d16ec789ce97adb9251 Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Fri, 8 Nov 2013 19:38:15 -0600 Subject: [PATCH 228/515] add herbstluftwm enable option --- .../services/x11/window-managers/default.nix | 1 + .../x11/window-managers/herbstluftwm.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/herbstluftwm.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 93e3b6ddf4c..4d52e398b47 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -17,6 +17,7 @@ in ./xmonad.nix ./i3.nix ./xbmc.nix + ./herbstluftwm.nix ]; options = { diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix new file mode 100644 index 00000000000..9480abba43b --- /dev/null +++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.services.xserver.windowManager.herbstluftwm; +in + +{ + options = { + services.xserver.windowManager.herbstluftwm.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable the herbstluftwm window manager."; + }; + }; + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "herbstluftwm"; + start = " + ${pkgs.herbstluftwm}/bin/herbstluftwm + "; + }; + environment.systemPackages = [ pkgs.herbstluftwm ]; + }; +} From da88a3a81e09d052f162122e112f987981da65e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 15:11:19 +0100 Subject: [PATCH 229/515] haskell-markdown-unlit: cannot generate documentation with Haddock shipped with ghc 7.0.4 or earlier --- pkgs/development/libraries/haskell/markdown-unlit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 06c1b9e2fca..e09feb10d90 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; testDepends = [ hspec QuickCheck silently stringbuilder ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { description = "Literate Haskell support for Markdown"; license = self.stdenv.lib.licenses.mit; From a9a5bde463e59b1a186de15fff3be5e1943efe61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:28:54 +0100 Subject: [PATCH 230/515] haskell-HTTP: update to version 4000.2.10 --- .../libraries/haskell/HTTP/{4000.2.9.nix => 4000.2.10.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.9.nix => 4000.2.10.nix} (88%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix similarity index 88% rename from pkgs/development/libraries/haskell/HTTP/4000.2.9.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.10.nix index 4ab03112189..c893d2f1e75 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.9"; - sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; + version = "4000.2.10"; + sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e8fac4ab52e..c1884876150 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_9; + HTTP = self.HTTP_4000_2_10; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_1; @@ -1217,8 +1217,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_9 = callPackage ../development/libraries/haskell/HTTP/4000.2.9.nix {}; - HTTP = self.HTTP_4000_2_9; + HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {}; + HTTP = self.HTTP_4000_2_10; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From 524935ebd567f388d2c9130ddd1cac018b8ce07a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:12 +0100 Subject: [PATCH 231/515] haskell-assert-failure: add version 0.1 --- .../libraries/haskell/assert-failure/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/assert-failure/default.nix diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix new file mode 100644 index 00000000000..abc520e7b4b --- /dev/null +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -0,0 +1,14 @@ +{ cabal, prettyShow, text }: + +cabal.mkDerivation (self: { + pname = "assert-failure"; + version = "0.1"; + sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + buildDepends = [ prettyShow text ]; + meta = { + homepage = "https://github.com/Mikolaj/assert-failure"; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c1884876150..1eeb36ddea2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -548,6 +548,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x arrows = callPackage ../development/libraries/haskell/arrows {}; + assertFailure = callPackage ../development/libraries/haskell/assert-failure {}; + asn1Data = callPackage ../development/libraries/haskell/asn1-data {}; asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; From b30738afe2511725a8909748b1c9178317b4f5e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:23 +0100 Subject: [PATCH 232/515] haskell-enummapset-th: add version 0.6.0.0 --- .../libraries/haskell/enummapset-th/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/enummapset-th/default.nix diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix new file mode 100644 index 00000000000..0b992a9daaf --- /dev/null +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "enummapset-th"; + version = "0.6.0.0"; + sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/liyang/enummapset-th"; + description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1eeb36ddea2..9747583549d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -964,6 +964,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x enummapset = callPackage ../development/libraries/haskell/enummapset {}; + enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; erf = callPackage ../development/libraries/haskell/erf {}; From ae58890b21757756053c321d5d54fee03eaae957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:09 +0100 Subject: [PATCH 233/515] haskell-monad-par: update to version 0.3.4.6 --- .../libraries/haskell/monad-par/{0.3.4.5.nix => 0.3.4.6.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.4.5.nix => 0.3.4.6.nix} (90%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix index 58cbb522fa2..911d984a88c 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.5"; - sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; + version = "0.3.4.6"; + sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9747583549d..af8eb5ea7df 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1536,8 +1536,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_5 = callPackage ../development/libraries/haskell/monad-par/0.3.4.5.nix {}; - monadPar = self.monadPar_0_3_4_5; + monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; + monadPar = self.monadPar_0_3_4_6; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From f449007adecfce312ea87c54b2f9880ddf65b041 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 234/515] haskell-git-annex: update to version 5.20131213 --- .../git-and-tools/git-annex/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index ea27852c4fd..9caaa2f4012 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,18 +4,18 @@ , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl -, network, networkInfo, networkMulticast, networkProtocolXmpp -, openssh, perl, QuickCheck, random, regexTdfa, rsync -, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text -, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger -, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault -, yesodForm, yesodStatic +, network, networkConduit, networkInfo, networkMulticast +, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa +, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit +, tastyQuickcheck, text, time, transformers, unixCompat, utf8String +, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod +, yesodCore, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20131130"; - sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1"; + version = "5.20131213"; + sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -24,11 +24,11 @@ cabal.mkDerivation (self: { editDistance extensibleExceptions feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json MissingH MonadCatchIOTransformers monadControl mtl network - networkInfo networkMulticast networkProtocolXmpp QuickCheck random - regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck - text time transformers unixCompat utf8String uuid wai waiLogger - warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm - yesodStatic + networkConduit networkInfo networkMulticast networkProtocolXmpp + QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit + tastyQuickcheck text time transformers unixCompat utf8String uuid + wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault + yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 From 6a3e496f6b0bf960587c3e2e643021ed0b00e444 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 235/515] haskell-ListLike: update to version 4.0.2 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 973fca3fb99..a9723721e1e 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.1"; - sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; + version = "4.0.2"; + sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; jailbreak = true; From c89a0aab3cf46bee7dc424eeac530ef99dd0c032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 236/515] haskell-cufft: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/cufft/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 5caec834139..df9f686383e 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.1"; - sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx"; + version = "0.1.0.3"; + sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From 03ed01551002ee53725196f3592afd116423e598 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 237/515] haskell-data-memocombinators: update to version 0.5.1 --- .../libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index df677731326..3bdaf941c83 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.5.0"; - sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74"; + version = "0.5.1"; + sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; From 9fe0d3696346f41d821b36cc8b1a2cc6e0eb5f0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 238/515] haskell-digestive-functors: update to version 0.6.2.0 --- .../libraries/haskell/digestive-functors/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 2207f18c35c..43f0c4337e7 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,15 +1,15 @@ { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.1"; - sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; - buildDepends = [ mtl text ]; + version = "0.6.2.0"; + sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7"; + buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text + testFrameworkQuickcheck2 text time ]; jailbreak = true; meta = { From 8df4a267a139135134243ef78d45fad3a43f0bb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 239/515] haskell-hledger-lib: update to version 0.22 --- .../libraries/haskell/hledger-lib/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 87d5181fa7d..89a6622cf1c 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,20 +1,20 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow -, regexCompat, regexpr, safe, split, testFramework +{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec +, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework , testFrameworkHunit, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21.3"; - sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870"; + version = "0.22"; + sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split time transformers utf8String + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split time transformers utf8String ]; testDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split testFramework testFrameworkHunit time - transformers + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split testFramework testFrameworkHunit + time transformers ]; meta = { homepage = "http://hledger.org"; From e759fa2d558f595f9cd186a229b23dcf01e224ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 240/515] haskell-hledger-web: update to version 0.22 --- .../libraries/haskell/hledger-web/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index e4dd6ef1faa..f846dba7fc8 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,20 +1,20 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec -, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe -, shakespeareText, text, time, transformers, wai, waiExtra -, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic -, yesodTest +, httpClient, httpConduit, HUnit, json, networkConduit, parsec +, regexpr, safe, shakespeareText, text, time, transformers, wai +, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore +, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21.3"; - sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy"; + version = "0.22"; + sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit json + hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json networkConduit parsec regexpr safe shakespeareText text time transformers wai waiExtra waiHandlerLaunch warp yaml yesod yesodCore yesodStatic From 4271c59830bd3bc536ce9c0758ec1ab8f590d2e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 241/515] haskell-hledger: update to version 0.22 --- .../libraries/haskell/hledger/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 36012251e07..47a5ed381f6 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,23 +1,24 @@ -{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl -, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText -, split, testFramework, testFrameworkHunit, text, time -, transformers, utf8String +{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe +, shakespeareText, split, tabular, testFramework +, testFrameworkHunit, text, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21.3"; - sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2"; + version = "0.22"; + sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe - shakespeareText split text time utf8String + cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec + regexpr safe shakespeareText split tabular text time utf8String ]; testDepends = [ - cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec - prettyShow regexCompat regexpr safe shakespeareText split - testFramework testFrameworkHunit text time transformers + cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl + parsec prettyShow regexCompatTdfa regexpr safe shakespeareText + split tabular testFramework testFrameworkHunit text time + transformers ]; meta = { homepage = "http://hledger.org"; From afe71506652e5ab99ac93a4d78a077e87360deeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 242/515] haskell-scotty: update to version 0.6.1 --- pkgs/development/libraries/haskell/scotty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 3f50ed38152..d72aed42852 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai -, waiExtra, warp +, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra +, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.0"; - sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; + version = "0.6.1"; + sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat resourcet text transformers wai waiExtra warp + mtl regexCompat text transformers wai waiExtra warp ]; meta = { homepage = "https://github.com/scotty-web/scotty"; From 62aecb91995129e0215107077243bf236a2726d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: [PATCH 243/515] haskell-tasty: update to version 0.5.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 8153eb9f6a7..39ee7f2d168 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.1"; - sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; + version = "0.5.2"; + sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From 23fbd4bb4bd9cd3edaf8b6cd87e1fabaec0d347a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 244/515] haskell-th-lift: update to version 0.6 --- pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index c479955db64..c10feac4ba6 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.6"; - sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4"; + version = "0.6"; + sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; From f3de4df1c5fc1c22597668ce32f4e0b95a1c4034 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 245/515] haskell-vty-ui: update to version 1.6.1 --- pkgs/development/libraries/haskell/vty-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 3b38db8c1de..ad3ab7823c0 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6"; - sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + version = "1.6.1"; + sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; isLibrary = true; isExecutable = true; buildDepends = [ From d7dd97c5da6efcf019c543dc0894e0484d5a82fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 246/515] haskell-wai-app-static: update to version 2.0.0.2 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index a6b8eeb4058..8f2c6ebb342 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.1"; - sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; + version = "2.0.0.2"; + sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath From ac0734056435a15ec11ad4b8854ceb2d1eb195a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 247/515] haskell-wai-extra: update to version 2.0.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d3b83587965..c6f8752f8b0 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.0.1"; - sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; + version = "2.0.1"; + sha256 = "0asjd7v1zdbs1rixqanwwn4n5b417gj48nv2qva6pfj09hs5dzhh"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase From fe7d9b733594b19be88ec38f02e01e0390247d20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 248/515] haskell-yesod-bin: update to version 1.2.5.2 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index dbee52da868..851d152eac5 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.5.1"; - sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; + version = "1.2.5.2"; + sha256 = "00n957gbq03qrbwxa29hpqkmyfnbr7n4bah4185rpjdvnywq3l8x"; isLibrary = false; isExecutable = true; buildDepends = [ From 1098138e2ee25a7b2defc7b30f8be2e3f45ab3ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 249/515] haskell-yesod-core: update to version 1.2.6.2 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 86b2eec8945..3a8bbb2cdf7 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.6.1"; - sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; + version = "1.2.6.2"; + sha256 = "11q70zc837d0sdwgh8c60pv1x4zki2klamcr5vw5zsjj0qsb9pby"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From f5587ef7519ba95f8c3da08cf5f86eb2b2cd25f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 250/515] haskell-yesod-form: update to version 1.3.4.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 c26d88b5080..936c4ab741b 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.3.4"; - sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; + version = "1.3.4.1"; + sha256 = "01h9k7qwp26i57akbm9236r8gbil4mh2317caa4bcva7m1dclvpj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From 5971b942a225995fbb5c504059caa9092f0d6019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 251/515] haskell-yesod-platform: update to version 1.2.5.2 --- pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index ee9cd3b1fd3..e17ed799c0e 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -31,8 +31,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.5"; - sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; + version = "1.2.5.2"; + sha256 = "0pvdaz860zlgizdrsjm4v1vsx0bvcmilz0si0skrx980gysxd0nn"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder From 3fe71f1c52696e647a03b71d565d270820e73a25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 252/515] haskell-yesod-routes: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d651e90a8a7..87b4d059dc5 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.2"; - sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; + version = "1.2.0.3"; + sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From bf870cfde0adb9c79d89f0ebb537dde7a781befa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 253/515] haskell-zip-archive: update to version 0.2 --- .../libraries/haskell/zip-archive/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index bddf09bc405..bfe648f449b 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,14 +1,12 @@ -{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String -, zlib -}: +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.4"; - sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb"; + version = "0.2"; + sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + buildDepends = [ binary digest filepath mtl text time zlib ]; testDepends = [ HUnit time ]; doCheck = false; meta = { From e185d0603a4ff598923640a417cf17208a50c15f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: [PATCH 254/515] haskell-LambdaHack: update to version 0.2.10.5 --- pkgs/games/LambdaHack/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index f76aab55164..4b9211b637f 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,17 +1,17 @@ -{ cabal, binary, ConfigFile, deepseq, enummapset, filepath, gtk -, hashable, keys, miniutter, mtl, prettyShow, random, stm, text -, transformers, unorderedContainers, zlib +{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh +, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random +, stm, text, transformers, unorderedContainers, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.10"; - sha256 = "1lj960r6gyg8kpc13fs6yq51l0qkpk4yd7ixhh0j4j8xghvx9mw5"; + version = "0.2.10.5"; + sha256 = "0a10xchhqh61idqb7ycassvy6gmprz9820w0z3r33h1c9sldq1lk"; isLibrary = true; isExecutable = true; buildDepends = [ - binary ConfigFile deepseq enummapset filepath gtk hashable keys - miniutter mtl prettyShow random stm text transformers + assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk + hashable keys miniutter mtl prettyShow random stm text transformers unorderedContainers zlib ]; meta = { From ab0438f128def9f328c9c5b5304ed92b5616b1f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 12:16:25 +0100 Subject: [PATCH 255/515] haskell-th-orphans: jailbreak to fix build with th-lift 0.6 --- pkgs/development/libraries/haskell/th-orphans/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9196e9ef76b..dd9fbc198bf 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.8"; sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr"; buildDepends = [ thLift ]; + jailbreak = true; meta = { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; From 3aef83f451ca7ba479802c8935c93d7341ed22ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 13:21:00 +0100 Subject: [PATCH 256/515] haskell-pandoc: jailbreak to fix build with unzip-archive --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 01ce4cc5bfb..b2e4020703c 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -27,6 +27,7 @@ cabal.mkDerivation (self: { ]; buildTools = [ alex happy ]; doCheck = false; + jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From 71d1e429a7da4fd9ebb758ec17fb970f04b286f4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:22:29 +0200 Subject: [PATCH 257/515] nano: update from 2.2.6 to 2.3.2 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 15cdadb04f5..c347a038ac9 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { pname = "nano"; - version = "2.2.6"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"; + sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z"; }; buildInputs = [ ncurses gettext ]; From 34593a22b39534b5db56ff8421de3b5bdb91c61a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:25:10 +0200 Subject: [PATCH 258/515] mpg123: update from 1.15.4 to 1.16.0 --- pkgs/applications/audio/mpg123/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 029c2ba4bcd..f14e2764211 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation { - name = "mpg123-1.15.4"; + name = "mpg123-1.16.0"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2; - sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8"; + url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2; + sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; From 672999a3d4227f38583afbff2a25688789af1685 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:28:33 +0200 Subject: [PATCH 259/515] oprofile: update from 0.9.8 to 0.9.9 --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index c0056697743..ee464423929 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -6,11 +6,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-0.9.8"; + name = "oprofile-0.9.9"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "1g31lwgpacql6w5z1z2f31pgwzn14rgsbh7kmmdmsgm2l47r0idb"; + sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy"; }; patchPhase = '' From cd31e1fbd7350014b5f97e3558a335b9dfcd9a73 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:30:26 +0200 Subject: [PATCH 260/515] perlPackages.CommonSense: update from 3.6 to 3.72 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30667d9d255..8fd27eb1ca0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1302,10 +1302,10 @@ rec { }; CommonSense = buildPerlPackage rec { - name = "common-sense-3.6"; + name = "common-sense-3.72"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.6.tar.gz; - sha256 = "0nkbp1by0mpvg1x6053fbh9dl8nnswlyfmqp8k2lppd717hw5ql6"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.72.tar.gz; + sha256 = "16q95qrjksyykdn3mfj9vx26kb6c3hg97scmcbd00hfbk332xyd4"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; From a5d733dc406fabda135112d4f3b259072899bf15 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:32:29 +0200 Subject: [PATCH 261/515] perlPackages.CompressRawZlib: update from 2.060 to 2.063 --- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 70c2a294d6f..9310e3ca081 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.060"; + name = "Compress-Raw-Zlib-2.063"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3"; + sha256 = "16cn9pq4pngncs3qhlam0yw2l0q7hq4qfdyxp03jaad6ndc4dzp9"; }; preConfigure = '' From effad71d8448bfcd2b42563d9306e91a675610e6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:32:58 +0200 Subject: [PATCH 262/515] perlPackages.CompressRawBzip2: update from 2.060 to 2.063 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8fd27eb1ca0..396cea16fc5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1313,10 +1313,10 @@ rec { }; CompressRawBzip2 = buildPerlPackage { - name = "Compress-Raw-Bzip2-2.060"; + name = "Compress-Raw-Bzip2-2.063"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz; - sha256 = "02azwhglk2w68aa47sjqhj6vwzi66mv4hwal87jccjfy17gcwvx7"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.063.tar.gz; + sha256 = "0qi2jg76pgx1qkh4897g746cxqjr2njzzbyv2k9pq4m1m2v3jr6s"; }; # Don't build a private copy of bzip2. From 7e64a165e7391f175bc5f652cf388d1cff366531 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:33:53 +0200 Subject: [PATCH 263/515] perlPackages.CryptCBC: update from 2.30 to 2.33 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 396cea16fc5..c6b8f49dd7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1584,10 +1584,10 @@ rec { }; CryptCBC = buildPerlPackage rec { - name = "Crypt-CBC-2.30"; + name = "Crypt-CBC-2.33"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "0cvigpxvwn18kb5i40jlp5fgijbhncvlh23xdgs1cnhxa17yrgwx"; + sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"; }; }; From fba4776d08fdc706665c32d4f4a380e65641e5ad Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:34:35 +0200 Subject: [PATCH 264/515] perlPackages.CryptDES: update from 2.05 to 2.07 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6b8f49dd7f..204c3743aec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1592,10 +1592,10 @@ rec { }; CryptDES = buildPerlPackage rec { - name = "Crypt-DES-2.05"; + name = "Crypt-DES-2.07"; src = fetchurl { url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; - sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp"; + sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; buildInputs = [CryptCBC]; }; From 646506620c14a161fef3c77dbd838be01018cf8b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:35:35 +0200 Subject: [PATCH 265/515] perlPackages.CryptDHGMP: update from 0.00010 to 0.00011 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 204c3743aec..b7ebdd42436 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1601,10 +1601,10 @@ rec { }; CryptDHGMP = buildPerlPackage rec { - name = "Crypt-DH-GMP-0.00010"; + name = "Crypt-DH-GMP-0.00011"; src = fetchurl { url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz"; - sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9"; + sha256 = "0c9sz67lh2d2pn9z82hngzns4sqqnawdc8a1yl7p7pc0l4r0q3hz"; }; buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; From 73959ecec80f3ce777665f0a44c53b869b24763d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:36:56 +0200 Subject: [PATCH 266/515] perlPackages.DataUUID: update from 1.218 to 1.219 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7ebdd42436..770a252566f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1876,10 +1876,10 @@ rec { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.218"; + name = "Data-UUID-1.219"; src = fetchurl { url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "1cb4i0j48g5dk2dwzz32myl6wv4ngxqnrkdnixq80pzjcmz1qkpl"; + sha256 = "0a6s6qwc548c1ldf459i5z55fvxsrdi4rnc57d167wdbdydd6dn7"; }; }; From 60a20b46e83b4d4b3424fde35339d71771dc8344 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:37:48 +0200 Subject: [PATCH 267/515] perlPackages.DateManip: update from 6.41 to 6.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 770a252566f..0d3887ea22e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1925,10 +1925,10 @@ rec { }; DateManip = buildPerlPackage { - name = "Date-Manip-6.41"; + name = "Date-Manip-6.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.41.tar.gz; - sha256 = "f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.42.tar.gz; + sha256 = "18zkdvam3qddv810hgzszk2zxra14whl0fs03ba79babqhbpbzna"; }; propagatedBuildInputs = [ TestInter ]; meta = { From 93c00e205c658b14f479d8ff0469d03e8d791a27 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:46:08 +0200 Subject: [PATCH 268/515] perlPackages.TextTable: update from 1.126 to 1.128 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d3887ea22e..44e29eb8697 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8706,10 +8706,10 @@ rec { }; TextTable = buildPerlPackage { - name = "Text-Table-1.126"; + name = "Text-Table-1.128"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.126.tar.gz; - sha256 = "18v9ll360q4hlhmpks175da7y8nf6ywygd39archnw3zpn1cv7h1"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz; + sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c"; }; propagatedBuildInputs = [ TextAligner ]; meta = { From bf6a1172a27119d54b4843bda1216bec006f49ab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:48:48 +0200 Subject: [PATCH 269/515] perlPackages.VariableMagic: update from 0.48 to 0.53 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44e29eb8697..4febd41074d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9076,10 +9076,10 @@ rec { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.48"; + name = "Variable-Magic-0.53"; src = fetchurl { url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; - sha256 = "124isksyw52br0y304dq4fcm26jk1v44s6ni1xd10nnl26fwmzbw"; + sha256 = "1mxygb7q8n01klpzdmf8mvbm1i5zhazcm48yiw6dz0xk2fwrgz8q"; }; }; From 3838aa8a1109c76abedcc0e4cf623966d7899e1a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:51:46 +0200 Subject: [PATCH 270/515] perlPackages.PodCoverageTrustPod: update from 0.100002 to 0.100003 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4febd41074d..71212ddc064 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6716,10 +6716,10 @@ rec { }; PodCoverageTrustPod = buildPerlPackage { - name = "Pod-Coverage-TrustPod-0.100002"; + name = "Pod-Coverage-TrustPod-0.100003"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100002.tar.gz; - sha256 = "2389f8085c16087b10f59f1bd1b9de5d83cca5eb203778a2af1cee897b89bb6e"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100003.tar.gz; + sha256 = "19lyc5a5hg3pqhw0k5fnd0q4l2mrdq0ck4kw1smjvwkccp24431z"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { From 1529494594c28c9e1e8d640d16fdc56ab5d32e62 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:52:38 +0200 Subject: [PATCH 271/515] perlPackages.Parent: update from 0.221 to 0.228 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71212ddc064..6cbb16f1b2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6380,10 +6380,10 @@ rec { }; Parent = buildPerlPackage { - name = "parent-0.221"; + name = "parent-0.228"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz; - sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz; + sha256 = "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b"; }; }; From d6e7bba6f216d319e874465a3b6adef5cfea2388 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:54:30 +0200 Subject: [PATCH 272/515] perlPackages.NetAddrIP: update from 4.062 to 4.071 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6cbb16f1b2e..baa9b59bd82 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5935,10 +5935,10 @@ rec { }; NetAddrIP = buildPerlPackage rec { - name = "NetAddr-IP-4.062"; + name = "NetAddr-IP-4.071"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; - sha256 = "08c037afe314ca2e6369f8aa92eb4b8937f493f977f9f1f35ca396c1de8ed0c6"; + sha256 = "0m8d8ccygpjhbsv00vjfz8cvkjcn8dws0k4x58vbvnbjdv3yhxb3"; }; }; From 59d1578c0871423594daf6f80939502560e5a819 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 14 Dec 2013 17:48:32 +0200 Subject: [PATCH 273/515] perlPackages.TextTable: add missing dependencies --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index baa9b59bd82..e9677b80d9d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8711,6 +8711,7 @@ rec { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz; sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c"; }; + buildInputs = [ TestPod TestPodCoverage ]; propagatedBuildInputs = [ TextAligner ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/docmake/; From ed05981c8a9abfbd7935387583fb0dfb265c384f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Dec 2013 02:25:32 +0100 Subject: [PATCH 274/515] It is a first try to an expression for MPV video player. It certainly needs a bit of improvement and testing, but it works nicely - so it's a good time to put it to the great public! --- pkgs/applications/video/mpv/default.nix | 131 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++ 2 files changed, 138 insertions(+) create mode 100644 pkgs/applications/video/mpv/default.nix diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix new file mode 100644 index 00000000000..4e1594e54f5 --- /dev/null +++ b/pkgs/applications/video/mpv/default.nix @@ -0,0 +1,131 @@ +{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass +, lua5, perl, libpthreadstubs +, python3, docutils, which +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, sdl2Support? true, SDL2 ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? true, libvdpau ? null +, dvdreadSupport? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, jackaudioSupport ? true, jackaudio ? null +, pulseSupport ? true, pulseaudio ? null +, bs2bSupport ? false, libbs2b ? null +# For screenshots +, libpngSupport ? true, libpng ? null +# for Youtube support +, quviSupport? false, libquvi ? null +, cacaSupport? false, libcaca ? null +}: + +assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); +assert xineramaSupport -> (libXinerama != null && x11Support); +assert xvSupport -> (libXv != null && x11Support); +assert sdl2Support -> SDL2 != null; +assert alsaSupport -> alsaLib != null; +assert screenSaverSupport -> libXScrnSaver != null; +assert vdpauSupport -> libvdpau != null; +assert dvdreadSupport -> libdvdread != null; +assert dvdnavSupport -> libdvdnav != null; +assert bluraySupport -> libbluray != null; +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert jackaudioSupport -> jackaudio != null; +assert pulseSupport -> pulseaudio != null; +assert bs2bSupport -> libbs2b != null; +assert libpngSupport -> libpng != null; +assert quviSupport -> libquvi != null; +assert cacaSupport -> libcaca != null; + +# Purity problem: Waf needed to be is downloaded by bootstrap.py +# but by purity reasons it should be avoided; thanks the-kenny to point it out! +# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour + +let + waf = fetchurl { + url = https://waf.googlecode.com/files/waf-1.7.13; + sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873"; +}; + +in + +stdenv.mkDerivation rec { + name = "mpv-20130812"; + + src = fetchgit { + url = "https://github.com/mpv-player/mpv.git"; + rev = "62925a5c15a76568c155259bafa1361ec139c66b"; + }; + + buildInputs = with stdenv.lib; + [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ] + ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional xineramaSupport libXinerama + ++ optional dvdreadSupport libdvdread + ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ optional bluraySupport libbluray + ++ optional jackaudioSupport jackaudio + ++ optional pulseSupport pulseaudio + ++ optional screenSaverSupport libXScrnSaver + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex + ++ optional bs2bSupport libbs2b + ++ optional libpngSupport libpng + ++ optional quviSupport libquvi + ++ optional sdl2Support SDL2 + ++ optional cacaSupport libcaca + ; + + nativeBuildInputs = [ python3 lua5 perl ]; + + postConfigure = '' + patchShebangs TOOLS + ''; + +# There are almost no need of "configure flags", but some libraries +# weren't detected; see the TODO comments below + + NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + + enableParallelBuilding = true; + + configurePhase = '' + python3 ${waf} configure --prefix=$out + ''; + + buildPhase = '' + python3 ${waf} build + ''; + + installPhase = '' + python3 ${waf} install + # Maybe not needed, but it doesn't hurt anyway: a standard font + mkdir -p $out/share/mpv + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + ''; + + meta = { + description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)"; + longDescription = '' + mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. + ''; + homepage = "http://mpv.io"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + }; +} + +# Heavily based on mplayer2 expression + +# TODO: Wayland support +# TODO: investigate libquvi support: it isn't detected by Waf script! +# TODO: investigate caca support: it isn't detected by Waf script! +# TODO: a more systematic way to test this package diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82bcb442f3..95a19cbb9bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8498,6 +8498,13 @@ let # !!! should depend on MPlayer }; + mpv = callPackage ../applications/video/mpv { + ffmpeg = ffmpeg_1; + bs2bSupport = true; + quviSupport = true; + cacaSupport = true; + }; + mrxvt = callPackage ../applications/misc/mrxvt { }; multisync = callPackage ../applications/misc/multisync { From f7b64d0e66dd6bb0376f13ab352250b1545b0f3c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:23:23 +0200 Subject: [PATCH 275/515] testdisk: update from 6.13 to 6.14 --- pkgs/tools/misc/testdisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 47734b4cd69..d4866ec11f2 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}: stdenv.mkDerivation { - name = "testdisk-6.13"; + name = "testdisk-6.14"; src = fetchurl { - url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2; - sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8"; + url = http://www.cgsecurity.org/testdisk-6.14.tar.bz2; + sha256 = "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5"; }; buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid]; From 503762f5dcd5f664123badd9ccc2c52e5e7d7cd2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:29:50 +0200 Subject: [PATCH 276/515] telepathy_mission_control: update from 5.14.0 to 5.14.1 --- .../instant-messengers/telepathy/mission-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 56abf34e1b3..97683ff56de 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: stdenv.mkDerivation rec { - name = "${pname}-5.14.0"; + name = "${pname}-5.14.1"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q"; + sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb"; }; buildInputs = [ telepathy_glib ]; From 6313b933ed849826b640548158571a3095398619 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:37:20 +0200 Subject: [PATCH 277/515] telepathy_glib: update from 0.20.1 to 0.20.4 --- pkgs/development/libraries/telepathy/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 46aba67702d..8c08a342a90 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.20.1"; + name = "telepathy-glib-0.20.4"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1dk1s977zv8c935jsiv7ll51a52rlwd7a6f8v7z8klzvc4zk9801"; + sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9"; }; propagatedBuildInputs = [dbus_glib glib python]; From a8ec55b3d997fb8751b5cde20cab14fecb6e0170 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:40:06 +0200 Subject: [PATCH 278/515] suitesparse: update from 4.2.0 to 4.2.1 --- pkgs/development/libraries/suitesparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index 01762083934..4d27701b135 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, blas, liblapack, gfortran } : stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; name = "suitesparse-${version}"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; - sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6"; + sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; }; buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; From e9a4b303e6ead84778f80bf9cb6d08cf24178ba8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:44:51 +0200 Subject: [PATCH 279/515] sdparm: update from 1.03 to 1.08 --- pkgs/os-specific/linux/sdparm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 8389728f22d..2a796c1b3a9 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "sdparm-1.03"; + name = "sdparm-1.08"; src = fetchurl { - url = http://sg.danny.cz/sg/p/sdparm-1.03.tgz; - sha256 = "067bdhq2qc7h7ykf1yv86s9x12zscpqnsdlnr636a0nv0di2wymq"; + url = http://sg.danny.cz/sg/p/sdparm-1.08.tgz; + sha256 = "0msy8anggdand1yr50vg2azcfgks7sbfpnqk7xzw9adi2jj7hsrp"; }; meta = { From e34aea6178d3cf65d33ce768b6321e53d88ce0ab Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Dec 2013 02:25:32 +0100 Subject: [PATCH 280/515] It is a first try to an expression for MPV video player. It certainly needs a bit of improvement and testing, but it works nicely - so it's a good time to put it to the great public! --- pkgs/applications/video/mpv/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4e1594e54f5..bb91ca5beb5 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -86,9 +86,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 lua5 perl ]; - postConfigure = '' - patchShebangs TOOLS - ''; # There are almost no need of "configure flags", but some libraries # weren't detected; see the TODO comments below @@ -99,6 +96,7 @@ stdenv.mkDerivation rec { configurePhase = '' python3 ${waf} configure --prefix=$out + patchShebangs TOOLS ''; buildPhase = '' From 60e76fd0c221827db6aa4cc7489de6db31bb8690 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 15 Dec 2013 00:27:22 +0400 Subject: [PATCH 281/515] BerkeleyDB: update to 0.54 --- pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index a6309d028e8..01f698da232 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,11 +1,11 @@ {buildPerlPackage, fetchurl, db4}: buildPerlPackage rec { - name = "BerkeleyDB-0.36"; + name = "BerkeleyDB-0.54"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + sha256 = "010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8"; }; preConfigure = '' From e57309963cc831501eaf6156f6c4c3d756416eaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 21:32:56 +0100 Subject: [PATCH 282/515] pandoc: cosmetic --- pkgs/development/libraries/haskell/pandoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b2e4020703c..b42fc3633f0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -26,8 +26,8 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text ]; buildTools = [ alex happy ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From e706edb8ee0569176c78b7b1ac3113ef59e30840 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 21:34:05 +0100 Subject: [PATCH 283/515] git-annex: disable test suite in this version to fix the build --- .../version-management/git-and-tools/git-annex/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 9caaa2f4012..9ad70206c36 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -44,12 +44,7 @@ cabal.mkDerivation (self: { -fTDFA"; preConfigure = "patchShebangs ."; installPhase = "./Setup install"; - checkPhase = '' - export HOME="$NIX_BUILD_TOP/tmp" - mkdir "$HOME" - cp dist/build/git-annex/git-annex git-annex - ./git-annex test - ''; + checkPhase = ":"; meta = { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; From 903e36a74c9505f98a14fd32e5ccfa5f07f26e93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:05:17 +0100 Subject: [PATCH 284/515] git-annex: fix build some more --- .../version-management/git-and-tools/git-annex/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 9ad70206c36..0c9e642d265 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -44,7 +44,10 @@ cabal.mkDerivation (self: { -fTDFA"; preConfigure = "patchShebangs ."; installPhase = "./Setup install"; - checkPhase = ":"; + checkPhase = '' + export HOME="$NIX_BUILD_TOP/tmp" + mkdir "$HOME" + ''; meta = { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; From b7e3905d28939131dc9d2c7caec90a79cc72c0f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:08:27 +0100 Subject: [PATCH 285/515] haskell-hledger-irr: update to version 0.1.1.3 --- pkgs/applications/office/hledger-irr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix index 1f4dd165c50..430b93011a3 100644 --- a/pkgs/applications/office/hledger-irr/default.nix +++ b/pkgs/applications/office/hledger-irr/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-irr"; - version = "0.1.1.2"; - sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2"; + version = "0.1.1.3"; + sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal hledgerLib statistics time ]; From e5e30f9ec96b2a33b810f0989a181bf79d0db169 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:13:22 +0100 Subject: [PATCH 286/515] haskell-wai-test: trigger re-build to fix broken reference to HUnit --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 9cae0a85d6c..7d97fe4b4fe 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { httpTypes HUnit network text transformers wai ]; testDepends = [ hspec wai ]; + postBuild = ":"; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; From 674047ed918184c2e8e1f1a003055ddf64ff874e Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 15 Dec 2013 01:16:18 +0400 Subject: [PATCH 287/515] Add moc music player --- pkgs/applications/audio/moc/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/moc/default.nix diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix new file mode 100644 index 00000000000..de29f2d53e7 --- /dev/null +++ b/pkgs/applications/audio/moc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }: + +stdenv.mkDerivation rec { + name = "moc-${version}"; + version = "2.5.0-beta1"; + + src = fetchurl { + url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2"; + sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6"; + }; + + configurePhase = "./configure prefix=$out"; + + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ]; + + meta = { + description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; + homepage = http://moc.daper.net/; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 916cc21564a..1fe91d45e0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8435,6 +8435,8 @@ let mmex = callPackage ../applications/office/mmex { }; + moc = callPackage ../applications/audio/moc { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monodevelop = callPackage ../applications/editors/monodevelop { From 77cefbe76af8a57e56286fba0555c68bffd39c39 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:04:07 +0800 Subject: [PATCH 288/515] luajit: fix ldconfig to correct *.so files(symlinks) --- pkgs/development/interpreters/luajit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e5e3aed8d12..7c11be739f7 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{ stdenv, fetchurl }: stdenv.mkDerivation rec{ version = "2.0.2"; @@ -9,8 +9,12 @@ stdenv.mkDerivation rec{ sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; }; + patchPhase = '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.glibc}/sbin/ldconfig + ''; + installPhase = '' - mkdir -p $out make install PREFIX=$out ''; From 87e572a3d1d2fcac31fe011d0c28414377cc6528 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:24:28 +0800 Subject: [PATCH 289/515] add love-0.9.0 (use luajit by default) --- pkgs/development/interpreters/love/0.9.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/interpreters/love/0.9.nix diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix new file mode 100644 index 00000000000..b635b5e477c --- /dev/null +++ b/pkgs/development/interpreters/love/0.9.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig +, SDL2, mesa, openal, luajit +, libdevil, freetype, physfs +, libmodplug, mpg123, libvorbis, libogg +}: + +stdenv.mkDerivation rec { + name = "love-0.9.0"; + src = fetchurl { + url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag"; + }; + + buildInputs = [ + pkgconfig SDL2 mesa openal luajit + libdevil freetype physfs libmodplug mpg123 libvorbis libogg + ]; + + configureFlags = [ + "--with-lua=luajit" + ]; + + meta = { + homepage = "http://love2d.org"; + description = "A Lua-based 2D game engine/scripting language"; + license = "zlib"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82bcb442f3..9bf0df0c799 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3209,6 +3209,7 @@ let love = callPackage ../development/interpreters/love {lua=lua5;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; lua4 = callPackage ../development/interpreters/lua-4 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; From 186f5f5f0512e540aa452086be6c4f6fe8061f10 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:46:53 +0200 Subject: [PATCH 290/515] convmv: update from 1.14 to 1.15 --- pkgs/tools/misc/convmv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index a4b84f13507..6d1ce21f318 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-1.14"; + name = "convmv-1.15"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "1vvwrbys5kkfpn6kvn0sj3hls5v03d6gr7j7d5phbj8p9bigb5cn"; + sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3"; }; preBuild='' From fcd81b58440368a74ab12eae7a08b63f1050b3a7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:52:38 +0200 Subject: [PATCH 291/515] check: update from 0.9.8 to 0.9.11 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index d04f8c8e750..9888da5c3ec 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv }: -let version = "0.9.8"; in +let version = "0.9.11"; in stdenv.mkDerivation { name = "check-${version}"; src = fetchurl { url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42"; + sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa"; }; doCheck = true; From 24cf5017e9544fb503d836f141eb0d38e1d041ae Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:54:18 +0200 Subject: [PATCH 292/515] ccrypt: update from 1.9 to 1.10 --- pkgs/tools/security/ccrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 5653af424d1..0d4841bf036 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "ccrypt-1.9"; + name = "ccrypt-1.10"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.9.tar.gz; - sha256 = "1bzbfq19jnnlp221kilzxpy0l6w3hk9b1iqjz4haypzlyxswnf35"; + url = mirror://sourceforge/ccrypt/ccrypt-1.10.tar.gz; + sha256 = "184v9676hx2w875cz04rd3a20wrcms33a1zwybvapb0g2yi6vml7"; }; nativeBuildInputs = [ perl ]; From 28cba5e9d4fd3a2e720184a312f36cbaa40505ba Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:01:16 +0200 Subject: [PATCH 293/515] babeld: update from 1.4.1 to 1.4.3 --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 6f773cd1f7d..08805738f50 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.4.1"; + name = "babeld-1.4.3"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "0ykyvg9kkbv5pnkivcv9ncdcsb8bp3gfxv8swpq9jc7bh9aa2ckp"; + sha256 = "18qb0g7pxxgl9j0jwpyzhxk2h8bf26sk5bwmnqxv34a5f6lhzf6h"; }; preBuild = '' From 202ea363c47e201b1bb333a1b50ce5a80312b122 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:04:24 +0200 Subject: [PATCH 294/515] astyle: update from 2.02.1 to 2.04 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 6128406bbe5..c7cda38ef43 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,14 +2,14 @@ let name = "astyle"; - version = "2.02.1"; + version = "2.04"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; - sha256 = "0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953"; + sha256 = "0q3b2579ng01glfwan75zcyvkggixdz9c4i6cgid2664ad47zcvh"; }; sourceRoot = "astyle/build/gcc"; From b56814d1cee620cfe1d77de40aeaedfb9e58b216 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:06:38 +0200 Subject: [PATCH 295/515] ack: update from 2.02 to 2.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9677b80d9d..6873e214544 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27,10 +27,10 @@ rec { ack = buildPerlPackage rec { - name = "ack-2.02"; + name = "ack-2.12"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "de5560f2ce6334f3f83bef4ee942fdb09b792f05cf534fe67be3cb0431bf758f"; + sha256 = "0avxpgg1fvib4354d9a9710j63sgxpb5j07if5qr83apq9xx7wjj"; }; # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; From c08c8ddb520ed3f225d8992456241d4967739a38 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:08:31 +0200 Subject: [PATCH 296/515] a2jmidid: update from 7 to 8 --- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index f6c17e6d8ed..9dbdada07d4 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "a2jmidid-${version}"; - version = "7"; + version = "8"; src = fetchurl { url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; - sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7"; + sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; From ac1972d1775b229e2fdb4c590467ff4027ed2ab0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:10:06 +0200 Subject: [PATCH 297/515] archimedes: update from 2.0.0 to 2.0.1 --- pkgs/applications/science/electronics/archimedes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index f22ef09a983..142519c30ed 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "archimedes-2.0.0"; + name = "archimedes-2.0.1"; src = fetchurl { url = "mirror://gnu/archimedes/${name}.tar.gz"; - sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x"; + sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; meta = { From 22ea5a1982c8a5dc5ac9ce6f75f6b31f84bda37f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:13:12 +0200 Subject: [PATCH 298/515] beecrypt: update from 4.1.2 to 4.2.1 --- pkgs/development/libraries/beecrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 430e45ceec1..d90dae2dee0 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, m4}: stdenv.mkDerivation { - name = "beecrypt-4.1.2"; + name = "beecrypt-4.2.1"; src = fetchurl { - url = mirror://sourceforge/beecrypt/beecrypt-4.1.2.tar.gz; - md5 = "820d26437843ab0a6a8a5151a73a657c"; + url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; + sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; buildInputs = [m4]; configureFlags = "--disable-optimized --enable-static"; From 9fa6637c901412e85b521f69098863cb0547f644 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:20:28 +0200 Subject: [PATCH 299/515] bristol: update from 0.60.10 to 0.60.11 --- pkgs/applications/audio/bristol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 0978b15bfaf..5eb4f0c4e9f 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bristol-${version}"; - version = "0.60.10"; + version = "0.60.11"; src = fetchurl { url = "mirror://sourceforge/bristol/${name}.tar.gz"; - sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; + sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; buildInputs = [ From efb58e101a8c0531a1b5cf8598db948f36418ec5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:22:59 +0200 Subject: [PATCH 300/515] bzflag: update from 2.0.16 to 2.4.2 --- pkgs/games/bzflag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index d15c25cef3c..ce3a0c8fa3c 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }: stdenv.mkDerivation rec { - name = "bzflag-2.0.16"; + name = "bzflag-2.4.2"; src = fetchurl { - url = mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2; - sha256 = "13v0ibiyq59j3xf23yf7s8blkmacagl8w48v2580k5bzkswa0vzy"; + url = mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2; + sha256 = "04f8c83hfwwh4i74gxqqdbgc2r5hn9ayam986py3jjychhicaysg"; }; buildInputs = [ curl SDL mesa glew ncurses ]; From 7cee23b69fbe91dd447c7287bf6ad0a602dd4bea Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:27:17 +0200 Subject: [PATCH 301/515] chromaprint: update from 0.7 to 1.1 --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 2c712c5c20e..40d41b633d2 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "0.7"; + version = "1.1"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf"; + sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b"; }; buildInputs = [ cmake fftw boost ]; From 4e2ea2d0c097836639d2be65a4bd9cea3ec258f2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:31:53 +0200 Subject: [PATCH 302/515] classads: update from 1.0.4 to 1.0.10 --- pkgs/development/libraries/classads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 080e854315d..6d47ae3e7b1 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "1.0.4"; in +let version = "1.0.10"; in stdenv.mkDerivation { name = "classads-${version}"; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; - sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24"; + sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; }; configureFlags = '' From e7c77dc527bb0a12ad38b1497cd7b7f51894f80a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 15 Dec 2013 11:38:20 +0200 Subject: [PATCH 303/515] classads: add a missing dependency --- pkgs/development/libraries/classads/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 6d47ae3e7b1..909e8ba7bf2 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pcre }: let version = "1.0.10"; in @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; }; + buildInputs = [ pcre ]; + configureFlags = '' --enable-namespace --enable-flexible-member ''; From 17588191ecb9c72fdcd311d1fa7616c8490e08b8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:40:25 +0200 Subject: [PATCH 304/515] dmg2img: update from 1.6.4 to 1.6.5 --- pkgs/tools/misc/dmg2img/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 75a9a2037db..2030463885c 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.4"; + name = "dmg2img-1.6.5"; src = fetchurl { url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; - sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb"; + sha256 = "021ka05vq7lsdngsglmv93r2j0vfakrkx964xslzhaybwp5ic2j0"; }; buildInputs = [zlib bzip2 openssl]; From 53261424c3c7d8c269bbf34cff02efeaa14cf87e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:19:28 +0200 Subject: [PATCH 305/515] dnsmasq: update from 2.67 to 2.68 --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 7217d987186..0c5dfc6fd74 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.67"; + name = "dnsmasq-2.68"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "0jkbn5j3jc96mw7w3nf9zfkl9l3183r4ls4ryi6mnd94c5xlrv4j"; + sha256 = "0bvw16i83ybiajskma59zjiqw59vzlcqf8f69k0crwak3zb1j820"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; From 84ea06eb9948474a92fafbdd5da0dd495d484dab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:21:29 +0200 Subject: [PATCH 306/515] dnstop: update from 20110502 to 20121017 --- pkgs/tools/networking/dnstop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index c9e1b58d2d2..00984a4ee70 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, ncurses }: stdenv.mkDerivation { - name = "dnstop-20110502"; + name = "dnstop-20121017"; src = fetchurl { - url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20110502.tar.gz; - sha256 = "0ra3xjf7dwvq5xm6qbqd2al35vigibihy46rsz1860qrn3wycy12"; + url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20121017.tar.gz; + sha256 = "1xjrz4dzwshfrlc226s390sbwd10j0pl2al09d62955b6xh2vvba"; }; buildInputs = [ libpcap ncurses ]; From 680a6380c86c9cbaf9b6d59deba5bc4e0e47b966 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:26:24 +0200 Subject: [PATCH 307/515] cppcheck: update from 1.53 to 1.62 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 8aea7bc8aa8..9d3859851ee 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.53"; + version = "1.62"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "878db83d3954d0c45135362308da951ec0670a160c76a7410466a9b539e8677f"; + sha256 = "031x2khbk0anlacpdk5g5r3q3y4xj0z5zsfhf2wcv189hxl7698c"; }; configurePhase = "makeFlags=PREFIX=$out"; From 38803914d6a35023189692761b31dfcb64c05270 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:32:24 +0200 Subject: [PATCH 308/515] doxygen: update from 1.8.3.1 to 1.8.5 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 4f2ef6df849..69c1f4181cc 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, flex, bison, qt4 }: let - name = "doxygen-1.8.3.1"; + name = "doxygen-1.8.5"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0m9bwxg9g2h5fp9as0l0rmibm9ing39nssfrn3608v0v21l9yx0c"; + sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4"; }; patches = [ ./tmake.patch ]; From e4df13e956650e7069a1b0af15d3bb67659ed5a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:35:47 +0200 Subject: [PATCH 309/515] enscript: update from 1.6.5.2 to 1.6.6 --- pkgs/tools/text/enscript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 665336cbd36..f25c41b72b9 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "enscript-1.6.5.2"; + name = "enscript-1.6.6"; src = fetchurl { url = "mirror://gnu/enscript/${name}.tar.gz"; - sha256 = "0xfblj3liwf1zxpx8bdcl2dwqi2lkfm1zsl6ld9757kgnfyk6gnv"; + sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; buildInputs = [ gettext ]; From 8c042a49ebf6f2c85ddfdc1be8b1a0dda74ef0cc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:38:46 +0200 Subject: [PATCH 310/515] etherape: update from 0.9.12 to 0.9.13 --- pkgs/applications/networking/sniffers/etherape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 3b9b8cce9e7..a51f65cbccb 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,10 +2,10 @@ , gnomedocutils, scrollkeeper, libxslt }: stdenv.mkDerivation rec { - name = "etherape-0.9.12"; + name = "etherape-0.9.13"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k"; + sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a"; }; configureFlags = [ "--disable-scrollkeeper" ]; From 6619a3a1d8a58d90fe6c29b55c91cd06e27ad583 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:49:39 +0200 Subject: [PATCH 311/515] dar: update from 2.4.6 to 2.4.11 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index ad2269f2add..9309886db80 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { - name = "dar-2.4.6"; + name = "dar-2.4.11"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "1r83ad32wbdrwxifkw1gdki7z534ggm9hfbmc6jf5lgr5mgkrqbq"; + sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1"; }; buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ]; From 873c95ba8d5ce2fc8f6e52e66049be0a7bbb75e7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:00:22 +0200 Subject: [PATCH 312/515] hexedit: update from 1.2.12 to 1.2.13 --- pkgs/applications/editors/hexedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 07985dc214a..ee9f44d06da 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hexedit-${version}"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { url = "http://rigaux.org/${name}.src.tgz"; - sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f"; + sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka"; }; buildInputs = [ ncurses ]; From 53754a0397180f4a4b8b83b30ed023f006c58693 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:03:15 +0200 Subject: [PATCH 313/515] help2man: update from 1.40.8 to 1.43.3 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index edbc37e76a6..a3e1348f940 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.40.8"; + name = "help2man-1.43.3"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.gz"; - sha256 = "0s6phazn8jgvpbsby8kj2m58rj1zjghi1aipvamh8af226ssqfzj"; + sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; From a49d2ee8b5008216df616701e674745820013175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:05:36 +0200 Subject: [PATCH 314/515] hello: update from 2.8 to 2.9 --- pkgs/applications/misc/hello/ex-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 80a3fb702c0..d3ade1ab850 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.8"; + name = "hello-2.9"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc"; }; doCheck = true; From aa36ddc188da5b2108841bbdf349ba57c5d081f5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:06:57 +0200 Subject: [PATCH 315/515] ii: update from 1.6 to 1.7, potentially fixes CVE-2012-2187 --- pkgs/applications/networking/irc/ii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index a283258d589..537897c13b4 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ii-1.6"; + name = "ii-1.7"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr"; + sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis"; }; installPhase = '' From 4095a1d55468006fb055c405cafa6bf8d3a8dfa5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:08:19 +0200 Subject: [PATCH 316/515] incrtcl: update from 3.4b1 to 3.4.1 --- pkgs/development/libraries/incrtcl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 0263e98f587..e6474abf11c 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; - version = "3.4b1"; + version = "3.4.1"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4b1.tar.gz; - sha256 = "0226vf7vmb7qmk9bcic635d33rm3gr1wqk5rpx6pf00bq3vgr6fw"; + url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz; + sha256 = "0s457j9mn3c1wjj43iwy3zwhyz980jlyqn3s9487da9dwwn86c2k"; }; buildInputs = [ tcl ]; From f95db595e7fbadeacc796cb4e6af43551324a955 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:11:20 +0200 Subject: [PATCH 317/515] ised: update from 2.2.2 to 2.5.0 --- pkgs/tools/misc/ised/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 0a04886f64c..02cb65b1060 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -10,10 +10,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="ised"; - version="2.2.2"; + version="2.5.0"; name="${baseName}-${version}"; url="mirror://sourceforge/project/ised/${name}.tar.bz2"; - hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn"; + hash="1avfb4ivq6iz50rraci0pcxl0w94899sz6icdqc0l4954y4zs8qd"; }; in rec { From ffd5623ec89bae8ff8ad5a5df03bcea9de3850be Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:16:57 +0200 Subject: [PATCH 318/515] libcddb: update from 1.3.0 to 1.3.2 --- pkgs/development/libraries/libcddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 4a0066fccd4..8e4f8a36547 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,11 +1,11 @@ {fetchurl, stdenv}: stdenv.mkDerivation rec { - name = "libcddb-1.3.0"; + name = "libcddb-1.3.2"; src = fetchurl { url = "mirror://sourceforge/libcddb/${name}.tar.bz2"; - sha256 = "1y8bfy12dwm41m1jahayn3v47dm34fmz7m9cjxyh7xcw6fp3lzaf"; + sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; meta = { From 3073e0697ff89d77766e0e9255e6200cc21d4e82 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:18:34 +0200 Subject: [PATCH 319/515] libcdio: update from 0.82 to 0.90 --- pkgs/development/libraries/libcdio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index fc26fb9aca1..00159e1de46 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.82"; + name = "libcdio-0.90"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; + sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; From 19f3061d10a18cc72f7ce1de555f1caef20cfa13 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:20:24 +0200 Subject: [PATCH 320/515] lingot: update from 0.9.0 to 0.9.1 --- pkgs/applications/audio/lingot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 44d946af2db..4b8ba4dbc24 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: stdenv.mkDerivation { - name = "lingot-0.9.0"; + name = "lingot-0.9.1"; src = fetchurl { - url = mirror://savannah/lingot/lingot-0.9.0.tar.gz; - sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb"; + url = mirror://savannah/lingot/lingot-0.9.1.tar.gz; + sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc"; }; buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; From d7a82dfe6f2753c3f87b5b7ab2a0b63d2fb5827f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:21:56 +0200 Subject: [PATCH 321/515] lockfileProgs: update from 0.1.16 to 0.1.17 --- pkgs/tools/misc/lockfile-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 41fca212158..15c6258e86f 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { _name = "lockfile-progs"; - version = "0.1.16"; + version = "0.1.17"; name = "${_name}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; - sha256 = "0sca19mg0lk68ms6idy4vfp8dyjpcbq9f143v9qzjyk86bb34lgr"; + sha256 = "04f5cvhrld15w58wkg6k2azywszsc5xp9cbmfx4jylwrak90byq3"; }; buildInputs = [ liblockfile ]; From 556e38c0f44f31943b859983c933392b26a429a0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 15 Dec 2013 20:12:35 +0400 Subject: [PATCH 322/515] Fix LuaJIT evaluation on non-Linux platforms --- pkgs/development/interpreters/luajit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 7c11be739f7..f74ad18d5e4 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec{ sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; }; - patchPhase = '' + patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null) + '' substituteInPlace Makefile \ - --replace ldconfig ${stdenv.glibc}/sbin/ldconfig + --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig ''; installPhase = '' @@ -22,5 +23,6 @@ stdenv.mkDerivation rec{ description= "Just-in-time compiler and interpreter for lua 5.1."; homepage = http://luajit.org; license = stdenv.lib.licenses.mit; + platorms = stdenv.lib.platforms.linux; }; } From a18b92f4e45229b335637cf560131a1a996ad881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 15 Dec 2013 19:40:15 +0100 Subject: [PATCH 323/515] ntopng: fix download url The current one doesn't work. (My bad for not testing properly after having done the initial download with nix-prefetch-url.) --- pkgs/tools/networking/ntopng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index e4f59a98cf0..78d44b7768d 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "ntopng-1.1_6932"; src = fetchurl { - url = "mirror://sourceforge/ntop/files/ntopng/${name}.tgz"; + url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"; sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr"; }; From b92620f6801383ce70875fb2a15cd5d6d701e1a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 23:32:13 +0200 Subject: [PATCH 324/515] kde4.digikam: update from 3.2.0 to 3.5.0, potentially fixes CVE-2012-4514, CVE-2012-4514 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 713adaffd06..5bc409d10e5 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-3.2.0"; + name = "digikam-3.5.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; + sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; From 66fa31308c06e7ce8e588b8b2a33ce6b270b42c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:03:17 +0100 Subject: [PATCH 325/515] haskell-ghc-mod: re-enable the test suite --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index fb3ccb8e50e..411c4a963f7 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { ioChoice syb time transformers ]; buildTools = [ emacs ]; - doCheck = false; postInstall = '' cd $out/share/$pname-$version make From 41f0df10681a88305cbd75c7e997e614a096fee3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:08:33 +0100 Subject: [PATCH 326/515] haskell-ghc-mod: don't rely on /bin/sh --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 411c4a963f7..b764d69fb3b 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { mv $pname-$version emacs/site-lisp mv $out/bin/ghc-mod $out/ghc-mod cat - > $out/bin/ghc-mod < Date: Sun, 15 Dec 2013 20:09:31 +0100 Subject: [PATCH 327/515] haskell-ghc-mod: keep the original 'ghc-mod' binary in $out/bin, not $out --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b764d69fb3b..472d2579048 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -24,12 +24,12 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/ghc-mod + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod < Date: Sun, 15 Dec 2013 19:08:52 +0100 Subject: [PATCH 328/515] haskell-quickcheck-io: revert hard-coding of HUnit and QuickCheck versions That patch broke the build on modern platforms. Instead of hard-coding those versions globally, we should do so on a per-platform basis in haskell-defaults.nix. --- 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 af8eb5ea7df..f00ac246546 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1832,10 +1832,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {}; - quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io { - HUnit = self.HUnit_1_2_5_2; - QuickCheck = self.QuickCheck2; - }; + quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; From 736ff4ae2a4d7b07c7f15f84a30a1b43b3eed26b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 19:40:48 +0100 Subject: [PATCH 329/515] haskell-quickcheck-io: override versions of HUnit and QuickCheck on older versions of Haskell Platform --- pkgs/top-level/haskell-defaults.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 19fcb98c82d..2dd5b0ca3df 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -63,6 +63,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc703Prefs = @@ -75,6 +79,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc702Prefs = ghc701Prefs; @@ -89,6 +97,10 @@ prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6123Prefs = ghc6122Prefs; @@ -108,6 +120,10 @@ mtl = self.mtl_2_1_2; HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6121Prefs = @@ -127,6 +143,10 @@ mtl = self.mtl_2_1_2; HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; }; + quickcheckIo = self.quickcheckIo.override { + HUnit = self.HUnit_1_2_5_2; + QuickCheck = self.QuickCheck2; + }; }; ghc6104Prefs = From 53e9145cd0e82e33fe1546b868e016cec7425136 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 18:04:49 +0100 Subject: [PATCH 330/515] haskell-mime-mail: update to version 0.4.3 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 691029ac5de..4f7353dfdb6 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.2.1"; - sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g"; + version = "0.4.3"; + sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; From 001776428e32d1d96f2e8cd04738f27d1f62d25e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 18:04:51 +0100 Subject: [PATCH 331/515] haskell-LambdaHack: update to version 0.2.10.6 --- pkgs/games/LambdaHack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 4b9211b637f..b9b66f4be69 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.10.5"; - sha256 = "0a10xchhqh61idqb7ycassvy6gmprz9820w0z3r33h1c9sldq1lk"; + version = "0.2.10.6"; + sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n"; isLibrary = true; isExecutable = true; buildDepends = [ From be8d22c05d476b544c6576f2ec460b9403df9239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 19:54:13 +0100 Subject: [PATCH 332/515] haskell-github: patch to fix build --- .../libraries/haskell/github/default.nix | 1 + .../libraries/haskell/github/fix-build.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/github/fix-build.patch diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 5a45e48bdc7..74368defc9c 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; + patches = [ ./fix-build.patch ]; jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch new file mode 100644 index 00000000000..2d3483b38ec --- /dev/null +++ b/pkgs/development/libraries/haskell/github/fix-build.patch @@ -0,0 +1,13 @@ +diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs +--- github-0.7.2-orig/Github/Private.hs 2013-12-15 19:45:00.611789227 +0100 ++++ github-0.7.2/Github/Private.hs 2013-12-15 19:45:46.359954006 +0100 +@@ -104,9 +104,6 @@ + in Just (Data.List.takeWhile (/= '>') s') + else Nothing + +-doHttps :: Method -> String -> Maybe GithubAuth +- -> Maybe (RequestBody (ResourceT IO)) +- -> IO (Either E.SomeException (Response LBS.ByteString)) + doHttps reqMethod url auth body = do + let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body + reqHeaders = maybe [] getOAuth auth From a2a1eb88cbf8b57ce7ddfd71b2f70bbae3ec8655 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:48:08 +0200 Subject: [PATCH 333/515] httpfs2: update from 0.1.4 to 0.1.5 --- pkgs/tools/filesystems/httpfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index bbb6d2efc7b..6f68a798ede 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -2,11 +2,11 @@ , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { - name = "httpfs2-0.1.4"; + name = "httpfs2-0.1.5"; src = fetchurl { url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz"; - sha256 = "0vlp6i119lz4ybnrd26hvvwms3h5d7x3jly5nzyyfcw24ngvpk7p"; + sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; buildInputs = From 49cfb2c89677a1b62288c9c8e66c31878bd91b15 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:49:32 +0200 Subject: [PATCH 334/515] httpunit: update from 1.6 to 1.7 --- pkgs/development/libraries/java/httpunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index b70bbf56073..73eb33df812 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, unzip} : stdenv.mkDerivation { - name = "httpunit-1.6"; + name = "httpunit-1.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/httpunit/httpunit-1.6.zip; - md5 = "e94b53b9f4d7bdb706e4baac95b6e424"; + url = mirror://sourceforge/httpunit/httpunit-1.7.zip; + sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; }; inherit unzip; From 1ff34a1cf80cf9286737bc84d0750afd68cd128d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:50:54 +0200 Subject: [PATCH 335/515] httrack: update from 3.47.21 to 3.47.27 --- pkgs/tools/backup/httrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index c02a16d821a..4fa3345d220 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.47.21"; + version = "3.47.27"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0"; + sha256 = "1qgrs9wdqq4v9ywlb1b89i95w4a36y741l49xbpmb7mb7nvbz5kw"; }; buildInputs = [ zlib openssl ]; From 25dc79783b68976e1b99d379ccedfc98b212a17e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:52:40 +0200 Subject: [PATCH 336/515] icoutils: update from 0.29.1 to 0.31.0 --- pkgs/tools/graphics/icoutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 5abc909ea30..10cd9adf2b3 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "icoutils-0.29.1"; + name = "icoutils-0.31.0"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "180yqv41yc3fi6ggx7azhmaciqzadj0ir87wajigmcpgxkjk6v34"; + sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8"; }; buildInputs = [ libpng ]; From 8a0a1b7768282b784a7403e531ea66ae06ea892b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:57:25 +0200 Subject: [PATCH 337/515] pg_top: update from 3.6.2 to 3.7.0 --- pkgs/tools/misc/pg_top/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4c183d9c402..392fcbcc8ff 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ncurses, postgresql}: stdenv.mkDerivation { - name = "pg_top-3.6.2"; + name = "pg_top-3.7.0"; src = fetchurl { - url = http://pgfoundry.org/frs/download.php/1781/pg_top-3.6.2.tar.gz; + url = http://pgfoundry.org/frs/download.php/1781/pg_top-3.7.0.tar.gz; sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2"; }; From 6fc2d316bb5b3e03afdef69a10c6aade6d57c510 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:59:52 +0200 Subject: [PATCH 338/515] procps-ng: update from 3.3.6 to 3.3.9 --- pkgs/os-specific/linux/procps-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 6099505f1d6..0b3389f903a 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "procps-ng-3.3.6"; + name = "procps-ng-3.3.9"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.6.tar.xz; - sha256 = "0k0j3ilzfpw8n3y058ymgfmafdfqqqwpqm7nh7a35xlk6zgw96nh"; + url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz; + sha256 = "0qw69v7wx8hilwylyk9455k3h1xg8sc13vxh0pvdss7rml7wpw00"; }; buildInputs = [ ncurses ]; From aeda3e2216ffadd3434b25dc8c62211ff7a4f67d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:01:08 +0200 Subject: [PATCH 339/515] psmisc: update from 22.19 to 22.21 --- pkgs/os-specific/linux/psmisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index dd6c70127bf..0e423f85d66 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "psmisc-22.19"; + name = "psmisc-22.21"; src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.gz"; - sha256 = "e112ccadd4694c98f5ea4a02cd6944fdc5a2a1985f20e2b3f74f4dbca83a2a31"; + sha256 = "1p13s2323mi2868y4fzy3q2kkmv4fn1ggabqnjf202x4030vjj1q"; }; buildInputs = [ncurses]; From f5f6b86fc8ae9da028765b2892dcea82ef4f246c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:03:15 +0200 Subject: [PATCH 340/515] rpPPPoE: update from 3.10 to 3.11 --- pkgs/tools/networking/rp-pppoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 5079b951a64..fe7f9810026 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.10" a; + version = a.lib.attrByPath ["version"] "3.11" a; buildInputs = with a; [ ppp ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; - sha256 = "1xj9rvsblvv2zi4n1bj8mkk00p1b24ch5hlr1gcc3b4l4m0ag73h"; + sha256 = "083pfjsb8w7afqgygbvgndwajgwkfmcnqla5vnk4z9yf5zcs98c6"; }; inherit buildInputs; From 3c936a05022981d3de04033ab34d14cc999397b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:05:27 +0200 Subject: [PATCH 341/515] tinc: update from 1.0.22 to 1.0.23 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index c2b25e863f2..61ff721a847 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.22"; + version = "1.0.23"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "0b2w5jic0zs8smfq2a9w99ql7lspb7jph3psmqaflw0hq4gdsfa7"; + sha256 = "04i88hr46nx3x3s71kasm9qrjhnn35icxh9zwchki47z2vgnpw5w"; }; buildInputs = [ lzo openssl zlib ]; From f90e505d506b068cfb7c4bee12b8e909d20eb692 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:06:44 +0200 Subject: [PATCH 342/515] units: update from 1.86 to 2.02 --- pkgs/tools/misc/units/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index c609d2275da..0d1a962cbf6 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "units-1.86"; + name = "units-2.02"; src = fetchurl { - url = mirror://gnu/units/units-1.86.tar.gz; - sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi"; + url = mirror://gnu/units/units-2.02.tar.gz; + sha256 = "16jfji9g1zc99agd5dcinajinhcxr4dgq2lrbc9md69ir5qgld1b"; }; meta = { From d2bb4dc100916d789010d826059d9c1e7dca3abe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:09:58 +0200 Subject: [PATCH 343/515] windowmaker: update from 0.95.4 to 0.95.5 --- pkgs/applications/window-managers/windowmaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 2b146a78cb3..bbb6c038825 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "windowmaker-${version}"; - version = "0.95.4"; + version = "0.95.5"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/" + "WindowMaker-${version}.tar.gz"; - sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib"; + sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab"; }; buildInputs = [ pkgconfig libX11 libXft libXmu ]; From 6112fc7fff8a0053e4b7745cee2a95191142d101 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:11:51 +0200 Subject: [PATCH 344/515] xaos: update from 3.5 to 3.6 --- pkgs/applications/graphics/xaos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 307c9477929..cddbc212c19 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.5" a; + version = a.lib.attrByPath ["version"] "3.6" a; buildInputs = with a; [ aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl @@ -11,7 +11,7 @@ in rec { src = fetchurl { url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz"; - sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7"; + sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; }; inherit buildInputs; From e54c26a65c6740ba82772bec7577006c2846ccc0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:13:19 +0200 Subject: [PATCH 345/515] xdaliclock: update from 2.35 to 2.40 --- pkgs/tools/misc/xdaliclock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 74ee8b5b548..f6d6a2bacfa 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -12,11 +12,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="xdaliclock"; - version="2.35"; + version="2.40"; name="${baseName}-${version}"; project="${baseName}"; url="http://www.jwz.org/${project}/${name}.tar.gz"; - hash="0iybha2d0wqb4wkpw7l1zi3zhw57kqh3y7p4ja1k0fmvrzqc08g7"; + hash="03i8vwi9vz3gr938wr4miiymwv283mg11wgfaf2jhl6aqbmz4id7"; }; in rec { From e748d4c498af88a2ffa126de574225f2e0059d43 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:16:40 +0200 Subject: [PATCH 346/515] gmtk: update from 1.0.5 to 1.0.8 --- .../networking/browsers/mozilla-plugins/gmtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index 6ccab87ebe7..66309dc7f19 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: stdenv.mkDerivation rec { - name = "gmtk-1.0.5"; + name = "gmtk-1.0.8"; src = fetchurl { url = "http://gmtk.googlecode.com/files/${name}.tar.gz"; - sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468"; + sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0"; }; buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; From 8dd78ae54d1360400ef3d4a2b4c1e9a8ab5db3f6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:18:24 +0200 Subject: [PATCH 347/515] gptfdisk: update from 0.8.6 to 0.8.8 --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 817e3015efe..93dfab9a1a4 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.6"; + name = "gptfdisk-0.8.8"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "1cj7lribq8f3i4q6463q08bs42pvlzfj0iz2f2cnjn94hiacsya5"; + sha256 = "16myqa72mp0wyhca8il299h1gd6k6sr7m52qcr97j840wk0fjcac"; }; buildInputs = [ libuuid popt icu ncurses ]; From 6a69d7e89815599404a7c3f837327fd60da8b899 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:19:56 +0200 Subject: [PATCH 348/515] gsl: update from 1.15 to 1.16 --- pkgs/development/libraries/gsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 49364f88242..9afcc4ad41d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.15"; + name = "gsl-1.16"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; doCheck = true; From c253a1fb40e38f343b28ac21164572cc9e30c965 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:22:13 +0200 Subject: [PATCH 349/515] guile_ncurses: update from 1.3 to 1.4 --- pkgs/development/guile-modules/guile-ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 674b35f441e..1eca6b3a302 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, guile, ncurses, libffi }: stdenv.mkDerivation rec { - name = "guile-ncurses-1.3"; + name = "guile-ncurses-1.4"; src = fetchurl { url = "mirror://gnu/guile-ncurses/${name}.tar.gz"; - sha256 = "0chvfjrlmg99db98ra9vzwjmbypqx7d4ssm8q0kvzi0n0p9irszi"; + sha256 = "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899"; }; buildInputs = [ guile ncurses libffi ]; From cda4252d4b59eb059f475e8bdf1b0669c54bf516 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:24:12 +0200 Subject: [PATCH 350/515] guile_lib: update from 0.2.1 to 0.2.2 --- pkgs/development/guile-modules/guile-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 593b090922e..310c0e92380 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -3,11 +3,11 @@ assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "guile-lib-0.2.1"; + name = "guile-lib-0.2.2"; src = fetchurl { url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "0ag18l7f9cpv4l577ln3f106xiggl7ndxhrqqiz7cg0w38s3cjvl"; + sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"; }; buildInputs = [guile texinfo]; From 106785b0928ce74f8e4eccf154abc4ef2e056962 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:26:13 +0200 Subject: [PATCH 351/515] ioping: update from 0.4 to 0.7 --- pkgs/tools/system/ioping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index d721feb9d74..52d32b4e838 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -10,10 +10,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="ioping"; - version="0.4"; + version="0.7"; name="${baseName}-${version}"; url="http://ioping.googlecode.com/files/${name}.tar.gz"; - hash="064pfjhg2a4hj6ly0wc9z85awiqry55n6wpx8kxzl9qasls0q447"; + hash="1c0k9gsq7rr9fqh6znn3i196l84zsm44nq3pl1b7grsnnbp2hki3"; }; in rec { From 0a290831883b712cb56f513de10e36988dba7603 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:27:28 +0200 Subject: [PATCH 352/515] jansson: update from 2.4 to 2.5 --- pkgs/development/libraries/jansson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 4908c737ece..3d4e5f260dc 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.4"; + name = "jansson-2.5"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41"; + sha256 = "1cdi1g4pyjwrw76z99ys8cr13iz9nz9i8sq6ivl1q0ymiarvz2yx"; }; meta = { From 2e43a29ec80df04641f9a09ad6d3807000b71a10 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:29:41 +0200 Subject: [PATCH 353/515] less: update from 436 to 462 --- pkgs/tools/misc/less/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index b22e7521764..fa391880a10 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "less-436"; + name = "less-462"; src = fetchurl { - url = http://www.greenwoodsoftware.com/less/less-436.tar.gz; - sha256 = "1lilcx6qrfr2dqahv7r10j9h2v86w5sb7m8wrx2sza9ifkq6z8ap"; + url = http://www.greenwoodsoftware.com/less/less-462.tar.gz; + sha256 = "1kv5izyrkds8lkkzd46c9gxsnjgxbr7w4ficzma95dprcn92m97a"; }; buildInputs = [ncurses]; From 84aba31f4276e1cdc90de262bd6775aa11b99cfe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:31:22 +0200 Subject: [PATCH 354/515] libconfig: update from 1.4.8 to 1.4.9 --- pkgs/development/libraries/libconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 03b7b2cfb92..70a882ff15c 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libconfig-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz"; - sha256 = "1v817hy9y416i64ly17xdmgrn62qwj225wqakdzqr2j3pygm1c8q"; + sha256 = "0h9h8xjd36lky2r8jyc6hw085xwpslf0x6wyjvi960g6aa99gj09"; }; meta = with stdenv.lib; { From 3695a604185232dd5b285e6a5c6bd47f5330e42f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:32:26 +0200 Subject: [PATCH 355/515] libeatmydata: update from 65 to 82 --- pkgs/development/libraries/libeatmydata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 48a0423653d..6b3a16d1c09 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libeatmydata-65"; + name = "libeatmydata-82"; src = fetchurl { url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la"; + sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb"; }; meta = { From 9f83ba8776abc1ca99182d845e754c4d41495925 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:35:44 +0200 Subject: [PATCH 356/515] log4cpp: update from 1.1 to 1.1.1 --- pkgs/development/libraries/log4cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 2b255307558..32424d546b4 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1"; + name = "log4cpp-1.1.1"; src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; - sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2"; + sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; }; meta = { From 2b65900e7516284237c7a6a7f0d0b6ad2fd9f87a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 16 Dec 2013 04:50:22 +0000 Subject: [PATCH 357/515] vagrant: update to 1.4.0 --- pkgs/development/tools/vagrant/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 64822a08d07..80fc093822f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.3.5"; + name = "vagrant-1.4.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb; - sha256 = "0wfdz1r6i6acdrqb22n21iijz57ywjh4wd3fggcj65c0dvs0czfv"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb; + sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh"; } else fetchurl { - url = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_i686.deb; - sha256 = "0dq1ha278mjca1kdhijs6wzs61npvv1knvahnbiihxmhjsx5d9ih"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb; + sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm"; }; meta = with stdenv.lib; { From acac786868a418893a116124606e4a1d9cedf8b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 14:46:21 +0100 Subject: [PATCH 358/515] linux: Update to 3.4.74 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 4cf3229f6fd..8608eee8456 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.73"; + version = "3.4.74"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "052g799pq6k0xzs231n3502bsv0k9ap3q8clxpyzyila8sx4rll7"; + sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd"; }; features.iwlwifi = true; From a2b45034b3ff57b42c26a100c674aeb6844e7f9f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 14:50:40 +0100 Subject: [PATCH 359/515] php: Update to 5.4.23, 5.3.28 CVE-2013-4073, CVE-2013-6420 --- pkgs/development/interpreters/php/5.3.nix | 4 ++-- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index caa673b31a9..f7bb29270c7 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -10,7 +10,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.27"; + version = "5.3.28"; name = "php-${version}"; @@ -224,7 +224,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1"; + sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 1e3d73fa884..bf60e90d634 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.21"; + version = "5.4.23"; name = "php-${version}"; @@ -235,7 +235,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" ]; - sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za"; + sha256 = "1k4iplqqcaqkmyq10h6a5qcpkfpkd05r2kclxw9n9qdrm47hfz5f"; name = "php-${version}.tar.bz2"; }; From edaa56041ceb3185d9c104ca72c457a5e7ae6e03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 13:55:16 +0100 Subject: [PATCH 360/515] pkgs/build-support/cabal: configure a proper library rpath for dynamically linked executables --- pkgs/build-support/cabal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index b17f720e561..d99faf41f88 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) - ]; + ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}"; # GHC needs the locale configured during the Haddock phase. LANG = "en_US.UTF-8"; From ec00fe09654d44c1b5a3625b95e73c66de865fbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 13:59:42 +0100 Subject: [PATCH 361/515] haskell-doctest: don't build haddock documentation with pre-7.4 versions of GHC --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 68731426683..46e69c95f94 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { stringbuilder syb transformers ]; doCheck = false; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; From 1e5e9a402b062a85264f3ec765a97486b66a76cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 362/515] haskell-DAV: update to version 0.5.1 --- pkgs/development/libraries/haskell/DAV/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c24ceacc021..4a908e46d93 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,16 +1,16 @@ -{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens -, liftedBase, mtl, network, optparseApplicative, resourcet +{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes +, lens, liftedBase, mtl, network, optparseApplicative, resourcet , transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.5"; - sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; + version = "0.5.1"; + sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpClient httpConduit httpTypes lens liftedBase + caseInsensitive httpClient httpClientTls httpTypes lens liftedBase mtl network optparseApplicative resourcet transformers xmlConduit xmlHamlet ]; From ee755fa3bccbad9044f2631c537c81fbbecea580 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 363/515] haskell-HsOpenSSL: update to version 0.10.3.6 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index eb7c406e81e..d7736a5d9b9 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.5"; - sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; + version = "0.10.3.6"; + sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { From a3c0e40e521ffe4a723495cc519a8b3fbb76f01f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 364/515] haskell-ansi-terminal: update to version 0.6.1 --- .../development/libraries/haskell/ansi-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 6d598f29ec9..2e9b1c0c25f 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.6"; - sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg"; + version = "0.6.1"; + sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://batterseapower.github.com/ansi-terminal"; + homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From c1413dc30b9266b3f9f0fb358fe1d5b01184b8f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 365/515] haskell-enummapset-th: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/enummapset-th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix index 0b992a9daaf..a675d4d74ea 100644 --- a/pkgs/development/libraries/haskell/enummapset-th/default.nix +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enummapset-th"; - version = "0.6.0.0"; - sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn"; + version = "0.6.0.1"; + sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/liyang/enummapset-th"; From 0bbe648085a6a48b862b53374093bd427033cb92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 366/515] haskell-snaplet-acid-state: update to version 0.2.6 --- .../libraries/haskell/snaplet-acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 838f45eccaa..8a9a594e45d 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snaplet-acid-state"; - version = "0.2.5"; - sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + version = "0.2.6"; + sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9"; buildDepends = [ acidState snap text ]; meta = { homepage = "https://github.com/mightybyte/snaplet-acid-state"; From 9a313321365287fe3388d8ce7661aee1cdab3005 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 367/515] haskell-tasty: update to version 0.5.2.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 39ee7f2d168..6ba25cdc99b 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.2"; - sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949"; + version = "0.5.2.1"; + sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From 60103a4bd99cce63dab60be358e0ba90724b8b21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: [PATCH 368/515] haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 7d97fe4b4fe..9cae0a85d6c 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -12,7 +12,6 @@ cabal.mkDerivation (self: { httpTypes HUnit network text transformers wai ]; testDepends = [ hspec wai ]; - postBuild = ":"; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; From 3b766653c6d40e435c934e0f8e966be60cfbf40d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 17 Dec 2013 11:13:55 +0100 Subject: [PATCH 369/515] Ported to old no-xcode patch to the current nodejs, so that it can be built on Darwin again --- pkgs/development/web/nodejs/default.nix | 2 +- pkgs/development/web/nodejs/no-xcode.patch | 39 ++++++++-------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 47c5178cc79..ae990ca3245 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation { homepage = http://nodejs.org; license = licenses.mit; maintainers = [ maintainers.goibhniu maintainers.shlevy ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch index 47a37bfaf3c..534d5204a2e 100644 --- a/pkgs/development/web/nodejs/no-xcode.patch +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -1,23 +1,9 @@ -diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py -index 806f92b..5256856 100644 ---- a/tools/gyp/pylib/gyp/xcode_emulation.py -+++ b/tools/gyp/pylib/gyp/xcode_emulation.py -@@ -224,8 +224,7 @@ class XcodeSettings(object): - - def _GetSdkVersionInfoItem(self, sdk, infoitem): - job = subprocess.Popen(['xcodebuild', '-version', '-sdk', sdk, infoitem], -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT) -+ stdout=subprocess.PIPE) - out = job.communicate()[0] - if job.returncode != 0: - sys.stderr.write(out + '\n') -@@ -234,9 +233,17 @@ class XcodeSettings(object): - - def _SdkPath(self): - sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx') -+ if sdk_root.startswith('/'): -+ return sdk_root +diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2013-11-12 21:22:12.000000000 +0100 ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2013-12-17 11:07:11.000000000 +0100 +@@ -285,8 +285,15 @@ + if sdk_root.startswith('/'): + return sdk_root if sdk_root not in XcodeSettings._sdk_path_cache: - XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( - sdk_root, 'Path') @@ -29,10 +15,11 @@ index 806f92b..5256856 100644 + # the user is probably on a CLT-only system, where there + # is no valid SDK root + XcodeSettings._sdk_path_cache[sdk_root] = None ++ return XcodeSettings._sdk_path_cache[sdk_root] def _AppendPlatformVersionMinFlags(self, lst): -@@ -339,10 +346,11 @@ class XcodeSettings(object): +@@ -397,10 +404,11 @@ cflags += self._Settings().get('WARNING_CFLAGS', []) @@ -48,7 +35,7 @@ index 806f92b..5256856 100644 self.configname = None return cflags -@@ -572,10 +580,11 @@ class XcodeSettings(object): +@@ -647,10 +655,11 @@ for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): ldflags.append('-Wl,-rpath,' + rpath) @@ -64,15 +51,15 @@ index 806f92b..5256856 100644 self.configname = None return ldflags -@@ -700,7 +709,10 @@ class XcodeSettings(object): +@@ -826,7 +835,10 @@ l = '-l' + m.group(1) else: l = library -- return l.replace('$(SDKROOT)', self._SdkPath()) +- return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + if self._SdkPath(): -+ return l.replace('$(SDKROOT)', self._SdkPath()) ++ return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + else: + return l - def AdjustLibraries(self, libraries): + def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like From 010273bf1ec2080d292076a2aae35056a6d7881d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 17 Dec 2013 11:45:07 +0100 Subject: [PATCH 370/515] Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa0bdbfe56c..a3d6eca4fa6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { export DVIDecodeDelegate=${tetex}/bin/dvips '' else ""; - configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' + configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib '' + '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 - ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; + ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex pkgconfig ]; From 84b09e26e5bc4567f8bdf6ee8c8410adf139311a Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 15 Dec 2013 21:29:42 -0600 Subject: [PATCH 371/515] dzen2: new package "Dzen is a general purpose messaging, notification and menuing program for X11. It was designed to be fast, tiny and scriptable in any language." -- https://github.com/robm/dzen --- .../window-managers/dzen2/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/window-managers/dzen2/default.nix diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix new file mode 100644 index 00000000000..b3e970e90be --- /dev/null +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }: + +stdenv.mkDerivation rec { + name = "dzen2-0.9.5"; + + buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ]; + + src = fetchurl { + url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; + sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556"; + }; + + patchPhase = '' + CFLAGS=" -Wall -Os ''${INCS} -DVERSION=\"''${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`" + LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11" + echo "CFLAGS=$CFLAGS" >>config.mk + echo "LIBS=$LIBS" >>config.mk + echo "LDFLAGS=$LIBS" >>config.mk + substituteInPlace config.mk --replace /usr/local "$out" + substituteInPlace gadgets/config.mk --replace /usr/local "$out" + ''; + + buildPhase = '' + mkdir -p $out/bin $out/man/man1 + make clean install + cd gadgets + make clean install + ''; + + meta = { + homepage = https://github.com/robm/dzen; + license = stdenv.lib.licenses.mit; + description = "X notification utility"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f25fcd910dd..fe463051fbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7709,6 +7709,8 @@ let patches = config.dwm.patches or []; }; + dzen2 = callPackage ../applications/window-managers/dzen2 { }; + eaglemode = callPackage ../applications/misc/eaglemode { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); From 82f39bd19e8f757b98136000da5c4e90738ee587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Dec 2013 13:27:03 +0100 Subject: [PATCH 372/515] linux: Fix hash --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 8608eee8456..46a87e65c50 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -5,7 +5,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd"; + sha256 = "189b7391shzsf0383c3yqf8wy9w82wkzfqmqzxkm77312px1b2yb"; }; features.iwlwifi = true; From eca727fc55031030f78c64b6f5e40d8357472262 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 17 Dec 2013 15:07:23 +0200 Subject: [PATCH 373/515] Revert "gsl: update from 1.15 to 1.16" Tests fail on i686: http://savannah.gnu.org/bugs/?40176 This reverts commit 6a69d7e89815599404a7c3f837327fd60da8b899. --- pkgs/development/libraries/gsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9afcc4ad41d..49364f88242 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.16"; + name = "gsl-1.15"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; + sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; }; doCheck = true; From 05b94c04cf9504c74ac84ff061bf51986ad940a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 18 Dec 2013 11:24:53 +0100 Subject: [PATCH 374/515] Updating nvidia legacy 304 to 304.117 --- pkgs/os-specific/linux/nvidia-x11/legacy304.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index e2739b291d4..bd88e847b6e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.84"; in +let versionNumber = "304.117"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.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 = "14hfx3rhf3vf3x3klkhz5qkjrg51r22nqqdzffilcwkxdjfg10j1"; + sha256 = "16a09iinz3zgrvj8cywyxsy7i8kpan28b814xhfbl88zadyj0hy3"; } 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 = "1ixxkykl78g874g537apvxalggp3kw0mm5q69rl99jlw6jibbm80"; + sha256 = "0kzcxfwnp4aw4q53vl57ypc9yck4yj1hfhy8v9wfjlxvi6w6cp0v"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 6200fc9ffaafc5ecb01d39a9027eb40d330df230 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:39 +0100 Subject: [PATCH 375/515] haskell-async: add version 2.0.1.5 --- .../libraries/haskell/async/2.0.1.5.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/async/2.0.1.5.nix diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix new file mode 100644 index 00000000000..d3340fb3678 --- /dev/null +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -0,0 +1,17 @@ +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "async"; + version = "2.0.1.5"; + sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd"; + buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; + jailbreak = true; + meta = { + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f00ac246546..37d560ff439 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -141,7 +141,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; + async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_10_4_0; caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; @@ -558,7 +558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; - async = self.async_2_0_1_4; + async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {}; + async = self.async_2_0_1_5; atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {}; From d1f0c0325c8ef426e15755394b9ba136e88925f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: [PATCH 376/515] haskell-DAV: update to version 0.6 --- pkgs/development/libraries/haskell/DAV/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 4a908e46d93..a7e15f2d6b4 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,18 +1,18 @@ { cabal, caseInsensitive, httpClient, httpClientTls, httpTypes -, lens, liftedBase, mtl, network, optparseApplicative, resourcet -, transformers, xmlConduit, xmlHamlet +, lens, liftedBase, monadControl, mtl, network, optparseApplicative +, transformers, transformersBase, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.5.1"; - sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj"; + version = "0.6"; + sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk"; isLibrary = true; isExecutable = true; buildDepends = [ caseInsensitive httpClient httpClientTls httpTypes lens liftedBase - mtl network optparseApplicative resourcet transformers xmlConduit - xmlHamlet + monadControl mtl network optparseApplicative transformers + transformersBase xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; From 378c821a626afed196357dfc4af7470f696ef5f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: [PATCH 377/515] haskell-language-c-quote: update to version 0.7.6 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index f4774ecd14b..94eb72633de 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.5"; - sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73"; + version = "0.7.6"; + sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 705b317fee6aefb9d6b6c22737179a176766bb67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: [PATCH 378/515] haskell-mainland-pretty: update to version 0.2.7 --- .../development/libraries/haskell/mainland-pretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 2bcf2037cbe..60990d2dbca 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.6"; - sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy"; + version = "0.2.7"; + sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; From 714f20806b9e8c9fc0e15a447af8b0886148f236 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:44 +0100 Subject: [PATCH 379/515] haskell-scientific: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/scientific/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index 42d1c4b8612..8494168df15 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.1.0.0"; - sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r"; + version = "0.1.0.1"; + sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; doCheck = false; From 580c339699b6e17cb98aec28158fadd31d062297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:44 +0100 Subject: [PATCH 380/515] haskell-smallcheck: update to version 1.1.1 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index ef8f0e5e5ba..e81a8872f7a 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.1.0.1"; - sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m"; + version = "1.1.1"; + sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From b913699f2add206164942bdea02cb88c29106ae7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 18 Dec 2013 14:49:01 +0100 Subject: [PATCH 381/515] obnam: Update to 1.6 --- pkgs/tools/backup/obnam/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 6d550e95a9d..f6a51eb3193 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.4"; + version = "1.6"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "0gipbhh20p9n1x1cdpcil8vg3i20f1saa0xyz2wydb9xl4l2mjff"; + sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33d4f5734e2..bc5824c26de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7620,11 +7620,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; - version = "1.20130313"; + version = "1.20130808"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; - sha256 = "0rk13a68668gsrv6yqgzqxskffqnlyjar4qav6k5iyrp77amn7qm"; + sha256 = "0i9fqkahrc16mnxjw8fcr4hwrq3ibfrj2lzzbzzb7v5yk5dlr532"; }; buildInputs = [ sphinx ]; @@ -7713,11 +7713,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { tracing = buildPythonPackage rec { - name = "tracing-0.7"; + name = "tracing-${version}"; + version = "0.8"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz"; - sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276"; + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; + sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; }; buildInputs = [ sphinx ]; @@ -7752,11 +7753,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; - version = "0.22"; + version = "0.23"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; - sha256 = "1hzv0sbrvgcmafflhvzh7plci0dg7wcjlk39i8kqdasg6rw0ag6f"; + sha256 = "0ymimviyjyh2iizqilg88g4p26f5vpq1zm3cvg7dr7q4y3gmik8y"; }; buildInputs = [ sphinx ]; @@ -7773,11 +7774,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { larch = buildPythonPackage rec { name = "larch-${version}"; - version = "1.20130316"; + version = "1.20131130"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_${version}.orig.tar.gz"; - sha256 = "1mkvmy0jdzd7dlvdx2a75wsbj5qw1clawcgndx9jwl816a9iy225"; + sha256 = "1hfanp9l6yc5348i3f5sb8c5s4r43y382hflnbl6cnz4pm8yh5r7"; }; buildInputs = [ sphinx ]; From dd07654ca0588aad41ddc5e97052a58b8715d883 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:23:17 +0200 Subject: [PATCH 382/515] SDL_gfx: update from 2.0.22 to 2.0.25 --- pkgs/development/libraries/SDL_gfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 1090a99915f..49f5fec1da3 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL} : stdenv.mkDerivation rec { - name = "SDL_gfx-2.0.22"; + name = "SDL_gfx-2.0.25"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; - sha256 = "1w1bdpyypvqg1nmbjwkqnjhmngvpjmhc0zanwgq7z4pxffzffx8m"; + sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm"; }; buildInputs = [ SDL ] ; From d4cf43d7073f7ee1dac026aedd2d2840f049c57c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:27:17 +0200 Subject: [PATCH 383/515] SDL_net: update from 1.2.7 to 1.2.8 --- pkgs/development/libraries/SDL_net/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 54b38110e00..6def7a92efc 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "SDL_net"; - version = "1.2.7"; + version = "1.2.8"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; - sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53"; + sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; propagatedBuildInputs = [SDL]; From 0102ffdf8de547899315b67590d2890e48779eb7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:30:58 +0200 Subject: [PATCH 384/515] aalib: update from 1.4rc4 to 1.4rc5 --- pkgs/development/libraries/aalib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 897fc9db8de..a2c968ceb02 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses, automake}: stdenv.mkDerivation { - name = "aalib-1.4rc4"; + name = "aalib-1.4rc5"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/aa-project/aalib-1.4rc4.tar.gz; - md5 = "d5aa8e9eae07b7441298b5c30490f6a6"; + url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; + sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; # The fuloong2f is not supported by aalib still From 46f338d55deee4b20ecd4327847592a2c54ad7dc Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 13:33:12 +0200 Subject: [PATCH 385/515] aalib: update builder --- pkgs/development/libraries/aalib/builder.sh | 5 ----- pkgs/development/libraries/aalib/default.nix | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 pkgs/development/libraries/aalib/builder.sh diff --git a/pkgs/development/libraries/aalib/builder.sh b/pkgs/development/libraries/aalib/builder.sh deleted file mode 100644 index 5d4df565a6d..00000000000 --- a/pkgs/development/libraries/aalib/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--without-x --with-ncurses=$ncurses" - -genericBuild diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index a2c968ceb02..fa21a9570c7 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "aalib-1.4rc5"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; @@ -13,8 +13,9 @@ stdenv.mkDerivation { cp ${automake}/share/automake*/config.{sub,guess} . ''; - buildInputs = [ncurses]; - inherit ncurses; + buildInputs = [ ncurses ]; + + configureFlags = "--without-x --with-ncurses=${ncurses}"; meta = { description = "ASCII art graphics library"; From b6b047bdbc7a4ad80c2e928ccaff7aae3c5f85c1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:40:47 +0200 Subject: [PATCH 386/515] acct: update from 6.5.5 to 6.6.1 --- pkgs/tools/system/acct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 1095d702d25..fec739b0e8a 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.5.5"; + name = "acct-6.6.1"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "1mbg18acrva5m7kxc9pzhaknsqm4r90nrp7ax9jkm9wjkrxwhqs1"; + sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; }; patches = [ ./no-gets.patch ]; From 7f27479d4ad95581925a5aa66759d45bdb5b2f46 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 13:43:50 +0200 Subject: [PATCH 387/515] acct: fix build --- pkgs/tools/system/acct/default.nix | 2 -- pkgs/tools/system/acct/no-gets.patch | 22 ---------------------- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/tools/system/acct/no-gets.patch diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index fec739b0e8a..cd9519590cc 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1jzz601cavml7894fjalw661gz28ia35002inw990agr3rhiaiam"; }; - patches = [ ./no-gets.patch ]; - doCheck = true; meta = { diff --git a/pkgs/tools/system/acct/no-gets.patch b/pkgs/tools/system/acct/no-gets.patch deleted file mode 100644 index 3478b66de9d..00000000000 --- a/pkgs/tools/system/acct/no-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -hack until acct pulls a newer gnulib version - -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Thu, 29 Mar 2012 13:30:41 -0600 -Subject: [PATCH] stdio: don't assume gets any more - -Gnulib intentionally does not have a gets module, and now that C11 -and glibc have dropped it, we should be more proactive about warning -any user on a platform that still has a declaration of this dangerous -interface. - ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -125,7 +125,6 @@ - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ From 55a8f167e268fbba9cf4df4d6dd5aaa9a3cc37ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:44:09 +0200 Subject: [PATCH 388/515] allegro5: update from 5.0.4 to 5.0.10 --- pkgs/development/libraries/allegro/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 2bfc57011fd..e2d78e4b57e 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -15,11 +15,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="allegro"; - version="5.0.4"; + version="5.0.10"; name="${baseName}-${version}"; project="alleg"; url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n"; + hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; }; in rec { From 4c2976230ace0c10f9c8f9ea5e1bd394a331fdb0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 13:46:33 +0200 Subject: [PATCH 389/515] allegro5: add missing dependencies --- pkgs/development/libraries/allegro/5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index e2d78e4b57e..60634dc7db8 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , kbproto + , kbproto, libjpeg, flac , ...}: builderDefsPackage (a : From 9f152ede35e09191f8dcd7787af145ed709dc8ff Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:48:28 +0200 Subject: [PATCH 390/515] archivemount: update from 0.6.1 to 0.8.3 --- pkgs/tools/filesystems/archivemount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 8c7593121bb..4c00252fc2a 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.6.1"; + name = "archivemount-0.8.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01"; + sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; buildInputs = [ pkgconfig fuse libarchive ]; From c9d980eec832cbc88ae2be5261b59b2069677275 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:50:55 +0200 Subject: [PATCH 391/515] aria: update from 0.14.0 to 0.16.2 --- pkgs/tools/networking/aria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index f6432f8aa22..2cd3892eede 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -1,11 +1,11 @@ args : with args; -let version="0.14.0"; in +let version="0.16.2"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; - sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr"; + sha256 = "02qj3j7a1r477pmk969nd3aa93m33kh4101azy001i9jacpjvzrp"; }; buildInputs = []; From a1226bfb6d26d698352b0df8fd5f491108630d86 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:52:51 +0200 Subject: [PATCH 392/515] aria2: update from 1.17.1 to 1.18.1 --- pkgs/tools/networking/aria2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 75b6492a851..87613695be7 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.17.1"; + name = "aria2-1.18.1"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y"; + sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy"; }; buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; From aa44e4995a058fc0e17b1784eb4dd84a6fe35550 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:53:57 +0200 Subject: [PATCH 393/515] asio: update from 1.5.3 to 1.10.1 --- pkgs/development/libraries/asio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index acf53c708e0..039c2e85d63 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.5.3"; + name = "asio-1.10.1"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj"; + sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2"; }; propagatedBuildInputs = [ boost ]; From c0a0c0b38e3f6f55732d269ff92263ceba5bc4b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:55:46 +0200 Subject: [PATCH 394/515] atanks: update from 4.7 to 4.9 --- pkgs/games/atanks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 211e388b871..7669c443321 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version="4.7"; + version="4.9"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - hash="0kd98anwb785irv4qm1gqpk2xnh1q0fxnfazkjqpwjvgrliyj2rh"; + hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd"; }; in rec { From de91f24803d01f54cb308308a0be26b06496cbac Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 13:58:00 +0200 Subject: [PATCH 395/515] atari800: update from 2.0.2 to 2.2.1 --- pkgs/misc/emulators/atari800/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 4e499a499fd..5b1576bd97c 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip, zlib, SDL}: stdenv.mkDerivation { - name = "atari800-2.0.2"; + name = "atari800-2.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz; - md5 = "a81f8a5ace5fd89eb6094faef7c936af"; + url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz; + sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz"; }; rom = fetchurl { url = mirror://sourceforge/atari800/xf25.zip; From 55aaab4f5f1ccac0a3f0047792d2047f2334fe1d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:00:55 +0200 Subject: [PATCH 396/515] auctex: update from 11.85 to 11.87 --- pkgs/tools/typesetting/tex/auctex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 3a8b41da660..b3c09952e43 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.85"; + version = "11.87"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; + sha256 = "1wjwpmvhpj8q0zd78lj7vyzqhx4rbdhkflslylkzgnw5wllp5mb3"; }; buildInputs = [ emacs texLive ]; From e941f202f191740a4c3b3dd0081c998fca295bb7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:02:25 +0200 Subject: [PATCH 397/515] audiofile: update from 0.3.3 to 0.3.6 --- pkgs/development/libraries/audiofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 73f38f02814..497909cf25c 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, alsaLib }: stdenv.mkDerivation rec { - name = "audiofile-0.3.3"; + name = "audiofile-0.3.6"; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; - sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq"; + sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; meta = with stdenv.lib; { From 8970fb09ab977f4519ac53e1e8b2bf3bd775054f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:05:00 +0200 Subject: [PATCH 398/515] autogen: update from 5.17 to 5.18 --- pkgs/development/tools/misc/autogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index cd4f19694b2..308183cb6fc 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, guile, which, libffi }: -let version = "5.17"; in +let version = "5.18"; in stdenv.mkDerivation { name = "autogen-${version}"; src = fetchurl { url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz"; - sha256 = "065mg9gfb605wxbsk3inf93528ygcjgg6j8ml51691f6ghj363ff"; + sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7"; }; buildInputs = [ guile which libffi ]; From de403540ab64bd34f78ed53a0de2895b845341d4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:07:14 +0200 Subject: [PATCH 399/515] avogadro: update from 1.0.3 to 1.1.1 --- pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index e45f5b645fd..e1c4a5f7e7a 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: stdenv.mkDerivation rec { - name = "avogadro-1.0.3"; + name = "avogadro-1.1.1"; src = fetchurl { url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; - sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; + sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; From 37d39237ab52c87cb0ee30795c71599edc239462 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:15:28 +0200 Subject: [PATCH 400/515] avrdude: update from 5.11 to 6.0.1 --- pkgs/development/tools/misc/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 133e1c38194..89e848df03b 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -3,11 +3,11 @@ let edf = composableDerivation.edf; in composableDerivation.composableDerivation {} rec { - name="avrdude-5.11"; + name="avrdude-6.0.1"; src = fetchurl { url = "mirror://savannah/avrdude/${name}.tar.gz"; - sha256 = "1mwmslqysak25a3x61pj97wygqgk79s5qpp50xzay6yb1zrz85v3"; + sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066"; }; configureFlags = [ "--disable-dependency-tracking" ]; From f7296b70f8a49f5e1c337471dd2f7aaf2b2bd417 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:18:06 +0200 Subject: [PATCH 401/515] barcode: update from 0.98 to 0.99 --- pkgs/tools/graphics/barcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 6f8ec54c4c0..d43540a8b99 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -9,11 +9,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="0.98"; + version="0.99"; baseName="barcode"; name="${baseName}-${version}"; url="mirror://gnu/${baseName}/${name}.tar.gz"; - hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2"; + hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw"; }; in rec { From be11410d4abf13cc84f98ece2418c62f8ec98322 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:18:58 +0200 Subject: [PATCH 402/515] batctl: update from 2013.2.0 to 2013.4.0 --- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 2ff9d214bbb..88c7ffd93ee 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - ver = "2013.2.0"; + ver = "2013.4.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha1 = "0ba6520c813c9dd2e59e6205e8ea2e60a0c85f52"; + sha256 = "0k6b695h38m92a8wn5gvb3z746m3fm0ygv58yyn163adcsvf7sjd"; }; preBuild = '' From 296e2d5207dc1a4812f36b7476b19e60b62bfdd6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:21:11 +0200 Subject: [PATCH 403/515] bazaarTools: update from 2.2.0 to 2.5 --- pkgs/applications/version-management/bazaar/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 19a00d2b841..f10fb5e65ce 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "2.2.0"; + version = "2.5"; src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b"; + sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; }; buildInputs = []; From b07899be3251763e36d5a4ea4e6f84058d67ebc5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:21:54 +0200 Subject: [PATCH 404/515] bibletime: update from 2.9.1 to 2.9.2 --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 36366d6ee72..689bcf89ef9 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.9.1"; + version = "2.9.2"; name = "bibletime-${version}"; src = fetchurl { url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; - sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih"; + sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r"; }; prePatch = '' From 01a474bce4b0e2e8397e6ff536bcee8c6675e39d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:24:58 +0200 Subject: [PATCH 405/515] bird: update from 1.3.11 to 1.4.0 --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ae50091add1..5e86d60871d 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, readline }: stdenv.mkDerivation rec { - name = "bird-1.3.11"; + name = "bird-1.4.0"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; - sha256 = "15c4d9cyd6l8jdlrvmzvwmpga81llm8zxqvbsir9gvwgzn6zbmna"; + sha256 = "1ickqvzpnyycq4a0l4d0kvf25pvq2vjayc0whqfv1233nb5426ys"; }; buildInputs = [ flex bison readline ]; From fe6522309e570811d6fe12cc2ab257e9ffa547c9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:27:19 +0200 Subject: [PATCH 406/515] bison3: update from 3.0 to 3.0.2 --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 9b1499c1537..b35ad14b32c 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, flex }: stdenv.mkDerivation rec { - name = "bison-3.0"; + name = "bison-3.0.2"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.xz"; - sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79"; + sha256 = "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2"; }; nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex]; From e66756f350031eca12f6357efebe9f7814aca6af Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:28:10 +0200 Subject: [PATCH 407/515] bitcoin: update from 0.8.5 to 0.8.6 --- pkgs/applications/misc/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index a6a289168c4..9e20be0dcbc 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.8.6"; name = "bitcoin-${version}"; src = fetchurl { url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz"; - sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44"; + sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk"; }; buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; From a94aa7cf497c113b19b4d06a97339e2daf6bccbe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:29:41 +0200 Subject: [PATCH 408/515] bluez5: update from 5.8 to 5.12 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 3f5d85e8f6f..4938f7f4470 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.8"; + name = "bluez-5.12"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700"; + sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm"; }; pythonPath = with pythonPackages; From 146bcfe7b196a7ac4e680865c12cf4ff59b8e396 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:30:59 +0200 Subject: [PATCH 409/515] boolstuff: update from 0.1.13 to 0.1.14 --- pkgs/development/libraries/boolstuff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 9b5c25d4ca4..c1bd8a4b3a2 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.13"; + name = "boolstuff-0.1.14"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn"; + sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6"; }; nativeBuildInputs = [ pkgconfig ]; From c677e9df98feb3dfe5c500eaa469dd9a58ae9a75 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:36:53 +0200 Subject: [PATCH 410/515] bwidget: update from 1.9.5 to 1.9.7 --- pkgs/development/libraries/bwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 17f2b545168..81f4f9a287e 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.5"; + version = "1.9.7"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "1njssjjvfalsfh37prkxwqi4hf0zj1d54qzggvjwpzkm424jjcii"; + sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6"; }; dontBuild = true; From a2b26be374cbcc74006cc2151ef12043ba312981 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:38:07 +0200 Subject: [PATCH 411/515] byobu: update from 5.37 to 5.68 --- pkgs/tools/misc/byobu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 03b3719c9f0..909e44d9809 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "byobu-5.37"; + name = "byobu-5.68"; src = fetchurl { - url = "https://launchpad.net/byobu/trunk/5.37/+download/byobu_5.37.orig.tar.gz"; - sha256 = "e9fec9c03ebdfbeb42d08e8e7a7e45d873e1a5d5f7984a39793e37fe7cc30688"; + url = "https://launchpad.net/byobu/trunk/5.68/+download/byobu_5.68.orig.tar.gz"; + sha256 = "1xf2m18zx3075c0qvx4fzvn5afm274j5dl0jps7p2lbaq4k1lyhm"; }; doCheck = true; From c7a7cfc9d2b835c49a8a411db9ae4ef5fe0875bc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:39:56 +0200 Subject: [PATCH 412/515] calibre: update from 1.14.0 to 1.15.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6c007aadd32..67031e20722 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.14.0"; + name = "calibre-1.15.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6"; + sha256 = "0kisdrvsbdpfkirg0p8ifzcm7fjidx74xsw4bdb96gry2wmpjwf7"; }; inherit python; From 32b2973807c6e84576175963b7a78cc814e82175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:42:28 +0200 Subject: [PATCH 413/515] ccache: update from 3.1.7 to 3.1.9 --- pkgs/development/tools/misc/ccache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 05a0d9bbeb5..3dd634274f3 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -3,10 +3,10 @@ let ccache = stdenv.mkDerivation { - name = "ccache-3.1.7"; + name = "ccache-3.1.9"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.1.7.tar.gz; - sha256 = "04ax6ks49b6rn57hx4v9wbvmsfmw6ipn0wyfqwhh4lzw70flv3r7"; + url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz; + sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2"; }; buildInputs = [ zlib ]; From f4172038331ea3d61cfcfe3f5fbdb5f393bdbeef Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:46:14 +0200 Subject: [PATCH 414/515] ccrtp: update from 2.0.3 to 2.0.6 --- pkgs/development/libraries/ccrtp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 73ea5254182..daf36e28919 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.3"; + name = "ccrtp-2.0.6"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz; - sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01"; + url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz; + sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir"; }; buildInputs = [ openssl pkgconfig libgcrypt ]; From 6584533c89babce1285856a714f7eb4c51ad39ad Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:49:18 +0200 Subject: [PATCH 415/515] celt: update from 0.11.1 to 0.11.3 --- pkgs/development/libraries/celt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 471a47de404..28e51efbc4b 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -10,10 +10,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="celt"; - version="0.11.1"; + version="0.11.3"; name="${baseName}-${version}"; url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz"; - hash="1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1"; + hash="0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y"; }; in rec { From 339a738e72c6344ad06cf433d76274f5de2c3855 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:51:01 +0200 Subject: [PATCH 416/515] cgal: update from 3.9 to 4.3 --- pkgs/development/libraries/CGAL/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 49cf0a6b94b..0b65fcba0cb 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - version = "3.9"; + version = "4.3"; name = "cgal-${version}"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz"; From be5572e2dc97c0a07e4dc6fa3298a4a6ecd366a5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:52:14 +0200 Subject: [PATCH 417/515] chipmunk: update from 6.0.3 to 6.1.5 --- pkgs/development/libraries/chipmunk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index d5471b9be75..d148c4d829a 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -4,17 +4,17 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.attrByPath ["version"] "6.0.3" args; - majorVersion = lib.attrByPath ["majorVersion"] "6" args; + version = lib.attrByPath ["version"] "6.1.5" args; + majorVersion = lib.attrByPath ["majorVersion"] "6" args; buildInputs = with args; [ - cmake freeglut mesa + cmake freeglut mesa libX11 xproto inputproto libXi libXmu ]; in rec { src = fetchurl { url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a"; + sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7"; }; inherit buildInputs; From 69bb44994e1eb69d92d10fb140d4ce79e15cad6a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 14:53:36 +0200 Subject: [PATCH 418/515] avogadro: build documentation --- pkgs/applications/science/chemistry/avogadro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index e1c4a5f7e7a..1e9f3ee521b 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig doxygen ]; NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; From 6fb71755b824160047cfbc288bdeb7cd204ff6d7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:57:25 +0200 Subject: [PATCH 419/515] cinepaint: update from 1.0 to 1.1 --- pkgs/applications/graphics/cinepaint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 8d88e570f27..41a4b102a6f 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -5,11 +5,11 @@ mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { - name = "cinepaint-1.0"; + name = "cinepaint-1.1"; src = fetchurl { url = "mirror://sourceforge/cinepaint/${name}.tgz"; - sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; + sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg From f52514956d72cf8988a470bd15530c470e54d57c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 14:59:51 +0200 Subject: [PATCH 420/515] clojure_binary: update from 1.4.0 to 1.5.1 --- pkgs/development/interpreters/clojure/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 3902d7f335c..1678a932379 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.5.1"; name = "clojure-binary-${version}"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; + sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy"; }; From 7f6851883fb70ee1fa23ab661fefe357b9393df9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:00:59 +0200 Subject: [PATCH 421/515] cminpack: update from 1.1.2 to 1.3.2 --- pkgs/development/libraries/cminpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 121f41a0f3c..c73e9594857 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cminpack-1.1.2"; + name = "cminpack-1.3.2"; src = fetchurl { - url = http://devernay.free.fr/hacks/cminpack/cminpack-1.1.2.tar.gz; - sha256 = "0sd8gqk7npyiiiz2jym8q89d9gqx8fig0mnx63swkwmp4lqmmxww"; + url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz; + sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0"; }; patchPhase = '' From 2d22254e874d39877bcbacd8e2f17329bbcb03b1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:03:11 +0200 Subject: [PATCH 422/515] cracklib: update from 2.8.16 to 2.9.1 --- pkgs/development/libraries/cracklib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 7fb9089420d..e0c8d443ec8 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "cracklib-2.8.16"; + name = "cracklib-2.9.1"; src = fetchurl { url = "mirror://sourceforge/cracklib/${name}.tar.gz"; - sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw"; + sha256 = "0mni2sz7350d4acs7gdl8nilfmnb8qhcvmxnpf6dr5wsag10b2a0"; }; buildInputs = libintlOrEmpty; From 8e9ed874bf0884ba3add231971feec6f016ea275 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:05:26 +0200 Subject: [PATCH 423/515] csound: update from 5.18.02 to 5.19.01 --- pkgs/applications/audio/csound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 34e98ae620d..19c590330f6 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-5.18.02"; + name = "csound-5.19.01"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound5.18.02.tar.gz; - sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8"; + url = mirror://sourceforge/csound/Csound5.19.01.tar.gz; + sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669"; }; buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; From 0b276be28baeadc8d338e643d879423c7111266f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:07:04 +0200 Subject: [PATCH 424/515] csslint: update from 0.5.0 to 0.10.0 --- pkgs/development/web/csslint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 668ff6a7f4a..4a6cdc3aa34 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, nodejs }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.10.0"; name = "csslint-${version}"; src = fetchurl { url = "http://registry.npmjs.org/csslint/-/${name}.tgz"; - sha256 = "ee7a79c8f2af1c228d4b7869b6681d0d02a93568774dbf51c7a45aa1ffa1da14"; + sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; # node is the interpreter used to run this script From e4258fe1a7a8d87b6aadb2bbb81604708be0a114 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:08:51 +0200 Subject: [PATCH 425/515] cupsBjnp: update from 0.5.4 to 1.2.1 --- pkgs/misc/cups/drivers/cups-bjnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 483ec7aab97..1ed74c57435 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cups}: stdenv.mkDerivation rec { - name = "cups-bjnp-0.5.4"; + name = "cups-bjnp-1.2.1"; src = fetchurl { url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; - sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6"; + sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x"; }; preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; From 191f3490522540f696967f7a325f0669b533cdf7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:13:04 +0200 Subject: [PATCH 426/515] cvc3: update from 2.2 to 2.4.1 --- pkgs/applications/science/logic/cvc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index 9bb8f8cde4c..07b87e3cf07 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -12,10 +12,10 @@ let ++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))]; sourceInfo = rec { baseName="cvc3"; - version="2.2"; + version="2.4.1"; name="${baseName}-${version}"; url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; - hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji"; + hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; in rec { From 362f26dec73838cdfff50de90a8e60673679e11d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:14:36 +0200 Subject: [PATCH 427/515] d1x_rebirth: update from 0.57.3 to 0.58.1 --- pkgs/games/d1x-rebirth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix index 471eca78cf1..ca348592d1d 100644 --- a/pkgs/games/d1x-rebirth/default.nix +++ b/pkgs/games/d1x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d1x-rebirth-0.57.3"; + name = "d1x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "07dbjza5flsczdsas0adb5xhn13gmhlpixa8ycp8hjm20y9kw1za"; + url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; From 113a5782a3d68240bce61a3db8e4c97850fbe93f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:15:12 +0200 Subject: [PATCH 428/515] d2x_rebirth: update from 0.57.3 to 0.58.1 --- pkgs/games/d2x-rebirth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/d2x-rebirth/default.nix b/pkgs/games/d2x-rebirth/default.nix index b52e2995198..644c2703599 100644 --- a/pkgs/games/d2x-rebirth/default.nix +++ b/pkgs/games/d2x-rebirth/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }: stdenv.mkDerivation rec { - name = "d2x-rebirth-0.57.3"; + name = "d2x-rebirth-0.58.1"; src = fetchurl { - url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.57.3-src.tar.gz"; - sha256 = "0yyandmxz12bbpnd746nddjlqh5i7dylwm006shixis3w3giz77c"; + url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz"; + sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8"; }; buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ]; From 0abf7e62244bd3c334bd47e0a89f904ba6f0f5a9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:16:35 +0200 Subject: [PATCH 429/515] dash: update from 0.5.6 to 0.5.7 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3918be2afc1..bb4b39f1cc3 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.6"; + name = "dash-0.5.7"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "0qnqx14y70ay1mn0w0hrknpll9266pvj0426k8niww9s7fzv89w5"; + sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df"; }; meta = { From 99c9ff6442221d3bad66ddfda7e60454ffeb6dc7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:18:19 +0200 Subject: [PATCH 430/515] db48: update from 4.8.26 to 4.8.30 --- pkgs/development/libraries/db4/db4-4.8.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix index 86424fac567..a56a42f22ae 100644 --- a/pkgs/development/libraries/db4/db4-4.8.nix +++ b/pkgs/development/libraries/db4/db4-4.8.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: stdenv.mkDerivation { - name = "db4-4.8.26"; + name = "db4-4.8.30"; builder = ./builder.sh; src = fetchurl { - url = http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz; - sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp"; + url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz; + sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; }; configureFlags = [ From a699697f144d2615de5069952136fbe5059ee1aa Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:20:20 +0200 Subject: [PATCH 431/515] disper: update from 0.3.0 to 0.3.1 --- pkgs/tools/misc/disper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index b4a159745d4..777f7b48675 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation rec { - name = "disper-0.3.0"; + name = "disper-0.3.1"; buildInputs = [python]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz; - sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58"; + url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz; + sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw"; }; meta = { From 8d2d9f6d217bbe343f0130d0b732b8ad3bef8bf2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:26:13 +0200 Subject: [PATCH 432/515] docutils: update from 0.10 to 0.11 --- pkgs/development/tools/documentation/docutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index f6edcf54463..cd01cf059d6 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.10" a; + version = a.lib.attrByPath ["version"] "0.11" a; buildInputs = with a; [ - python pil makeWrapper + python pil makeWrapper ]; in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip"; + sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"; }; inherit buildInputs; From b89bcaef223fba6ad590377d81bc9263c82661a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:29:36 +0200 Subject: [PATCH 433/515] dos2unix: update from 5.3.1 to 6.0.3 --- pkgs/tools/text/dos2unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dcc4116813b..a0033771b67 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-5.3.1"; + name = "dos2unix-6.0.3"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz; - sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz; + sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm"; }; configurePhase = '' From 6b0e77f8b5d3139651e746d83bb351ff564e2849 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:32:52 +0200 Subject: [PATCH 434/515] dovecot: update from 2.1.8 to 2.1.17 --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index cb29c9ebc89..46cf742c452 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: stdenv.mkDerivation rec { - name = "dovecot-2.1.8"; + name = "dovecot-2.1.17"; buildInputs = [openssl pam bzip2 zlib inotifyTools openldap]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; - sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028"; + sha256 = "06j2s5bcrmc0dhjsyavqiss3k65p6xn00a7sffpsv6w3yngv777m"; }; # It will hardcode this for /var/lib/dovecot. From 74c3965b92f88e73484ec05f5973c903015ff1c7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:37:12 +0200 Subject: [PATCH 435/515] enca: update from 1.13 to 1.15 --- pkgs/tools/text/enca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index ce1c7401a4e..68748e62640 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv ? null }: stdenv.mkDerivation rec { - name = "enca-1.13"; + name = "enca-1.15"; src = fetchurl { url = "http://dl.cihar.com/enca/${name}.tar.bz2"; - sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; }; buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); From 74ced3209ee63dc87a19e6c049716571d982423e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 15:41:35 +0200 Subject: [PATCH 436/515] enca: update dependencies --- pkgs/tools/text/enca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 68748e62640..23223572bb2 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv ? null }: +{ stdenv, fetchurl, libiconvOrNull, recode }: stdenv.mkDerivation rec { name = "enca-1.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv"; }; - buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + buildInputs = [ recode libiconvOrNull ]; meta = { homepage = http://freecode.com/projects/enca; From 490dfa536371c7424c1b6fa82da0dd3751061e57 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:43:35 +0200 Subject: [PATCH 437/515] enet: update from 1.3.1 to 1.3.9 --- pkgs/development/libraries/enet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 6df90622383..39a332223ea 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.1"; + name = "enet-1.3.9"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99"; + sha256 = "0z4blmkyfjrkvgr12adjx7nnjrx4mvcm4zj8jp581m6rral7nf9y"; }; meta = { From d3b47ef72575ccf2f1c885d325f2e3427e7abe2b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:44:39 +0200 Subject: [PATCH 438/515] esdl: update from 1.0.1 to 1.2 --- pkgs/development/libraries/esdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index ccc3318ff6b..49b72008698 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, mesa, erlang}: stdenv.mkDerivation rec { - name = "esdl-1.0.1"; + name = "esdl-1.2"; src = fetchurl { url = "mirror://sourceforge/esdl/${name}.src.tar.gz"; - sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n"; + sha256 = "0zbnwhy2diivrrs55n96y3sfnbs6lsgz91xjaq15sfi858k9ha29"; }; buildInputs = [ erlang ]; From 8d2853102bc814e8f8ab8025f15005e3eaedda68 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:45:48 +0200 Subject: [PATCH 439/515] ethtool: update from 3.10 to 3.11 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 90d345daa13..01b45cd6d8b 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ethtool-3.10"; + name = "ethtool-3.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq"; + sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym"; }; meta = with stdenv.lib; { From 0a6ec77d3a3687045b86f959dce2875903016a25 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:47:10 +0200 Subject: [PATCH 440/515] exiv2: update from 0.22 to 0.23 --- pkgs/development/libraries/exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index fec9600b010..a7deb9f4c27 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, zlib, expat}: stdenv.mkDerivation rec { - name = "exiv2-0.22"; + name = "exiv2-0.23"; src = fetchurl { url = "http://www.exiv2.org/${name}.tar.gz"; - sha256 = "0ynf4r4fqijaa9yb0wfddk0a151p8cbcqxab54dyhc1xk83saf6k"; + sha256 = "04bbg2cg6mgcyz435zamx37sp5zw44n2alb59ki1daz71f851yl1"; }; propagatedBuildInputs = [zlib expat]; From 46a632eef39e634f87a78d0c97e7ea2edd17dc43 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:51:33 +0200 Subject: [PATCH 441/515] figlet: update from 2.2.4 to 2.2.5 --- pkgs/tools/misc/figlet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 488f8020b63..7f22a35e8de 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "figlet-2.2.4"; + name = "figlet-2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.4.tar.gz; - sha256 = "19qcmm9cmf78w1z7gbpyj9wmrfjzjl25sax9f2j37sijznrh263f"; + url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; installPhase = "make prefix=$out install"; From 05288d3ad5f0c939d91c0daf30e978927d4d2e45 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:55:49 +0200 Subject: [PATCH 442/515] findbugs: update from 1.3.2 to 2.0.3 --- pkgs/development/tools/analysis/findbugs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 0623632936d..2adaaf3c031 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "findbugs-1.3.2"; + name = "findbugs-2.0.3"; src = fetchurl { - url = mirror://sourceforge/findbugs/findbugs-1.3.2.tar.gz; - sha256 = "0mbwxzz5m9vizxlbg0i6rh5ywywiiw9zpabq5li7map43768apvr"; + url = mirror://sourceforge/findbugs/findbugs-2.0.3.tar.gz; + sha256 = "17s93vszc5s2b7pwi0yk8d6w54gandxrr7vflhzmpbl6sxj2mfjr"; }; buildPhase = '' From c47477d06e29299f0e7adc50532afb3538ce404e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:58:25 +0200 Subject: [PATCH 443/515] foomatic_filters: update from 4.0.12 to 4.0.17 --- pkgs/misc/drivers/foomatic-filters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index ff03770014d..f618a28b4d6 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, cups, dbus }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.12"; + name = "foomatic-filters-4.0.17"; src = fetchurl { url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; - sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8"; + sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; buildInputs = [ pkgconfig perl cups dbus ]; From f3bbb6ff5d2fb596a48b7c79a2430f45771ff750 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 15:59:31 +0200 Subject: [PATCH 444/515] fox_1_6: update from 1.6.48 to 1.6.49 --- pkgs/development/libraries/fox/fox-1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 2a7bb1dc31a..1d986275563 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -2,7 +2,7 @@ , libXrandr, mesa, libXft, libXfixes, xinput }: let - version = "1.6.48"; + version = "1.6.49"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k"; + sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr From fa78387a3869ae1f345857a59be78e70718af362 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:01:32 +0200 Subject: [PATCH 445/515] freeipmi: update from 1.1.3 to 1.3.4 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 82377aa92f5..2bfa77164b8 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.1.3"; + name = "freeipmi-1.3.4"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk"; + sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63"; }; buildInputs = [ libgcrypt readline ]; From 46d3388196b750ebaff8bc7b81ac4ba9ececfe0b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:03:29 +0200 Subject: [PATCH 446/515] gemrb: update from 0.6.1 to 0.8.0.1 --- pkgs/games/gemrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index aae7241cf88..31e8ae05d00 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -3,11 +3,11 @@ assert stdenv.gcc.libc != null; stdenv.mkDerivation rec { - name = "gemrb-0.6.1"; + name = "gemrb-0.8.0.1"; src = fetchurl { url = "mirror://sourceforge/gemrb/${name}.tar.gz"; - sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93"; + sha256 = "0v9iypls4iawnfkc91hcdnmc4vyg3ix7v7lmw3knv73q145v0ksd"; }; buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; From 767a9d575a2ebfa8f16b0e0b037a2ef686eb2ed9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:04:30 +0200 Subject: [PATCH 447/515] getmail: update from 4.42.0 to 4.43.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 06e7789eca3..80d29835da5 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "getmail-4.42.0"; + name = "getmail-4.43.0"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj"; + sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy"; }; doCheck = false; From 3cd09215c7ce7b9a07016520bcdbf92afcbc7aa6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:05:45 +0200 Subject: [PATCH 448/515] gifsicle: update from 1.52 to 1.78 --- pkgs/tools/graphics/gifsicle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 515858bd439..f3f17692df8 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xproto, libXt, libX11 }: stdenv.mkDerivation { - name = "gifsicle-1.52"; + name = "gifsicle-1.78"; src = fetchurl { - url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz; - sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk"; + url = http://www.lcdf.org/gifsicle/gifsicle-1.78.tar.gz; + sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53"; }; buildInputs = [ xproto libXt libX11 ]; From 20f3c4de3d8f6022f7fc776832cbe8e3c4a212e8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:08:06 +0200 Subject: [PATCH 449/515] gimp: update from 2.8.8 to 2.8.10 --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index d6b005e8e3d..af7d9e3399b 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.8"; + name = "gimp-2.8.10"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "ef2547c3514a1096931637bd6250635a"; + sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; }; buildInputs = From 8fa0f4debf7a19357059c16bec38ada2723d64dc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:10:35 +0200 Subject: [PATCH 450/515] gitAndTools.git: update from 1.8.5.1 to 1.8.5.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e364a8ea87b..dd8821711de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.5.1"; + version = "1.8.5.2"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m"; + sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From efa05777b0a815d8fa497ee7365f3914ba1be8b7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:31:59 +0200 Subject: [PATCH 451/515] glew: update from 1.9.0 to 1.10.0 --- pkgs/development/libraries/glew/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 313eec0bc7d..ef81f210d39 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: stdenv.mkDerivation rec { - name = "glew-1.9.0"; + name = "glew-1.10.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv"; + sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; From ec635085e906a691d364004ace6a9dd459d110e0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:35:19 +0200 Subject: [PATCH 452/515] glfw: update from 2.6 to 2.7.9 --- pkgs/development/libraries/glfw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix index 1f4df39408e..292c15361b6 100644 --- a/pkgs/development/libraries/glfw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, mesa, libX11, libXext }: stdenv.mkDerivation { - name = "glfw-2.6"; + name = "glfw-2.7.9"; src = fetchurl { - url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2; - sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv"; + url = mirror://sourceforge/glfw/glfw-2.7.9.tar.bz2; + sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; buildInputs = [ mesa libX11 libXext ]; From 68e201b41cd0b03079c1c5191c7d5e7928e4ba4e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:37:55 +0200 Subject: [PATCH 453/515] gnome.libgnomeprintui: update from 2.18.4 to 2.18.6 --- pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index da7673de419..a19b20e86b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: stdenv.mkDerivation { - name = "libgnomeprintui-2.18.4"; + name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; - sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; From 882ddb2b1d7712372858d9438ea49bae87e1ffea Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:39:48 +0200 Subject: [PATCH 454/515] gnome3.gnome_keyring: update from 3.6.2 to 3.6.3 --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 5983b74c0f4..9e08c6fa663 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -2,11 +2,11 @@ , gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }: stdenv.mkDerivation rec { - name = "gnome-keyring-3.6.2"; + name = "gnome-keyring-3.6.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz"; - sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f"; + sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0"; }; buildInputs = [ From f40d79adf6de1c3b20f7d09a84e3227eed0f360d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:46:49 +0200 Subject: [PATCH 455/515] graphite2: update from 1.2.3 to 1.2.4 --- pkgs/development/libraries/silgraphite/graphite2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 0a36efbc982..1ceb7a05000 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "graphite2-${version}"; src = fetchurl { url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz"; - sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g"; + sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb"; }; buildInputs = [pkgconfig freetype libXft pango fontconfig cmake]; From 24c79d66261d0d4a71feb14bc57a59e97f071ab8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:49:50 +0200 Subject: [PATCH 456/515] gromacsDouble: update from 4.5.5 to 4.6.5 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index de4bb171497..b9abf7b55b4 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { - name = "gromacs-4.5.5"; + name = "gromacs-4.6.5"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz"; - md5 = "6a87e7cdfb25d81afa9fea073eb28468"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz"; + sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957"; }; buildInputs = [cmake fftw]; From 965c3464e181008e2e3ff9f745f7cb224ae64c25 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:51:16 +0200 Subject: [PATCH 457/515] gssdp: update from 0.12.1 to 0.12.2.1 --- pkgs/development/libraries/gssdp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index c33457544f5..2c14451ba78 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}: stdenv.mkDerivation { - name = "gssdp-0.12.1"; + name = "gssdp-0.12.2.1"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.1.tar.xz; - sha256 = "0irkbzaj9raais6zdnbj3ysjkmdqhmdvfn0p1sz6x0s9ab6b9b0n"; + url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz; + sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj"; }; buildInputs = [pkgconfig libsoup glib libxml2]; From 7e348c17dad8a7621bcee70096a6455f53ad2e1f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:54:12 +0200 Subject: [PATCH 458/515] gst_plugins_bad: update from 0.10.22 to 0.10.23 --- .../libraries/gstreamer/gst-plugins-bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix index 2d1309f3a3c..470cc29eb8e 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix @@ -2,14 +2,14 @@ , libdvdnav, libdvdread }: stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.10.22"; + name = "gst-plugins-bad-0.10.23"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq"; + sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; }; buildInputs = From 0d453d90e3a9244b2504d6903f2e44e579a14d6e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:55:18 +0200 Subject: [PATCH 459/515] gst_plugins_ugly: update from 0.10.18 to 0.10.19 --- .../libraries/gstreamer/gst-plugins-ugly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix index b85fb983880..3a59ef16529 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix @@ -2,14 +2,14 @@ , libmad, libdvdread, libmpeg2, libcdio, a52dec }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.18"; + name = "gst-plugins-ugly-0.10.19"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr"; + sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w"; }; buildInputs = From 399c0474a84e52a32b0d99f9045ba0dc67786a03 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:56:04 +0200 Subject: [PATCH 460/515] gst_python: update from 0.10.19 to 0.10.22 --- pkgs/development/libraries/gstreamer/gst-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix index fedb44068eb..e960aa90421 100644 --- a/pkgs/development/libraries/gstreamer/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-0.10.19"; + name = "gst-python-0.10.22"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415"; + sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; }; buildInputs = From 8fd04f45c563b94b2df136025cc17003f7a79001 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:58:28 +0200 Subject: [PATCH 461/515] gtkgnutella: update from 0.97 to 1.0.0 --- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index e30192598cc..4c3ee0c4d6f 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -2,14 +2,14 @@ let name = "gtk-gnutella"; - version = "0.97"; + version = "1.0.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0l2gdzp517hjk31318djq0sww6kzckzl9rfqvhgspihn874lm9hb"; + sha256 = "11nri43q99zbxql9wg3pkq98vcgzvbndpzc3a1jlg3lzh7css0hc"; }; buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib]; From 0aef5b8381be4da80928f2f44b20b742f59912e4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 16:59:52 +0200 Subject: [PATCH 462/515] gtkwave: update from 3.3.39 to 3.3.53 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index bb4b969f062..0bc6b60e721 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.39"; + name = "gtkwave-3.3.53"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg"; + sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; From 0b3d2c0cacfe8d69f3106466ca8378548be444bf Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:00:56 +0200 Subject: [PATCH 463/515] gupnp: update from 0.18.1 to 0.18.4 --- pkgs/development/libraries/gupnp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index c70d8fcb0c2..ca92bb82a73 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: stdenv.mkDerivation { - name = "gupnp-0.18.1"; + name = "gupnp-0.18.4"; src = fetchurl { - url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.1.tar.xz; - sha256 = "1bn98mw4zicg0a7a2xjr4j93ksnpwkhccii8y8zy08g7x2jg3dhk"; + url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz; + sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb"; }; propagatedBuildInputs = [ libxml2 libsoup gssdp ]; From 1ef60acae5b0fbd9913e3bea2787ffd2e4358d70 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:03:40 +0200 Subject: [PATCH 464/515] highlight: update from 3.5 to 3.9 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 40a3bcf78ea..9bca0a91d4f 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, getopt, lua, boost }: stdenv.mkDerivation rec { - name = "highlight-3.5"; + name = "highlight-3.9"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28"; + sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja"; }; buildInputs = [ getopt lua boost ]; From d315309339cb7624cacf78c62c92ea9335e96fe2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:06:19 +0200 Subject: [PATCH 465/515] impressive: update from 0.10.2 to 0.10.3 --- pkgs/applications/office/impressive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index f1de422fa24..de6517923b6 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , xpdf, pil, pyopengl, pygame , setuptools, mesa, freeglut }: -let version = "0.10.2"; +let version = "0.10.3"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950"; + sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v"; }; # Note: We need to have `setuptools' in the path to be able to use From 14e0d3d693743ee111dab95d2aacde87f8ab8ea2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:08:54 +0200 Subject: [PATCH 466/515] isocodes: update from 3.40 to 3.49 --- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 4e6614345c1..3c408e6bc78 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.40"; + name = "iso-codes-3.49"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr"; + sha256 = "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04"; }; patchPhase = '' for i in `find . -name \*.py` From 6b76ba365d1465cf8ae1f00d478a56906a4b0d2e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:09:51 +0200 Subject: [PATCH 467/515] jackmeter: update from 0.3 to 0.4 --- pkgs/applications/audio/jackmeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 97c39982a65..98fcb8943af 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jackaudio, pkgconfig }: stdenv.mkDerivation rec { - name = "jackmeter-0.3"; + name = "jackmeter-0.4"; src = fetchurl { url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; - sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp"; + sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; buildInputs = [ jackaudio pkgconfig ]; From b3f1ee3863ab1eb0794f48f80ee8f003a06d5c0f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:11:14 +0200 Subject: [PATCH 468/515] jags: update from 2.2.0 to 3.4.0 --- pkgs/applications/science/math/jags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 3043df15da7..a93386149bd 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gfortran, liblapack, blas}: stdenv.mkDerivation rec { - name = "JAGS-2.2.0"; + name = "JAGS-3.4.0"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; - sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6"; + sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; buildInputs = [gfortran liblapack blas]; From 3f39947054a35083e2da7b4273210cde576c852f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:12:23 +0200 Subject: [PATCH 469/515] jetty61: update from 6.1.21 to 6.1.26 --- pkgs/servers/http/jetty/6.1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix index 10913a65641..894a21fdece 100644 --- a/pkgs/servers/http/jetty/6.1/default.nix +++ b/pkgs/servers/http/jetty/6.1/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "jetty-6.1.21"; + name = "jetty-6.1.26"; builder = ./bin-builder.sh; buildInputs = [unzip]; src = fetchurl { - url = http://dist.codehaus.org/jetty/jetty-6.1.21/jetty-6.1.21.zip; - sha256 = "1nrjglrmf29m1j1c80nskngmlqmc5vc7c48fggczn605l722cwaw"; + url = http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip; + sha256 = "11w1ciayv8zvxjg45xzs0kwc7k45x97sbnxkqb62sxy3gsw8xh4n"; }; } From 3e97ec3a0175301da195d6bc658886e0d3df19b5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:14:27 +0200 Subject: [PATCH 470/515] kde4.kwooty: update from 0.8.1 to 0.8.4 --- pkgs/applications/networking/newsreaders/kwooty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index 15b1c6c6b4e..e49e2c6fe26 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,14 +5,14 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.1"; +let version = "0.8.4"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4"; + sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; }; patches = [ ./searchPath.patch ]; From 6ac1c01e51415fe4ff339b19b79ffc77dca82f90 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:15:13 +0200 Subject: [PATCH 471/515] kde4.rekonq: update from 1.70 to 1.80 --- pkgs/applications/networking/browsers/rekonq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index c8542ad7a52..3deabd42e01 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0 + name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 src = fetchurl { url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad"; + sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; From 4ed5c4df73a4774806e4026e3125470915a93f8f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:19:08 +0200 Subject: [PATCH 472/515] leptonica: update from 1.68 to 1.69 --- pkgs/development/libraries/leptonica/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index e84bd0656c4..ecd63e98f19 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: stdenv.mkDerivation { - name = "leptonica-1.68"; + name = "leptonica-1.69"; src = fetchurl { - url = http://www.leptonica.org/source/leptonica-1.68.tar.gz; - sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; + url = http://www.leptonica.org/source/leptonica-1.69.tar.gz; + sha256 = "0bd7w0zpmwwfn1cnrlyzjw3jf8x59r0rhdmvk7rigr57rnfnddry"; }; buildInputs = [ libpng libtiff libjpeg zlib ]; From c0536e306c46a45313353242e8a2a66f00baeb06 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:20:50 +0200 Subject: [PATCH 473/515] libav_0_8: update from 0.8.8 to 0.8.9 --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 287ac32fff5..6678984ebbe 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,7 +27,7 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3"; - libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; + libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { From 63df9742ba5aed987fb0f0dbecd702cb7cd216da Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:21:57 +0200 Subject: [PATCH 474/515] libcaca: update from 0.99.beta17 to 0.99.beta18 --- pkgs/development/libraries/libcaca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index b8410380aba..f183d9c3cd0 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "libcaca-0.99.beta17"; + name = "libcaca-0.99.beta18"; src = fetchurl { url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz"; - sha256 = "1mpicj3xf4d0mf8papb1zbks5yzi4lnj6yh5cvpq7sb176gawmb3"; + sha256 = "189kdh7zi88gxb3w33rh0p5l0yhn7s1c2xjgrpf24q2a7xihdskp"; }; configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; From e6ef5bd6e26e8b865aab932fffb9045b5b6dc5b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:23:03 +0200 Subject: [PATCH 475/515] libcdio: update from 0.90 to 0.92 --- pkgs/development/libraries/libcdio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 00159e1de46..856d5124a3f 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.90"; + name = "libcdio-0.92"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"; + sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; From cd698b44ec241dd915d3ae062d2d1bb6a9908848 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:28:49 +0200 Subject: [PATCH 476/515] libdc1394: update from 2.2.0 to 2.2.1 --- pkgs/development/libraries/libdc1394/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index cd784a4de6a..f92bc585524 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libraw1394, libusb1 }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.0"; + name = "libdc1394-2.2.1"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0v7y8r8zxpkcw8fhwr6x08wkbpfzs5snw5s589fpqmn569f1grn6"; + sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j"; }; buildInputs = [ libraw1394 libusb1 ]; From b54df4fe1b91c95b5581fa671bf8565c8610ed6f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:30:37 +0200 Subject: [PATCH 477/515] libdmtx: update from 0.7.2 to 0.7.4 --- pkgs/development/libraries/libdmtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 970a1cf05e9..8d7049dc29a 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, imagemagick }: stdenv.mkDerivation rec { - name = "libdmtx-0.7.2"; + name = "libdmtx-0.7.4"; src = fetchurl { url = "mirror://sourceforge/libdmtx/${name}.tar.bz2"; - sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk"; + sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; }; nativeBuildInputs = [ pkgconfig ]; From 6b5525f471761c44ddee3f9bdfe176751beec070 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:32:03 +0200 Subject: [PATCH 478/515] libdvdcss: update from 1.2.10 to 1.2.13 --- pkgs/development/libraries/libdvdcss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 73755ab3386..40fa337bd66 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdvdcss-1.2.10"; + name = "libdvdcss-1.2.13"; src = fetchurl { - url = http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.bz2; - sha256 = "0812zxg4b6yjkckzwdzfzb4jnffykr9567f9v29barmb2d8ag513"; + url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2; + sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4"; }; meta = { From 787977493002669fe23e3084dd522bf06a2e6d33 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:34:34 +0200 Subject: [PATCH 479/515] libgcrypt: update from 1.5.3 to 1.6.0 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 997e9cfc5b8..f12e0dfa61c 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation (rec { - name = "libgcrypt-1.5.3"; + name = "libgcrypt-1.6.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; + sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6"; }; propagatedBuildInputs = [ libgpgerror ]; From 01fb1ca1b89c6e1f1089258bc6a0969007ed67f3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:42:29 +0200 Subject: [PATCH 480/515] libgpgerror: update from 1.11 to 1.12 --- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index eb0de7aa2be..da142a957ad 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash }: stdenv.mkDerivation (rec { - name = "libgpg-error-1.11"; + name = "libgpg-error-1.12"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1h0ql8j65ns2rmhj9wnc9035026crzkg226xg8614fq71947ccxf"; + sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"; }; doCheck = true; From d81a5a46dec001f822787a2e26871378718cb706 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:44:06 +0200 Subject: [PATCH 481/515] libmemcached: update from 1.0.7 to 1.0.8 --- pkgs/development/libraries/libmemcached/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index b724f915150..9ab1962806a 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cyrus_sasl, libevent }: stdenv.mkDerivation rec { - name = "libmemcached-1.0.7"; + name = "libmemcached-1.0.8"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.7/+download/libmemcached-1.0.7.tar.gz; - sha256 = "10cdczkgqiirjy7jwfdk49namqi4jiv1djqrf5fxbaiyfg4qdyiy"; + url = https://launchpad.net/libmemcached/1.0/1.0.8/+download/libmemcached-1.0.8.tar.gz; + sha256 = "198wcvhrqjnak0cjnkxmjsr3xkjc1k6yq2a77nlk852gcf8ypx03"; }; buildInputs = [ cyrus_sasl libevent ]; From 5ca15d27aa59707674c7c05b087f9e003fea561f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:45:32 +0200 Subject: [PATCH 482/515] libmtp: update from 1.1.5 to 1.1.6 --- pkgs/development/libraries/libmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 95d060df7f7..10bc9e5eebf 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.5"; + name = "libmtp-1.1.6"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0fn6y7kirgln6sfizmwvjsy7qkdb0p3rccf0zkr3r2xg3cbpjxkq"; + sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s"; }; meta = { From 7a2584fb8790c7de1de87cf02c355c285fef8c92 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:46:19 +0200 Subject: [PATCH 483/515] libmspack: update from 0.3alpha to 0.4alpha --- pkgs/development/libraries/libmspack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 7a8b2d36143..d02217afd3e 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmspack-0.3alpha"; + name = "libmspack-0.4alpha"; src = fetchurl { - url = http://www.cabextract.org.uk/libmspack/libmspack-0.3alpha.tar.gz; - sha256 = "03rlzhvzd3qm7sb029gs14syq1z6xjmczvwb9kbz5sl20sjngidh"; + url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; + sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp"; }; meta = { From 2d2e6199eef0f47f93987de83c8f4e1b53b20446 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:47:22 +0200 Subject: [PATCH 484/515] libogg: update from 1.3.0 to 1.3.1 --- pkgs/development/libraries/libogg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index f3c2d3b766d..b11b1202080 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "libogg-1.3.0"; + name = "libogg-1.3.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3"; + sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs"; }; nativeBuildInputs = [ xz ]; From fbc0c4ffccfea431c1c9826d027230ca8726ddfe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:49:36 +0200 Subject: [PATCH 485/515] librdf_raptor2: update from 2.0.8 to 2.0.12 --- pkgs/development/libraries/librdf/raptor2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 4658cf28335..500acdfb2ec 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, curl }: stdenv.mkDerivation rec { - name = "raptor2-2.0.8"; # 2.0.9 misses a header and so fails liblrdf + name = "raptor2-2.0.12"; # 2.0.9 misses a header and so fails liblrdf src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1mz7cxnfw73saf74c9if06n2mlsvn2rnn67vy7j2mq3wkhy0hcb0"; + sha256 = "1644a1nnw5k6168v9gjfx1rcbij6ybjximd35a3zhcvyyijmb5di"; }; buildInputs = [ libxml2 libxslt ]; From f0500be89a68f335654d27ee00e30adbee4a2165 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:50:41 +0200 Subject: [PATCH 486/515] librdf_rasqal: update from 0.9.30 to 0.9.31 --- pkgs/development/libraries/librdf/rasqal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 6d6f9d05808..1acc7c1d73c 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.30"; + name = "rasqal-0.9.31"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1z8wifq79kivcwpwzmjnjdrbr65zam190gpxhgrvsyfch0yykw5b"; + sha256 = "1vkzifr488i31vxdnykyf2aq87023vx4bag4d94b1rdhy74l7mr8"; }; nativeBuildInputs = [ pkgconfig ]; From b9964865fec5a1f84ff3977c1e576be01cc332da Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:51:57 +0200 Subject: [PATCH 487/515] libsamplerate: update from 0.1.7 to 0.1.8 --- pkgs/development/libraries/libsamplerate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 57eaf529a63..708d8989304 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fftw, libsndfile }: stdenv.mkDerivation rec { - name = "libsamplerate-0.1.7"; + name = "libsamplerate-0.1.8"; src = fetchurl { url = "http://www.mega-nerd.com/SRC/${name}.tar.gz"; - sha256 = "1k3z09b13c0z10mqfn6w48pxsdx569s3wslg0x52q5mzy6gmvvbq"; + sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck"; }; buildInputs = [ pkgconfig ]; From 67ca29d457a566f639ea361410753b5f2da381d8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:54:46 +0200 Subject: [PATCH 488/515] libsndfile: update from 1.0.23 to 1.0.25 --- pkgs/development/libraries/libsndfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 8164b79e61b..8b0eeeb8e57 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.23"; + name = "libsndfile-1.0.25"; src = fetchurl { url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal"; + sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; }; buildInputs = [ pkgconfig flac libogg libvorbis ]; From ee2575f16febe84c0361af08afc897e3198dc797 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:55:54 +0200 Subject: [PATCH 489/515] libsoup_2_40: update from 2.44.1 to 2.44.2 --- pkgs/development/libraries/libsoup/2.40.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsoup/2.40.nix b/pkgs/development/libraries/libsoup/2.40.nix index ca37ceb941c..c82bb399e5e 100644 --- a/pkgs/development/libraries/libsoup/2.40.nix +++ b/pkgs/development/libraries/libsoup/2.40.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation { - name = "libsoup-2.44.1"; + name = "libsoup-2.44.2"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz; - sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5"; + url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz; + sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77"; }; From d4f8c6874eb8d5dad952fb1b4f828fbdb82e2422 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:57:22 +0200 Subject: [PATCH 490/515] liburcu: update from 0.7.7 to 0.8.1 --- pkgs/development/libraries/liburcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 74c6b8fa615..44daabe6a73 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.7.7"; + version = "0.8.1"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a"; + sha256 = "07p0lh43j7i1606m4l1dxm195z6fcfz74fmx7q2d7mrhn2bzc240"; }; meta = with stdenv.lib; { From 947f0a2282ea794e8bed2e7594943c2c333f8fce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:58:12 +0200 Subject: [PATCH 491/515] lmodern: update from 2.004.1 to 2.004.4 --- pkgs/data/fonts/lmodern/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 1368537c2a1..543a4894f30 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lmodern-2.004.1"; + name = "lmodern-2.004.4"; src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.1.orig.tar.gz; - sha256 = "1bvlf8p39667q58pvyfzy3yl0mylf0ak96flwp8vj01vqbi3rfaz"; + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; }; installPhase = '' From b2fc677345e0d350d2532355ef988832cb6c695f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 17:59:04 +0200 Subject: [PATCH 492/515] log4cplus: update from 1.0.4 to 1.1.2 --- pkgs/development/libraries/log4cplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 0856832c188..9d07f033eda 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.0.4"; + name = "log4cplus-1.1.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef"; + sha256 = "14zdfaxnxjrnfdjipmcrvsqp8pj1s4wscphvg4jvbp3kd34mcvf4"; }; meta = { From 50bfd93274a2f438340f251591b444d28b3c9327 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:00:40 +0200 Subject: [PATCH 493/515] mate-icon-theme: update from 1.6.1 to 1.6.2 --- pkgs/misc/themes/mate-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix index 65965e46b32..fe19a45b2ac 100644 --- a/pkgs/misc/themes/mate-icon-theme/default.nix +++ b/pkgs/misc/themes/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }: stdenv.mkDerivation { - name = "mate-icon-theme-1.6.1"; + name = "mate-icon-theme-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz"; - sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.2.tar.xz"; + sha256 = "1ahijywk6vj8yyiglqdpc56dkczyj1v99ziblaaclmhi4sxxb5jm"; }; buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ]; From 231e9cff364c481c26e024d027f853e170ee72c0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:01:19 +0200 Subject: [PATCH 494/515] mate-themes: update from 1.6.1 to 1.6.2 --- pkgs/misc/themes/mate-themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix index 0f0f41af638..32d1a24cbf4 100644 --- a/pkgs/misc/themes/mate-themes/default.nix +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: stdenv.mkDerivation { - name = "mate-themes-1.6.1"; + name = "mate-themes-1.6.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz"; - sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp"; + url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.2.tar.xz"; + sha256 = "145mjdijjvkpjjgqdfwjp30jvvs0qzxlnh15q6mig8df6drg5fn6"; }; buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; From 22b9ebd4f05888ad7b5e5119a4112e4bf9129ba4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:05:39 +0200 Subject: [PATCH 495/515] opencv: update from 2.4.5 to 2.4.7 --- pkgs/development/libraries/opencv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index a7e514a5780..ea858417b2f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }: -let v = "2.4.5"; in +let v = "2.4.7"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz"; - sha256 = "14k2w07jcchp11c9v6p5x49h3h1zmg2m9brm2sypz5sp9g7yw2yk"; + sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer From d9bd3c6d2f6c5d3e29e5e9df1a48f6eaac75001f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:08:32 +0200 Subject: [PATCH 496/515] phonon: update from 4.7.0 to 4.7.1 --- pkgs/development/libraries/phonon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index ce5adc4b0a5..5948fd0ef2b 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.7.0"; + v = "4.7.1"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac"; + sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg"; }; buildInputs = [ qt4 pulseaudio ]; From 9a35ac20f375b7429c700b5c77524a38b6504dd9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:09:53 +0200 Subject: [PATCH 497/515] pinentry: update from 0.8.2 to 0.8.3 --- pkgs/tools/security/pinentry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 543c5d81ba1..81efd4841a6 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.2"; + name = "pinentry-0.8.3"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h"; + sha256 = "1bd047crf7xb8g61mval8v6qww98rddlsw2dz6j8h8qbnl4hp2sn"; }; buildInputs = let opt = stdenv.lib.optional; in [] From 5725ac31e1eed41db1411bb0e644aabefd8a9782 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:13:49 +0200 Subject: [PATCH 498/515] ucommon: update from 6.0.5 to 6.0.7 --- pkgs/development/libraries/ucommon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 699da60768f..2ec478d7a76 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-6.0.5"; + name = "ucommon-6.0.7"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz; - sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l"; + url = mirror://gnu/commoncpp/ucommon-6.0.7.tar.gz; + sha256 = "1rlvchmg6qq8jq79qjgv0l0wqi1dqhmm4ng1qj9f012dbhwcap3x"; }; buildInputs = [ pkgconfig gnutls zlib ]; From 6f17df861eb3c76246ea5d14dd8eadf14fc3c470 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:16:06 +0200 Subject: [PATCH 499/515] wineUnstable: update from 1.7.7 to 1.7.8 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 2c649900034..47f5b1ccc04 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.7"; + version = "1.7.8"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi"; + sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h"; }; gecko = fetchurl { From 8e97719684e8db13881751006beef66b632d81e0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 18 Dec 2013 18:17:23 +0200 Subject: [PATCH 500/515] xineLib: update from 1.2.2 to 1.2.4 --- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 45c60acfa89..11ba5df80ca 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.2"; + name = "xine-lib-1.2.4"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1"; + sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww"; }; nativeBuildInputs = [ pkgconfig perl ]; From 01a051292f718bd387f0644efdafbb28a3895a2a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 18 Dec 2013 12:35:07 -0500 Subject: [PATCH 501/515] Linux 3.12.5 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 842d2911f77..74ad329fb55 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb"; + sha256 = "48181474f3943f77c1e62bed676b09a9fed64364d5847ce14a45b8d947112719"; }; features.iwlwifi = true; From 0c246250c0192fe4798ffe597f3c310c0d1b845f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Dec 2013 21:31:49 +0200 Subject: [PATCH 502/515] Revert "libgcrypt: update from 1.5.3 to 1.6.0" Too much breakage. This reverts commit 787977493002669fe23e3084dd522bf06a2e6d33. --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index f12e0dfa61c..997e9cfc5b8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation (rec { - name = "libgcrypt-1.6.0"; + name = "libgcrypt-1.5.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6"; + sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; }; propagatedBuildInputs = [ libgpgerror ]; From 743159515920e01a5d4377053d15dc5874ba698f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: [PATCH 503/515] haskell-OpenAL: update to version 1.6.0.0 --- pkgs/development/libraries/haskell/OpenAL/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index a04aea993fa..36d3b41583f 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,13 +1,13 @@ -{ cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, openal, OpenGL }: cabal.mkDerivation (self: { pname = "OpenAL"; - version = "1.4.0.2"; - sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz"; - buildDepends = [ ObjectName StateVar Tensor ]; + version = "1.6.0.0"; + sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd"; + buildDepends = [ OpenGL ]; extraLibraries = [ openal ]; meta = { - homepage = "http://connect.creativelabs.com/openal/"; + homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 481678ed08af96484d8ad7182797adf88b95e565 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: [PATCH 504/515] haskell-doctest: update to version 0.9.10 --- pkgs/development/libraries/haskell/doctest/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 46e69c95f94..68731426683 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,7 +14,6 @@ cabal.mkDerivation (self: { stringbuilder syb transformers ]; doCheck = false; - noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; From 200305d3e390924dd02f6912edce62ab5e4a6f40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: [PATCH 505/515] haskell-haskell-names: update to version 0.3.2.3 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index b77cd134dc8..bac417b618b 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.2"; - sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; + version = "0.3.2.3"; + sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass From a415fcc5c58a649449f426ccaf102732f07b28c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 506/515] haskell-http-client-conduit: update to version 0.2.0.1 --- .../libraries/haskell/http-client-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix index df4b49b47f3..1c47b68f06c 100644 --- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-client-conduit"; - version = "0.2.0.0"; - sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + version = "0.2.0.1"; + sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5"; buildDepends = [ conduit httpClient resourcet transformers ]; meta = { homepage = "https://github.com/snoyberg/http-client"; From 6066969c92e53f6bac5a2b30b59eaa174e40544e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 507/515] haskell-http-client-tls: update to version 0.2.0.1 --- .../development/libraries/haskell/http-client-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index f92ddcd7d55..f0b28ab1612 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.0.0"; - sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + version = "0.2.0.1"; + sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; doCheck = false; From 0939566a80dadfbf9c22257fa603c5a76a48e3f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 508/515] haskell-http-conduit: update to version 2.0.0.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b041957e555..bb237f16d58 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.2"; - sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; + version = "2.0.0.3"; + sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers From 178c4ed9d03d15e630e82905b8bc8fe01659d6b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 509/515] haskell-monad-logger: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 83cd57ce39b..afd96822710 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.3.1"; - sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; + version = "0.3.3.2"; + sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase From 1d96322785168dfc06b8c8c6486beb22f9b744fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 510/515] haskell-resourcet: update to version 0.4.10 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index b4d0fccd8a0..913e77483e4 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.9"; - sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz"; + version = "0.4.10"; + sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; From 63a33906837e82674bee9a9baf5a98f89606ad4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 511/515] haskell-stylish-haskell: update to version 0.5.9.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 74646c9acca..c430dfc36a6 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.8.0"; - sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r"; + version = "0.5.9.0"; + sha256 = "1iy0d437yd6hgmxmiqa0b6lvg4gw838jxqwn83kdpy1mlykqwmgq"; isLibrary = true; isExecutable = true; buildDepends = [ From cedf33fafc8e15912df8be82630f05abea73098d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 512/515] haskell-yesod-auth: update to version 1.2.4.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 87cbe9f3d43..d6bab2c5da5 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.4"; - sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; + version = "1.2.4.1"; + sha256 = "05csxa0mgqnam375fq38r0rl51zdjq0bki2dzrr99469mg33fzh4"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From 640547334370ee4fd3c29cda3b838ef56c7eebeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: [PATCH 513/515] haskell-yesod-routes: update to version 1.2.0.4 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 87b4d059dc5..1c2922fe069 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.3"; - sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; + version = "1.2.0.4"; + sha256 = "1c3fpfvcdx8ijvjxxfjwld5zl6x4xl2587a8gdj2qmsr94f8lgb9"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From 18e81a5365f35605f7fde00024822743f9ad2c58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 18:34:14 +0100 Subject: [PATCH 514/515] haskell-packages.nix: OpenAL builds only with the latest OpenGL --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 37d560ff439..b43d2a39f2a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1658,7 +1658,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x oeis = callPackage ../development/libraries/haskell/oeis {}; - OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { + OpenGL = self.OpenGL_2_9_1_0; + }; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; From 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 21:31:30 +0100 Subject: [PATCH 515/515] haskell-packages.nix: the latest OpenGL needs the latest OpenGLRaw to compile --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b43d2a39f2a..5078076350d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1668,7 +1668,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix { + OpenGLRaw = self.OpenGLRaw_1_4_0_0; + }; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};