diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-19 20:12:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-19 20:12:10 +0000 |
| commit | 22253677b33c5e6afeb22975562bcf6269d742b6 (patch) | |
| tree | 68b94ea944a9074a490fe9e95c760ff558f62630 /pkgs/tools/misc | |
| parent | cd6de2880faab0475af10898772d92dd79c89cf0 (diff) | |
| download | nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.gz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.bz2 nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.lz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.xz nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.tar.zst nixlib-22253677b33c5e6afeb22975562bcf6269d742b6.zip | |
Merging from trunk. The previous merge took the firefox 3.6 in a bad state.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/memtest86/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 5df5fd31382b..480a29c63c95 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86+-4.00"; + name = "memtest86+-4.10"; src = fetchurl { - url = http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz; - sha256 = "193chqvwmcxsrvpcfy3mbz1vakvpfhxvjmawzidp26x8kma2zi3f"; + url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz; + sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq"; }; preBuild = '' @@ -17,10 +17,7 @@ stdenv.mkDerivation { fi ''; - # Override the default optimisation setting (`-Os') to prevent lots - # of spurious errors. See - # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412. - NIX_CFLAGS_COMPILE = "-O1 -I."; + NIX_CFLAGS_COMPILE = "-I."; installPhase = '' ensureDir $out |