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-02-05 10:28:52 +01:00
parent 080f1e7f5c 2b3d2dbaf9
commit 76a439239e
156 changed files with 1607 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/radare2/cutter.nix
View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "radare2-cutter";
version = "1.9.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "1ln55ssrasbaam267lwc2vxnm8j0c2x35qsda44xi2p8hqxslf8k";
sha256 = "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3";
};
postUnpack = "export sourceRoot=$sourceRoot/src";

24
pkgs/development/tools/analysis/radare2/default.nix
View File

@@ -110,22 +110,22 @@ in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "23159";
gittap = "4.0.0";
gittip = "e97047299af43e9b4e658c246816a2b48bdc087e";
rev = "4.0.0";
version = "4.0.0";
sha256 = "15b79hska3skrlbrig7fl405kmbvy4410m93lfsfmkwxs0wr9jis";
version_commit = "23710";
gittap = "4.2.0";
gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d";
rev = "4.2.0";
version = "4.2.0";
sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
version_commit = "22888";
gittap = "3.8.0";
gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
rev = "b4860e4eecad2053202965926f16296864b2f1e5";
version = "2019-09-03";
sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
version_commit = "23710";
gittap = "4.2.1";
gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
version = "2020-01-31";
sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};

6
pkgs/development/tools/bazelisk/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "1rjv21jwq2lkyq60qqg6bd8226dz90hanl3zd9fjlms3vm0zarf8";
sha256 = "15h4mbsfjwby4wq57rdj4dzsf595qjfgi3v5zw62yycn3m2w922p";
};
modSha256 = "0gs8y618izqi0gfa46jqh79yj8lzsmc6yj95fakhp2f5i8v1xrmx";
modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz";
meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";

40
pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
View File

@@ -1,40 +0,0 @@
{ stdenv, buildBazelPackage, lib, fetchFromGitHub, git, jre, makeWrapper }:
buildBazelPackage rec {
name = "bazel-deps-${version}";
version = "2019-07-11";
meta = with stdenv.lib; {
homepage = "https://github.com/johnynek/bazel-deps";
description = "Generate bazel dependencies for maven artifacts";
license = licenses.mit;
maintainers = [ maintainers.uri-canva ];
platforms = platforms.all;
broken = true; # global variable '_common_attrs_for_plugin_bootstrapping' is referenced before assignment.
};
src = fetchFromGitHub {
owner = "johnynek";
repo = "bazel-deps";
rev = "48fdf7f8bcf3aadfa07f9f7e6f0c9f4247cb0f58";
sha256 = "0wpn5anfgq5wfljfhpn8gbgdmgcp0claffjgqcnv5dh70ch7i0gi";
};
bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
buildInputs = [ git makeWrapper ];
fetchAttrs = {
sha256 = "1r5qxsbw2cgww7vcg5psh7404l3jcxpvc0ndgl3k8vj1x8y93nkf";
};
buildAttrs = {
installPhase = ''
mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
cp gen_maven_deps.sh $out/bin
wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]}
cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
'';
};
}

29
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
View File

