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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-05 00:36:22 +00:00 committed by GitHub
commit 3c4d8b38c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 1175 additions and 1682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -6723,6 +6723,12 @@
githubId = 148037; githubId = 148037;
name = "Joachim Breitner"; name = "Joachim Breitner";
}; };
nomisiv = {
email = "simon@nomisiv.com";
github = "NomisIV";
githubId = 47303199;
name = "Simon Gutgesell";
};
noneucat = { noneucat = {
email = "andy@lolc.at"; email = "andy@lolc.at";
github = "noneucat"; github = "noneucat";

6
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -666,6 +666,12 @@ self: super:
<varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space. <varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>isync</literal>: The <literal>isync</literal> compatibility wrapper was removed and the Master/Slave
terminology has been deprecated and should be replaced with Far/Near in the configuration file.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

4
pkgs/applications/audio/kid3/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kid3"; pname = "kid3";
version = "3.8.4"; version = "3.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc="; sha256 = "sha256-DEZ5J1QendgXJ1gBZ3h0LwsVTLL1vPznJ7Nc+97jFB8=";
}; };
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

4
pkgs/applications/editors/texstudio/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "texstudio"; pname = "texstudio";
version = "3.0.3"; version = "3.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "${pname}-org"; owner = "${pname}-org";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; sha256 = "03q1mdz47crflkvpc364ky52farad7517jhszb1fg1s3c2bnndn0";
}; };
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

4
pkgs/applications/misc/gpsprune/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpsprune"; pname = "gpsprune";
version = "20.1"; version = "20.2";
src = fetchurl { src = fetchurl {
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
sha256 = "sha256-NU2AhqMVxjPyCocjZg5dzwHpTgAIBluMqdKqn4lnknM="; sha256 = "sha256-40GrihCeDAqJCFcg4FMFxCg7bzd6CrDR5JU70e5VHDE=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

14
pkgs/applications/networking/browsers/lagrange/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, nix-update-script
, cmake , cmake
, pkg-config , pkg-config
, libunistring , libunistring
, mpg123
, openssl , openssl
, pcre , pcre
, SDL2 , SDL2
@ -12,19 +14,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lagrange"; pname = "lagrange";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skyjake"; owner = "skyjake";
repo = "lagrange"; repo = "lagrange";
rev = "v${version}"; rev = "v${version}";
sha256 = "04bp5k1byjbzwnmcx4b7sw68pr2jrj4c21z76jq311hyrmanj6fi"; sha256 = "0c7w4a19cwx3bkmbhc9c1wx0zmqd3a1grrj4ffifdic95wdihv7x";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libunistring openssl pcre SDL2 ] buildInputs = [ libunistring mpg123 openssl pcre SDL2 ]
++ lib.optional stdenv.isDarwin AppKit; ++ lib.optional stdenv.isDarwin AppKit;
hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
@ -34,6 +36,12 @@ stdenv.mkDerivation rec {
mv Lagrange.app $out/Applications mv Lagrange.app $out/Applications
'' else null; '' else null;
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; { meta = with lib; {
description = "A Beautiful Gemini Client"; description = "A Beautiful Gemini Client";
homepage = "https://gmi.skyjake.fi/lagrange/"; homepage = "https://gmi.skyjake.fi/lagrange/";

9
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -475,6 +475,15 @@
"sha256": "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf", "sha256": "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf",
"version": "1.1.0" "version": "1.1.0"
}, },
"kafka": {
"owner": "Mongey",
"provider-source-address": "registry.terraform.io/Mongey/kafka",
"repo": "terraform-provider-kafka",
"rev": "v0.2.12",
"sha256": "0jm592chliiph5643rymzpwnlcq7q6bpwg2h86x5qmbzbiyqsi83",
"vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd",
"version": "0.2.12"
},
"ksyun": { "ksyun": {
"owner": "terraform-providers", "owner": "terraform-providers",
"repo": "terraform-provider-ksyun", "repo": "terraform-provider-ksyun",

2
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day";
homepage = "https://www.bluejeans.com"; homepage = "https://www.bluejeans.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ veprbl ]; maintainers = with maintainers; [ ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

33
pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
View File

@ -1,6 +1,6 @@
From 6cf3c2e42d219b9665a43ca65f321c653b0aa102 Mon Sep 17 00:00:00 2001 From c715a96c693baa0e6c8ab3c96b6c10e0a40bf7af Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca> From: Tadeo Kondrak <me@tadeo.ca>
Date: Mon, 28 Oct 2019 08:36:36 -0600 Date: Thu, 21 Jan 2021 10:40:49 +0100
Subject: [PATCH] Fix aerc breaking every time the package is rebuilt. Subject: [PATCH] Fix aerc breaking every time the package is rebuilt.
On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc
@ -8,28 +8,28 @@ fills it in as part of the default config and then installs that config
to the users home folder. Fix this by not substituting @SHAREDIR@ in the to the users home folder. Fix this by not substituting @SHAREDIR@ in the
default config until runtime. default config until runtime.
--- ---
Makefile | 2 +- Makefile | 2 +-
config/config.go | 8 ++++++++ config/config.go | 13 +++++++++++++
2 files changed, 9 insertions(+), 1 deletion(-) 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index d1c755d..1185a96 100644 index 77f5e61..98cbc11 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -24,7 +24,7 @@ aerc: $(GOSRC) @@ -23,7 +23,7 @@ aerc: $(GOSRC)
-o $@ -o $@
aerc.conf: config/aerc.conf.in aerc.conf: config/aerc.conf.in
- sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in - sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in
+ cat config/aerc.conf.in > $@ + cat config/aerc.conf.in > $@
DOCS := \ debug: $(GOSRC)
aerc.1 \ GOFLAGS="-tags=notmuch" \
diff --git a/config/config.go b/config/config.go diff --git a/config/config.go b/config/config.go
index 32d07fc..8ffd3e8 100644 index 87d183a..cb6611a 100644
--- a/config/config.go --- a/config/config.go
+++ b/config/config.go +++ b/config/config.go
@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { @@ -470,6 +470,16 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
return nil, err return nil, err
} }
} }
@ -37,12 +37,16 @@ index 32d07fc..8ffd3e8 100644
+ if key, err := sec.GetKey("template-dirs"); err == nil { + if key, err := sec.GetKey("template-dirs"); err == nil {
+ sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) + sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
+ } + }
+ }
+ if sec, err := file.GetSection("ui"); err == nil {
+ if key, err := sec.GetKey("stylesets-dirs"); err == nil {
+ sec.NewKey("stylesets-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
+ }
+ } + }
file.NameMapper = mapName file.NameMapper = mapName
config := &AercConfig{ config := &AercConfig{
Bindings: BindingConfig{ Bindings: BindingConfig{
@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { @@ -547,6 +557,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
if err = config.LoadConfig(file); err != nil {
return nil, err return nil, err
} }
@ -53,5 +57,4 @@ index 32d07fc..8ffd3e8 100644
if err := ui.MapTo(&config.General); err != nil { if err := ui.MapTo(&config.General); err != nil {
return nil, err return nil, err
-- --
2.23.0 2.30.0

6
pkgs/applications/networking/syncthing/default.nix
View File

@ -3,17 +3,17 @@
let let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
version = "1.12.1"; version = "1.13.1";
name = "${stname}-${version}"; name = "${stname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
sha256 = "1jyqkprb9ps8xc86qnf140wbx5kvshyihxxgym409kfks6dk3cq5"; sha256 = "1jvmcpyj4k43s4hv753pr9a1qg930nac90d5c8haqv30v1rw5pws";
}; };
vendorSha256 = "1xlkc47wfhsf6gzq9sgimlzqnrqdsjgc1zzfkjp3xzbbv5ay7wca"; vendorSha256 = "140b0wqp5ayyyan7ml12jqd72s00cawhmdf8g699j5sav8j6hppi";
doCheck = false; doCheck = false;

6
pkgs/applications/video/shotcut/default.nix
View File

@ -21,17 +21,17 @@
, common-updater-scripts , common-updater-scripts
}: }:
assert lib.versionAtLeast mlt.version "6.22.1"; assert lib.versionAtLeast mlt.version "6.24.0";
mkDerivation rec { mkDerivation rec {
pname = "shotcut"; pname = "shotcut";
version = "20.11.28"; version = "21.01.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "shotcut"; repo = "shotcut";
rev = "v${version}"; rev = "v${version}";
sha256 = "1yr71ihml9wnm7y5pv0gz41l1k6ybd16dk78zxf96kn9b838mzhq"; sha256 = "0Q+63IRY4UbiYS+IMnn7hlr6w3IYtWynjBfTBvtWBMo=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/applications/virtualization/gvisor/default.nix
View File

@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
''; '';
sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34";
}; };
buildAttrs = { buildAttrs = {

34
pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "gruvbox-dark-icons-gtk";
version = "1.0.0";
src = fetchFromGitHub {
owner = "jmattheis";
repo = pname;
rev = "v${version}";
sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2";
};
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ];
installPhase = ''
mkdir -p $out/share/icons/oomox-gruvbox-dark
rm README.md
cp -r * $out/share/icons/oomox-gruvbox-dark
gtk-update-icon-cache $out/share/icons/oomox-gruvbox-dark
'';
dontDropIconThemeCache = true;
meta = with lib; {
description = "Gruvbox icons for GTK based desktop environments";
homepage = "https://github.com/jmattheis/gruvbox-dark-gtk";
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.nomisiv ];
};
}

27
pkgs/data/themes/gruvbox-dark-gtk/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "gruvbox-dark-gtk";
version = "1.0.1";
src = fetchFromGitHub {
owner = "jmattheis";
repo = pname;
rev = "v${version}";
sha256 = "1wf4ybnjdp2kbbvz7pmqdnzk94axaqx5ws18f34hrg4y267n0w4g";
};
installPhase = ''
mkdir -p $out/share/themes/gruvbox-dark
rm -rf README.md LICENSE .github
cp -r * $out/share/themes/gruvbox-dark
'';
meta = with lib; {
description = "Gruvbox theme for GTK based desktop environments";
homepage = "https://github.com/jmattheis/gruvbox-dark-gtk";
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.nomisiv ];
};
}

