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

Merge branch 'staging'

Browse Source 
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
This commit is contained in:
Vladimír Čunát
2017-09-12 19:17:52 +02:00
parent 7786aab173 ab62b7e9b9
commit 422adc3063
67 changed files with 423 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.5/default.nix
View File

@@ -65,7 +65,7 @@ let version = "4.5.4";
/* Cross-gcc settings */
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";

6
pkgs/development/compilers/nasm/default.nix
View File

@@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.12.02";
version = "2.13.01";
src = fetchurl {
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00";
sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88";
};
meta = with stdenv.lib; {
homepage = http://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub willibutz ];
};
}