JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'channel-nixos' into python

Browse Source
This commit is contained in:
Florian Friesdorf 2013-01-15 21:49:28 +01:00
commit 8d6aa9c971
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/bazaar/default.nix
View File

@ -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 ];

2
pkgs/os-specific/linux/cpufrequtils/default.nix
View File

@ -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";
};

2
pkgs/os-specific/linux/module-init-tools/default.nix
View File

@ -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";
})

2
pkgs/os-specific/linux/pam/default.nix
View File

@ -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";
};

1
pkgs/os-specific/linux/powertop/default.nix
View File

@ -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";

5
pkgs/os-specific/linux/v86d/default.nix
View File

@ -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";
};

2
pkgs/tools/filesystems/reiserfsprogs/default.nix
View File

@ -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";
};

14
pkgs/tools/system/logrotate/default.nix
View File

@ -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;
};
}