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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2014-12-26 22:41:19 +01:00
parent dd4dfee2c2 d89518bd1b
commit becf038336
17 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/uclibc/default.nix
View File

@@ -48,12 +48,12 @@ let
in
stdenv.mkDerivation {
name = "uclibc-0.9.34-pre-20141029" + stdenv.lib.optionalString (cross != null)
name = "uclibc-0.9.34-pre-20141215" + stdenv.lib.optionalString (cross != null)
("-" + cross.config);
src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141029.tar.bz2;
sha256 = "018r3bhw1jyyihmm5xxq1psl3r5yx02a57p8qxvay3vvzxn2cvzm";
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2;
sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f";
};
# 'ftw' needed to build acl, a coreutils dependency

4
pkgs/os-specific/linux/util-linux/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
name = "util-linux-2.25.1";
name = "util-linux-2.25.2";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz";
sha256 = "4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8";
sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6";
};
crossAttrs = {