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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-04-03 21:54:40 +02:00
parent ac46ffbcfc 3420bd63b9
commit 92124ed660
357 changed files with 6567 additions and 4186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/compcert/default.nix
View File

@@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "compcert";
version = "3.6";
version = "3.7";
src = fetchFromGitHub {
owner = "AbsInt";
repo = "CompCert";
rev = "v${version}";
sha256 = "1k9xhj7fgllhf7bn7rp3w6zfvs4clglnc4w39zp4678hrwvdcpha";
sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/compilers/computecpp/default.nix
View File

@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "computecpp";
version = "1.2.0";
version = "1.3.0";
src = fetchzip {
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz";
sha256 = "191kwvzxfg1sbaq6aw6f84chi7bhsibb2a63zsyz3gz8m0c0syr5";
sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz";
stripRoot = true;
};

10
pkgs/development/compilers/fpc/binary.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "fpc-2.6.0-binary";
name = "fpc-3.0.0-binary";
src =
if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar";
sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k";
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar";
sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9";
}
else throw "Not supported on ${stdenv.hostPlatform.system}.";

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

@@ -3,20 +3,22 @@
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec {
version = "3.0.0";
version = "3.0.4";
pname = "fpc";
src = fetchurl {
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm";
sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn";
};
buildInputs = [ startFPC gawk ];
glibc = stdenv.cc.libc.out;
preConfigure =
if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];

4
pkgs/development/compilers/fpc/lazarus.nix
View File

@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
pname = "lazarus";
version = "1.8.4";
version = "2.0.6";
src = fetchurl {
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz";
sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s";
sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2";
};
buildInputs = [

16
pkgs/development/compilers/jwasm/default.nix
View File

@@ -2,24 +2,30 @@
, cmake }:
with stdenv.lib;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "jwasm";
version = "git-2017-11-22";
version = "2.13";
src = fetchFromGitHub {
owner = "JWasm";
repo = "JWasm";
rev = "26f97c8b5c9d9341ec45538701116fa3649b7766";
rev = version;
sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w";
};
nativeBuildInputs = [ cmake ];
installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/";
installPhase = ''
install -Dpm755 jwasm -t $out/bin/
install -Dpm644 $src/History.txt $src/Readme.txt \
$src/Doc/enh.txt $src/Doc/fixes.txt \
$src/Doc/gencode.txt $src/Doc/overview.txt \
-t $out/share/doc/jwasm/
'';
meta = {
description = "A MASM-compatible x86 assembler";
homepage = http://jwasm.github.io/;
homepage = "http://jwasm.github.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.darwin ++ platforms.linux;

2
pkgs/development/compilers/llvm/10/clang/default.nix
View File

@@ -8,7 +8,7 @@ let
pname = "clang";
inherit version;
src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2";
src = fetch "clang" "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8";
unpackPhase = ''
unpackFile $src

2
pkgs/development/compilers/llvm/10/compiler-rt.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "compiler-rt";
inherit version;
src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri";
src = fetch pname "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba";
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

7
pkgs/development/compilers/llvm/10/default.nix
View File

@@ -6,15 +6,14 @@
let
release_version = "10.0.0";
candidate = "rc5";
version = "10.0.0${candidate}"; # differentiating these is important for rc's
version = release_version; # differentiating these (variables) is important for rc's
fetch = name: sha256: fetchurl {
url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz";
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
inherit sha256;
};
clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i";
clang-tools-extra_src = fetch "clang-tools-extra" "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc";
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });

2
pkgs/development/compilers/llvm/10/libc++/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
pname = "libc++";
inherit version;
src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs";
src = fetch "libcxx" "1isnj78diknh0nvd73mlq8p8g209f9bab2mbysq826bg2wzql3r7";
postUnpack = ''
unpackFile ${libcxxabi.src}

2
pkgs/development/compilers/llvm/10/libc++abi.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
pname = "libc++abi";
inherit version;
src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf";
src = fetch "libcxxabi" "1q8lrbh68a9v4lr88b8xsjpmwx5z96sa5wnkb92xx7ccm1ssq6z7";
nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;

2
pkgs/development/compilers/llvm/10/libunwind.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "libunwind";
inherit version;
src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l";
src = fetch pname "09n66dl9cc17d81qflj5h1l4garmhvzfi2lhcb7rx00l8z65xp09";
nativeBuildInputs = [ cmake ];

2
pkgs/development/compilers/llvm/10/lld.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
pname = "lld";
inherit version;
src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc";
src = fetch pname "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r";
nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];

2
pkgs/development/compilers/llvm/10/lldb.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x";
src = fetch pname "0ddikvc0kbqlqvsypsm9nhfwmyw4prp4rv49f0bgacyh5ssgq7yx";
patches = [ ./lldb-procfs.patch ];

4
pkgs/development/compilers/llvm/10/llvm.nix
View File

@@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec {
pname = "llvm";
inherit version;
src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709";
polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r";
src = fetch pname "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz";
polly_src = fetch "polly" "15sd3dq0w60jsb76pis09lkagj5iy43h9hg4kd9gx5l8cbnsdyrm";
unpackPhase = ''
unpackFile $src

2
pkgs/development/compilers/llvm/10/openmp.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
pname = "openmp";
inherit version;
src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam";
src = fetch pname "1ymd13gj07x0b0vxziygm0p41vrq6nsgx837jqg9ll6h8ndg57rv";
nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];

4
pkgs/development/compilers/nim/default.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "nim";
version = "1.0.6";
version = "1.2.0";
src = fetchurl {
url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
sha256 = "1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk";
sha256 = "TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=";
};
enableParallelBuilding = true;

70
pkgs/development/compilers/purescript/psc-package/default.nix
View File

@@ -1,27 +1,61 @@
{ haskellPackages, mkDerivation, fetchFromGitHub, lib }:
# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix
{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }:
with lib;
let
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
in
stdenv.mkDerivation rec {
pname = "psc-package-simple";
mkDerivation rec {
pname = "psc-package";
version = "0.6.2";
src = fetchFromGitHub {
owner = "purescript";
repo = pname;
rev = "v${version}";
sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y";
src = if stdenv.isDarwin
then fetchurl {
url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz";
sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1";
}
else fetchurl {
url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz";
sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54";
};
isLibrary = false;
isExecutable = true;
buildInputs = [ gmp zlib ];
nativeBuildInputs = [ installShellFiles ];
executableHaskellDepends = with haskellPackages; [
aeson aeson-pretty either errors optparse-applicative
system-filepath turtle
];
libPath = lib.makeLibraryPath buildInputs;
description = "A package manager for PureScript based on package sets";
license = licenses.bsd3;
maintainers = with lib.maintainers; [ Profpatsch ];
dontStrip = true;
installPhase = ''
mkdir -p $out/bin
PSC_PACKAGE=$out/bin/psc-package
install -D -m555 -T psc-package $PSC_PACKAGE
chmod u+w $PSC_PACKAGE
'' + lib.optionalString stdenv.isDarwin ''
install_name_tool \
-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \
-change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \
$PSC_PACKAGE
'' + lib.optionalString (!stdenv.isDarwin) ''
patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE
'' + ''
chmod u-w $PSC_PACKAGE
$PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash
$PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish
$PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package
installShellCompletion \
psc-package.{bash,fish} \
--zsh _psc-package
'';
meta = with lib; {
description = "A package manager for PureScript based on package sets";
license = licenses.bsd3;
maintainers = with maintainers; [ Profpatsch ];
platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
}