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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-18 00:42:45 +00:00 committed by GitHub
commit abb757ba28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 410 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -210,6 +210,7 @@ in
magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};
magnetico = handleTest ./magnetico.nix {};
mailcatcher = handleTest ./mailcatcher.nix {};
mailhog = handleTest ./mailhog.nix {};
mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {};
mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {};
matomo = handleTest ./matomo.nix {};

24
nixos/tests/mailhog.nix Normal file
View File

@ -0,0 +1,24 @@
import ./make-test-python.nix ({ lib, ... }: {
name = "mailhog";
meta.maintainers = with lib.maintainers; [ jojosch ];
machine = { pkgs, ... }: {
services.mailhog.enable = true;
environment.systemPackages = with pkgs; [ swaks ];
};
testScript = ''
start_all()
machine.wait_for_unit("mailhog.service")
machine.wait_for_open_port("1025")
machine.wait_for_open_port("8025")
machine.succeed(
'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
)
assert "this is the body of the email" in machine.succeed(
"curl --fail http://localhost:8025/api/v2/messages"
)
'';
})

8
pkgs/applications/audio/noisetorch/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "NoiseTorch";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "lawl";
repo = "NoiseTorch";
rev = version;
sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf";
sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg";
};
patches = [ ./version.patch ./embedlibrnnoise.patch ];
patches = [ ./version.patch ];
vendorSha256 = null;
@ -21,6 +21,8 @@ buildGoModule rec {
buildInputs = [ rnnoise-plugin ];
postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'";
preBuild = ''
export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
go generate;

13
pkgs/applications/audio/noisetorch/embedlibrnnoise.patch
View File

@ -1,13 +0,0 @@
diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go
index 43daf80..0b3004b 100644
--- a/scripts/embedlibrnnoise.go
+++ b/scripts/embedlibrnnoise.go
@@ -8,7 +8,7 @@ import (
)
func main() {
- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so")
+ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN"))
if err != nil {
fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err)
os.Exit(1)

10
pkgs/applications/graphics/xournalpp/default.nix
View File

@ -4,7 +4,7 @@
, cmake
, gettext
, wrapGAppsHook
, pkgconfig
, pkg-config
, glib
, gsettings-desktop-schemas
@ -22,16 +22,16 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.0.19";
version = "1.0.20";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq";
sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k";
};
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
buildInputs =
[ glib
gsettings-desktop-schemas
@ -50,8 +50,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
homepage = "https://xournalpp.github.io/";

6
pkgs/applications/misc/tasknc/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }:
stdenv.mkDerivation rec {
version = "2017-05-15";
version = "2020-12-17";
pname = "tasknc";
src = fetchFromGitHub {
owner = "lharding";
repo = "tasknc";
rev = "c41d0240e9b848e432f01de735f28de93b934ae7";
sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr";
rev = "a182661fbcc097a933d5e8cce3922eb1734a563e";
sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56";
};
nativeBuildInputs = [

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "88.0.4324.41",
"sha256": "06hnawylr7fl1zav6cyg1yfw2z04qrpnj4n3v07qx7ya6p8qyp2g",
"sha256bin64": "1iq4qd5x7ivypcxh47d6av45hyqdgga2s80idyhf1f51f660h2vc",
"version": "88.0.4324.50",
"sha256": "17v0qp05785xc4whsbw6fmf0x5ccjx2mk6n4qy6z2mx2yjjjfv8q",
"sha256bin64": "01cphbd56l7g3cdmrvwynkzrpx9h3v7pz6ac76sxlp6irjzhbnva",
"deps": {
"gn": {
"version": "2020-11-05",

4
pkgs/applications/networking/cluster/sonobuoy/default.nix
View File

@ -7,10 +7,8 @@ buildGoModule rec {
pname = "sonobuoy";
version = "0.19.0";
goPackagePath = "github.com/vmware-tanzu/sonobuoy";
buildFlagsArray =
let t = goPackagePath;
let t = "github.com/vmware-tanzu/sonobuoy";
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=v${version}

6
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -157,9 +157,9 @@ in rec {
});
terraform_0_14 = pluggable (generic {
version = "0.14.2";
sha256 = "0j09bjdl1z836y3zdlgjcdah11wlnvsd5hmsagjsz9am04qlyfya";
vendorSha256 = "1iifjrnc79f4liyy4pgjbnarv2fx6vwlaqcv75crmyji40xv0w9s";
version = "0.14.3";
sha256 = "0w2j1phjv989bspbyvkhr25bdz1zjch3zggwk2lgjyk77mdw5h20";
vendorSha256 = "03dg703pw3h98vfvi2mnd2lw0mv6hlhvmc1l7ngrqdyv54cmihnp";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

10
pkgs/applications/networking/feedreaders/newsflash/default.nix
View File

@ -8,7 +8,7 @@
, gdk-pixbuf
, glib
, gtk3
, libhandy_0
, libhandy
, openssl
, sqlite
, webkitgtk
@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsflash";
version = "1.0.5";
version = "1.1.1";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
sha256 = "0kh1xqvxfz58gnrl8av0zkig9vcgmx9iaxw5p6gdm8a7gv18nvp3";
sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd";
};
cargoSha256 = "059sppidbxzjk8lmjq41d5qbymp9j9v2qr0jxd7xg9avr0klwc2s";
cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26";
patches = [
./no-post-install.patch
@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
gtk3
libhandy_0
libhandy
openssl
sqlite
webkitgtk

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.39.3"; # Please backport all updates to the stable channel.
version = "1.39.4"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1zrmxg7x5y48h9chiar798rbxrz8v79qa3lbkm0rxcjqfrnmr63x";
sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View File

@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "gnome-calendar";
version = "3.38.1";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j";
sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0=";
};
patches = [

5
pkgs/development/go-modules/generic/default.nix
View File

@ -36,6 +36,9 @@
, meta ? {}
# Not needed with buildGoModule
, goPackagePath ? null
, ... }@args':
with builtins;
@ -242,5 +245,7 @@ let
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
else if (goPackagePath != null) then
throw "`goPackagePath` not needed with `buildGoModule`"
else
package

4
pkgs/development/interpreters/python/default.nix
View File

@ -181,9 +181,9 @@ in {
major = "3";
minor = "10";
patch = "0";
suffix = "a2";
suffix = "a3";
};
sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr";
sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY=";
inherit (darwin) configd;
inherit passthruFun;
};

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

@ -4,6 +4,8 @@ buildPythonPackage rec {
pname = "ansi2html";
version = "1.6.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
@ -22,6 +24,5 @@ buildPythonPackage rec {
homepage = "https://github.com/ralphbean/ansi2html";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ davidtwco ];
platforms = platforms.all;
};
}

2
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.26.0";
goPackagePath = "github.com/buildkite/agent";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";

2
pkgs/development/tools/github-commenter/default.nix
View File

@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0=";
goPackagePath = "github.com/cloudposse/${pname}";
meta = with lib; {
description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
license = licenses.asl20;

2
pkgs/development/tools/misc/terraform-ls/default.nix
View File

@ -12,8 +12,6 @@ buildGoModule rec {
};
vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI=";
goPackagePath = "github.com/hashicorp/terraform-ls";
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
doCheck = false;

1
pkgs/development/tools/wally-cli/default.nix
View File

@ -4,7 +4,6 @@ buildGoModule rec {
pname = "wally-cli";
version = "2.0.0";
goPackagePath = "github.com/zsa/wally-cli";
subPackages = [ "." ];
nativeBuildInputs = [ pkg-config ];

584
pkgs/development/tools/wasm-bindgen-cli/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/development/tools/wasm-bindgen-cli/default.nix
View File

@ -4,7 +4,7 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
version = "0.2.67";
version = "0.2.69";
src =
let
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
sha256 = "0qx178aicbn59b150j5r78zya5n0yljvw4c4lhvg8x4cpfshjb5j";
sha256 = "1psylk3hlx0ahwib3ph8qdk0jwlp8qzc6dv61002rj7ns28vs4mx";
};
in runCommand "source" { } ''
cp -R ${tarball} $out
@ -23,14 +23,14 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkgconfig ];
cargoSha256 = "0chpw6syqxn824cbkdjx1s26vmajx511gc4mp9y64vy7b7asba6x";
cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
license = licenses.asl20;
description = "Facilitating high-level interactions between wasm modules and JavaScript";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ma27 rizary ];
platforms = platforms.unix;
};
}

2
pkgs/development/tools/ytt/default.nix
View File

@ -10,8 +10,6 @@ buildGoModule rec {
sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l";
};
goPackagePath = "github.com/vmware-tanzu/carvel-ytt";
vendorSha256 = null;
subPackages = [ "cmd/ytt" ];

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -22,10 +22,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "460.27.04";
sha256_64bit = "plTqtc5QZQwM0f3MeMZV0N5XOiuSXCCDklL/qyy8HM8=";
settingsSha256 = "hU9J0VSrLXs7N14zq6U5LbBLZXEIyTfih/Bj6eFcMf0=";
persistencedSha256 = "PmqhoPskqhJe2FxMrQh9zX1BWQCR2kkfDwvA89+XALA=";
version = "455.45.01";
sha256_64bit = "6tyMfggvZVQPp/aiSdgwn7VG/mIGb0lUcnAdyMEDoVM=";
settingsSha256 = "70ABqnO/heCp/5IztpU0Lo7eZd4n4wUoTlp1xIQ3aCc=";
persistencedSha256 = "36sM+djZvm77Gle7dcZ5tppgzQkD4IA0FJgCGsdZRI8=";
}
else legacy_390;