6
pkgs/development/dhall-modules/Prelude.nix
View File

@ -1,11 +1,11 @@
{ buildDhallGitHubPackage }: { buildDhallGitHubPackage }:
buildDhallGitHubPackage { buildDhallGitHubPackage {
name = "Prelude-20.0.0"; name = "Prelude";
owner = "dhall-lang"; owner = "dhall-lang";
repo = "dhall-lang"; repo = "dhall-lang";
directory = "Prelude"; directory = "Prelude";
file = "package.dhall"; file = "package.dhall";
rev = "v20.0.0"; rev = "v20.1.0";
sha256 = "1smk57xki1cj24xpp0s3gv85radl6ry76ybsjkqak8h13s79lwla"; sha256 = "04r1w7wqydmwm9mh3lz4y96a87k5kkvzsmrhbdrf0izcy5bqqv5y";
} }

29
pkgs/development/libraries/coordgenlibs/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ fetchFromGitHub
, lib
, stdenv
, boost
, zlib
, cmake
, maeparser
}:
stdenv.mkDerivation rec {
pname = "coordgenlibs";
version = "1.4.2";
src = fetchFromGitHub {
owner = "schrodinger";
repo = pname;
rev = "v${version}";
sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost zlib maeparser ];
meta = with lib; {
description = "Schrodinger-developed 2D Coordinate Generation";
maintainers = [ maintainers.rmcgibbo ];
license = licenses.bsd3;
};
}

26
pkgs/development/libraries/inchi/default.nix
View File

@ -1,4 +1,11 @@
{ pkgs, fetchurl, lib, stdenv, unzip }: { pkgs
, fetchurl
, lib
, stdenv
, unzip
, fixDarwinDylibNames
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "inchi"; pname = "inchi";
version = "1.05"; version = "1.05";
@ -7,15 +14,23 @@ stdenv.mkDerivation {
sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c"; sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c";
}; };
nativeBuildInputs = [ pkgs.unzip ]; nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
enableParallelBuilding = true; enableParallelBuilding = true;
preBuild = '' preConfigure = ''
cd ./INCHI_API/libinchi/gcc cd ./INCHI_API/libinchi/gcc
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace makefile \
--replace ",--version-script=libinchi.map" "" \
--replace "LINUX_Z_RELRO = ,-z,relro" "" \
--replace "-soname" "-install_name" \
--replace "gcc" $CC
''; '';
installPhase = '' installPhase = ''
runHook preInstall
cd ../../.. cd ../../..
mkdir -p $out/lib mkdir -p $out/lib
mkdir -p $out/include/inchi mkdir -p $out/include/inchi
@ -29,6 +44,10 @@ stdenv.mkDerivation {
runHook postInstall runHook postInstall
''; '';
preFixup = lib.optionalString stdenv.isDarwin ''
fixDarwinDylibNames $(find "$out" -name "*.so.*")
'';
postInstall = postInstall =
let let
src-doc = fetchurl { src-doc = fetchurl {
@ -45,7 +64,6 @@ stdenv.mkDerivation {
homepage = "https://www.inchi-trust.org/"; homepage = "https://www.inchi-trust.org/";
description = "IUPAC International Chemical Identifier library"; description = "IUPAC International Chemical Identifier library";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ rmcgibbo ]; maintainers = with maintainers; [ rmcgibbo ];
}; };
} }

6
pkgs/development/libraries/libkeyfinder/default.nix
View File

@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv"; sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv";
}; };
# needed for linking libkeyfinder.so into keyfinder-tests executable # needed for finding libkeyfinder.so to link it into keyfinder-tests executable
preBuild = '' cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
export LD_LIBRARY_PATH=$(pwd)
'';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

28
pkgs/development/libraries/maeparser/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ fetchFromGitHub
, lib
, stdenv
, boost
, zlib
, cmake
}:
stdenv.mkDerivation rec {
pname = "maeparser";
version = "1.2.4";
src = fetchFromGitHub {
owner = "schrodinger";
repo = "maeparser";
rev = "v${version}";
sha256 = "1qzp8d58ksy88y4fx1b0x65wycslm7zxzbb8ns28gkjh12xpzhwz";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost zlib ];
meta = with lib; {
description = "maestro file parser";
maintainers = [ maintainers.rmcgibbo ];
license = licenses.mit;
};
}

