From 81f1b21af0c1b513c35be6f008c933bdc19b219f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 23 Dec 2020 14:00:02 +0100 Subject: [PATCH 01/19] perldevel: 5.33.4 -> 5.33.5 dependencies: perl-cross: 6c115604fcbf01ceb3c6d7c13206a7590abf6c21 -> b4447944a0aeff9590dc023d64f8ddf3de7669fb --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index ac41a63cef7..6b7d1d4d99c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -174,11 +174,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020 + crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1"; + sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +214,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.4"; - sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz"; + version = "5.33.5"; + sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr"; }; } From 0937f24518e05afb8b0b8cd449a62c0d10ae3410 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 14:03:53 -0600 Subject: [PATCH 02/19] calligra: use qt515 --- pkgs/top-level/all-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5a25414c..69236539952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15701,6 +15701,12 @@ in suffix = "qt5"; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -20623,13 +20629,10 @@ in calibre = calibre-py3; - calligra = libsForQt514.callPackage ../applications/office/calligra { + calligra = libsForQt5.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61.override { - qt5Support = true; - # Must be using the same qt version as calligra itself. - qtbase = qt514.qtbase; - }; + # Must use the same Qt version as Calligra itself: + poppler = libsForQt5.poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; From 66ee431f3d131636111dfeae01c70fb1b683be18 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 16:58:56 -0600 Subject: [PATCH 03/19] digikam: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69236539952..e9b2c511f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25618,7 +25618,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; From 4070b3deff1fdfb9cc5d12a505123a87f62349b7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 18:32:35 -0600 Subject: [PATCH 04/19] kdevelop: use qt515 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9b2c511f7d..855385d1f2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22304,14 +22304,14 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; From ed58d97091ee94177b36960d3b2fee868d38667a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 18:58:29 -0600 Subject: [PATCH 05/19] trojita: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855385d1f2e..72d558c2757 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24465,7 +24465,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; From df00d5d9d0bfa3232c97084b0b10396baba8cccd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 20:29:35 -0600 Subject: [PATCH 06/19] zanshin: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72d558c2757..a173b391dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25280,7 +25280,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt514.callPackage ../applications/office/zanshin { + zanshin = libsForQt5.callPackage ../applications/office/zanshin { boost = boost160; }; From 754d97f8a04300a01aa44d9b93ddfeedca5b3d0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:13:05 -0600 Subject: [PATCH 07/19] zanshin: patch for kontactinterface >= 5.14.42 --- pkgs/applications/office/zanshin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index e3b9408ed96..c724c239a45 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , qtbase , boost @@ -24,6 +25,15 @@ mkDerivation rec { sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; + patches = [ + # Build with kontactinterface >= 5.14.42. + # Remove after next release. + (fetchpatch { + url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; + sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; From 266a6b296833d8346441c5b958bd405714475d30 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:16:19 -0600 Subject: [PATCH 08/19] lxqt: use qt515 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a173b391dd5..76a739e45c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26504,10 +26504,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit qt5; - inherit libsForQt5; inherit pkgs; inherit (lib) makeScope; + inherit qt5 libsForQt5; }); mate = recurseIntoAttrs (callPackage ../desktops/mate { }); From 2e2047ef863ea15922c316b65b5f7ee76deae5d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:43:54 -0600 Subject: [PATCH 09/19] zanshin: not broken --- pkgs/applications/office/zanshin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index c724c239a45..843e7ec0145 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -58,6 +58,5 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; - broken = true; }; } From c674a51382ce556f98c76f270275ecece3a4936a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 25 Dec 2020 00:13:53 +0100 Subject: [PATCH 10/19] nixos/systemd: provide libidn2 for systemd-resolved systemd started using dlopen() for some of their "optional" dependencies. Apparently, `libidn2` isn't so optional, and systemd-resolved doesn't work without libidn2 present, breaking DNS resolution. Fixes https://github.com/NixOS/nixpkgs/issues/107537 Upstream bug: https://github.com/systemd/systemd/issues/18078 --- nixos/modules/system/boot/resolved.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 84bc9b78076..7fe8f4dfb7e 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; let @@ -150,6 +150,9 @@ in wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.resolve1.service" ]; restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; + # Upstream bug: https://github.com/systemd/systemd/issues/18078 + # systemd-resolved without libidn2 is broken + environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib"; }; environment.etc = { From 6f400cf29006e204c4b737b6c45b42e32f9de42c Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Fri, 25 Dec 2020 13:54:58 +0100 Subject: [PATCH 11/19] glow: 1.2.1 -> 1.3.0 --- pkgs/applications/editors/glow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index d941c85e2c6..462127d0a79 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; + sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j"; }; - vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; + vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639"; doCheck = false; From bf3616c304dc6f41c49941544c0fb24decb2174a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Dec 2020 13:42:43 +0000 Subject: [PATCH 12/19] python37Packages.jupyterlab-git: 0.23.2 -> 0.23.3 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index d8ab5093ec2..1c6c9a5b9e3 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.23.2"; + version = "0.23.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089"; + sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d"; }; propagatedBuildInputs = [ notebook nbdime git ]; From ff42b4ae551db026bf9410f8a3fe55bfb5cfcdff Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Fri, 25 Dec 2020 15:07:12 +0100 Subject: [PATCH 13/19] glow: add changelog meta-attribute --- pkgs/applications/editors/glow/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 462127d0a79..06013b50d63 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; + changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; From 3fb1e542e793d33699974364877b56ea980be4cd Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 25 Dec 2020 00:22:34 -0500 Subject: [PATCH 14/19] code-minimap: init at 0.4.3 Message-Id: <20201225052234.17216-1-ben@bsima.me> --- pkgs/tools/misc/code-minimap/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/code-minimap/default.nix diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix new file mode 100644 index 00000000000..8c43e2b903c --- /dev/null +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "code-minimap"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + }; + + cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + + meta = with stdenv.lib; { + description = "A high performance code minimap render"; + homepage = "https://github.com/wfxr/code-minimap"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ bsima ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32bba34a798..91e9f0e9a09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1859,6 +1859,8 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; + code-minimap = callPackage ../tools/misc/code-minimap { }; + codesearch = callPackage ../tools/text/codesearch { }; codec2 = callPackage ../development/libraries/codec2 { }; From f03f386f45bd091d397aa1fe850c662a6e4afdb7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Dec 2020 11:00:21 -0500 Subject: [PATCH 15/19] httpstat: 1.3.0 -> 1.3.1 --- pkgs/tools/networking/httpstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index e9987a51eae..f404090e5e3 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; + sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM="; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; From c1951a1fb3342586da16558ec764f32d872ab304 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Dec 2020 11:03:04 -0500 Subject: [PATCH 16/19] sbt: 1.4.5 -> 1.4.6 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 39832109d99..a9314cef0cc 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U="; + sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ="; }; patchPhase = '' From dee1b3faa7b2516c77177a011b3387bbe806b452 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Dec 2020 16:24:35 +0000 Subject: [PATCH 17/19] python37Packages.runway-python: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 9c7f89585d8..69b928aad08 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; + sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740"; }; propagatedBuildInputs = [ From 8b49787dfe63664f9fb16b9f6cef65c4e3449274 Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Fri, 25 Dec 2020 08:49:10 -0800 Subject: [PATCH 18/19] maintainers: add svrana --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0fa804c1f9c..a80ec598ea6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8573,6 +8573,12 @@ githubId = 1040871; name = "Mathis Antony"; }; + svrana = { + email = "shaw@vranix.com"; + github = "svrana"; + githubId = 850665; + name = "Shaw Vrana"; + }; svsdep = { email = "svsdep@gmail.com"; github = "svsdep"; From 5fba017cccb6262a734386e2b6202dcb7e802ea6 Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Wed, 23 Dec 2020 16:11:52 -0800 Subject: [PATCH 19/19] go-minimock: init at 3.0.8 --- .../development/tools/go-minimock/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/go-minimock/default.nix diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix new file mode 100644 index 00000000000..ed4374e7764 --- /dev/null +++ b/pkgs/development/tools/go-minimock/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-minimock"; + version = "3.0.8"; + + src = fetchFromGitHub { + owner = "gojuno"; + repo = "minimock"; + rev = "v${version}"; + sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; + }; + + vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; + + doCheck = true; + + subPackages = [ "cmd/minimock" "." ]; + + meta = with lib; { + homepage = "https://github.com/gojuno/minimock"; + description = "A golang mock generator from interfaces"; + license = licenses.mit; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5a25414c..2115e447cce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18943,6 +18943,8 @@ in go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-minimock = callPackage ../development/tools/go-minimock { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; go-symbols = callPackage ../development/tools/go-symbols { };