1
pkgs/servers/demoit/default.nix
View File

@ -6,7 +6,6 @@
buildGoModule {
pname = "demoit";
version = "unstable-2020-06-11";
goPackagePath = "github.com/dgageot/demoit";
src = fetchFromGitHub {
owner = "dgageot";

12
pkgs/servers/mail/mailhog/default.nix
View File

@ -2,24 +2,22 @@
buildGoPackage rec {
pname = "MailHog";
version = "1.0.0";
rev = "v${version}";
version = "1.0.1";
goPackagePath = "github.com/mailhog/MailHog";
src = fetchFromGitHub {
inherit rev;
owner = "mailhog";
repo = "MailHog";
sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83";
rev = "v${version}";
sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Web and API based SMTP testing";
homepage = "https://github.com/mailhog/MailHog";
maintainers = with maintainers; [ disassembler ];
changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}";
maintainers = with maintainers; [ disassembler jojosch ];
license = licenses.mit;
};
}

191
pkgs/servers/mail/mailhog/deps.nix generated
View File

@ -1,191 +0,0 @@
[
{
goPackagePath = "github.com/gorilla/pat";
fetch = {
type = "git";
url = "https://github.com/gorilla/pat";
rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d";
sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf";
};
}
{
goPackagePath = "github.com/gorilla/context";
fetch = {
type = "git";
url = "https://github.com/gorilla/context";
rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a";
sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4";
};
}
{
goPackagePath = "github.com/gorilla/mux";
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
rev = "bcd8bc72b08df0f70df986b97f95590779502d31";
sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13";
sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc";
};
}
{
goPackagePath = "github.com/ian-kent/go-log";
fetch = {
type = "git";
url = "https://github.com/ian-kent/go-log";
rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1";
sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d";
};
}
{
goPackagePath = "github.com/ian-kent/envconf";
fetch = {
type = "git";
url = "https://github.com/ian-kent/envconf";
rev = "c19809918c02ab33dc8635d68c77649313185275";
sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx";
};
}
{
goPackagePath = "github.com/ian-kent/goose";
fetch = {
type = "git";
url = "https://github.com/ian-kent/goose";
rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c";
sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv";
};
}
{
goPackagePath = "github.com/ian-kent/linkio";
fetch = {
type = "git";
url = "https://github.com/ian-kent/linkio";
rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd";
sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq";
};
}
{
goPackagePath = "github.com/mailhog/MailHog-Server";
fetch = {
type = "git";
url = "https://github.com/mailhog/MailHog-Server";
rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd";
sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla";
};
}
{
goPackagePath = "github.com/mailhog/MailHog-UI";
fetch = {
type = "git";
url = "https://github.com/mailhog/MailHog-UI";
rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7";
sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54";
};
}
{
goPackagePath = "github.com/mailhog/http";
fetch = {
type = "git";
url = "https://github.com/mailhog/http";
rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2";
sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8";
};
}
{
goPackagePath = "github.com/mailhog/mhsendmail";
fetch = {
type = "git";
url = "https://github.com/mailhog/mhsendmail";
rev = "002527025ef50364446d7560600aedc5daaa1997";
sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91";
};
}
{
goPackagePath = "github.com/mailhog/data";
fetch = {
type = "git";
url = "https://github.com/mailhog/data";
rev = "024d554958b5bea5db220bfd84922a584d878ded";
sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf";
};
}
{
goPackagePath = "github.com/mailhog/smtp";
fetch = {
type = "git";
url = "https://github.com/mailhog/smtp";
rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54";
sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6";
};
}
{
goPackagePath = "github.com/mailhog/storage";
fetch = {
type = "git";
url = "https://github.com/mailhog/storage";
rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa";
sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk";
};
}
{
goPackagePath = "github.com/ogier/pflag";
fetch = {
type = "git";
url = "https://github.com/ogier/pflag";
rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f";
sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj";
};
}
{
goPackagePath = "github.com/tinylib/msgp";
fetch = {
type = "git";
url = "https://github.com/tinylib/msgp";
rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d";
sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r";
};
}
{
goPackagePath = "github.com/philhofer/fwd";
fetch = {
type = "git";
url = "https://github.com/philhofer/fwd";
rev = "1612a298117663d7bc9a760ae20d383413859798";
sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
};
}
{
goPackagePath = "github.com/t-k/fluent-logger-golang";
fetch = {
type = "git";
url = "https://github.com/t-k/fluent-logger-golang";
rev = "0f8ec08f2057a61574b6943e75045fffbeae894e";
sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
};
}
{
goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mgo.v2";
rev = "d90005c5262a3463800497ea5a89aed5fe22c886";
sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7";
};
}
]

2
pkgs/tools/misc/cod/default.nix
View File

@ -4,8 +4,6 @@ buildGoModule rec {
pname = "cod";
version = "unstable-2020-09-10";
goPackagePath = "cod";
src = fetchFromGitHub {
owner = "dim-an";
repo = pname;

2
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
html-proofer (3.18.1)
html-proofer (3.18.2)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)

4
pkgs/tools/misc/html-proofer/gemset.nix
View File

@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mp8vbnb58z97gscrbp0q0yn4wmq8gcr914kb8g6pjv5laq9hfxn";
sha256 = "06vbbm8qdmw4955522zh9wqn2214ajsf70y0vymxgl7dlwjd2pz0";
type = "gem";
};
version = "3.18.1";
version = "3.18.2";
};
mercenary = {
groups = ["default"];

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

@ -5268,7 +5268,7 @@ in
mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (pythonPackages) ansi2html;
inherit (python3Packages) ansi2html;
};
medfile = callPackage ../development/libraries/medfile { };
@ -12513,7 +12513,7 @@ in
hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
niv = haskell.lib.justStaticExecutables haskellPackages.niv;
niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv);
ormolu = haskellPackages.ormolu.bin;