@@ -8,19 +8,25 @@
buildBazelPackage rec {
name = "bazel-remote-${version}";
version = "2019-01-12";
version = "2020-01-29";
src = fetchFromGitHub {
owner = "buchgr";
repo = "bazel-remote";
rev = "3f65b6ccf69e223950c77275a743d0d3a04a8583";
sha256 = "0fklrlylmc55yzhm3m1f211x5gmk7hpqjb7k5kml7n3gw3npbjda";
rev = "ae9378321552dd14066332f8fa55076040228cb7";
sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p";
};
nativeBuildInputs = [ go git ];
bazelTarget = "//:bazel-remote";
removeRulesCC = false;
# this is to work around `test -f` failing when called by gazelle
# https://github.com/bazelbuild/bazel-gazelle/blob/v0.19.1/internal/go_repository.bzl#L135
patches = [ ./disable_build_file_generation.patch ];
fetchAttrs = {
preBuild = ''
patchShebangs .
@@ -28,12 +34,11 @@ buildBazelPackage rec {
# tell rules_go to use the Go binary found in the PATH
sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
# update gazelle to work around https://github.com/golang/go/issues/29850
sed -e 's,https://github.com/bazelbuild/bazel-gazelle/releases/download/0.15.0/bazel-gazelle-0.15.0.tar.gz,https://github.com/bazelbuild/bazel-gazelle/releases/download/0.16.0/bazel-gazelle-0.16.0.tar.gz,g' -i WORKSPACE
sed -e 's,6e875ab4b6bf64a38c352887760f21203ab054676d9c1b274963907e0768740d,7949fc6cc17b5b191103e97481cf8889217263acf52e00b560683413af204fcb,g' -i WORKSPACE
# tell rules_go to invoke GIT with custom CAINFO path
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
# force gazelle to use the nix go cache rather than its own
# export GO_REPOSITORY_USE_HOST_CACHE=1
'';
preInstall = ''
@@ -47,6 +52,11 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
# Remove the gazelle repository cache as it contains built binaries
chmod -R u+w $bazelOut/external/bazel_gazelle_go_repository_cache
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker}
sed -e '/^FILE:@bazel_gazelle_go_repository_cache.*/d' -i $bazelOut/external/\@*.marker
# Remove the gazelle tools, they contain go binaries that are built
# non-deterministically. As long as the gazelle version matches the tools
# should be equivalent.
@@ -54,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
sha256 = "1wvyv3w5y6vj6qs6v5qyd356j1lxc3mf7n3j2pcib1bqmx3igw35";
sha256 = "1n66hg1w5jv2rc8q4sjlaf0agvxr713aa40mbkhgjv57x9j7bgn0";
};
buildAttrs = {
@@ -75,7 +85,6 @@ buildBazelPackage rec {
description = "A remote HTTP/1.1 cache for Bazel.";
license = licenses.asl20;
maintainers = [ maintainers.uri-canva ];
platforms = platforms.darwin;
broken = true; # global variable '_layer' is referenced before assignment.
platforms = platforms.darwin ++ platforms.linux;
};
}

24
pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch Normal file
View File

@@ -0,0 +1,24 @@
From 3f5abd591b93ebdbc1ae82e5c29cf26024222f5f Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Thu, 30 Jan 2020 16:47:36 +1100
Subject: [PATCH] Disable build file generation for remote apis.
---
WORKSPACE | 1 +
1 file changed, 1 insertion(+)
diff --git a/WORKSPACE b/WORKSPACE
index f9ebafa..52e4e0b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -208,6 +208,7 @@ http_archive(
go_repository(
name = "com_github_bazelbuild_remote_apis",
+ build_file_generation = "off",
importpath = "github.com/bazelbuild/remote-apis",
sum = "h1:OPH+hf+ICw8WEp2CV2ncfdyWPC30Cmw8b5NKun0n5IQ=",
version = "v0.0.0-20191119143007-b5123b1bb285",
--
2.25.0

38
pkgs/development/tools/database/liquibase/default.nix
View File

@@ -6,27 +6,15 @@ assert mysqlSupport -> mysql_jdbc != null;
with stdenv.lib;
let
extraJars = optional mysqlSupport mysql_jdbc;
logback-core = fetchurl {
url = "http://central.maven.org/maven2/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar";
sha256 = "5946d837fe6f960c02a53eda7a6926ecc3c758bbdd69aa453ee429f858217f22";
};
logback-classic = fetchurl {
url = "http://central.maven.org/maven2/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar";
sha256 = "fb53f8539e7fcb8f093a56e138112056ec1dc809ebb020b59d8a36a5ebac37e0";
};
slf4j = fetchurl {
url = "http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar";
sha256 = "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79";
};
in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "3.6.2";
version = "3.8.5";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz";
sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx";
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0wvz188i1214b904xrhvba90hyfrlc4za3aibbdqfm86wm3qzh6s";
};
buildInputs = [ jre makeWrapper ];
@@ -42,22 +30,17 @@ stdenv.mkDerivation rec {
done
'';
in ''
mkdir -p $out/{bin,lib,sdk}
mv ./* $out/
cp ${logback-core} ${logback-classic} ${slf4j} $out/lib
mkdir -p $out
mv ./{lib,licenses,liquibase.jar} $out/
# Clean up documentation.
mkdir -p $out/share/doc/${pname}-${version}
mv $out/LICENSE.txt \
$out/README.txt \
mv LICENSE.txt \
README.txt \
ABOUT.txt \
changelog.txt \
$out/share/doc/${pname}-${version}
# Remove silly files.
rm $out/liquibase.bat $out/liquibase.spec
# we provide our own script
rm $out/liquibase
mkdir -p $out/bin
# there’s a lot of escaping, but I’m not sure how to improve that
cat > $out/bin/liquibase <<EOF
#!/usr/bin/env bash
@@ -75,6 +58,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Version Control for your database";
homepage = http://www.liquibase.org/;
changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt";
license = licenses.asl20;
maintainers = with maintainers; [ nequissimus ];
platforms = with platforms; unix;

84
pkgs/development/tools/database/sqldeveloper/18.2.nix
View File

@@ -1,84 +0,0 @@
{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
let
version = "18.2.0.183.1748";
desktopItem = makeDesktopItem {
name = "sqldeveloper";
exec = "sqldeveloper";
icon = "sqldeveloper";
desktopName = "Oracle SQL Developer 18";
genericName = "Oracle SQL Developer 18";
comment = "Oracle's Oracle DB GUI client";
categories = "Application;Development;";
};
in
stdenv.mkDerivation {
inherit version;
pname = "sqldeveloper";
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
message = ''
This Nix expression requires that ${name} already be part of the store. To
obtain it you need to
- navigate to ${url}
- make sure that it says "Version ${version}" above the list of downloads
- if it does not, click on the "Previous Version" link below the downloads
and repeat until the version is correct. This is necessarry because as the
time of this writing there exists no permanent link for the current version
yet.
Also consider updating this package yourself (you probably just need to
change the `version` variable and update the sha256 to the one of the
new file) or opening an issue at the nixpkgs repo.
- accept the license agreement
- download the file listed under "Other Platforms"
- sign in or create an oracle account if neccessary
and then add the file to the Nix store using either:
nix-store --add-fixed sha256 ${name}
or
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k";
};
buildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir -p $out/libexec $out/share/{applications,pixmaps}
mv * $out/libexec/
mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
cp ${desktopItem}/share/applications/* $out/share/applications
makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
--set JAVA_HOME ${jdk.home} \
--run "cd $out/libexec/sqldeveloper/bin"
'';
meta = with stdenv.lib; {
description = "Oracle's Oracle DB GUI client";
longDescription = ''
Oracle SQL Developer is a free integrated development environment that
simplifies the development and management of Oracle Database in both
traditional and Cloud deployments. SQL Developer offers complete
end-to-end development of your PL/SQL applications, a worksheet for
running queries and scripts, a DBA console for managing the database,
a reports interface, a complete data modeling solution, and a migration
platform for moving your 3rd party databases to Oracle.
'';
homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ardumont flokli ma27 ];
};
}

10
pkgs/development/tools/database/sqldeveloper/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
let
version = "17.4.1.054.0712";
version = "19.4.0.354.1759";
desktopItem = makeDesktopItem {
name = "sqldeveloper";
@@ -20,7 +20,7 @@ in
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html";
message = ''
This Nix expression requires that ${name} already be part of the store. To
obtain it you need to
@@ -46,7 +46,7 @@ in
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
sha256 = "1hk3hfxyl6ryp4v1l9mgzflban565ayfmm2k412azmw5rnmjf6fv";
};
buildInputs = [ makeWrapper unzip ];
@@ -78,7 +78,7 @@ in
'';
homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ ardumont flokli ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ardumont ma27 ];
};
}

6
pkgs/development/tools/misc/editorconfig-checker/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = "${version}";
sha256 = "0v2ml9r8b5admi3sv80wa1pwl9qnz03q2p84vgcmgg2nv1v6yxf3";
sha256 = "1gn7q6wg7byhr1l5ly60rbb700xrww9slbq7gbxbw5c1fl0pp3yk";
};
modSha256 = "09b1v9gyh6827yqlfxxxq3lcqhd5snn3n7gdlbjmga3wyp2x4g2r";
modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x";
meta = with lib; {
description = "A tool to verify that your files are in harmony with your .editorconfig";

27
pkgs/development/tools/misc/moby/default.nix
View File

@@ -1,27 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "moby";
version = "2017-07-06";
rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
goPackagePath = "github.com/moby/tool";
src = fetchFromGitHub {
owner = "moby";
repo = "tool";
inherit rev;
sha256 = "0xhasm69g5gwihcm8g7rff9nkx7iffvd642bknky6j3w133gs5lp";
};
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0")
'';
meta = {
description = "Assembly tool for the Moby project, an open framework to assemble specialized container systems without reinventing the wheel";
license = lib.licenses.asl20;
homepage = https://mobyproject.org;
platforms = lib.platforms.unix;
};
}