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

Merge remote-tracking branch 'origin/master' into openssl-1.1

Browse Source
This commit is contained in:
Linus Heckemann
2019-08-23 17:27:39 +02:00
parent 9ae11067b8 54f385241e
commit d1d602f559
74 changed files with 2307 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/flow/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.105.2";
version = "0.106.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1zvg4yz9rpibvai66lb781qivgx9gr8222z3dix673dns06rd4nf";
sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw";
};
installPhase = ''

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.9.3";
version = "0.10.1";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
sha256 = "10saljrman41pjmjhbzan8jw8jbz069yhcf6vvzxmw763x5s3n85";
sha256 = "0x9kh0bvbil6z09v41gzk5sdiprqg288jfcjw1n2x809sj7c6vhf";
};
modSha256 = "0zfgyv1m7iay3brkqmh35gw1giyr3i3ja56dh4kgm6ai4z1jmvgc";
modSha256 = "0wig41m81kmy7l6sj6kk4ryc3m1b18n2vlf80x0bbhn46kyfnbgr";
subPackages = [ "." ];

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
version = "12.1.0";
version = "12.2.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch";
sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk";
sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn";
sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3";
};
patches = [ ./fix-shell-path.patch ];

13
pkgs/development/tools/coursier/default.nix
View File

@@ -1,12 +1,18 @@
{ stdenv, fetchurl, makeWrapper, jre }:
let
zshCompletion = version: fetchurl {
url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
sha256 = "0gfr1q66crh6si4682xbxnj41igws83qj710npgm2bvq90xa8m49";
};
in
stdenv.mkDerivation rec {
name = "coursier-${version}";
version = "1.1.0-M14-6";
version = "2.0.0-RC3-3";
src = fetchurl {
url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7";
sha256 = "1qrybajwk46h6d1yp6n4zxdvrfl19lqhjsqxbm48vk3wbvj31vyl";
};
nativeBuildInputs = [ makeWrapper ];
@@ -15,6 +21,9 @@ stdenv.mkDerivation rec {
install -Dm555 $src $out/bin/coursier
patchShebangs $out/bin/coursier
wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
# copy zsh completion
install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier
'';
meta = with stdenv.lib; {

4
pkgs/development/tools/fdroidserver/default.nix
View File

@@ -4,14 +4,14 @@
, lib }:
python.pkgs.buildPythonApplication rec {
version = "1.1.1";
version = "1.1.4";
pname = "fdroidserver";
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
rev = version;
sha256 = "0m618rvjh8h8hnbafrxsdkw8m5r2wnkz7whqnh60jh91h3yr0kzs";
sha256 = "020b6w2vhqgkpbrc1d08zh6mkh704mqhqqly14hir2bvay9rr9li";
};
patchPhase = ''

12
pkgs/development/tools/icestorm/default.nix
View File

@@ -6,12 +6,12 @@
# and IceStorm isn't intended to be used as a library other than by the
# nextpnr build process (which is also sped up by using PyPy), so we
# use it by default. See 18839e1 for more details.
, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */
, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux"
}:
stdenv.mkDerivation rec {
pname = "icestorm";
version = "2019.08.08";
version = "2019.08.15";
pythonPkg = if usePyPy then pypy3 else python3;
pythonInterp = pythonPkg.interpreter;
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
rev = "2ccae0d3864fd7268118287a85963c0116745cff";
sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7";
rev = "95949315364f8d9b0c693386aefadf44b28e2cf6";
sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2";
};
nativeBuildInputs = [ pkgconfig ];
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.clifford.at/icestorm/;
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
platforms = stdenv.lib.platforms.all;
};
}

18
pkgs/development/tools/misc/gengetopt/default.nix
View File

@@ -1,17 +1,25 @@
{ fetchurl, stdenv }:
{ fetchurl, stdenv, texinfo, help2man }:
stdenv.mkDerivation rec {
name = "gengetopt-2.22.6";
pname = "gengetopt";
version = "2.23";
src = fetchurl {
url = "mirror://gnu/gengetopt/${name}.tar.gz";
sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h";
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "1b44fn0apsgawyqa4alx2qj5hls334mhbszxsy6rfr0q074swhdr";
};
doCheck = true;
enableParallelBuilding = true;
nativeBuildInputs = [ texinfo help2man ];
#Fix, see #28255
postPatch = ''
sed -e 's/set -o posix/set +o posix/' -i configure
substituteInPlace configure --replace \
'set -o posix' \
'set +o posix'
'';
meta = {

6
pkgs/development/tools/misc/mkcert/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mkcert";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = pname;
rev = "v${version}";
sha256 = "1aadnsx5pfmryf8mgxg9g0i083dm1pmrc6v4ln2mm3n89wwqc9b7";
sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
};
modSha256 = "0snvvwhyfq01nwgjz55dgd5skpg7z0dzix7sdag90cslbrr983i1";
modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
meta = with lib; {
homepage = https://github.com/FiloSottile/mkcert;

6
pkgs/development/tools/ocaml/dune/default.nix
View File

@@ -6,10 +6,10 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "1.11.1";
version = "1.11.3";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
sha256 = "0hizfaidl1bxl614i65yvyfhsjbp93y7y9qy1a8zw448w1js5bsp";
sha256 = "1lmvsis6dk8mccbwpypz9qdxr134gjhdwshxw6q12mi4x3kn6fn8";
};
buildInputs = [ ocaml findlib ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://dune.build/";
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
license = stdenv.lib.licenses.mit;
inherit (ocaml.meta) platforms;
};

4
pkgs/development/tools/scalafmt/default.nix
View File

@@ -2,7 +2,7 @@
let
baseName = "scalafmt";
version = "2.0.0";
version = "2.0.1";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -13,7 +13,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "18mf23ssy4lwvsi4pg6m4b003paz5yds5vs7nhl0bfcq57xg6qj1";
outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5";
};
in
stdenv.mkDerivation rec {

16
pkgs/development/tools/solarus-quest-editor/default.nix
View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitLab, cmake, luajit,
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis, solarus,
qtbase, qttools, glm }:
stdenv.mkDerivation rec {
name = "solarus-quest-editor-${version}";
version = "1.6.0";
mkDerivation rec {
pname = "solarus-quest-editor";
version = "1.6.2";
src = fetchFromGitLab {
owner = "solarus-games";
repo = "solarus-quest-editor";
repo = pname;
rev = "v${version}";
sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c";
sha256 = "0dq94iw9ldl4p83dqcwjs5ilpkvz5jgdk8rbls8pf8b7afpg36rz";
};
buildInputs = [ cmake luajit SDL2
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
openal libmodplug libvorbis
solarus qtbase qttools glm ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";
longDescription = ''
Solarus is a game engine for Zelda-like ARPG games written in lua.

4
pkgs/development/tools/trellis/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/symbiflow/prjtrellis;
license = stdenv.lib.licenses.isc;
maintainers = with maintainers; [ q3k thoughtpolice ];
platforms = stdenv.lib.platforms.linux;
maintainers = with maintainers; [ q3k thoughtpolice emily ];
platforms = stdenv.lib.platforms.all;
};
}