Author: viric
Date: Wed Sep 1 09:49:53 2010
New Revision: 23587
URL: https://svn.nixos.org/websvn/nix/?rev=23587&sc=1
Log:
Setting the new binutils snapshot niksnut copied to nixos.org, for the time
while they don't
release.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
Wed Sep 1 08:52:54 2010 (r23586)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/binutils/snapshot.nix
Wed Sep 1 09:49:53 2010 (r23587)
@@ -7,8 +7,8 @@
name = basename + stdenv.lib.optionalString (cross != null)
"-${cross.config}";
src = fetchurl {
- url = "file:///root/binutils/${basename}.tar.bz2";
- sha256 = "1f0na8c31sccbipzk8xiyd7n7ydh5gg09kirbs28vcb2714cxws0";
+ url = http://nixos.org/tarballs/binutils-2.20.51-pre-20100901.tar.bz2;
+ sha256 = "1872fdnbnq5z5svq7mvc0vyyad8pknwvx2glxq1bbk0xv7arp72y";
};
patches = [
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Sep
1 08:52:54 2010 (r23586)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Sep
1 09:49:53 2010 (r23587)
@@ -2267,8 +2267,8 @@
inherit noSysDirs;
};
- binutils = if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then
binutils_snapshot
- else binutils_release;
+ # We are waiting for a release. Meanwhile, sysvinit and the loongson2f need
it.
+ binutils = binutils_snapshot;
binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils {
inherit stdenv fetchurl;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
