From c5bc23a2596d1952623a56218ad991ec91823a0b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 22:21:39 +0000 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix new file mode 100644 index 000000000000..64822a08d073 --- /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 bef1cff60ede..1a567d98cf55 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; -- cgit 1.4.1 From 3cff0a80149003620405d841d441119a64936e32 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Tue, 5 Nov 2013 23:11:57 +0100 Subject: 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/ --- .../0001-Undo-weird-modification-of-data_dir.patch | 24 ++++++++++ ...equirement-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 (limited to 'pkgs') 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 000000000000..8bec643c6e5f --- /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 000000000000..99467c371264 --- /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 000000000000..e4f59a98cf05 --- /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 db76a4e55065..bd8b06c8c037 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 { }; -- cgit 1.4.1 From 48f24712dca6859a4f66dcb46c5b5056a12f0ef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 23:20:23 +0100 Subject: 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 +- pkgs/development/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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 9d37b580d802..2012739afb45 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 140d554e88c6..f38082fba88b 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 3d1091f27027..39123a176dc7 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 c4a31d541b58..2c53925f975d 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 7ed70bc092cf..db5b62169c40 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 d77e2052f811..b1c154badd8e 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 7953b04183a9..78100521584b 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 fcaf95672e18..818789173844 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 ca1db1372064..f57ee931fafa 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 0c6951aa3e76..ed700fa63569 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 54b089bd08e9..d1748cc252ef 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 80fc075107c1..d6952b8e3757 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 723741b2c836..8a5eb6ad759e 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 ec1c9021522f..ade7fd202d53 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 ]; }; }) -- cgit 1.4.1 From 7d5ab6167c866c98ad6014429ce034de98e3b3f9 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 11 Dec 2013 13:05:07 +0800 Subject: renpy: update to 6.16.3 --- pkgs/development/interpreters/renpy/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index f7d8b93f966d..60884fce69d1 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; - }; } -- cgit 1.4.1 From 6ba2d327b6d17237f6272546bc4fe65281534b07 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 15:44:54 +0200 Subject: amsn: update from 0.98.4 to 0.98.9 --- pkgs/applications/networking/instant-messengers/amsn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index fc7906b3e402..37c0b4a694dd 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"; -- cgit 1.4.1 From 96f551a8f96e1bc28c36528e180277dbd772a633 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 17:03:58 +0200 Subject: libgtop: update from 2.28.4 to 2.28.5 --- pkgs/development/libraries/libgtop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index b592f458c6ce..b9ae43a7c8b9 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 ]; -- cgit 1.4.1 From 3b3e7e8f25c8cf7fca5ebba9af690288ac6e4023 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 17:10:46 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix index 9e7949047c7f..a2044d1b2702 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 = -- cgit 1.4.1 From d706aab747c1b7e2e5d26d0870c165219c1bcbcd Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 18:30:42 +0200 Subject: diffstat: update from 1.45 to 1.58 --- pkgs/tools/text/diffstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index d1d366ba5998..6bbf1a9a8c7f 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 = { -- cgit 1.4.1 From b7a9e1a9982d4f63508db872a93e0ca5e4935a52 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Sat, 7 Dec 2013 00:13:35 -0500 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix new file mode 100644 index 000000000000..49d7810a3c20 --- /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 3f9f1ccf0470..4a2b66bb29bb 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 { }; -- cgit 1.4.1 From db426d4601be0279cdb0cecb311a09dee8227b05 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 11 Dec 2013 12:00:05 +0100 Subject: k3d: fix changed URL/patch --- pkgs/applications/graphics/k3d/debian-patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix index fe1289f14413..cf6b47ee9597 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"; } ] -- cgit 1.4.1 From 900786ab3732caa371cbfbce49fcf59cb075da58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Dec 2013 12:08:12 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index f9666ccf4ddc..58c150a22d6e 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 0ef70a197d6f..171a6202e738 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 5588fe3d647f..2850c35b720e 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 ]; }; } -- cgit 1.4.1 From 4855b0a22eb957740e7c1e0ead39ca3984f98d33 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 11 Dec 2013 12:13:24 +0100 Subject: dragonegg: fix build via update to 3.3 --- pkgs/development/compilers/llvm/dragonegg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix index 42d337b8eace..737b9533a089 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) -- cgit 1.4.1 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: Fix a minor bug in fsg --- pkgs/games/fsg/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 7a9dc1105408..a4579ad2ae36 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 = '' -- cgit 1.4.1 From f329865aa26fa1ebc90d1901b2e0d9883d8c59d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Dec 2013 12:55:55 +0100 Subject: apr: Update to 1.5.0 --- pkgs/development/libraries/apr/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 1893a2c94136..e248dbd649e7 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 ]; }; } -- cgit 1.4.1 From f74ca42ba6daee4558b6708c36d46baaa81f5db4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Dec 2013 14:28:37 +0100 Subject: linux: Update to 3.4.73 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e7405c522a62..4cf3229f6fde 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; -- cgit 1.4.1 From 3e06d3da1db823a598925aee0f94180bbff73029 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Thu, 12 Dec 2013 00:32:13 +0100 Subject: dmidecode: set meta.platforms to linux --- pkgs/os-specific/linux/dmidecode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 40564f9f95a7..19d4092ba783 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; }; } -- cgit 1.4.1 From b95f7102eea4f00dd723671fca29041c461efb9b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:52:31 +0200 Subject: flpsed: update from 0.7.0 to 0.7.1 --- pkgs/applications/editors/flpsed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 15605218b741..a18bfd8b2c65 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 ]; -- cgit 1.4.1 From c584ac123f716f52fb0779a3b66b84c514126a02 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:57:03 +0200 Subject: fping: update from 3.4 to 3.8 --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 4bda944c68a5..10f31fb8297d 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 = { -- cgit 1.4.1 From c8f28ec7e32619103232af7d19e11e21d22a24a1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 09:58:18 +0200 Subject: geany: update from 1.23 to 1.23.1 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index e7c8e276d27b..d7ed048cdaa8 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 ]; -- cgit 1.4.1 From 57826becead63ab9fe0245ec5f0912fb3bbc5175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:01:00 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index dc7a467fb0c2..d0efe4e62494 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; -- cgit 1.4.1 From 143dcc1123dbb7cacb221a01073355e28f8516b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:06:26 +0200 Subject: geos: update from 3.3.8 to 3.4.2 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 56c3c3e7a2bd..d1695f295fcb 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; -- cgit 1.4.1 From b35d255286a0240b0fe37f038f31b65ea8e8d505 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:10:58 +0200 Subject: gkrellm: update from 2.3.4 to 2.3.5 --- pkgs/applications/misc/gkrellm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index af10ca9800d0..3b8f8b1cc680 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]; -- cgit 1.4.1 From 8cfaf0697c841c0dd8dcd540bac4e6cd17782eff Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:13:44 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 91cf2be4f73b..d1cd59d8828a 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 ]; -- cgit 1.4.1 From 510100344efb9ce96e799dc06eb1a74d208e40b3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:15:58 +0200 Subject: glpk: update from 4.47 to 4.52.1 --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index edfbc0e86d7d..eb653591005e 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; -- cgit 1.4.1 From e0ae2b01e615551164314468beda62f91921d8f7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:20:20 +0200 Subject: gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10 --- pkgs/development/tools/documentation/gnome-doc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 374002e8d6ca..b653c705478d 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"; -- cgit 1.4.1 From 687a074979f50b7025d21e8cbdd4e8ef05b5c8a4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:23:06 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index ca386b15f0e1..820e8eb07c9e 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 ]; -- cgit 1.4.1 From f453b1fd03eaea85871274d50339625433b9cc6b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 11 Dec 2013 10:24:44 +0200 Subject: gnuvd: update from 1.0.10 to 1.0.12 --- pkgs/tools/misc/gnuvd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 122694af4567..359f04673ea8 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 = { -- cgit 1.4.1 From bf05b39cd53147f869607370caab3e2d585e1e42 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 11 Dec 2013 22:00:31 +0200 Subject: gptfdisk: fix maintainers --- pkgs/tools/system/gptfdisk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 7c8c2ec09ed3..817e3015efe9 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; }; -- cgit 1.4.1 From 1cedd2647f8d3baf3bc5bd1bf306d4c9097a660b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:26:11 +0200 Subject: autopanosiftc: update from 2.5.0 to 2.5.1 --- pkgs/applications/graphics/autopanosiftc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index a27d982ce8b2..be3cfc5935c7 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 ]; -- cgit 1.4.1 From b376a50dc52c2d12f81004e7c835938a3d97e218 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:30:14 +0200 Subject: autossh: update from 1.4b to 1.4c --- pkgs/tools/networking/autossh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 0c32b1c12400..94c466612ef5 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 ]; -- cgit 1.4.1 From 233118579400d89af0674ac11aa0bb9f920734e7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 03:34:12 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 5aff37580d31..0ba160c8a917 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 -- cgit 1.4.1 From 85372d5fba8cbe85326801a336f5919e0ed64d27 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 12 Dec 2013 11:04:38 +0800 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix new file mode 100644 index 000000000000..5f75c05a68f3 --- /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 3f9f1ccf0470..5ada4859ac1a 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 { }; -- cgit 1.4.1 From 4c1981c4e0b016db127e86eacff7e8d5269ef898 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 12 Dec 2013 09:33:57 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 83ad717c0d3c..9453b8d2cdb2 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 ]; -- cgit 1.4.1 From 38a0e6dfd583d00edc5d8caedbbee86761ed8af1 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 12 Dec 2013 14:11:24 +0100 Subject: lispPackages: Fix Github URIs. Signed-off-by: Moritz Ulrich --- pkgs/development/lisp-modules/lisp-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 015d5fccdc35..f7d6dd2676d6 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''; -- cgit 1.4.1 From 0e18b7cd9707240287f17b530c99aa5368c14b0b Mon Sep 17 00:00:00 2001 From: Chong Li Date: Wed, 11 Dec 2013 21:12:40 +0100 Subject: Switched xbmc to pythonFull. Fixes python plugin errors. --- pkgs/applications/video/xbmc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 59537c7dce02..691b41dc6e30 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" \ -- cgit 1.4.1 From e69887ea67297b99f3c89f58fc2486c2e0dd1cfc Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 12 Dec 2013 18:49:14 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f9f1ccf0470..d995a9ef7928 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{ -- cgit 1.4.1 From a2c48451a25ca95d82090c3e5e8134dd3a923c97 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Thu, 12 Dec 2013 19:41:51 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 33bc196143b1..df3ffc8f60f8 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 abb92f7b08b4..b02319fd3e88 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 8ca1445b1f6d..005b9fac2e55 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; -- cgit 1.4.1 From dbfeebeef74a8ef5b13424985f7e05d1d841e51e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 22:26:57 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 48ef55892c8f..914157c7a0cd 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 ]; -- cgit 1.4.1 From 8264cb98ae14305e6f89728cacd3ea88064c24ca Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:46:12 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05a6aec35a22..c683a91e468d 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 ]; -- cgit 1.4.1 From aef9ae72d014bb40dd1ffaab72485321c7d9c706 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:50:47 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 3d9287a9b8c2..2ec7f433596c 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 -- cgit 1.4.1 From 22840f80487d8531728fafd3fc3b1d9256142573 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 12 Dec 2013 23:55:06 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index cb60355ef558..997e9cfc5b88 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 ]; -- cgit 1.4.1 From 22eabfcc025992ad340124fbdf72ce8fc1940ac3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:00:48 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 8461bfef4391..68c3ac5130df 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]; } -- cgit 1.4.1 From 36677bbe869c7738a04540a01bd89c82da112dba Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:08:33 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 962799117a05..74e8a530560c 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 ]; -- cgit 1.4.1 From ec833696392789e4b6016292892c19dc77d9286f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:10:35 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index bdf34cdba9a4..1af54994fd14 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 ] -- cgit 1.4.1 From ed9ce850fd317e38295b7a441c580f9678b51ca6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 00:39:20 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 5c7e704390b5..063f89edaa2b 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 = '' -- cgit 1.4.1 From d9f3dab48ebe4614f1813229071eb05578511046 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 12 Dec 2013 20:27:07 -0800 Subject: Firefox 26.0. (Doesn't build.) --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 1f37911b8327..a48535b9b327 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 = -- cgit 1.4.1 From 8ddc7b8db26747ef7f0554fa486ba044150ae742 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 13 Dec 2013 00:11:52 -0800 Subject: firefox: Hack to get it to compile. --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + pkgs/applications/networking/browsers/firefox/xpidl.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/xpidl.patch (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a48535b9b327..49c1e5951b6d 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 000000000000..e6a6b4d82646 --- /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) + -- cgit 1.4.1 From 3c677fde651aa07e310fe351b84f7737c9f51bf7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:32:36 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index ab95accd7493..51430f6e4eb4 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 -- cgit 1.4.1 From 698860bf7cd0b85f4d4e0a019ac96da26a23455b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:38:09 +0100 Subject: nginx: add headers more nginx module --- pkgs/servers/http/nginx/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 86b22ab5a18c..fe0681448e32 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" -- cgit 1.4.1 From 1b019fe39fbc9638cf616698cbe7fe7fe4d85c36 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:41:22 +0100 Subject: nginx: enable ipv6 and spdy --- pkgs/servers/http/nginx/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 86b22ab5a18c..d29518d710ee 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}" -- cgit 1.4.1 From c2f385cf4acd1dadca8a780935a99c0ea0d8fba3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:44:51 +0100 Subject: dhcpcd: make dhcpcd work in linux containers --- pkgs/tools/networking/dhcpcd/default.nix | 2 ++ .../tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch (limited to 'pkgs') diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 9b3b6238420c..ad0b62d19f81 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 000000000000..066ea67db9ee --- /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; -- cgit 1.4.1 From c53d8c81f5025a9a182c7843f3595ea0d9484957 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 13 Dec 2013 11:13:23 +0200 Subject: pycrypto: remove version 2.5 since it's vulnerable to CVE-2012-2417, CVE-2013-1445 --- pkgs/development/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 (limited to 'pkgs') 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 de192c64b722..000000000000 --- 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 baf5003ccda3..5b44dff89bca 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; -- cgit 1.4.1 From faf82de7d2e80aac1c3acf0c8ddf383c2450f15a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 10:15:35 +0100 Subject: cgminer: update to 3.7.2 --- pkgs/applications/misc/cgminer/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 4ae404a002f1..54650d395c2b 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 = '' -- cgit 1.4.1 From 2e094898950c625cbc11be06997023e4248bc453 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 13 Dec 2013 11:16:40 +0100 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix new file mode 100644 index 000000000000..2b555db32821 --- /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 d995a9ef7928..be875c2a88e9 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 { }; -- cgit 1.4.1 From 6ffa9261f95c06ee039ab8813f6790cd80babec5 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Fri, 13 Dec 2013 10:41:38 +0100 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix new file mode 100644 index 000000000000..2257fb50293b --- /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 be875c2a88e9..a81c58d55c7e 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 { }; -- cgit 1.4.1 From 8f583cced9baffd717309f685714db799dea687c Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 22 May 2013 18:25:30 +0200 Subject: photivo: Add photivo photo processor / RAW development laboratory. --- pkgs/applications/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 (limited to 'pkgs') diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 1f795a800ff6..536249e70a60 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 000000000000..257ee681db61 --- /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 a81c58d55c7e..427c73d23f62 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; -- cgit 1.4.1 From 492c4838b267187ee93b42d8d55fdffecb75abb6 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 29 Apr 2013 22:19:58 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index c2bf899a9cd2..a7464893cbbb 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] ; -- cgit 1.4.1 From c5927837413edd3d738cfc500e0988125ee6495a Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Thu, 16 May 2013 06:53:49 +0200 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix new file mode 100644 index 000000000000..130f1f905a44 --- /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 427c73d23f62..f82bcb442f30 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; }; -- cgit 1.4.1 From f9d66c239eb112619654ee2b831f78749d12bcef Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Tue, 28 May 2013 10:08:39 +0200 Subject: lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno files. --- pkgs/development/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 (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 21064ebe870a..a8d376ef23c8 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 428ae399d4ea..000000000000 --- 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); - -- cgit 1.4.1 From 0be455e0e4318bf74f81eab3fe7c82fc909b2a09 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 14:48:49 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 77d7efdb5f68..01ef17845c44 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 ]; -- cgit 1.4.1 From 3f21eaf705569d4e673d3cf6549fe787db3b1c6c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 16:14:57 +0200 Subject: cppunit: update from 1.12.0 to 1.12.1 --- pkgs/development/libraries/cppunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 2504f87a230a..596720c542cb 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 = { -- cgit 1.4.1 From bb108be59cb7f0790dba060841ce03a7c2d1a4c7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 16:21:40 +0200 Subject: yajl: update from 2.0.1 to 2.0.4 --- pkgs/development/libraries/yajl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index e58c6dcba120..afcbcafab118 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 ]; -- cgit 1.4.1 From ffb359cb57e26214559e7feaa810fc0563b7c1d9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 13 Dec 2013 09:27:49 +0100 Subject: nmap: update to 6.40. close #1368. --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 2280ff3cfbed..73b6f660bf94 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 ]; -- cgit 1.4.1 From 28455d2388d0f01ac6e503090dad9b67ed68df50 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:37:04 +0200 Subject: libyaml: update from 0.1.3 to 0.1.4 --- pkgs/development/libraries/libyaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 50bc4019df6e..cf687c972430 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 = { -- cgit 1.4.1 From f717d1468cd3a709c239b771227c4b22ed6aecee Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:38:42 +0200 Subject: libwpg: update from 0.2.1 to 0.2.2 --- pkgs/development/libraries/libwpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 18a8e49beea7..f71cc9654724 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 ]; -- cgit 1.4.1 From 0aa3ff47e27bb650848d79b4ab7421c15c3cf9ab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:40:20 +0200 Subject: libwpd: update from 0.9.5 to 0.9.9 --- pkgs/development/libraries/libwpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3df58615aa6d..830890fad560 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 ]; -- cgit 1.4.1 From 05e8d1187f49a182028b8441a5b3c2da13967bec Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:41:58 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 3deaa7097c46..0a52df0bee79 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 = " -- cgit 1.4.1 From d466259fd88aa448d32af47145ba19ac383b6b11 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:46:34 +0200 Subject: libviper: update from 1.4.5 to 1.4.6 --- pkgs/development/libraries/libviper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index b292580e7052..f82581b10977 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 = '' -- cgit 1.4.1 From f1103684b4dddbf2729104c190bb95225060c4ef Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:47:21 +0200 Subject: libunibreak: update from 1.0 to 1.1 --- pkgs/development/libraries/libunibreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 5fb8622d1e0f..bf4d07c51cfd 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; { -- cgit 1.4.1 From 27d28a2e759f91ef0af7cc1a735ddbb07941227b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:49:44 +0200 Subject: libtasn1: update from 2.13 to 2.14 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ad5783ae4f83..42fa2578062d 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; -- cgit 1.4.1 From 649fb3bd6ad8834b2c4d75794e295b32a8a31a3d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:52:34 +0200 Subject: libsodium: update from 0.4.3 to 0.4.5 --- pkgs/development/libraries/libsodium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e8124c2643ab..754893894b6a 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"; -- cgit 1.4.1 From ee95dbde4d02c8b380b4c587dc8ed5afc1cf9728 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:56:00 +0200 Subject: libnova: update from 0.12.1 to 0.12.3 --- pkgs/development/libraries/libnova/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 28decb9cfca0..b56697865a7a 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 = { -- cgit 1.4.1 From fd78d4d3890df8bf8e6d74d964750000da9d9118 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:57:47 +0200 Subject: libidn: update from 1.25 to 1.28 --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 1bd8aaca9dca..da8a7d50b67e 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; -- cgit 1.4.1 From faa3c3c00b47ea729026172cd0a6b918fb868ef1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 22:58:45 +0200 Subject: libgsf: update from 1.14.26 to 1.14.28 --- pkgs/development/libraries/libgsf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9253468b8df5..0c79b20b5645 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 ]; -- cgit 1.4.1 From ba166470ce46d7cdd750e2f3b133cc388f21ad29 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:03:31 +0200 Subject: newt: update from 0.52.14 to 0.52.15 --- pkgs/development/libraries/newt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 743314d18154..d9369d59c7be 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 = '' -- cgit 1.4.1 From 7456615f2ea2fce1ffbf99741bf1e2956c578746 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:05:10 +0200 Subject: opendkim: update from 2.4.2 to 2.4.3 --- pkgs/development/libraries/opendkim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 62a343d8efc7..5dfd87c4d84d 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}"; -- cgit 1.4.1 From f5d3be98f6df61d139b5b56ec66518cbf3aa7389 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:07:29 +0200 Subject: openresolv: update from 3.5.4 to 3.5.6 --- pkgs/tools/networking/openresolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 2879c5cc1a15..3271941f884b 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 = -- cgit 1.4.1 From b637ff684ceb02448562c3921067e14e80454837 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:11:45 +0200 Subject: perlPackages.AnyEvent: update from 7.04 to 7.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c683a91e468d..41bdd2d51f09 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 ]; -- cgit 1.4.1 From 8e87742d76eb081f9445a10bc3155e44d5610ee2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:13:03 +0200 Subject: perlPackages.ArrayCompare: update from 1.16 to 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 41bdd2d51f09..79b36f64269b 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"; }; }; -- cgit 1.4.1 From 37f46f652905628ea699364c79b7d0a6fec43a3b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:13:57 +0200 Subject: perlPackages.Autobox: update from 2.79 to 2.82 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79b36f64269b..57f5866bd28e 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 = { -- cgit 1.4.1 From becb8cda725601b5bb5fcfc266844f0913b9f594 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:15:13 +0200 Subject: perlPackages.CGISession: update from 4.46 to 4.48 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57f5866bd28e..d5871b3d8a22 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 ]; }; -- cgit 1.4.1 From 9872cea479e7a020329b097a998ee53acc9e39ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:16:14 +0200 Subject: perlPackages.CPANMetaRequirements: update from 2.122 to 2.125 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d5871b3d8a22..4d16aacb48c3 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 = { -- cgit 1.4.1 From 154b473eb4639cefd323718e747ed08e6467b0e6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:17:50 +0200 Subject: perlPackages.ClassAccessorGrouped: update from 0.10009 to 0.10010 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d16aacb48c3..bab715d06edb 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 ]; -- cgit 1.4.1 From 7e60697ea9cc0e987db6fc27c3d7b85ac2ada66e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:18:57 +0200 Subject: perlPackages.ConfigAny: update from 0.23 to 0.24 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bab715d06edb..eb25bbd39c67 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"; }; }; -- cgit 1.4.1 From 160daf8cef68896d01fc4142f40ce1e388dd1bd2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:19:39 +0200 Subject: perlPackages.ConfigGeneral: update from 2.51 to 2.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb25bbd39c67..df53f56f9cf0 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"; -- cgit 1.4.1 From 18a348a2da179afb16704f7cbe732fddaa4ec3ce Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:20:52 +0200 Subject: perlPackages.SetScalar: update from 1.25 to 1.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df53f56f9cf0..8e6dd5181e04 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"; -- cgit 1.4.1 From 0ec8915c50156cad3783b9a717e6c8dc001d415d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:21:43 +0200 Subject: perlPackages.StringFlogger: update from 1.101243 to 1.101244 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e6dd5181e04..bf760e04394e 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 = { -- cgit 1.4.1 From 0fb5aab661e0e0499ac55ee46ba2b70866bfc27b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:22:18 +0200 Subject: perlPackages.StringFormatter: update from 0.102082 to 0.102084 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf760e04394e..0bcc8ec68ef7 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 = { -- cgit 1.4.1 From db01357a11fe83462a440241de7f9df2061cc71e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:23:03 +0200 Subject: perlPackages.StringTruncate: update from 1.100600 to 1.100601 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0bcc8ec68ef7..36d99ae4f355 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 = { -- cgit 1.4.1 From 038d1b91f31b5424ef34851f412b44f7e5e8cf68 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:24:36 +0200 Subject: perlPackages.TemplateToolkit: update from 2.24 to 2.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36d99ae4f355..397b841f1ccf 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 = { -- cgit 1.4.1 From e1f980d99f1489b819433511b36997fc6ace6bd1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:25:42 +0200 Subject: perlPackages.TestVersion: update from 1.002001 to 1.002004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 397b841f1ccf..6d5967e2adbb 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 ]; -- cgit 1.4.1 From 755439bbf77a75c1572c5cba7e027f3ff0592182 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:27:05 +0200 Subject: perlPackages.TimeHiRes: update from 1.9725 to 1.9726 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d5967e2adbb..30667d9d2553 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"; }; }; -- cgit 1.4.1 From cfc84230eb35294d99826bbae142af1abfc15b1a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 23:31:52 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b44dff89bca..89ebe453cf4f 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 ]; -- cgit 1.4.1 From 1937d842033167a1511763c8a5e220cd2f772343 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Fri, 13 Dec 2013 21:46:00 +0000 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index d574f9c860f6..e039291882c5 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 ] -- cgit 1.4.1 From a398237f37fa5497ac2e8237af4c1cb43f5706f1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:16:27 +0200 Subject: lsscsi: update from 0.24 to 0.27 --- pkgs/os-specific/linux/lsscsi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 886f6c799a43..70e82662b415 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 = '' -- cgit 1.4.1 From 1485941a562a770e7a8fec5285892dc530727ab8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:30:29 +0200 Subject: pgf1: update from 1.10 to 1.18 --- pkgs/tools/typesetting/tex/pgf/1.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 91948f995a0e..032d9b5520e7 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"; -- cgit 1.4.1 From ea11828d4440e55b6c70eaff7d99fb0446addae3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:33:10 +0200 Subject: pwgen: update from 2.05 to 2.06 --- pkgs/tools/security/pwgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index ef91e69428a3..be96510eca0d 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"; -- cgit 1.4.1 From 209ff52d0b699f82bd6d4045e53eb94995d2ed2f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:36:24 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 143e45b5484b..fdb81a88b151 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 { -- cgit 1.4.1 From 904ee6d5d209301cd1df2db23fcb6f519c783041 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:41:47 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index e603768b8cc2..00b32bed44e5 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 = { -- cgit 1.4.1 From 48949544e5bef27244c7f446f77fbe5dc8e28326 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:44:09 +0200 Subject: xlsfonts: update from 1.0.2 to 1.0.4 --- pkgs/applications/misc/xlsfonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 879f5ae568cc..71d0a39296e9 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]; -- cgit 1.4.1 From 75bef13fca9ebd2e6a7c569f064a61fd3d54c084 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 00:46:44 +0200 Subject: xfsprogs: update from 3.1.8 to 3.1.11 --- pkgs/tools/filesystems/xfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 229802d1d78f..400890e95f30 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 = '' -- cgit 1.4.1 From 537a5d4b7011a4588afb1a7ee80035fca6abb67c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 04:36:56 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 8df9f71c1816..d67407eb03df 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 -- cgit 1.4.1 From 07d7a5d78672631c202cf6659ff2322e0852f575 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 04:40:53 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 4d0eda22c5bb..5e54e800f55b 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"; }; } -- cgit 1.4.1 From a23acb830a3c676d6f553f14ed798a799de88765 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 14 Dec 2013 11:26:38 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89ebe453cf4f..37be149fc1bb 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"; -- cgit 1.4.1 From 4353a1a8738b892aec3783456d103f36f76cb004 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 14 Dec 2013 11:35:43 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 340c9d0a69e9..37265c954e83 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 560820676565..916cc21564a9 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 { -- cgit 1.4.1 From d4f47af75aebc1f24b664a7f9d6246bad1f374a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 13:26:50 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5e4488add3fe..e8fac4ab52e1 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; -- cgit 1.4.1 From 8d52c9066e0e124ec8c28f436b6359e2b01c2acd Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 14 Dec 2013 14:22:29 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37be149fc1bb..33d4f5734e23 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 ]; }; }; -- cgit 1.4.1 From da88a3a81e09d052f162122e112f987981da65e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 15:11:19 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 06c1b9e2fcae..e09feb10d905 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; -- cgit 1.4.1 From a9a5bde463e59b1a186de15fff3be5e1943efe61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:28:54 +0100 Subject: haskell-HTTP: update to version 4000.2.10 --- .../libraries/haskell/HTTP/4000.2.10.nix | 24 ++++++++++++++++++++++ .../libraries/haskell/HTTP/4000.2.9.nix | 24 ---------------------- pkgs/top-level/haskell-packages.nix | 6 +++--- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.10.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.9.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix new file mode 100644 index 000000000000..c893d2f1e750 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix @@ -0,0 +1,24 @@ +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.10"; + sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; + buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix deleted file mode 100644 index 4ab03112189c..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.9"; - sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - 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 e8fac4ab52e1..c18848761504 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 {}; -- cgit 1.4.1 From 524935ebd567f388d2c9130ddd1cac018b8ce07a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:12 +0100 Subject: 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 (limited to 'pkgs') 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 000000000000..abc520e7b4ba --- /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 c18848761504..1eeb36ddea25 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 {}; -- cgit 1.4.1 From b30738afe2511725a8909748b1c9178317b4f5e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:23 +0100 Subject: 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 (limited to 'pkgs') 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 000000000000..0b992a9daaff --- /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 1eeb36ddea25..9747583549d6 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 {}; -- cgit 1.4.1 From ae58890b21757756053c321d5d54fee03eaae957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:09 +0100 Subject: haskell-monad-par: update to version 0.3.4.6 --- .../libraries/haskell/monad-par/0.3.4.5.nix | 28 ---------------------- .../libraries/haskell/monad-par/0.3.4.6.nix | 28 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix create mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix deleted file mode 100644 index 58cbb522fa24..000000000000 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras -, mtl, mwcRandom, parallel, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh -, time -}: - -cabal.mkDerivation (self: { - pname = "monad-par"; - version = "0.3.4.5"; - sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; - buildDepends = [ - abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom - parallel - ]; - testDepends = [ - abstractDeque abstractPar deepseq HUnit monadParExtras mtl - mwcRandom QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time - ]; - doCheck = false; - meta = { - homepage = "https://github.com/simonmar/monad-par"; - description = "A library for parallel programming based on a monad"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix new file mode 100644 index 000000000000..911d984a88c0 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -0,0 +1,28 @@ +{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras +, mtl, mwcRandom, parallel, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +, time +}: + +cabal.mkDerivation (self: { + pname = "monad-par"; + version = "0.3.4.6"; + sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; + buildDepends = [ + abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom + parallel + ]; + testDepends = [ + abstractDeque abstractPar deepseq HUnit monadParExtras mtl + mwcRandom QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh time + ]; + doCheck = false; + meta = { + homepage = "https://github.com/simonmar/monad-par"; + description = "A library for parallel programming based on a monad"; + 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 9747583549d6..af8eb5ea7dfa 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 {}; -- cgit 1.4.1 From f449007adecfce312ea87c54b2f9880ddf65b041 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-git-annex: update to version 5.20131213 --- .../git-and-tools/git-annex/default.nix | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs') 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 ea27852c4fd8..9caaa2f4012a 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 -- cgit 1.4.1 From 6a3e496f6b0bf960587c3e2e643021ed0b00e444 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-ListLike: update to version 4.0.2 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 973fca3fb991..a9723721e1e9 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; -- cgit 1.4.1 From c89a0aab3cf46bee7dc424eeac530ef99dd0c032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-cufft: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/cufft/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 5caec8341392..df9f686383e1 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; }; }) -- cgit 1.4.1 From 03ed01551002ee53725196f3592afd116423e598 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-data-memocombinators: update to version 0.5.1 --- pkgs/development/libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index df6777313264..3bdaf941c837 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"; -- cgit 1.4.1 From 9fe0d3696346f41d821b36cc8b1a2cc6e0eb5f0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-digestive-functors: update to version 0.6.2.0 --- .../libraries/haskell/digestive-functors/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 2207f18c35cd..43f0c4337e74 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 = { -- cgit 1.4.1 From 8df4a267a139135134243ef78d45fad3a43f0bb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger-lib: update to version 0.22 --- .../libraries/haskell/hledger-lib/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 87d5181fa7de..89a6622cf1ce 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"; -- cgit 1.4.1 From e759fa2d558f595f9cd186a229b23dcf01e224ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger-web: update to version 0.22 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index e4dd6ef1faad..f846dba7fc87 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 -- cgit 1.4.1 From 4271c59830bd3bc536ce9c0758ec1ab8f590d2e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger: update to version 0.22 --- .../libraries/haskell/hledger/default.nix | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 36012251e077..47a5ed381f6b 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"; -- cgit 1.4.1 From afe71506652e5ab99ac93a4d78a077e87360deeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-scotty: update to version 0.6.1 --- pkgs/development/libraries/haskell/scotty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 3f50ed381523..d72aed42852f 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"; -- cgit 1.4.1 From 62aecb91995129e0215107077243bf236a2726d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-tasty: update to version 0.5.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 8153eb9f6a76..39ee7f2d168d 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 ]; -- cgit 1.4.1 From 23fbd4bb4bd9cd3edaf8b6cd87e1fabaec0d347a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-th-lift: update to version 0.6 --- pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index c479955db645..c10feac4ba68 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"; -- cgit 1.4.1 From f3de4df1c5fc1c22597668ce32f4e0b95a1c4034 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 3b38db8c1de4..ad3ab7823c0e 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 = [ -- cgit 1.4.1 From d7dd97c5da6efcf019c543dc0894e0484d5a82fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index a6b8eeb4058b..8f2c6ebb342c 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 -- cgit 1.4.1 From ac0734056435a15ec11ad4b8854ceb2d1eb195a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d3b835879650..c6f8752f8b00 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 -- cgit 1.4.1 From fe7d9b733594b19be88ec38f02e01e0390247d20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index dbee52da8680..851d152eac56 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 = [ -- cgit 1.4.1 From 1098138e2ee25a7b2defc7b30f8be2e3f45ab3ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 86b2eec8945c..3a8bbb2cdf73 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 -- cgit 1.4.1 From f5587ef7519ba95f8c3da08cf5f86eb2b2cd25f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index c26d88b50807..936c4ab741b6 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 -- cgit 1.4.1 From 5971b942a225995fbb5c504059caa9092f0d6019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index ee9cd3b1fd3b..e17ed799c0e1 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 -- cgit 1.4.1 From 3fe71f1c52696e647a03b71d565d270820e73a25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d651e90a8a7f..87b4d059dc5b 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 = { -- cgit 1.4.1 From bf870cfde0adb9c79d89f0ebb537dde7a781befa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-zip-archive: update to version 0.2 --- pkgs/development/libraries/haskell/zip-archive/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index bddf09bc405d..bfe648f449b0 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 = { -- cgit 1.4.1 From e185d0603a4ff598923640a417cf17208a50c15f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-LambdaHack: update to version 0.2.10.5 --- pkgs/games/LambdaHack/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index f76aab551648..4b9211b637ff 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 = { -- cgit 1.4.1 From ab0438f128def9f328c9c5b5304ed92b5616b1f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 12:16:25 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9196e9ef76b2..dd9fbc198bff 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; -- cgit 1.4.1 From 3aef83f451ca7ba479802c8935c93d7341ed22ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 13:21:00 +0100 Subject: haskell-pandoc: jailbreak to fix build with unzip-archive --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 01ce4cc5bfb8..b2e4020703c5 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"; -- cgit 1.4.1 From 71d1e429a7da4fd9ebb758ec17fb970f04b286f4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:22:29 +0200 Subject: nano: update from 2.2.6 to 2.3.2 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 15cdadb04f53..c347a038ac9a 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 ]; -- cgit 1.4.1 From 34593a22b39534b5db56ff8421de3b5bdb91c61a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:25:10 +0200 Subject: mpg123: update from 1.15.4 to 1.16.0 --- pkgs/applications/audio/mpg123/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 029c2ba4bcdf..f14e2764211e 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; -- cgit 1.4.1 From 672999a3d4227f38583afbff2a25688789af1685 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:28:33 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index c00566977431..ee4644239298 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 = '' -- cgit 1.4.1 From cd31e1fbd7350014b5f97e3558a335b9dfcd9a73 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:30:26 +0200 Subject: perlPackages.CommonSense: update from 3.6 to 3.72 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30667d9d2553..8fd27eb1ca06 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; -- cgit 1.4.1 From a5d733dc406fabda135112d4f3b259072899bf15 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:32:29 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 70c2a294d6f2..9310e3ca0816 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 = '' -- cgit 1.4.1 From effad71d8448bfcd2b42563d9306e91a675610e6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:32:58 +0200 Subject: perlPackages.CompressRawBzip2: update from 2.060 to 2.063 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8fd27eb1ca06..396cea16fc50 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. -- cgit 1.4.1 From 7e64a165e7391f175bc5f652cf388d1cff366531 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:33:53 +0200 Subject: perlPackages.CryptCBC: update from 2.30 to 2.33 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 396cea16fc50..c6b8f49dd7ff 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"; }; }; -- cgit 1.4.1 From fba4776d08fdc706665c32d4f4a380e65641e5ad Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:34:35 +0200 Subject: perlPackages.CryptDES: update from 2.05 to 2.07 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6b8f49dd7ff..204c3743aec9 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]; }; -- cgit 1.4.1 From 646506620c14a161fef3c77dbd838be01018cf8b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:35:35 +0200 Subject: perlPackages.CryptDHGMP: update from 0.00010 to 0.00011 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 204c3743aec9..b7ebdd424367 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"; -- cgit 1.4.1 From 73959ecec80f3ce777665f0a44c53b869b24763d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:36:56 +0200 Subject: perlPackages.DataUUID: update from 1.218 to 1.219 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7ebdd424367..770a252566fc 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"; }; }; -- cgit 1.4.1 From 60a20b46e83b4d4b3424fde35339d71771dc8344 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:37:48 +0200 Subject: perlPackages.DateManip: update from 6.41 to 6.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 770a252566fc..0d3887ea22e9 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 = { -- cgit 1.4.1 From 93c00e205c658b14f479d8ff0469d03e8d791a27 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:46:08 +0200 Subject: perlPackages.TextTable: update from 1.126 to 1.128 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d3887ea22e9..44e29eb8697b 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 = { -- cgit 1.4.1 From bf6a1172a27119d54b4843bda1216bec006f49ab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:48:48 +0200 Subject: perlPackages.VariableMagic: update from 0.48 to 0.53 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44e29eb8697b..4febd41074d2 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"; }; }; -- cgit 1.4.1 From 3838aa8a1109c76abedcc0e4cf623966d7899e1a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:51:46 +0200 Subject: perlPackages.PodCoverageTrustPod: update from 0.100002 to 0.100003 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4febd41074d2..71212ddc0646 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 = { -- cgit 1.4.1 From 1529494594c28c9e1e8d640d16fdc56ab5d32e62 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:52:38 +0200 Subject: perlPackages.Parent: update from 0.221 to 0.228 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71212ddc0646..6cbb16f1b2eb 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"; }; }; -- cgit 1.4.1 From d6e7bba6f216d319e874465a3b6adef5cfea2388 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 17:54:30 +0200 Subject: perlPackages.NetAddrIP: update from 4.062 to 4.071 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6cbb16f1b2eb..baa9b59bd827 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"; }; }; -- cgit 1.4.1 From 59d1578c0871423594daf6f80939502560e5a819 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 14 Dec 2013 17:48:32 +0200 Subject: perlPackages.TextTable: add missing dependencies --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index baa9b59bd827..e9677b80d9d4 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/; -- cgit 1.4.1 From ed05981c8a9abfbd7935387583fb0dfb265c384f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Dec 2013 02:25:32 +0100 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix new file mode 100644 index 000000000000..4e1594e54f5d --- /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 f82bcb442f30..95a19cbb9bb8 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 { -- cgit 1.4.1 From f7b64d0e66dd6bb0376f13ab352250b1545b0f3c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:23:23 +0200 Subject: testdisk: update from 6.13 to 6.14 --- pkgs/tools/misc/testdisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 47734b4cd69e..d4866ec11f25 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]; -- cgit 1.4.1 From 503762f5dcd5f664123badd9ccc2c52e5e7d7cd2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:29:50 +0200 Subject: 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(-) (limited to 'pkgs') 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 56abf34e1b39..97683ff56deb 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 ]; -- cgit 1.4.1 From 6313b933ed849826b640548158571a3095398619 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:37:20 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 46aba67702df..8c08a342a903 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]; -- cgit 1.4.1 From a8ec55b3d997fb8751b5cde20cab14fecb6e0170 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:40:06 +0200 Subject: suitesparse: update from 4.2.0 to 4.2.1 --- pkgs/development/libraries/suitesparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index 017620839346..4d27701b135a 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]; -- cgit 1.4.1 From e9a4b303e6ead84778f80bf9cb6d08cf24178ba8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 14 Dec 2013 21:44:51 +0200 Subject: sdparm: update from 1.03 to 1.08 --- pkgs/os-specific/linux/sdparm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 8389728f22d8..2a796c1b3a9e 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 = { -- cgit 1.4.1 From e34aea6178d3cf65d33ce768b6321e53d88ce0ab Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Dec 2013 02:25:32 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4e1594e54f5d..bb91ca5beb5c 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 = '' -- cgit 1.4.1 From 60e76fd0c221827db6aa4cc7489de6db31bb8690 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 15 Dec 2013 00:27:22 +0400 Subject: BerkeleyDB: update to 0.54 --- pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index a6309d028e8c..01f698da2326 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 = '' -- cgit 1.4.1 From e57309963cc831501eaf6156f6c4c3d756416eaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 21:32:56 +0100 Subject: pandoc: cosmetic --- pkgs/development/libraries/haskell/pandoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b2e4020703c5..b42fc3633f09 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"; -- cgit 1.4.1 From e706edb8ee0569176c78b7b1ac3113ef59e30840 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 21:34:05 +0100 Subject: 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(-) (limited to 'pkgs') 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 9caaa2f4012a..9ad70206c361 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"; -- cgit 1.4.1 From 903e36a74c9505f98a14fd32e5ccfa5f07f26e93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:05:17 +0100 Subject: git-annex: fix build some more --- .../version-management/git-and-tools/git-annex/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs') 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 9ad70206c361..0c9e642d2650 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"; -- cgit 1.4.1 From b7e3905d28939131dc9d2c7caec90a79cc72c0f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:08:27 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix index 1f4dd165c50e..430b93011a36 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 ]; -- cgit 1.4.1 From e5e30f9ec96b2a33b810f0989a181bf79d0db169 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:13:22 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 9cae0a85d6c9..7d97fe4b4fe1 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"; -- cgit 1.4.1 From 674047ed918184c2e8e1f1a003055ddf64ff874e Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 15 Dec 2013 01:16:18 +0400 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix new file mode 100644 index 000000000000..de29f2d53e74 --- /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 916cc21564a9..1fe91d45e0da 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 { -- cgit 1.4.1 From 77cefbe76af8a57e56286fba0555c68bffd39c39 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:04:07 +0800 Subject: luajit: fix ldconfig to correct *.so files(symlinks) --- pkgs/development/interpreters/luajit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e5e3aed8d124..7c11be739f7b 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 ''; -- cgit 1.4.1 From 87e572a3d1d2fcac31fe011d0c28414377cc6528 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:24:28 +0800 Subject: 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 (limited to 'pkgs') diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix new file mode 100644 index 000000000000..b635b5e477c6 --- /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 f82bcb442f30..9bf0df0c7999 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 { }; -- cgit 1.4.1 From 186f5f5f0512e540aa452086be6c4f6fe8061f10 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:46:53 +0200 Subject: convmv: update from 1.14 to 1.15 --- pkgs/tools/misc/convmv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index a4b84f13507c..6d1ce21f318d 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='' -- cgit 1.4.1 From fcd81b58440368a74ab12eae7a08b63f1050b3a7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:52:38 +0200 Subject: check: update from 0.9.8 to 0.9.11 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index d04f8c8e750a..9888da5c3ec9 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; -- cgit 1.4.1 From 24cf5017e9544fb503d836f141eb0d38e1d041ae Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 10:54:18 +0200 Subject: ccrypt: update from 1.9 to 1.10 --- pkgs/tools/security/ccrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 5653af424d1e..0d4841bf036b 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 ]; -- cgit 1.4.1 From 28cba5e9d4fd3a2e720184a312f36cbaa40505ba Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:01:16 +0200 Subject: babeld: update from 1.4.1 to 1.4.3 --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 6f773cd1f7d3..08805738f505 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 = '' -- cgit 1.4.1 From 202ea363c47e201b1bb333a1b50ce5a80312b122 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:04:24 +0200 Subject: astyle: update from 2.02.1 to 2.04 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 6128406bbe5b..c7cda38ef431 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"; -- cgit 1.4.1 From b56814d1cee620cfe1d77de40aeaedfb9e58b216 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:06:38 +0200 Subject: ack: update from 2.02 to 2.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9677b80d9d4..6873e2145441 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 ]; -- cgit 1.4.1 From c08c8ddb520ed3f225d8992456241d4967739a38 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:08:31 +0200 Subject: a2jmidid: update from 7 to 8 --- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index f6c17e6d8ed5..9dbdada07d49 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 ]; -- cgit 1.4.1 From ac1972d1775b229e2fdb4c590467ff4027ed2ab0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:10:06 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index f22ef09a9839..142519c30ed5 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 = { -- cgit 1.4.1 From 22ea5a1982c8a5dc5ac9ce6f75f6b31f84bda37f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:13:12 +0200 Subject: beecrypt: update from 4.1.2 to 4.2.1 --- pkgs/development/libraries/beecrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 430e45ceec18..d90dae2dee0a 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"; -- cgit 1.4.1 From 9fa6637c901412e85b521f69098863cb0547f644 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:20:28 +0200 Subject: bristol: update from 0.60.10 to 0.60.11 --- pkgs/applications/audio/bristol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 0978b15bfaf0..5eb4f0c4e9f1 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 = [ -- cgit 1.4.1 From efb58e101a8c0531a1b5cf8598db948f36418ec5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:22:59 +0200 Subject: bzflag: update from 2.0.16 to 2.4.2 --- pkgs/games/bzflag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index d15c25cef3cd..ce3a0c8fa3c3 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 ]; -- cgit 1.4.1 From 7cee23b69fbe91dd447c7287bf6ad0a602dd4bea Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:27:17 +0200 Subject: chromaprint: update from 0.7 to 1.1 --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 2c712c5c20ed..40d41b633d26 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 ]; -- cgit 1.4.1 From 4e2ea2d0c097836639d2be65a4bd9cea3ec258f2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:31:53 +0200 Subject: classads: update from 1.0.4 to 1.0.10 --- pkgs/development/libraries/classads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 080e854315dc..6d47ae3e7b1f 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 = '' -- cgit 1.4.1 From e7c77dc527bb0a12ad38b1497cd7b7f51894f80a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 15 Dec 2013 11:38:20 +0200 Subject: classads: add a missing dependency --- pkgs/development/libraries/classads/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 6d47ae3e7b1f..909e8ba7bf26 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 ''; -- cgit 1.4.1 From 17588191ecb9c72fdcd311d1fa7616c8490e08b8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 11:40:25 +0200 Subject: dmg2img: update from 1.6.4 to 1.6.5 --- pkgs/tools/misc/dmg2img/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 75a9a2037dbe..2030463885c9 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]; -- cgit 1.4.1 From 53261424c3c7d8c269bbf34cff02efeaa14cf87e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:19:28 +0200 Subject: dnsmasq: update from 2.67 to 2.68 --- pkgs/tools/networking/dnsmasq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 7217d9871864..0c5dfc6fd748 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"; -- cgit 1.4.1 From 84ea06eb9948474a92fafbdd5da0dd495d484dab Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:21:29 +0200 Subject: dnstop: update from 20110502 to 20121017 --- pkgs/tools/networking/dnstop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index c9e1b58d2d2c..00984a4ee70a 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 ]; -- cgit 1.4.1 From 680a6380c86c9cbaf9b6d59deba5bc4e0e47b966 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:26:24 +0200 Subject: cppcheck: update from 1.53 to 1.62 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 8aea7bc8aa8e..9d3859851ee0 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"; -- cgit 1.4.1 From 38803914d6a35023189692761b31dfcb64c05270 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:32:24 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 4f2ef6df8498..69c1f4181cc7 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 ]; -- cgit 1.4.1 From e4df13e956650e7069a1b0af15d3bb67659ed5a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:35:47 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 665336cbd364..f25c41b72b93 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 ]; -- cgit 1.4.1 From 8c042a49ebf6f2c85ddfdc1be8b1a0dda74ef0cc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:38:46 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 3b9b8cce9e7c..a51f65cbccb0 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" ]; -- cgit 1.4.1 From 6619a3a1d8a58d90fe6c29b55c91cd06e27ad583 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 12:49:39 +0200 Subject: dar: update from 2.4.6 to 2.4.11 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index ad2269f2add9..9309886db806 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 ]; -- cgit 1.4.1 From 873c95ba8d5ce2fc8f6e52e66049be0a7bbb75e7 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:00:22 +0200 Subject: hexedit: update from 1.2.12 to 1.2.13 --- pkgs/applications/editors/hexedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 07985dc214ae..ee9f44d06da4 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 ]; -- cgit 1.4.1 From 53754a0397180f4a4b8b83b30ed023f006c58693 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:03:15 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index edbc37e76a60..a3e1348f940d 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 ]; -- cgit 1.4.1 From a49d2ee8b5008216df616701e674745820013175 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:05:36 +0200 Subject: hello: update from 2.8 to 2.9 --- pkgs/applications/misc/hello/ex-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 80a3fb702c02..d3ade1ab8505 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; -- cgit 1.4.1 From aa36ddc188da5b2108841bbdf349ba57c5d081f5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:06:57 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index a283258d589a..537897c13b4a 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 = '' -- cgit 1.4.1 From 4095a1d55468006fb055c405cafa6bf8d3a8dfa5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:08:19 +0200 Subject: incrtcl: update from 3.4b1 to 3.4.1 --- pkgs/development/libraries/incrtcl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 0263e98f587c..e6474abf11c1 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 ]; -- cgit 1.4.1 From f95db595e7fbadeacc796cb4e6af43551324a955 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:11:20 +0200 Subject: ised: update from 2.2.2 to 2.5.0 --- pkgs/tools/misc/ised/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 0a04886f64c6..02cb65b1060a 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 { -- cgit 1.4.1 From ffd5623ec89bae8ff8ad5a5df03bcea9de3850be Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:16:57 +0200 Subject: libcddb: update from 1.3.0 to 1.3.2 --- pkgs/development/libraries/libcddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 4a0066fccd49..8e4f8a36547a 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 = { -- cgit 1.4.1 From 3073e0697ff89d77766e0e9255e6200cc21d4e82 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:18:34 +0200 Subject: libcdio: update from 0.82 to 0.90 --- pkgs/development/libraries/libcdio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index fc26fb9aca11..00159e1de46b 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 ]; -- cgit 1.4.1 From 19f3061d10a18cc72f7ce1de555f1caef20cfa13 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:20:24 +0200 Subject: lingot: update from 0.9.0 to 0.9.1 --- pkgs/applications/audio/lingot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 44d946af2dbd..4b8ba4dbc242 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 ]; -- cgit 1.4.1 From d7a82dfe6f2753c3f87b5b7ab2a0b63d2fb5827f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 13:21:56 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 41fca2121581..15c6258e86fd 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 ]; -- cgit 1.4.1 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: Fix LuaJIT evaluation on non-Linux platforms --- pkgs/development/interpreters/luajit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 7c11be739f7b..f74ad18d5e41 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; }; } -- cgit 1.4.1 From a18b92f4e45229b335637cf560131a1a996ad881 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 15 Dec 2013 19:40:15 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index e4f59a98cf05..78d44b7768dc 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"; }; -- cgit 1.4.1 From b92620f6801383ce70875fb2a15cd5d6d701e1a0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 15 Dec 2013 23:32:13 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 713adaffd063..5bc409d10e52 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 ]; -- cgit 1.4.1 From 66fa31308c06e7ce8e588b8b2a33ce6b270b42c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:03:17 +0100 Subject: haskell-ghc-mod: re-enable the test suite --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index fb3ccb8e50ec..411c4a963f74 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 -- cgit 1.4.1 From 41f0df10681a88305cbd75c7e997e614a096fee3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:08:33 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 411c4a963f74..b764d69fb3ba 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: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b764d69fb3ba..472d25790481 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: 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(-) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af8eb5ea7dfa..f00ac2465462 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; -- cgit 1.4.1 From 736ff4ae2a4d7b07c7f15f84a30a1b43b3eed26b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 19:40:48 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 19fcb98c82d9..2dd5b0ca3df1 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 = -- cgit 1.4.1 From 53e9145cd0e82e33fe1546b868e016cec7425136 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 18:04:49 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 691029ac5de2..4f7353dfdb6f 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 ]; -- cgit 1.4.1 From 001776428e32d1d96f2e8cd04738f27d1f62d25e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 18:04:51 +0100 Subject: haskell-LambdaHack: update to version 0.2.10.6 --- pkgs/games/LambdaHack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 4b9211b637ff..b9b66f4be691 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 = [ -- cgit 1.4.1 From be8d22c05d476b544c6576f2ec460b9403df9239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 19:54:13 +0100 Subject: haskell-github: patch to fix build --- pkgs/development/libraries/haskell/github/default.nix | 1 + pkgs/development/libraries/haskell/github/fix-build.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/github/fix-build.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 5a45e48bdc7b..74368defc9c8 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 000000000000..2d3483b38ec1 --- /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 -- cgit 1.4.1 From a2a1eb88cbf8b57ce7ddfd71b2f70bbae3ec8655 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:48:08 +0200 Subject: httpfs2: update from 0.1.4 to 0.1.5 --- pkgs/tools/filesystems/httpfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index bbb6d2efc7b2..6f68a798ede9 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 = -- cgit 1.4.1 From 49cfb2c89677a1b62288c9c8e66c31878bd91b15 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:49:32 +0200 Subject: httpunit: update from 1.6 to 1.7 --- pkgs/development/libraries/java/httpunit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index b70bbf56073e..73eb33df812d 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; -- cgit 1.4.1 From 1ff34a1cf80cf9286737bc84d0750afd68cd128d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:50:54 +0200 Subject: httrack: update from 3.47.21 to 3.47.27 --- pkgs/tools/backup/httrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index c02a16d821ac..4fa3345d220a 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 ]; -- cgit 1.4.1 From 25dc79783b68976e1b99d379ccedfc98b212a17e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:52:40 +0200 Subject: icoutils: update from 0.29.1 to 0.31.0 --- pkgs/tools/graphics/icoutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 5abc909ea306..10cd9adf2b3c 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 ]; -- cgit 1.4.1 From 8a0a1b7768282b784a7403e531ea66ae06ea892b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:57:25 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4c183d9c4025..392fcbcc8ff9 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"; }; -- cgit 1.4.1 From 6fc2d316bb5b3e03afdef69a10c6aade6d57c510 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 00:59:52 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 6099505f1d65..0b3389f903a8 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 ]; -- cgit 1.4.1 From aeda3e2216ffadd3434b25dc8c62211ff7a4f67d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:01:08 +0200 Subject: psmisc: update from 22.19 to 22.21 --- pkgs/os-specific/linux/psmisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index dd6c70127bf8..0e423f85d66f 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]; -- cgit 1.4.1 From f5f6b86fc8ae9da028765b2892dcea82ef4f246c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:03:15 +0200 Subject: rpPPPoE: update from 3.10 to 3.11 --- pkgs/tools/networking/rp-pppoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 5079b951a645..fe7f98100262 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; -- cgit 1.4.1 From 3c936a05022981d3de04033ab34d14cc999397b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:05:27 +0200 Subject: tinc: update from 1.0.22 to 1.0.23 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index c2b25e863f20..61ff721a8479 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 ]; -- cgit 1.4.1 From f90e505d506b068cfb7c4bee12b8e909d20eb692 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:06:44 +0200 Subject: units: update from 1.86 to 2.02 --- pkgs/tools/misc/units/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index c609d2275dad..0d1a962cbf66 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 = { -- cgit 1.4.1 From d2bb4dc100916d789010d826059d9c1e7dca3abe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:09:58 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 2b146a78cb39..bbb6c0388251 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 ]; -- cgit 1.4.1 From 6112fc7fff8a0053e4b7745cee2a95191142d101 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:11:51 +0200 Subject: xaos: update from 3.5 to 3.6 --- pkgs/applications/graphics/xaos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 307c94779296..cddbc212c190 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; -- cgit 1.4.1 From e54c26a65c6740ba82772bec7577006c2846ccc0 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:13:19 +0200 Subject: xdaliclock: update from 2.35 to 2.40 --- pkgs/tools/misc/xdaliclock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 74ee8b5b5484..f6d6a2bacfa7 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 { -- cgit 1.4.1 From e748d4c498af88a2ffa126de574225f2e0059d43 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:16:40 +0200 Subject: gmtk: update from 1.0.5 to 1.0.8 --- .../applications/networking/browsers/mozilla-plugins/gmtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index 6ccab87ebe74..66309dc7f192 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 ]; -- cgit 1.4.1 From 8dd78ae54d1360400ef3d4a2b4c1e9a8ab5db3f6 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:18:24 +0200 Subject: gptfdisk: update from 0.8.6 to 0.8.8 --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 817e3015efe9..93dfab9a1a47 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 ]; -- cgit 1.4.1 From 6a69d7e89815599404a7c3f837327fd60da8b899 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:19:56 +0200 Subject: gsl: update from 1.15 to 1.16 --- pkgs/development/libraries/gsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 49364f882429..9afcc4ad41d6 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; -- cgit 1.4.1 From c253a1fb40e38f343b28ac21164572cc9e30c965 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:22:13 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 674b35f441e9..1eca6b3a3025 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 ]; -- cgit 1.4.1 From cda4252d4b59eb059f475e8bdf1b0669c54bf516 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:24:12 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 593b090922ec..310c0e923805 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]; -- cgit 1.4.1 From 106785b0928ce74f8e4eccf154abc4ef2e056962 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:26:13 +0200 Subject: ioping: update from 0.4 to 0.7 --- pkgs/tools/system/ioping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index d721feb9d74d..52d32b4e838e 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 { -- cgit 1.4.1 From 0a290831883b712cb56f513de10e36988dba7603 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:27:28 +0200 Subject: jansson: update from 2.4 to 2.5 --- pkgs/development/libraries/jansson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 4908c737ece4..3d4e5f260dce 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 = { -- cgit 1.4.1 From 2e43a29ec80df04641f9a09ad6d3807000b71a10 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:29:41 +0200 Subject: less: update from 436 to 462 --- pkgs/tools/misc/less/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index b22e7521764c..fa391880a101 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]; -- cgit 1.4.1 From 84aba31f4276e1cdc90de262bd6775aa11b99cfe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:31:22 +0200 Subject: libconfig: update from 1.4.8 to 1.4.9 --- pkgs/development/libraries/libconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 03b7b2cfb928..70a882ff15c1 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; { -- cgit 1.4.1 From 3695a604185232dd5b285e6a5c6bd47f5330e42f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:32:26 +0200 Subject: libeatmydata: update from 65 to 82 --- pkgs/development/libraries/libeatmydata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 48a0423653d6..6b3a16d1c092 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 = { -- cgit 1.4.1 From 9f83ba8776abc1ca99182d845e754c4d41495925 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Mon, 16 Dec 2013 01:35:44 +0200 Subject: log4cpp: update from 1.1 to 1.1.1 --- pkgs/development/libraries/log4cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 2b2553075580..32424d546b44 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 = { -- cgit 1.4.1 From 2b65900e7516284237c7a6a7f0d0b6ad2fd9f87a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 16 Dec 2013 04:50:22 +0000 Subject: vagrant: update to 1.4.0 --- pkgs/development/tools/vagrant/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 64822a08d073..80fc093822fd 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; { -- cgit 1.4.1 From acac786868a418893a116124606e4a1d9cedf8b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 14:46:21 +0100 Subject: linux: Update to 3.4.74 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 4cf3229f6fde..8608eee84569 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; -- cgit 1.4.1 From a2b45034b3ff57b42c26a100c674aeb6844e7f9f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 14:50:40 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index caa673b31a92..f7bb29270c7b 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 1e3d73fa884e..bf60e90d634a 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"; }; -- cgit 1.4.1 From edaa56041ceb3185d9c104ca72c457a5e7ae6e03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 13:55:16 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index b17f720e5618..d99faf41f88d 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"; -- cgit 1.4.1 From ec00fe09654d44c1b5a3625b95e73c66de865fbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 13:59:42 +0100 Subject: 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(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 687314266839..46e69c95f940 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"; -- cgit 1.4.1 From 1e5e9a402b062a85264f3ec765a97486b66a76cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-DAV: update to version 0.5.1 --- pkgs/development/libraries/haskell/DAV/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c24ceacc0216..4a908e46d934 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 ]; -- cgit 1.4.1 From ee755fa3bccbad9044f2631c537c81fbbecea580 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-HsOpenSSL: update to version 0.10.3.6 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index eb7c406e81e4..d7736a5d9b9a 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 = { -- cgit 1.4.1 From a3c0e40e521ffe4a723495cc519a8b3fbb76f01f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-ansi-terminal: update to version 0.6.1 --- pkgs/development/libraries/haskell/ansi-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 6d598f29ec95..2e9b1c0c25f4 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; -- cgit 1.4.1 From c1413dc30b9266b3f9f0fb358fe1d5b01184b8f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix index 0b992a9daaff..a675d4d74ea6 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"; -- cgit 1.4.1 From 0bbe648085a6a48b862b53374093bd427033cb92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-snaplet-acid-state: update to version 0.2.6 --- pkgs/development/libraries/haskell/snaplet-acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 838f45eccaad..8a9a594e45d7 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"; -- cgit 1.4.1 From 9a313321365287fe3388d8ce7661aee1cdab3005 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-tasty: update to version 0.5.2.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 39ee7f2d168d..6ba25cdc99b2 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 ]; -- cgit 1.4.1 From 60103a4bd99cce63dab60be358e0ba90724b8b21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 7d97fe4b4fe1..9cae0a85d6c9 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"; -- cgit 1.4.1