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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2020-07-29 18:40:28 +02:00
parent cd719c1eae d807152c69
commit 60d89e5793
377 changed files with 9647 additions and 7355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/clojure/default.nix
+13 -13
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.547";
version = "1.10.1.590";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0";
sha256 = "18x8xkxsqwnv3k1mf42ylfv7zzjllm7yiagq16b2gkq62j5sm1k7";
};
nativeBuildInputs = [
@@ -18,20 +18,20 @@ stdenv.mkDerivation rec {
let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in
''
mkdir -p $out/libexec
cp clojure-tools-${version}.jar $out/libexec
cp example-deps.edn $out
cp deps.edn $out
''
mkdir -p $out/libexec
cp clojure-tools-${version}.jar $out/libexec
cp example-deps.edn $out
cp deps.edn $out
substituteInPlace clojure --replace PREFIX $out
substituteInPlace clojure --replace PREFIX $out
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
installManPage clj.1 clojure.1
'';
installManPage clj.1 clojure.1
'';
doInstallCheck = true;
installCheckPhase = ''
pkgs/development/interpreters/erlang/R23.nix
+2 -2
View File
@@ -3,8 +3,8 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "23.0.2";
sha256 = "19ly2m0rjay6071r75s9870cm3sph25zd1mvy67l5v4jg7mxdjzy";
version = "23.0.3";
sha256 = "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
pkgs/development/interpreters/evcxr/default.nix
+4 -4
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "evcxr";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "582ce09f216d4812f7d152f6eedf0b034fc4dbbd";
sha256 = "12hlqgh74z8vmd7fkxh4vk3dqp8hlhzkxnbyywk6nphi562n6w5w";
rev = "v${version}";
sha256 = "09xziv2vmjd30yy095l3n33v9vdkbbkyjdcc5azyd76m2fk9vi42";
};
cargoSha256 = "0yr8vwlpfsg47sg0032yrsdcgxyky0hy4963zkh0pmjykbyqkb3h";
cargoSha256 = "1cdj5qh3z4bnz2267s83chw6n1kg9zl1hrawkis5rr9vq7llrb24";
nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
pkgs/development/interpreters/hy/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "hy";
version = "0.18.0";
version = "0.19.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2";
sha256 = "05k05qmiiysiwdc05sxmanwhv1crfwbb3l8swxfisbzbvmv1snis";
};
checkInputs = with python3Packages; [ flake8 pytest ];