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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-03-28 21:15:15 +01:00
parent 48a137da73 7f4e4b279e
commit a36be028f5
639 changed files with 13721 additions and 10162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/compilers/acme/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchsvn }:
stdenv.mkDerivation rec {
pname = "acme";
version = "120";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
rev = version;
sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2";
};
sourceRoot = "code-0-r${src.rev}/src";
makeFlags = [ "BINDIR=$(out)/bin" ];
postPatch = ''
substituteInPlace Makefile \
--replace "= gcc" "?= gcc"
'';
meta = with stdenv.lib; {
description = "A multi-platform cross assembler for 6502/6510/65816 CPUs.";
homepage = "https://sourceforge.net/projects/acme-crossass/";
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
};
}

40
pkgs/development/compilers/as31/default.nix
View File

@@ -1,40 +0,0 @@
{ stdenv, fetchpatch, fetchurl, yacc }:
let
version = "2.3.1";
in stdenv.mkDerivation {
pname = "as31";
inherit version;
src = fetchurl {
name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
};
buildInputs = [ yacc ];
patches = [
(fetchpatch {
name = "CVE-2012-0808.patch";
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5";
sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21";
})
];
preConfigure = ''
chmod +x ./configure
'';
postConfigure = ''
rm as31/parser.c
'';
meta = with stdenv.lib; {
homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31;
description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
maintainers = with maintainers; [ aneeshusa ];
platforms = with platforms; unix;
};
}

8
pkgs/development/compilers/elm/default.nix
View File

@@ -52,14 +52,6 @@ let
}));
elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
patches = [(
# GHC 8.8.1 and Cabal >= 1.25.0 support
# https://github.com/zwilias/elm-instrument/pull/3
fetchpatch {
url = "https://github.com/turboMaCk/elm-instrument/commit/4272db2aea742c8b54509e536fa4f35d04f95da5.patch";
sha256 = "1d1lc43lp3x5jfhlyb1b7na7nj1g1i1vc1np26pcisg9c2s7gjz6";
}
)];
prePatch = ''
sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place
'';

8
pkgs/development/compilers/elm/packages/elm-instrument.nix
View File

@@ -3,15 +3,15 @@
, fetchgit, filepath, free, HUnit, indents, json, mtl
, optparse-applicative, parsec, process, QuickCheck, quickcheck-io
, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
, text, elm
, text
}:
mkDerivation {
pname = "elm-instrument";
version = "0.0.7";
src = fetchgit {
url = "https://github.com/zwilias/elm-instrument.git";
sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56";
rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7";
url = "https://github.com/zwilias/elm-instrument";
sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv";
rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e";
fetchSubmodules = true;
};
isLibrary = true;

18
pkgs/development/compilers/ghc/8.10.1.nix
View File

@@ -88,12 +88,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.10.0.20200123";
version = "8.10.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf";
url = "https://downloads.haskell.org/ghc/8.10.1/ghc-${version}-src.tar.xz";
sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf";
};
enableParallelBuilding = true;
@@ -149,15 +149,21 @@ stdenv.mkDerivation (rec {
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optionals (libffi != null) [
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ stdenv.lib.optionals useLdGold [

5
pkgs/development/compilers/ghc/8.2.2-binary.nix
View File

@@ -1,12 +1,15 @@
{ stdenv, substituteAll
, fetchurl, perl, gcc, llvm
, ncurses5, gmp, glibc, libiconv
, llvmPackages
}:
# Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform;
let
useLLVM = !stdenv.targetPlatform.isx86;
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ];
propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/

23
pkgs/development/compilers/ghc/8.6.3-binary.nix → pkgs/development/compilers/ghc/8.6.5-binary.nix
View File

@@ -1,12 +1,15 @@
{ stdenv
, fetchurl, perl, gcc
, ncurses5, gmp, glibc, libiconv
, llvmPackages
}:
# Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform;
let
useLLVM = !stdenv.targetPlatform.isx86;
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -24,27 +27,33 @@ let
in
stdenv.mkDerivation rec {
version = "8.6.3";
version = "8.6.5";
name = "ghc-${version}-binary";
# https://downloads.haskell.org/~ghc/8.6.5/
src = fetchurl ({
i686-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m";
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w";
};
x86_64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719";
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz";
sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw";
};
aarch64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz";
sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq";
};
x86_64-darwin = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r";
sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
@@ -168,5 +177,5 @@ stdenv.mkDerivation rec {
};
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
}

3
pkgs/development/compilers/go/1.12.nix
View File

@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];

3
pkgs/development/compilers/go/1.13.nix
View File

@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];

3
pkgs/development/compilers/go/1.14.nix
View File

@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];

2
pkgs/development/compilers/go/1.4.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcre ];
propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
hardeningDisable = [ "all" ];

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

@@ -14,14 +14,14 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
version = "2020.02.04";
version = "2020.03.25";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "ca733561873cd54be047ae30a94efcd71b3f8be5";
sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
rev = "a3ede0293a50c910e7d96319b2084d50f2501a6b";
sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq";
name = "nextpnr";
})
(fetchFromGitHub {

7
pkgs/development/compilers/ocaml/4.09.nix
View File

@@ -1,6 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "09";
patch_version = "0";
sha256 = "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj";
patch_version = "1";
sha256 = "1aq5505lpa39garky2icgfv4c7ylpx3j623cz9bsz5c466d2kqls";
# Breaks build with Clang
hardeningDisable = [ "strictoverflow" ];
}

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

@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
version = "2020.03.16";
version = "2020.03.24";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "ed4fa19ba2812c286562baf26bbbcb49afad83bc";
sha256 = "1sza5ng0q8dy6p4hks9b2db129xjcid9n6l8aglf2cj5ks82k5nv";
rev = "c9555c9adeba886a308c60615ac794ec20d9276e";
sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a";
};
enableParallelBuilding = true;

44
pkgs/development/compilers/zasm/default.nix Normal file
View File

@@ -0,0 +1,44 @@
{ fetchFromGitHub, zlib, stdenv }:
let
libs-src = fetchFromGitHub {
owner = "megatokio";
repo = "Libraries";
rev = "97ea480051b106e83a086dd42583dfd3e9d458a1";
sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh";
};
in
stdenv.mkDerivation {
pname = "zasm";
version = "4.2.6";
src = fetchFromGitHub {
owner = "megatokio";
repo = "zasm";
rev = "f1424add17a5514895a598d6b5e3982579961519";
sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks";
};
buildInputs = [ zlib ];
configurePhase = ''
ln -sf ${libs-src} Libraries
'';
buildPhase = ''
cd Linux
make
'';
installPhase = ''
mkdir -p $out/bin
mv zasm $out/bin
'';
meta = with stdenv.lib; {
description = "Z80 / 8080 assembler (for unix-style OS)";
homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";
license = licenses.bsd2;
maintainers = [ maintainers.turbomack ];
platforms = platforms.linux;
badPlatforms = platforms.aarch64;
};
}