4
pkgs/development/libraries/mlt/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mlt"; pname = "mlt";
version = "6.22.1"; version = "6.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "mlt"; repo = "mlt";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -26,13 +26,13 @@
let inherit (lib) getDev; in let inherit (lib) getDev; in
mkDerivation rec { mkDerivation rec {
pname = "mlt"; pname = "mlt";
version = "6.22.1"; version = "6.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mltframework"; owner = "mltframework";
repo = "mlt"; repo = "mlt";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9";
}; };
buildInputs = [ buildInputs = [

10
pkgs/development/python-modules/dm-sonnet/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, bazel_0_26
, buildBazelPackage , buildBazelPackage
, buildPythonPackage , buildPythonPackage
, git , git
@ -19,6 +20,8 @@ let
# first build all binaries and generate setup.py using bazel # first build all binaries and generate setup.py using bazel
bazel-build = buildBazelPackage { bazel-build = buildBazelPackage {
bazel = bazel_0_26;
name = "dm-sonnet-bazel-${version}"; name = "dm-sonnet-bazel-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -36,14 +39,9 @@ let
bazelTarget = ":install"; bazelTarget = ":install";
fetchAttrs = { fetchAttrs = {
sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k";
}; };
bazelFlags = [
# https://github.com/deepmind/sonnet/issues/134
"--incompatible_disable_deprecated_attr_params=false"
];
buildAttrs = { buildAttrs = {
preBuild = '' preBuild = ''
patchShebangs . patchShebangs .

20
pkgs/development/python-modules/markdown2/default.nix
View File

@ -1,15 +1,23 @@
{ lib, buildPythonPackage, fetchPypi }: { lib, buildPythonPackage, fetchFromGitHub, python, pygments }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "markdown2"; pname = "markdown2";
version = "2.3.6"; version = "2.4.0";
src = fetchPypi { # PyPI does not contain tests, so using GitHub instead.
inherit pname version; src = fetchFromGitHub {
extension = "zip"; owner = "trentm";
sha256 = "08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05"; repo = "python-markdown2";
rev = version;
sha256 = "sha256:03qmf087phpj0h9hx111k4r5pkm48dhb61mqhp1v75gd09k0z79z";
}; };
checkInputs = [ pygments ];
checkPhase = ''
${python.interpreter} ./test/test.py
'';
meta = with lib; { meta = with lib; {
description = "A fast and complete Python implementation of Markdown"; description = "A fast and complete Python implementation of Markdown";
homepage = "https://github.com/trentm/python-markdown2"; homepage = "https://github.com/trentm/python-markdown2";

157
pkgs/development/python-modules/rdkit/default.nix Normal file
View File

@ -0,0 +1,157 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchzip
, cmake
, boost
, catch
, inchi
, cairo
, eigen
, python
, rapidjson
, maeparser
, coordgenlibs
, numpy
, pandas
, pillow
, git
}:
let
external = {
avalon = fetchzip {
url = "http://sourceforge.net/projects/avalontoolkit/files/AvalonToolkit_1.2/AvalonToolkit_1.2.0.source.tar";
sha256 = "0nhxfxckb5a5qs0g148f55yarhncqjgjzcvdskkv9rxi2nrs7160";
stripRoot = false;
};
yaehmop = fetchFromGitHub {
owner = "greglandrum";
repo = "yaehmop";
rev = "1b13b52e2738a77715b1bad876e3b4e93f2b5269";
sha256 = "1jp7wz8win4mgwxkaz2gnrgsaaqgln04n2lwgfr96isdv1klf62d";
};
freesasa = fetchFromGitHub
{
owner = "mittinatten";
repo = "freesasa";
rev = "2.0.3";
sha256 = "0x686zm9fpyg5647fdgxnxgbwav99nc6ymh4bmkr2063yyda4kzc";
};
};
in
buildPythonPackage rec {
version = "2020.09.3";
pname = "rdkit";
src =
let
versionTag = lib.replaceStrings [ "." ] [ "_" ] version;
in
fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Release_${versionTag}";
sha256 = "1k1wvzcd1yfx4nhz3iq2aaadzdk5w6sfcb4imhvm7pkbzij0nicx";
};
unpackPhase = ''
mkdir -p source/External/AvalonTools/avalon source/External/YAeHMOP/yaehmop source/External/FreeSASA/freesasa
cp -r ${src}/* source
cp -r ${external.avalon}/SourceDistribution/* source/External/AvalonTools/avalon
cp -r ${external.yaehmop}/* source/External/YAeHMOP/yaehmop
cp -r ${external.freesasa}/* source/External/FreeSASA/freesasa
find source -type d -exec chmod 755 {} +
cp source/External/FreeSASA/freesasa2.c source/External/FreeSASA/freesasa/src
ln -s ${rapidjson} source/External/rapidjson-1.1.0
'';
sourceRoot = "source";
nativeBuildInputs = [
cmake
git # required by freesasa
];
buildInputs = [
boost
catch
inchi
eigen
cairo
rapidjson
];
propagatedBuildInputs = [
numpy
pandas
pillow
];
hardeningDisable = [ "format" ]; # required by yaehmop
# doCheck = false;
dontUseSetuptoolsBuild = true;
dontUsePipInstall = true;
dontUseSetuptoolsCheck = true;
preConfigure = ''
# Don't want this contacting the git remote during the build
substituteInPlace External/YAeHMOP/CMakeLists.txt --replace \
'GIT_TAG master' 'DOWNLOAD_COMMAND true'
# Since we can't expand with bash in cmakeFlags
cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')"
cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa"
cmakeFlags="$cmakeFlags -DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa"
cmakeFlags="$cmakeFlags -DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon"
'';
cmakeFlags = [
"-DCATCH_DIR=${catch}/include/catch"
"-DINCHI_LIBRARY=${inchi}/lib/libinchi.so"
"-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so"
"-DINCHI_INCLUDE_DIR=${inchi}/include/inchi"
"-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
"-DRDK_INSTALL_INTREE=OFF"
"-DRDK_INSTALL_STATIC_LIBS=OFF"
"-DRDK_BUILD_INCHI_SUPPORT=ON"
"-DRDK_BUILD_AVALON_SUPPORT=ON"
"-DRDK_BUILD_FREESASA_SUPPORT=ON"
"-DRDK_BUILD_YAEHMOP_SUPPORT=ON"
"-DRDK_BUILD_MAEPARSER_SUPPORT=ON"
"-DMAEPARSER_DIR=${maeparser}"
"-DRDK_BUILD_COORDGEN_SUPPORT=ON"
"-DCOORDGEN_DIR=${coordgenlibs}"
"-DRDK_USE_URF=OFF"
"-DRDK_USE_FLEXBISON=OFF"
"-DRDK_BUILD_CAIRO_SUPPORT=ON"
"-DRDK_BUILD_THREADSAFE_SSS=ON"
"-DRDK_TEST_MULTITHREADED=ON"
"-DRDK_BUILD_CPP_TESTS=ON"
"-DRDK_TEST_MULTITHREADED=ON"
"-DPYTHON_EXECUTABLE=${python}/bin/python"
"-DBOOST_ROOT=${boost}"
"-DBoost_NO_SYSTEM_PATHS=ON"
"-DBoost_NO_BOOST_CMAKE=TRUE"
];
checkPhase = ''
export QT_QPA_PLATFORM='offscreen'
export RDBASE=$(realpath ..)
export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
(cd $RDBASE/rdkit/Chem && python $RDBASE/rdkit/TestRunner.py test_list.py)
'';
pythonImportsCheck = [
"rdkit"
"rdkit.Chem"
"rdkit.Chem.AllChem"
];
meta = with lib; {
description = "Open source toolkit for cheminformatics";
maintainers = [ maintainers.rmcgibbo ];
license = licenses.bsd3;
homepage = "https://www.rdkit.org";
};
}

40
pkgs/development/python-modules/slixmpp/default.nix
View File

@ -1,14 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, substituteAll, aiodns, pyasn1, pyasn1-modules, aiohttp, gnupg, nose }: { lib
, buildPythonPackage
, aiodns
, aiohttp
, fetchPypi
, gnupg
, isPy3k
, pyasn1
, pyasn1-modules
, pytestCheckHook
, substituteAll
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "slixmpp"; pname = "slixmpp";
version = "1.6.0"; version = "1.7.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0jamly1jv31ragpv8yn52av1m48iwl4i7f9knb67vmk8c22rjdwa"; sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc=";
}; };
patches = [ patches = [
@ -18,17 +29,24 @@ buildPythonPackage rec {
}) })
]; ];
propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules aiohttp ]; propagatedBuildInputs = [
aiodns
aiohttp
pyasn1
pyasn1-modules
];
checkInputs = [ nose ]; checkInputs = [ pytestCheckHook ];
checkPhase = '' # Exclude live tests
nosetests --where=tests --exclude=live -i slixtest.py disabledTestFiles = [ "tests/live_test.py" ];
'';
meta = { pythonImportsCheck = [ "slixmpp" ];
meta = with lib; {
description = "Elegant Python library for XMPP"; description = "Elegant Python library for XMPP";
license = lib.licenses.mit; homepage = "https://slixmpp.readthedocs.io/";
homepage = "https://dev.louiz.org/projects/slixmpp"; license = licenses.mit;
maintainers = with maintainers; [ fab ];
}; };
} }

3
pkgs/development/python-modules/tensorflow-probability/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, bazel_0_26
, buildBazelPackage , buildBazelPackage
, buildPythonPackage , buildPythonPackage
, python , python
@ -26,6 +27,8 @@ let
# first build all binaries and generate setup.py using bazel # first build all binaries and generate setup.py using bazel
bazel-wheel = buildBazelPackage { bazel-wheel = buildBazelPackage {
bazel = bazel_0_26;
name = "${pname}-${version}-py2.py3-none-any.whl"; name = "${pname}-${version}-py2.py3-none-any.whl";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -288,9 +288,9 @@ let
fetchAttrs = { fetchAttrs = {
# cudaSupport causes fetch of ncclArchive, resulting in different hashes # cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then sha256 = if cudaSupport then
"0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz" "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4"
else else
"0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9"; "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45";
}; };
buildAttrs = { buildAttrs = {

2
pkgs/development/tools/bazel-watcher/default.nix
View File

@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
''; '';
sha256 = "0yl5rs6y1xifxjfsa9zv8bjcwiky7rxk9y3rmi01pqpsm7ik12a9"; sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg";
}; };
buildAttrs = { buildAttrs = {

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

@ -4,6 +4,7 @@
, git , git
, go , go
, lib , lib
, stdenv
}: }:
buildBazelPackage rec { buildBazelPackage rec {
@ -64,7 +65,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
''; '';
sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi"; sha256 = "1vijh3nl30n8k6xlx6in92pzs70x15akbqiqalk8apgvphvdz8vy";
}; };
buildAttrs = { buildAttrs = {
@ -86,5 +87,6 @@ buildBazelPackage rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.uri-canva ]; maintainers = [ maintainers.uri-canva ];
platforms = platforms.darwin ++ platforms.linux; platforms = platforms.darwin ++ platforms.linux;
broken = stdenv.isDarwin;
}; };
} }

32
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
View File

@ -25,11 +25,11 @@
}: }:
let let
version = "3.3.1"; version = "3.7.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0"; sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy";
}; };
# Update with `eval $(nix-build -A bazel.updater)`, # Update with `eval $(nix-build -A bazel.updater)`,
@ -49,13 +49,15 @@ let
srcs.io_bazel_rules_sass srcs.io_bazel_rules_sass
srcs.platforms srcs.platforms
# `bazel query` wants all of these to be available regardless of platform. # `bazel query` wants all of these to be available regardless of platform.
srcs."java_tools_javac11_darwin-v8.0.zip" srcs."java_tools_javac11_darwin-v10.0.zip"
srcs."java_tools_javac11_linux-v8.0.zip" srcs."java_tools_javac11_linux-v10.0.zip"
srcs."java_tools_javac11_windows-v8.0.zip" srcs."java_tools_javac11_windows-v10.0.zip"
srcs."coverage_output_generator-v2.1.zip" srcs."coverage_output_generator-v2.5.zip"
srcs.build_bazel_rules_nodejs srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.19.0rc1.tar.gz" srcs."android_tools_pkg-0.19.0rc3.tar.gz"
srcs."bazel-toolchains-3.1.0.tar.gz" srcs."bazel-toolchains-3.1.0.tar.gz"
srcs."com_github_grpc_grpc"
srcs.upb
srcs.rules_pkg srcs.rules_pkg
srcs.rules_cc srcs.rules_cc
srcs.rules_java srcs.rules_java
@ -98,7 +100,7 @@ let
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
# Java toolchain used for the build and tests # Java toolchain used for the build and tests
javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}";
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
@ -112,7 +114,7 @@ let
remote_java_tools = stdenv.mkDerivation { remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}"; name = "remote_java_tools_${system}";
src = srcDepsSet."java_tools_javac11_${system}-v8.0.zip"; src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ]; nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ]; buildInputs = [ gcc-unwrapped ];
@ -169,13 +171,19 @@ stdenv.mkDerivation rec {
sourceRoot = "."; sourceRoot = ".";
patches = [ patches = [
./python-shebang.patch
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last # This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string. # argument if it's found to be an empty string.
../trim-last-argument-to-gcc-if-empty.patch ../trim-last-argument-to-gcc-if-empty.patch
# On Darwin, using clang 6 to build fails because of a linker error (see #105573),
# but using clang 7 fails because libarclite_macosx.a cannot be found when linking
# the xcode_locator tool.
# This patch removes using the -fobjc-arc compiler option and makes the code
# compile without automatic reference counting. Caveat: this leaks memory, but
# we accept this fact because xcode_locator is only a short-lived process used during the build.
./no-arc.patch
# --experimental_strict_action_env (which may one day become the default # --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default # see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin"). # action environment to a non hermetic value (e.g. "/usr/local/bin").
@ -371,6 +379,8 @@ stdenv.mkDerivation rec {
src/tools/xcode/stdredirect/BUILD \ src/tools/xcode/stdredirect/BUILD \
tools/osx/BUILD tools/osx/BUILD
substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc

34
pkgs/development/tools/build-managers/bazel/bazel_3/no-arc.patch Normal file
View File

@ -0,0 +1,34 @@
--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100
+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100
@@ -21,10 +21,6 @@
// 6,6.4,6.4.1 = 6.4.1
// 6.3,6.3.0 = 6.3
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
#import <CoreServices/CoreServices.h>
#import <Foundation/Foundation.h>
--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100
+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100
@@ -123,7 +123,6 @@
"macosx",
"clang",
"-mmacosx-version-min=10.9",
- "-fobjc-arc",
"-framework",
"CoreServices",
"-framework",
--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100
+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100
@@ -27,7 +27,7 @@
])
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
-framework Foundation -o $@ $<
"""

20
pkgs/development/tools/build-managers/bazel/bazel_3/python-shebang.patch
View File

@ -1,20 +0,0 @@
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:46:01.608403087 +0200
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:50:52.881398320 +0200
@@ -238,14 +238,15 @@
// TODO(#8685): Remove this special-case handling as part of making the proper shebang a
// property of the Python toolchain configuration.
String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
+ String pythonShebang = "#!/usr/bin/env " + pythonExecutableName;
ruleContext.registerAction(
new SpawnAction.Builder()
.addInput(zipFile)
.addOutput(executable)
.setShellCommand(
shExecutable,
- "echo '#!/usr/bin/env "
- + pythonExecutableName
+ "echo '"
+ + pythonShebang
+ "' | cat - "
+ zipFile.getExecPathString()
+ " > "

344
pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json
View File

@ -39,14 +39,6 @@
"https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
] ]
}, },
"8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": {
"name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip"
]
},
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": {
"name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
"sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
@ -55,6 +47,14 @@
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
] ]
}, },
"9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": {
"name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
"sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
"urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
"https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
]
},
"android_tools_for_testing": { "android_tools_for_testing": {
"name": "android_tools_for_testing", "name": "android_tools_for_testing",
"patch_cmds": [ "patch_cmds": [
@ -65,14 +65,22 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
}, },
"android_tools_pkg-0.19.0rc1.tar.gz": { "android_tools_pkg-0.19.0rc3.tar.gz": {
"name": "android_tools_pkg-0.19.0rc1.tar.gz", "name": "android_tools_pkg-0.19.0rc3.tar.gz",
"sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
]
},
"b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
"name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip",
"sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
"https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
] ]
}, },
"bazel-toolchains-3.1.0.tar.gz": { "bazel-toolchains-3.1.0.tar.gz": {
@ -143,6 +151,21 @@
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
] ]
}, },
"com_github_grpc_grpc": {
"name": "com_github_grpc_grpc",
"patch_args": [
"-p1"
],
"patches": [
"//third_party/grpc:grpc_1.26.0.patch"
],
"sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
"strip_prefix": "grpc-1.26.0",
"urls": [
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
]
},
"com_google_googletest": { "com_google_googletest": {
"name": "com_google_googletest", "name": "com_google_googletest",
"sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
@ -166,20 +189,20 @@
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"patches": [ "patches": [
"//third_party/protobuf:3.11.3.patch" "//third_party/protobuf:3.13.0.patch"
], ],
"sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
"strip_prefix": "protobuf-3.11.3", "strip_prefix": "protobuf-3.13.0",
"urls": [ "urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz" "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
] ]
}, },
"coverage_output_generator-v2.1.zip": { "coverage_output_generator-v2.5.zip": {
"name": "coverage_output_generator-v2.1.zip", "name": "coverage_output_generator-v2.5.zip",
"sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e", "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip" "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
] ]
}, },
"desugar_jdk_libs": { "desugar_jdk_libs": {
@ -199,6 +222,14 @@
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"
] ]
}, },
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": {
"name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
"sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
"urls": [
"https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
"https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
]
},
"io_bazel_rules_sass": { "io_bazel_rules_sass": {
"name": "io_bazel_rules_sass", "name": "io_bazel_rules_sass",
"sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647", "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
@ -217,25 +248,25 @@
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
] ]
}, },
"java_tools_javac11_darwin-v8.0.zip": { "java_tools_javac11_darwin-v10.0.zip": {
"name": "java_tools_javac11_darwin-v8.0.zip", "name": "java_tools_javac11_darwin-v10.0.zip",
"sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
] ]
}, },
"java_tools_javac11_linux-v8.0.zip": { "java_tools_javac11_linux-v10.0.zip": {
"name": "java_tools_javac11_linux-v8.0.zip", "name": "java_tools_javac11_linux-v10.0.zip",
"sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
] ]
}, },
"java_tools_javac11_windows-v8.0.zip": { "java_tools_javac11_windows-v10.0.zip": {
"name": "java_tools_javac11_windows-v8.0.zip", "name": "java_tools_javac11_windows-v10.0.zip",
"sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
] ]
}, },
"java_tools_langtools_javac11": { "java_tools_langtools_javac11": {
@ -245,13 +276,6 @@
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
] ]
}, },
"java_tools_langtools_javac12": {
"name": "java_tools_langtools_javac12",
"sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip"
]
},
"openjdk11_darwin_archive": { "openjdk11_darwin_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk11_darwin_archive", "name": "openjdk11_darwin_archive",
@ -279,31 +303,31 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
] ]
}, },
"openjdk12_darwin_archive": { "openjdk14_darwin_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_darwin_archive", "name": "openjdk14_darwin_archive",
"sha256": "67ca9d285056132ebb19fa237a14affda52132142e1171fe1c20e18974b3b8a5", "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-macosx_x64", "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
"urls": [ "urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-macosx_x64.tar.gz" "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
] ]
}, },
"openjdk12_linux_archive": { "openjdk14_linux_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_linux_archive", "name": "openjdk14_linux_archive",
"sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
"urls": [ "urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
] ]
}, },
"openjdk12_windows_archive": { "openjdk14_windows_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_windows_archive", "name": "openjdk14_windows_archive",
"sha256": "cf28404c23c3aa1115363ba6e796c30580a768e1d7d6681a7d053e516008e00d", "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-win_x64", "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
"urls": [ "urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-win_x64.zip" "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
] ]
}, },
"openjdk_linux": { "openjdk_linux": {
@ -351,8 +375,17 @@
"name": "openjdk_linux_ppc64le_vanilla", "name": "openjdk_linux_ppc64le_vanilla",
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"urls": [ "urls": [
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
]
},
"openjdk_linux_s390x_vanilla": {
"downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
"name": "openjdk_linux_s390x_vanilla",
"sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
"urls": [
"https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
] ]
}, },
"openjdk_linux_vanilla": { "openjdk_linux_vanilla": {
@ -430,9 +463,9 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e", "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip" "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
] ]
}, },
"remote_java_tools_darwin_for_testing": { "remote_java_tools_darwin_for_testing": {
@ -445,10 +478,10 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip", "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_darwin-v8.0.zip" "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip"
] ]
}, },
"remote_java_tools_javac11_test_darwin": { "remote_java_tools_javac11_test_darwin": {
@ -461,9 +494,9 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1", "sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
] ]
}, },
"remote_java_tools_javac11_test_linux": { "remote_java_tools_javac11_test_linux": {
@ -476,9 +509,9 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
] ]
}, },
"remote_java_tools_javac11_test_windows": { "remote_java_tools_javac11_test_windows": {
@ -491,54 +524,9 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip" "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
]
},
"remote_java_tools_javac12_test_darwin": {
"name": "remote_java_tools_javac12_test_darwin",
"patch_cmds": [
"test -f BUILD && chmod u+w BUILD || true",
"echo >> BUILD",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
],
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "54df966e7583bafe659e39b4103a4ce934201d969de638d071ada07d8e0c1a3a",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_darwin-v3.0.zip"
]
},
"remote_java_tools_javac12_test_linux": {
"name": "remote_java_tools_javac12_test_linux",
"patch_cmds": [
"test -f BUILD && chmod u+w BUILD || true",
"echo >> BUILD",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
],
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "3997ee9a57b095748f1c0d084839fab2fbc72504aeb7b37b1f71c31738d330e3",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_linux-v3.0.zip"
]
},
"remote_java_tools_javac12_test_windows": {
"name": "remote_java_tools_javac12_test_windows",
"patch_cmds": [
"test -f BUILD && chmod u+w BUILD || true",
"echo >> BUILD",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
],
"patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "cfad1718dad1fed12816748eed27ab30b9ea1268c8ce9940acf3b5b7d82d483d",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_windows-v3.0.zip"
] ]
}, },
"remote_java_tools_linux_for_testing": { "remote_java_tools_linux_for_testing": {
@ -551,10 +539,10 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e", "sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip", "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_linux-v8.0.zip" "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip"
] ]
}, },
"remote_java_tools_windows_for_testing": { "remote_java_tools_windows_for_testing": {
@ -567,10 +555,10 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430", "sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
"urls": [ "urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip", "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_windows-v8.0.zip" "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip"
] ]
}, },
"remotejdk11_linux_aarch64_for_testing": { "remotejdk11_linux_aarch64_for_testing": {
@ -621,8 +609,26 @@
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
"strip_prefix": "jdk-11.0.7+10", "strip_prefix": "jdk-11.0.7+10",
"urls": [ "urls": [
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
]
},
"remotejdk11_linux_s390x_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk11_linux_s390x_for_testing",
"patch_cmds": [
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
"echo >> BUILD.bazel",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
],
"patch_cmds_win": [
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
"strip_prefix": "jdk-11.0.7+10",
"urls": [
"https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
] ]
}, },
"remotejdk11_macos_for_testing": { "remotejdk11_macos_for_testing": {
@ -659,6 +665,57 @@
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
] ]
}, },
"remotejdk14_linux_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk14_linux_for_testing",
"patch_cmds": [
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
"echo >> BUILD.bazel",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
],
"patch_cmds_win": [
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
]
},
"remotejdk14_macos_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk14_macos_for_testing",
"patch_cmds": [
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
"echo >> BUILD.bazel",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
],
"patch_cmds_win": [
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
]
},
"remotejdk14_win_for_testing": {
"build_file": "@local_jdk//:BUILD.bazel",
"name": "remotejdk14_win_for_testing",
"patch_cmds": [
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
"echo >> BUILD.bazel",
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
],
"patch_cmds_win": [
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
],
"sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
]
},
"rules_cc": { "rules_cc": {
"name": "rules_cc", "name": "rules_cc",
"patch_cmds": [ "patch_cmds": [
@ -669,11 +726,11 @@
"patch_cmds_win": [ "patch_cmds_win": [
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
], ],
"sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f", "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
"strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0", "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
"urls": [ "urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip" "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
] ]
}, },
"rules_java": { "rules_java": {
@ -742,12 +799,35 @@
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
] ]
}, },
"v3.11.3.tar.gz": { "upb": {
"name": "v3.11.3.tar.gz", "name": "upb",
"sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", "patch_args": [
"-p1"
],
"patches": [
"//third_party/grpc:upb_gcc10_fix.patch"
],
"sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
"strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482",
"urls": [ "urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz" "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
]
},
"v1.26.0.tar.gz": {
"name": "v1.26.0.tar.gz",
"sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
"urls": [
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
]
},
"v3.13.0.tar.gz": {
"name": "v3.13.0.tar.gz",
"sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
"urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
] ]
}, },
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": { "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": {

3
pkgs/development/tools/build-managers/bazel/update-srcDeps.py
View File

@ -47,6 +47,9 @@ def winsdk_configure(*args, **kw): pass
def register_local_rc_exe_toolchains(*args, **kw): pass def register_local_rc_exe_toolchains(*args, **kw): pass
def register_toolchains(*args, **kw): pass def register_toolchains(*args, **kw): pass
def debian_deps(): pass def debian_deps(): pass
def grpc_deps(): pass
def grpc_extra_deps(): pass
def bazel_skylib_workspace(): pass
# execute the WORKSPACE like it was python code in this module, # execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above. # using all the function stubs from above.

4
pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec { buildGoModule rec {
pname = "fcct"; pname = "fcct";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coreos"; owner = "coreos";
repo = "fcct"; repo = "fcct";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kdsnsp9nzkkfwakcx64md66yz2k7cpw8bkhdv798yirbrqprgp6"; sha256 = "0gxaj2fy889fl5vhb4s89rhih9a65aqjsz2yffhi5z4fa2im8szv";
}; };
vendorSha256 = null; vendorSha256 = null;

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -4,11 +4,11 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-make"; pname = "cargo-make";
version = "0.32.11"; version = "0.32.12";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-A61CZwJiXrsrBqTU15fAR1PTEbDsrgN3gwaIPPjQi2M="; sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoSha256 = "sha256-GvizO979sVuEogIJHzjsHD8SWNCf2XgCSRTIESRUe7A="; cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw=";
# Some tests fail because they need network access. # Some tests fail because they need network access.
# However, Travis ensures a proper build. # However, Travis ensures a proper build.

17
pkgs/games/osu-lazer/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk, dotnet-netcore, dotnetPackages , dotnetCorePackages, dotnetPackages, cacert
, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins , ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins
}: }:
@ -8,24 +8,31 @@ let
ffmpeg_4 alsaLib SDL2 lttng-ust numactl ffmpeg_4 alsaLib SDL2 lttng-ust numactl
]; ];
dotnet-sdk = dotnetCorePackages.sdk_5_0;
dotnet-net = dotnetCorePackages.net_5_0;
# https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids
runtimeId = "linux-x64"; runtimeId = "linux-x64";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2020.1225.0"; version = "2021.129.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
rev = version; rev = version;
sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0="; sha256 = "AVx842Zq3mq59VCPdF94mcx5uOr70SmkV/tMNkNyMSY=";
}; };
patches = [ ./bypass-tamper-detection.patch ]; patches = [ ./bypass-tamper-detection.patch ];
patchFlags = [ "--binary" "-p1" ]; patchFlags = [ "--binary" "-p1" ];
nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; nativeBuildInputs = [
dotnet-sdk dotnetPackages.Nuget makeWrapper
# FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49
cacert
];
nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
fetchNuGet = { name, version, sha256 }: fetchurl { fetchNuGet = { name, version, sha256 }: fetchurl {
@ -75,7 +82,7 @@ in stdenv.mkDerivation rec {
--output $out/lib/osu --output $out/lib/osu
makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \
--set DOTNET_ROOT "${dotnet-netcore}" \ --set DOTNET_ROOT "${dotnet-net}" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
for i in 16 32 48 64 96 128 256 512 1024; do for i in 16 32 48 64 96 128 256 512 1024; do
install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png

965
pkgs/games/osu-lazer/deps.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/games/osu-lazer/osu.runtimeconfig.json
View File

@ -1,9 +1,9 @@
{ {
"runtimeOptions": { "runtimeOptions": {
"tfm": "netcoreapp3.1", "tfm": "net5.0",
"framework": { "framework": {
"name": "Microsoft.NETCore.App", "name": "Microsoft.NETCore.App",
"version": "3.1.0" "version": "5.0.0"
} }
} }
} }

2
pkgs/games/osu-lazer/update.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 #!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
set -eo pipefail set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"

47
pkgs/servers/gonic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchFromGitHub { lib, buildGoModule, fetchFromGitHub
, pkg-config, taglib, alsaLib , pkg-config, taglib, alsaLib
# Disable on-the-fly transcoding, # Disable on-the-fly transcoding,
@ -7,53 +7,26 @@
# to the original file, but if transcoding is configured # to the original file, but if transcoding is configured
# that takes a while. So best to disable all transcoding # that takes a while. So best to disable all transcoding
# in the configuration if you disable transcodingSupport. # in the configuration if you disable transcodingSupport.
, transcodingSupport ? true, ffmpeg , transcodingSupport ? true, ffmpeg }:
# udpater
, writers, vgo2nix }:
assert transcodingSupport -> ffmpeg != null;
let
# update these, then run `updateScript` to update dependencies
version = "0.11.0";
rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea";
sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9";
buildGoModule rec {
pname = "gonic";
version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sentriz"; owner = "sentriz";
repo = "gonic"; repo = pname;
inherit rev sha256; rev = "6c69bd3be6279f743c83596c4f0fc12798fdb26a";
sha256 = "1igb2lbkc1nfxp49id3yxql9sbdqr467661jcgnchcnbayj4d664";
}; };
in
buildGoPackage {
pname = "gonic-${version}";
inherit version src;
goPackagePath = "go.senan.xyz/gonic";
goDeps = ./deps.nix;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ]; buildInputs = [ taglib alsaLib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
postPatch = lib.optionalString transcodingSupport ''
substituteInPlace \
server/encode/encode.go \
--replace \
'ffmpegPath = "/usr/bin/ffmpeg"' \
'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \
'';
passthru.updateScript = writers.writeDash "update-gonic" ''
${vgo2nix}/bin/vgo2nix \
-dir ${src} \
-outfile ${lib.escapeShellArg (toString ./deps.nix)}
'';
meta = { meta = {
homepage = "https://github.com/sentriz/gonic"; homepage = "https://github.com/sentriz/gonic";
description = "Music streaming server / subsonic server API implementation"; description = "Music streaming server / subsonic server API implementation";
license = lib.licenses.gpl3; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ Profpatsch ]; maintainers = with lib.maintainers; [ Profpatsch ];
}; };
} }

795
pkgs/servers/gonic/deps.nix generated
View File

@ -1,795 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://github.com/googleapis/google-cloud-go";
rev = "v0.33.1";
sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v";
};
}
{
goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
fetch = {
type = "git";
url = "https://dmitri.shuralyov.com/gpu/mtl";
rev = "666a987793e9";
sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/BurntSushi/xgb";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/xgb";
rev = "27f122750802";
sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
};
}
{
goPackagePath = "github.com/Masterminds/goutils";
fetch = {
type = "git";
url = "https://github.com/Masterminds/goutils";
rev = "v1.1.0";
sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
};
}
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
type = "git";
url = "https://github.com/Masterminds/semver";
rev = "v1.5.0";
sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx";
};
}
{
goPackagePath = "github.com/Masterminds/sprig";
fetch = {
type = "git";
url = "https://github.com/Masterminds/sprig";
rev = "v2.22.0";
sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd";
};
}
{
goPackagePath = "github.com/OneOfOne/xxhash";
fetch = {
type = "git";
url = "https://github.com/OneOfOne/xxhash";
rev = "v1.2.2";
sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
};
}
{
goPackagePath = "github.com/cespare/xxhash";
fetch = {
type = "git";
url = "https://github.com/cespare/xxhash";
rev = "v1.1.0";
sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
};
}
{
goPackagePath = "github.com/d4l3k/messagediff";
fetch = {
type = "git";
url = "https://github.com/d4l3k/messagediff";
rev = "7e0a312ae40b";
sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/denisenkom/go-mssqldb";
fetch = {
type = "git";
url = "https://github.com/denisenkom/go-mssqldb";
rev = "732737034ffd";
sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf";
};
}
{
goPackagePath = "github.com/disintegration/imaging";
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
rev = "v1.6.2";
sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5";
};
}
{
goPackagePath = "github.com/dustin/go-humanize";
fetch = {
type = "git";
url = "https://github.com/dustin/go-humanize";
rev = "v1.0.0";
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
};
}
{
goPackagePath = "github.com/erikstmartin/go-testdb";
fetch = {
type = "git";
url = "https://github.com/erikstmartin/go-testdb";
rev = "8d10e4a1bae5";
sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq";
};
}
{
goPackagePath = "github.com/faiface/beep";
fetch = {
type = "git";
url = "https://github.com/faiface/beep";
rev = "v1.0.2";
sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "v1.0.0";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "v1.1.1";
sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d";
};
}
{
goPackagePath = "github.com/go-audio/audio";
fetch = {
type = "git";
url = "https://github.com/go-audio/audio";
rev = "v1.0.0";
sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3";
};
}
{
goPackagePath = "github.com/go-audio/riff";
fetch = {
type = "git";
url = "https://github.com/go-audio/riff";
rev = "v1.0.0";
sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4";
};
}
{
goPackagePath = "github.com/go-audio/wav";
fetch = {
type = "git";
url = "https://github.com/go-audio/wav";
rev = "v1.0.0";
sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk";
};
}
{
goPackagePath = "github.com/go-gl/glfw";
fetch = {
type = "git";
url = "https://github.com/go-gl/glfw";
rev = "6f7a984d4dc4";
sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "v1.5.0";
sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
};
}
{
goPackagePath = "github.com/gofrs/uuid";
fetch = {
type = "git";
url = "https://github.com/gofrs/uuid";
rev = "v3.2.0";
sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz";
};
}
{
goPackagePath = "github.com/golang-sql/civil";
fetch = {
type = "git";
url = "https://github.com/golang-sql/civil";
rev = "cb61b32ac6fe";
sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.2.0";
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.2.0";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "v1.1.1";
sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
{
goPackagePath = "github.com/gopherjs/gopherjs";
fetch = {
type = "git";
url = "https://github.com/gopherjs/gopherjs";
rev = "0210a2f0f73c";
sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j";
};
}
{
goPackagePath = "github.com/gopherjs/gopherwasm";
fetch = {
type = "git";
url = "https://github.com/gopherjs/gopherwasm";
rev = "v1.0.0";
sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri";
};
}
{
goPackagePath = "github.com/gorilla/context";
fetch = {
type = "git";
url = "https://github.com/gorilla/context";
rev = "v1.1.1";
sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
};
}
{
goPackagePath = "github.com/gorilla/mux";
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
rev = "v1.7.4";
sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh";
};
}
{
goPackagePath = "github.com/gorilla/securecookie";
fetch = {
type = "git";
url = "https://github.com/gorilla/securecookie";
rev = "v1.1.1";
sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410";
};
}
{
goPackagePath = "github.com/gorilla/sessions";
fetch = {
type = "git";
url = "https://github.com/gorilla/sessions";
rev = "v1.2.0";
sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1";
};
}
{
goPackagePath = "github.com/hajimehoshi/go-mp3";
fetch = {
type = "git";
url = "https://github.com/hajimehoshi/go-mp3";
rev = "v0.2.1";
sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg";
};
}
{
goPackagePath = "github.com/hajimehoshi/oto";
fetch = {
type = "git";
url = "https://github.com/hajimehoshi/oto";
rev = "v0.6.1";
sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h";
};
}
{
goPackagePath = "github.com/huandu/xstrings";
fetch = {
type = "git";
url = "https://github.com/huandu/xstrings";
rev = "v1.3.1";
sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy";
};
}
{
goPackagePath = "github.com/icza/bitio";
fetch = {
type = "git";
url = "https://github.com/icza/bitio";
rev = "v1.0.0";
sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w";
};
}
{
goPackagePath = "github.com/icza/mighty";
fetch = {
type = "git";
url = "https://github.com/icza/mighty";
rev = "cfd07d671de6";
sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
type = "git";
url = "https://github.com/imdario/mergo";
rev = "v0.3.9";
sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90";
};
}
{
goPackagePath = "github.com/jfreymuth/oggvorbis";
fetch = {
type = "git";
url = "https://github.com/jfreymuth/oggvorbis";
rev = "v1.0.0";
sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a";
};
}
{
goPackagePath = "github.com/jfreymuth/vorbis";
fetch = {
type = "git";
url = "https://github.com/jfreymuth/vorbis";
rev = "v1.0.0";
sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a";
};
}
{
goPackagePath = "github.com/jinzhu/gorm";
fetch = {
type = "git";
url = "https://github.com/jinzhu/gorm";
rev = "v1.9.12";
sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3";
};
}
{
goPackagePath = "github.com/jinzhu/inflection";
fetch = {
type = "git";
url = "https://github.com/jinzhu/inflection";
rev = "v1.0.0";
sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy";
};
}
{
goPackagePath = "github.com/jinzhu/now";
fetch = {
type = "git";
url = "https://github.com/jinzhu/now";
rev = "v1.0.1";
sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p";
};
}
{
goPackagePath = "github.com/joho/godotenv";
fetch = {
type = "git";
url = "https://github.com/joho/godotenv";
rev = "v1.3.0";
sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
};
}
{
goPackagePath = "github.com/josephburnett/jd";
fetch = {
type = "git";
url = "https://github.com/josephburnett/jd";
rev = "aa1a7c66b42f";
sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c";
};
}
{
goPackagePath = "github.com/karrick/godirwalk";
fetch = {
type = "git";
url = "https://github.com/karrick/godirwalk";
rev = "v1.15.6";
sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c";
};
}
{
goPackagePath = "github.com/kr/pretty";
fetch = {
type = "git";
url = "https://github.com/kr/pretty";
rev = "v0.1.0";
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
};
}
{
goPackagePath = "github.com/kr/pty";
fetch = {
type = "git";
url = "https://github.com/kr/pty";
rev = "v1.1.1";
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
};
}
{
goPackagePath = "github.com/kr/text";
fetch = {
type = "git";
url = "https://github.com/kr/text";
rev = "v0.1.0";
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "v1.3.0";
sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "12d3b2882a08";
sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "v0.0.4";
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
};
}
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "v2.0.3";
sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv";
};
}
{
goPackagePath = "github.com/mewkiz/flac";
fetch = {
type = "git";
url = "https://github.com/mewkiz/flac";
rev = "v1.0.6";
sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx";
};
}
{
goPackagePath = "github.com/mewkiz/pkg";
fetch = {
type = "git";
url = "https://github.com/mewkiz/pkg";
rev = "f6b5e26764c3";
sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2";
};
}
{
goPackagePath = "github.com/mitchellh/copystructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/copystructure";
rev = "v1.0.0";
sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
};
}
{
goPackagePath = "github.com/mitchellh/go-wordwrap";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-wordwrap";
rev = "v1.0.0";
sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
};
}
{
goPackagePath = "github.com/mitchellh/reflectwalk";
fetch = {
type = "git";
url = "https://github.com/mitchellh/reflectwalk";
rev = "v1.0.1";
sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx";
};
}
{
goPackagePath = "github.com/nicksellen/audiotags";
fetch = {
type = "git";
url = "https://github.com/nicksellen/audiotags";
rev = "94015fa599bd";
sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j";
};
}
{
goPackagePath = "github.com/oklog/run";
fetch = {
type = "git";
url = "https://github.com/oklog/run";
rev = "v1.1.0";
sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk";
};
}
{
goPackagePath = "github.com/oxtoacart/bpool";
fetch = {
type = "git";
url = "https://github.com/oxtoacart/bpool";
rev = "03653db5a59c";
sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "v1.6.0";
sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
};
}
{
goPackagePath = "github.com/peterbourgon/ff";
fetch = {
type = "git";
url = "https://github.com/peterbourgon/ff";
rev = "v1.7.0";
sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.9.1";
sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/rainycape/unidecode";
fetch = {
type = "git";
url = "https://github.com/rainycape/unidecode";
rev = "cb7f23ec59be";
sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5";
};
}
{
goPackagePath = "github.com/spaolacci/murmur3";
fetch = {
type = "git";
url = "https://github.com/spaolacci/murmur3";
rev = "f09979ecbc72";
sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.0";
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "github.com/wader/gormstore";
fetch = {
type = "git";
url = "https://github.com/wader/gormstore";
rev = "65a111a20c23";
sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "06a226fb4e37";
sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5";
};
}
{
goPackagePath = "golang.org/x/exp";
fetch = {
type = "git";
url = "https://go.googlesource.com/exp";
rev = "00229845015e";
sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff";
};
}
{
goPackagePath = "golang.org/x/image";
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "33d19683fad8";
sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk";
};
}
{
goPackagePath = "golang.org/x/mobile";
fetch = {
type = "git";
url = "https://go.googlesource.com/mobile";
rev = "4c31acba0007";
sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c";
};
}
{
goPackagePath = "golang.org/x/mod";
fetch = {
type = "git";
url = "https://go.googlesource.com/mod";
rev = "331c550502dd";
sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "3b0461eec859";
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "112230192c58";
sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "fe76b779f299";
sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "b753a1ba74fa";
sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv";
};
}
{
goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
url = "https://go.googlesource.com/xerrors";
rev = "1b5146add898";
sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.4.0";
sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
};
}
{
goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1";
fetch = {
type = "git";
url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1";
rev = "v1.3.0";
sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "788fd7840127";
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
};
}
{
goPackagePath = "gopkg.in/gormigrate.v1";
fetch = {
type = "git";
url = "https://gopkg.in/gormigrate.v1";
rev = "v1.6.0";
sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.4";
sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
};
}
]

2
pkgs/servers/http/envoy/default.nix
View File

@ -56,7 +56,7 @@ buildBazelPackage rec {
]; ];
fetchAttrs = { fetchAttrs = {
sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM="; sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0";
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
preInstall = '' preInstall = ''
# Strip out the path to the build location (by deleting the comment line). # Strip out the path to the build location (by deleting the comment line).

6
pkgs/tools/X11/opentabletdriver/default.nix
View File

@ -23,18 +23,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "OpenTabletDriver"; pname = "OpenTabletDriver";
version = "0.5.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "InfinityGhost"; owner = "InfinityGhost";
repo = "OpenTabletDriver"; repo = "OpenTabletDriver";
rev = "v${version}"; rev = "v${version}";
sha256 = "1xi97nn5zb4fs3pyyqznvxnz07j30j3p967s7jigjmlm9321vkqp"; sha256 = "1if2mkj193yzf5si9pwaynrm6wkhqy7ihk4k1lklzcryk5675w36";
}; };
debPkg = fetchurl { debPkg = fetchurl {
url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";
sha256 = "06m2g5qvc02ga9f98f2ssa7wr2b7b2qm90qwaf17fz5z8rr0qmp0"; sha256 = "16a1rr0yxra1dhwysbbfgsxpigh2jhjlsl7r28dgp8qcxncck7wg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/tools/networking/goimapnotify/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoPackage, fetchFromGitLab, lib }: { buildGoPackage, fetchFromGitLab, lib, runtimeShell }:
buildGoPackage rec { buildGoPackage rec {
pname = "goimapnotify"; pname = "goimapnotify";
@ -13,6 +13,10 @@ buildGoPackage rec {
sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42";
}; };
postPatch = ''
substituteInPlace command.go --replace '"sh"' '"${runtimeShell}"'
'';
goDeps = ./deps.nix; goDeps = ./deps.nix;
meta = with lib; { meta = with lib; {

10
pkgs/tools/networking/isync/default.nix
View File

@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl, pkg-config, perl { lib, stdenv, fetchurl, pkg-config, perl
, openssl, db, zlib, cyrus_sasl , openssl, db, cyrus_sasl, zlib
, Security
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "isync"; pname = "isync";
version = "1.3.4"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
sha256 = "0w9fqz1qsdm1zfpv9jp5v2dav6pyigf1n6x7asxi0fg58sf49sz8"; sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44";
}; };
nativeBuildInputs = [ pkg-config perl ]; nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ openssl db cyrus_sasl zlib ]; buildInputs = [ openssl db cyrus_sasl zlib ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; { meta = with lib; {
homepage = "http://isync.sourceforge.net/"; homepage = "http://isync.sourceforge.net/";

25
pkgs/tools/text/each/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "each";
version = "0.1.3";
src = fetchFromGitHub {
owner = "arraypad";
repo = pname;
rev = "v${version}";
sha256 = "04rx8jf871l4darfx6029dhpnbpmzwjgzazayp1qcaadsk8207z5";
};
cargoSha256 = "1rcmymjff9sc0dv4zplklivfws14wqx6q4ky47arg6jkj3dyprp8";
meta = with lib; {
description = " A better way of working with structured data on the command line";
homepage = "https://github.com/arraypad/each";
license = with licenses; [ mit ];
maintainers = with maintainers; [ thiagokokada ];
};
}

27
pkgs/top-level/all-packages.nix
View File

@ -218,6 +218,8 @@ in
containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; containerpilot = callPackage ../applications/networking/cluster/containerpilot { };
coordgenlibs = callPackage ../development/libraries/coordgenlibs { };
cp437 = callPackage ../tools/misc/cp437 { }; cp437 = callPackage ../tools/misc/cp437 { };
cpu-x = callPackage ../applications/misc/cpu-x { }; cpu-x = callPackage ../applications/misc/cpu-x { };
@ -230,6 +232,8 @@ in
deadcode = callPackage ../development/tools/deadcode { }; deadcode = callPackage ../development/tools/deadcode { };
each = callPackage ../tools/text/each { };
eclipse-mat = callPackage ../development/tools/eclipse-mat { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { };
glade = callPackage ../development/tools/glade { }; glade = callPackage ../development/tools/glade { };
@ -5327,7 +5331,9 @@ in
ispike = callPackage ../development/libraries/science/robotics/ispike { }; ispike = callPackage ../development/libraries/science/robotics/ispike { };
isync = callPackage ../tools/networking/isync { }; isync = callPackage ../tools/networking/isync {
inherit (darwin.apple_sdk.frameworks) Security;
};
itm-tools = callPackage ../development/tools/misc/itm-tools { }; itm-tools = callPackage ../development/tools/misc/itm-tools { };
@ -6059,6 +6065,8 @@ in
madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; madlang = haskell.lib.justStaticExecutables haskellPackages.madlang;
maeparser = callPackage ../development/libraries/maeparser { };
mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { };
maildrop = callPackage ../tools/networking/maildrop { }; maildrop = callPackage ../tools/networking/maildrop { };
@ -11721,10 +11729,10 @@ in
bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 {
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8_headless; buildJdk = jdk11_headless;
buildJdkName = "jdk8"; buildJdkName = "java11";
runJdk = jdk11_headless; runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
bazel_self = bazel_3; bazel_self = bazel_3;
}; };
@ -20333,6 +20341,12 @@ in
greybird = callPackage ../data/themes/greybird { }; greybird = callPackage ../data/themes/greybird { };
gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { };
gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk {
inherit (plasma5Packages) breeze-icons;
};
gubbi-font = callPackage ../data/fonts/gubbi { }; gubbi-font = callPackage ../data/fonts/gubbi { };
gyre-fonts = callPackage ../data/fonts/gyre {}; gyre-fonts = callPackage ../data/fonts/gyre {};
@ -24081,10 +24095,7 @@ in
osmium-tool = callPackage ../applications/misc/osmium-tool { }; osmium-tool = callPackage ../applications/misc/osmium-tool { };
osu-lazer = callPackage ../games/osu-lazer { osu-lazer = callPackage ../games/osu-lazer { };
dotnet-sdk = dotnetCorePackages.sdk_3_1;
dotnet-netcore = dotnetCorePackages.netcore_3_1;
};
owamp = callPackage ../applications/networking/owamp { }; owamp = callPackage ../applications/networking/owamp { };

2
pkgs/top-level/python-packages.nix
View File

@ -6662,6 +6662,8 @@ in {
rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
rdkit = callPackage ../development/python-modules/rdkit { };
re-assert = callPackage ../development/python-modules/re-assert { }; re-assert = callPackage ../development/python-modules/re-assert { };
readchar = callPackage ../development/python-modules/readchar { }; readchar = callPackage ../development/python-modules/readchar { };