From 4c9cfd87aad71540bb68b553bd16ef605cd2c824 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:39:25 +0100 Subject: [PATCH 1/8] bazaar: Update to 2.5.1 --- pkgs/applications/version-management/bazaar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 856320f0168..1eb114ecd8c 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.3"; + version = "2.5"; release = ".1"; name = "bazaar-${version}${release}"; src = fetchurl { url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53"; + sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; From 45b0bcbc69994d237f734356117f6ee24e87b2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:42:29 +0100 Subject: [PATCH 2/8] v86d: Fix URL --- pkgs/os-specific/linux/v86d/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index aedfe9ac686..f0f7fcbb9ce 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-0.1.10-${kernel.version}"; + name = "v86d-${version}-${kernel.version}"; + version = "0.1.10"; src = fetchurl { - url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; + url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2"; sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3"; }; From a6768a8df215bea572832d7c8778dd4d1672a735 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:46:30 +0100 Subject: [PATCH 3/8] logrotate: Update to 3.8.3 --- pkgs/tools/system/logrotate/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index a9994f14b57..784c8e75e76 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, gzip, popt}: +{ stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.7.8"; + name = "logrotate-3.8.3"; src = fetchurl { - url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz; - sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1"; + url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; + sha256 = "0xqrz8xzs2c1vx8l5h9lp2ciwwifj7y52xsppb1vrvbi254vyxh7"; }; # Logrotate wants to access the 'mail' program; to be done. @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; meta = { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.all; }; } From 634aa5020d3f62f1bb2dda929cabb6865c27578b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:43:53 +0100 Subject: [PATCH 4/8] module-init-tools: Fix URL --- pkgs/os-specific/linux/module-init-tools/default.nix | 2 +- pkgs/os-specific/linux/powertop/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 077d08f899d..240150b09dd 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = [ (fetchurl { - url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; }) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 68075d115a4..2fb852acc31 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -2,6 +2,7 @@ stdenv.mkDerivation rec { name = "powertop-2.1"; + src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; From 7cf37131879eeee67e8a6c0f9511ed5b1abc3202 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:45:39 +0100 Subject: [PATCH 5/8] cpufrequtils: Fix URL --- pkgs/os-specific/linux/cpufrequtils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 35bf57c269e..e9e0a36f156 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "cpufrequtils-008"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz"; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; md5 = "52d3e09e47ffef634833f7fab168eccf"; }; From 4bca4fa2b81a7ce6427ab01c6c4f89d6962c4adf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:47:21 +0100 Subject: [PATCH 6/8] reiserfsprogs: Fix URL --- pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2283a0c1746..2c14bc624ae 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "reiserfsprogs-3.6.21"; src = fetchurl { - url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2"; + url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2"; sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam"; }; From 1d174fb9740732e425d1b5698fbe4d46802fcf6f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:48:54 +0100 Subject: [PATCH 7/8] linux-pam: Fix URL --- pkgs/os-specific/linux/pam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index c18ea2b1f2b..7da03cf9cad 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "linux-pam-1.1.1"; src = fetchurl { - url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2; + url = http://www.linux-pam.org/library/Linux-PAM-1.1.1.tar.bz2; sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0"; }; From d3e54e01258cbb1d7b50ff9f1b424c7b14a4ab22 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 19:04:41 +0100 Subject: [PATCH 8/8] python-pyquery-1.2.4 and dep python-cssselect-0.7.1 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41b545a6862..5437ef1e65c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -458,6 +458,16 @@ let pythonPackages = python.modules // rec { }; }; + cssselect = buildPythonPackage rec { + name = "cssselect-0.7.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; + md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; + }; + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + }; + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; @@ -2171,6 +2181,16 @@ let pythonPackages = python.modules // rec { }; + pyquery = buildPythonPackage rec { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + buildInputs = [ cssselect lxml ]; + }; + + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c";