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:
github-actions[bot]
2021-05-07 18:24:29 +00:00
committed by GitHub
parent 7b23f8694f 6eef66f4c8
commit 1ae6d3d02f
70 changed files with 870 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/8.10.2-binary.nix
View File

@@ -214,11 +214,12 @@ stdenv.mkDerivation rec {
enableShared = true;
};
meta = {
meta = rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
license = lib.licenses.bsd3;
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet ];
};
}

7
pkgs/development/compilers/ghc/8.6.5-binary.nix
View File

@@ -173,6 +173,9 @@ stdenv.mkDerivation rec {
enableShared = true;
};
meta.license = lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
meta = rec {
license = lib.licenses.bsd3;
platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;
};
}

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

@@ -1,14 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
let
version = "1.4.21";
in stdenv.mkDerivation {
inherit version;
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.4.32";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6";
hash = "sha256-3+8ju4a9XzYWbU7BJnyN5Ts4J8RG1U6CMixrbarTWUw=";
};
propagatedBuildInputs = [ jre ] ;