From 99439dc4eec5917343deceb8b7bed574c28478e1 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:06:36 +0000 Subject: [PATCH 01/11] bluez5: update from 5.24 to 5.25 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 3d1f90fe8ebd..e8be1b6b0e66 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.24"; + name = "bluez-5.25"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0dxqkyxjx4051k6ghacqnm0cyvw52z9f4867dy2rcd5zl3xwaw78"; + sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; }; pythonPath = with pythonPackages; From 3f8ff5b5ba902c5beae6f85e3b37797e4bef30ad Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:06:55 +0000 Subject: [PATCH 02/11] b43FirmwareCutter: update from 018 to 019 --- .../linux/firmware/b43-firmware-cutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index a01d5d38e938..701b9742b6a6 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-018"; + name = "b43-fwcutter-019"; src = fetchurl { url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; - sha256 = "13v34pa0y1jf4hkhsh3zagyb7s8b8ymplffaayscwsd3s7f6kc2p"; + sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; patches = [ ./no-root-install.patch ]; From 88ea3e8c484961830715ee596d3b8149206201c7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:07:17 +0000 Subject: [PATCH 03/11] bsddb3: update from 6.0.1 to 6.1.0 --- pkgs/development/python-modules/bsddb3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 574796e2c681..bd5b953f048a 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, db}: stdenv.mkDerivation rec { - name = "bsddb3-6.0.1"; + name = "bsddb3-6.1.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - md5 = "2b22ab1b4d896961c30e4106660e9139"; + sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; }; buildInputs = [python]; buildPhase = "true"; From 1e8e030f6b6d0dcedd52952e777ecec77c9b0b93 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:07:47 +0000 Subject: [PATCH 04/11] bwidget: update from 1.9.7 to 1.9.8 --- pkgs/development/libraries/bwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0d1913bc8e7a..ed670e61243d 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6"; + sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l"; }; dontBuild = true; From 6e12ae2bc6ce0dad5402ee1645ab0cfbfe3dac1c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:08:11 +0000 Subject: [PATCH 05/11] check: update from 0.9.12 to 0.9.14 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a782ff61e287..5273e88763a8 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.12"; in +let version = "0.9.14"; in stdenv.mkDerivation { name = "check-${version}"; src = fetchurl { url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "18qybf3s25s1gydp2lwbc4icnmdc6f9sj21fllcwm81kw5apxm67"; + sha256 = "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 From f4c350d26ebce68b1ca483693a3ffe4b471da27a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:09:30 +0000 Subject: [PATCH 06/11] dropbear: update from 2013.62 to 2014.66 --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 1f7c8a449f3d..c9b0101a7e6c 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.62"; + name = "dropbear-2014.66"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6"; + sha256 = "0xmbcjm2pbhih459667wy8acs4nax4amvzwqwfxw0z2i19ky4gxb"; }; dontDisableStatic = enableStatic; From 9b14ab9f6aba404b98e5932a7d5f03252576839c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:10:49 +0000 Subject: [PATCH 07/11] e17.eina: update from 1.7.5 to 1.7.10 --- pkgs/desktops/e17/eina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index 77d4829a8419..653bb639b1b0 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.7.5"; + version = "1.7.10"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; + sha256 = "06pqn17zknmxzdk5gw6df0gpbicnrdjl9g4vncw57k2wzf5icy33"; }; meta = { description = "Enlightenment's core data structure library"; From d3568f277c8688fd0464bce9a316e1086ab014c6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:03 +0000 Subject: [PATCH 08/11] e17.terminology: update from 0.5.1 to 0.7.0 --- pkgs/desktops/e17/terminology/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix index 692f4e73ac2c..35e2f3f5a34f 100644 --- a/pkgs/desktops/e17/terminology/default.nix +++ b/pkgs/desktops/e17/terminology/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.5.1"; + version = "0.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1b8m6fhzx2fdr3m6ak2163v33zc4svmg2k875m0xppzifdd9xvyf"; + sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; }; buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; From 1f199f21a5454f090966a28e2816b2d592b7db73 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:17 +0000 Subject: [PATCH 09/11] emacs24Packages.rainbowDelimiters: update from 1.3.12 to 1.3.13 --- .../editors/emacs-modes/rainbow-delimiters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 62b3a0af1fbc..2b4223cdc1fd 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, emacs}: -let version = "1.3.12"; +let version = "1.3.13"; in stdenv.mkDerivation { name = "emacs-rainbow-delimiters-${version}"; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "0l65rqmnrc02q1b406kxc29w5cfpmrmq0glv493pjzhzc5m3r63z"; + sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; }; buildInputs = [ emacs ]; From 4603a8eff622c859fd89f2767e5bcfa53cebef31 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:50 +0000 Subject: [PATCH 10/11] giflib_5_0: update from 5.0.5 to 5.0.6 --- pkgs/development/libraries/giflib/5.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 4dc8132805c4..6dcf696839f1 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { - name = "giflib-5.0.5"; + name = "giflib-5.0.6"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2; - sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0"; + url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; + sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; From 35218a325a91f9ffd44f896d84dcebeef99b7b4a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:13:21 +0000 Subject: [PATCH 11/11] giflib: add meta.branch info --- pkgs/development/libraries/giflib/5.0.nix | 8 +++++++- pkgs/development/libraries/giflib/5.1.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 6dcf696839f1..49e3fc40ba66 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -8,5 +8,11 @@ stdenv.mkDerivation { }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; + meta = { + description = "giflib is a library for reading and writing gif images"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.0"; + }; } - diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix index 3ff71255b851..dcd52fc93f46 100644 --- a/pkgs/development/libraries/giflib/5.1.nix +++ b/pkgs/development/libraries/giflib/5.1.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.1"; }; }