git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit5663f4625de72248bd108f65daa4f7ff65f5cddc authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateWed 15 Sep 2021, 06:01 (5 years ago) parent728f30ccf5f9be
23 files changed+151−139
pkgs/applications/editors/emacs/elisp-packages/ement/default.nix+32 pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix+4 pkgs/applications/editors/emacs/elisp-packages/plz/default.nix+23 pkgs/applications/misc/numberstation/default.nix+3−3 pkgs/applications/misc/obinskit/default.nix+6−6 pkgs/applications/networking/instant-messengers/chatty/default.nix+8−2 pkgs/applications/networking/nextdns/default.nix+2−2 pkgs/applications/radio/pyradio/default.nix+2−2 pkgs/applications/science/biology/picard-tools/default.nix+2−2 pkgs/applications/version-management/git-and-tools/gitui/default.nix+5−2 pkgs/applications/video/streamlink/default.nix+12−13 pkgs/development/tools/metals/default.nix+2−2 pkgs/development/tools/misc/terraformer/default.nix+3−3 pkgs/servers/nats-server/default.nix+2−2 pkgs/servers/teleport/default.nix+2−2 pkgs/tools/games/ajour/default.nix+3−3 pkgs/tools/inputmethods/kime/default.nix+3−3 pkgs/tools/misc/nomino/default.nix+22 pkgs/tools/misc/slop/default.nix+2−2 pkgs/tools/security/swtpm/default.nix+9−28 pkgs/tools/security/swtpm/python-installation.patch−60 pkgs/tools/text/vale/default.nix+2−2 pkgs/top-level/all-packages.nix+2
pkgs/applications/editors/emacs/elisp-packages/ement/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ trivialBuild
2+, lib
3+, fetchFromGitHub
4+, curl
5+, plz
6+, cl-lib
7+, ts
8+}:
9+
10+trivialBuild {
11+ pname = "ement";
12+ version = "unstable-2021-09-08";
13+
14+ packageRequires = [
15+ plz
16+ cl-lib
17+ ts
18+ ];
19+
20+ src = fetchFromGitHub {
21+ owner = "alphapapa";
22+ repo = "ement.el";
23+ rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d";
24+ sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I=";
25+ };
26+
27+ meta = {
28+ description = "Ement.el is a Matrix client for Emacs";
29+ license = lib.licenses.gpl3Only;
30+ platforms = lib.platforms.all;
31+ };
32+}
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix+4
@@ -264,6 +264,8 @@
264264
265265 emacspeak = callPackage ./emacspeak { };
266266
267+ ement = callPackage ./ement { };
268+
267269 ess-R-object-popup = callPackage ./ess-R-object-popup { };
268270
269271 font-lock-plus = callPackage ./font-lock-plus { };
@@ -284,6 +286,8 @@
284286
285287 perl-completion = callPackage ./perl-completion { };
286288
289+ plz = callPackage ./plz { };
290+
287291 pod-mode = callPackage ./pod-mode { };
288292
289293 power-mode = callPackage ./power-mode { };
pkgs/applications/editors/emacs/elisp-packages/plz/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ trivialBuild, lib, fetchFromGitHub, curl }:
2+
3+trivialBuild {
4+ pname = "plz";
5+ version = "unstable-2021-08-22";
6+
7+ src = fetchFromGitHub {
8+ owner = "alphapapa";
9+ repo = "plz.el";
10+ rev = "7e456638a651bab3a814e3ea81742dd917509cbb";
11+ sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
12+ };
13+
14+ postPatch = ''
15+ substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
16+ '';
17+
18+ meta = {
19+ description = "plz is an HTTP library for Emacs";
20+ license = lib.licenses.gpl3Only;
21+ platforms = lib.platforms.all;
22+ };
23+}
pkgs/applications/misc/numberstation/default.nix+3−3
@@ -15,7 +15,7 @@
1515
1616python3.pkgs.buildPythonApplication rec {
1717 pname = "numberstation";
18− version = "0.4.0";
18+ version = "0.5.0";
1919
2020 format = "other";
2121
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
2323 owner = "~martijnbraam";
2424 repo = "numberstation";
2525 rev = version;
26− sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv";
26+ sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb";
2727 };
2828
2929 postPatch = ''
@@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec {
6363 description = "TOTP Authentication application for mobile";
6464 homepage = "https://sr.ht/~martijnbraam/numberstation/";
6565 license = licenses.gpl3Only;
66− maintainers = with maintainers; [ dotlambda ];
66+ maintainers = with maintainers; [ dotlambda tomfitzhenry ];
6767 };
6868}
pkgs/applications/misc/obinskit/default.nix+6−6
@@ -4,7 +4,7 @@
44, libxkbcommon
55, systemd
66, xorg
7−, electron_3
7+, electron_11
88, makeWrapper
99, makeDesktopItem
1010}:
@@ -17,15 +17,15 @@ let
1717 genericName = "Obinskit keyboard configurator";
1818 categories = "Utility";
1919 };
20− electron = electron_3;
20+ electron = electron_11;
2121in
2222stdenv.mkDerivation rec {
2323 pname = "obinskit";
24− version = "1.1.4";
24+ version = "1.1.8";
2525
2626 src = fetchurl {
2727 url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
28− sha256 = "0q422rmfn4k4ww1qlgrwdmxz4l10dxkd6piynbcw5cr4i5icnh2l";
28+ sha256 = "MgasbgexOdscQrUte/6OzCSrc74RvaBq44oHplQA/Gc=";
2929 };
3030
3131 unpackPhase = "tar -xzf $src";
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
5151 postFixup = ''
5252 makeWrapper ${electron}/bin/electron $out/bin/${pname} \
5353 --add-flags $out/opt/obinskit/resources/app.asar \
54− --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
54+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}"
5555 '';
5656
5757 meta = with lib; {
5858 description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
59− homepage = "http://en.obins.net/obinskit/"; # https is broken
59+ homepage = "https://www.hexcore.xyz/obinskit";
6060 license = licenses.unfree;
6161 maintainers = with maintainers; [ shou ];
6262 platforms = [ "x86_64-linux" ];
pkgs/applications/networking/instant-messengers/chatty/default.nix+8−2
@@ -10,11 +10,14 @@
1010, wrapGAppsHook
1111, evolution-data-server
1212, feedbackd
13+, glibmm
14+, gspell
1315, gtk3
1416, json-glib
1517, libgcrypt
1618, libhandy
1719, libphonenumber
20+, modemmanager
1821, olm
1922, pidgin
2023, protobuf
@@ -24,14 +27,14 @@
2427
2528stdenv.mkDerivation rec {
2629 pname = "chatty";
27− version = "0.3.4";
30+ version = "0.4.0";
2831
2932 src = fetchFromGitLab {
3033 domain = "source.puri.sm";
3134 owner = "Librem5";
3235 repo = "chatty";
3336 rev = "v${version}";
34− sha256 = "0910f5bw75ph576gxbsd6ysdwnlk4ysdp0pml2i3mjqpcbkqfs3w";
37+ sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d";
3538 };
3639
3740 postPatch = ''
@@ -51,11 +54,14 @@ stdenv.mkDerivation rec {
5154 buildInputs = [
5255 evolution-data-server
5356 feedbackd
57+ glibmm
58+ gspell
5459 gtk3
5560 json-glib
5661 libgcrypt
5762 libhandy
5863 libphonenumber
64+ modemmanager
5965 olm
6066 pidgin
6167 protobuf
pkgs/applications/networking/nextdns/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "nextdns";
5− version = "1.36.0";
5+ version = "1.37.2";
66
77 src = fetchFromGitHub {
88 owner = "nextdns";
99 repo = "nextdns";
1010 rev = "v${version}";
11− sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME=";
11+ sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc=";
1212 };
1313
1414 vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48=";
pkgs/applications/radio/pyradio/default.nix+2−2
@@ -2,13 +2,13 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "pyradio";
5− version = "0.8.7.2";
5+ version = "0.8.9.9";
66
77 src = fetchFromGitHub {
88 owner = "coderholic";
99 repo = pname;
1010 rev = version;
11− sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1";
11+ sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc";
1212 };
1313
1414 checkPhase = ''
pkgs/applications/science/biology/picard-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "picard-tools";
5− version = "2.26.0";
5+ version = "2.26.2";
66
77 src = fetchurl {
88 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
9− sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w=";
9+ sha256 = "sha256-mfqxaZpzX9BIoFl1okN3TxzJnoepsoMR1KqHLQY5BHQ=";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/version-management/git-and-tools/gitui/default.nix+5−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
1+{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }:
22rustPlatform.buildRustPackage rec {
33 pname = "gitui";
44 version = "0.17.1";
@@ -12,11 +12,14 @@ rustPlatform.buildRustPackage rec {
1212
1313 cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE=";
1414
15− nativeBuildInputs = [ python3 perl ];
15+ nativeBuildInputs = [ python3 perl pkg-config ];
1616 buildInputs = [ openssl ]
1717 ++ lib.optional stdenv.isLinux xclip
1818 ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
1919
20+ # Needed to get openssl-sys to use pkg-config.
21+ OPENSSL_NO_VENDOR = 1;
22+
2023 meta = with lib; {
2124 description = "Blazing fast terminal-ui for git written in rust";
2225 homepage = "https://github.com/extrawurst/gitui";
pkgs/applications/video/streamlink/default.nix+12−13
@@ -1,35 +1,33 @@
11{ lib
2−, python3
3−, fetchFromGitHub
2+, python3Packages
43, rtmpdump
54, ffmpeg
65}:
76
8−python3.pkgs.buildPythonApplication rec {
7+python3Packages.buildPythonApplication rec {
98 pname = "streamlink";
10− version = "2.3.0";
9+ version = "2.4.0";
1110
12− src = fetchFromGitHub {
13− owner = "streamlink";
14− repo = "streamlink";
15− rev = version;
16− sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g=";
11+ src = python3Packages.fetchPypi {
12+ inherit pname version;
13+ sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af";
1714 };
1815
19− checkInputs = with python3.pkgs; [
16+ checkInputs = with python3Packages; [
2017 pytestCheckHook
2118 mock
2219 requests-mock
2320 freezegun
2421 ];
2522
26− propagatedBuildInputs = (with python3.pkgs; [
23+ propagatedBuildInputs = (with python3Packages; [
2724 pycryptodome
2825 requests
2926 iso-639
3027 iso3166
3128 websocket-client
3229 isodate
30+ lxml
3331 ]) ++ [
3432 rtmpdump
3533 ffmpeg
@@ -38,11 +36,11 @@ python3.pkgs.buildPythonApplication rec {
3836 # note that upstream currently uses requests 2.25.1 in Windows builds
3937 postPatch = ''
4038 substituteInPlace setup.py \
41− --replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0'
39+ --replace 'requests>=2.26.0,<3.0' 'requests'
4240 '';
4341
4442 meta = with lib; {
45− homepage = "https://github.com/streamlink/streamlink";
43+ homepage = "https://streamlink.github.io/";
4644 description = "CLI for extracting streams from various websites to video player of your choosing";
4745 longDescription = ''
4846 Streamlink is a CLI utility that pipes videos from online
@@ -51,6 +49,7 @@ python3.pkgs.buildPythonApplication rec {
5149
5250 Streamlink is a fork of the livestreamer project.
5351 '';
52+ changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
5453 license = licenses.bsd2;
5554 platforms = platforms.linux ++ platforms.darwin;
5655 maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
pkgs/development/tools/metals/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "metals";
5− version = "0.10.5";
5+ version = "0.10.6";
66
77 deps = stdenv.mkDerivation {
88 name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 '';
1717 outputHashMode = "recursive";
1818 outputHashAlgo = "sha256";
19− outputHash = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01";
19+ outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9";
2020 };
2121
2222 nativeBuildInputs = [ makeWrapper ];
pkgs/development/tools/misc/terraformer/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "terraformer";
5− version = "0.8.15";
5+ version = "0.8.16";
66
77 src = fetchFromGitHub {
88 owner = "GoogleCloudPlatform";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-d8DOUvUj5hdc1kcd0vgMufVIOJqV0eG4sXQIX597L/w=";
11+ sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU=";
1212 };
1313
14− vendorSha256 = "sha256-VQ3yZQqpq9KbAkBDnQAfOE+axlT0GhvUpMIjb59PYT0=";
14+ vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA=";
1515
1616 subPackages = [ "." ];
1717
pkgs/servers/nats-server/default.nix+2−2
@@ -4,7 +4,7 @@ with lib;
44
55buildGoPackage rec {
66 pname = "nats-server";
7− version = "2.4.0";
7+ version = "2.5.0";
88
99 goPackagePath = "github.com/nats-io/${pname}";
1010
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 rev = "v${version}";
1313 owner = "nats-io";
1414 repo = pname;
15− sha256 = "sha256-v758qj1dy8zh3zfZxKkKALxZqNAxc1XdtTW4dxU4l5A=";
15+ sha256 = "sha256-q6TgRbIorOL9ZSLdjAbqbwY60XJ2cZhxUHMrzGGZG8I=";
1616 };
1717
1818 meta = {
pkgs/servers/teleport/default.nix+2−2
@@ -10,14 +10,14 @@ let
1010in
1111buildGoModule rec {
1212 pname = "teleport";
13− version = "7.0.3";
13+ version = "7.1.0";
1414
1515 # This repo has a private submodule "e" which fetchgit cannot handle without failing.
1616 src = fetchFromGitHub {
1717 owner = "gravitational";
1818 repo = "teleport";
1919 rev = "v${version}";
20− sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk=";
20+ sha256 = "sha256-4kXI/eOrgJQYt4D/S709bUt+x5cGiFGAOP0VEoSgIsM=";
2121 };
2222
2323 vendorSha256 = null;
pkgs/tools/games/ajour/default.nix+3−3
@@ -34,16 +34,16 @@ let
3434
3535in rustPlatform.buildRustPackage rec {
3636 pname = "Ajour";
37− version = "1.3.0";
37+ version = "1.3.1";
3838
3939 src = fetchFromGitHub {
4040 owner = "casperstorm";
4141 repo = "ajour";
4242 rev = version;
43− sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70=";
43+ sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk=";
4444 };
4545
46− cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo=";
46+ cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E=";
4747
4848 nativeBuildInputs = [
4949 autoPatchelfHook
pkgs/tools/inputmethods/kime/default.nix+3−3
@@ -16,18 +16,18 @@ let
1616in
1717stdenv.mkDerivation rec {
1818 pname = "kime";
19− version = "2.5.3";
19+ version = "2.5.5";
2020
2121 src = fetchFromGitHub {
2222 owner = "Riey";
2323 repo = pname;
2424 rev = "v${version}";
25− sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl";
25+ sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs=";
2626 };
2727
2828 cargoDeps = rustPlatform.fetchCargoTarball {
2929 inherit src;
30− sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk";
30+ sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4=";
3131 };
3232
3333 # Replace autostart path
pkgs/tools/misc/nomino/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ fetchFromGitHub, lib, rustPlatform }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "nomino";
5+ version = "1.1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "yaa110";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp";
12+ };
13+
14+ cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg";
15+
16+ meta = with lib; {
17+ description = "Batch rename utility for developers";
18+ homepage = "https://github.com/yaa110/nomino";
19+ license = with licenses; [ mit /* or */ asl20 ];
20+ maintainers = with maintainers; [ figsoda ];
21+ };
22+}
pkgs/tools/misc/slop/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "slop";
8− version = "7.5";
8+ version = "7.6";
99
1010 src = fetchFromGitHub {
1111 owner = "naelstrof";
1212 repo = "slop";
1313 rev = "v${version}";
14− sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837";
14+ sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U=";
1515 };
1616
1717 nativeBuildInputs = [ cmake pkg-config ];
pkgs/tools/security/swtpm/default.nix+9−28
@@ -1,68 +1,49 @@
11{ lib
22, stdenv
3−, fetchFromGitHub
3+, fetchFromGitHub, fetchpatch
44, autoreconfHook
55, pkg-config
6−, libtasn1, openssl, fuse, glib, libseccomp
6+, libtasn1, openssl, fuse, glib, libseccomp, json-glib
77, libtpms
88, unixtools, expect, socat
99, gnutls
1010, perl
11−, python3, python3Packages
1211}:
1312
1413stdenv.mkDerivation rec {
1514 pname = "swtpm";
16− version = "0.5.2";
15+ version = "0.6.0";
1716
1817 src = fetchFromGitHub {
1918 owner = "stefanberger";
2019 repo = "swtpm";
2120 rev = "v${version}";
22− sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk=";
21+ sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y=";
2322 };
2423
25− pythonPath = with python3Packages; requiredPythonModules [
26− setuptools
27− cryptography
28− ];
29−
3024 patches = [
31− # upstream looks for /usr directory in $prefix to check
32− # whether or not to proceed with installation of python
33− # tools (swtpm_setup utility).
34− ./python-installation.patch
25+ (fetchpatch {
26+ url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch";
27+ sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU=";
28+ })
3529 ];
3630
37− prePatch = ''
38− patchShebangs src/swtpm_setup/setup.py
39− patchShebangs samples/setup.py
40− '';
41−
4231 nativeBuildInputs = [
4332 pkg-config unixtools.netstat expect socat
4433 perl # for pod2man
4534 autoreconfHook
46− python3
4735 ];
4836 buildInputs = [
4937 libtpms
5038 openssl libtasn1 libseccomp
51− fuse glib
39+ fuse glib json-glib
5240 gnutls
53− python3.pkgs.wrapPython
5441 ];
55− propagatedBuildInputs = pythonPath;
5642
5743 configureFlags = [
5844 "--with-cuse"
5945 ];
6046
61− postInstall = ''
62− wrapPythonProgramsIn $out/bin "$out $pythonPath"
63− wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath"
64− '';
65−
6647 enableParallelBuilding = true;
6748
6849 outputs = [ "out" "man" ];
pkgs/tools/security/swtpm/python-installation.patchdeleted−60
@@ -1,60 +0,0 @@
1−commit 353794feb596d95e3f8893e39b174c5a89d1013e
2−Author: Arthur Gautier <baloo@superbaloo.net>
3−Date: Wed Feb 17 02:27:40 2021 +0000
4−
5− python-install
6−
7− Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
8−
9−diff --git a/samples/Makefile.am b/samples/Makefile.am
10−index 7d69bf8..1803bb9 100644
11−--- a/samples/Makefile.am
12−+++ b/samples/Makefile.am
13−@@ -39,19 +39,9 @@ python-uninstall:
14− $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
15−
16− if PYTHON_INSTALLATION
17−-install-exec-local: $(PY_PACKAGE)
18−- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
19−- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
20−- else \
21−- $(MAKE) python-install; \
22−- fi
23−+install-exec-local: python-install
24−
25−-uninstall-local:
26−- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
27−- echo "Cleanup for distcheck build not implemented" ; \
28−- else \
29−- $(MAKE) python-uninstall; \
30−- fi
31−+uninstall-local: python-uninstall
32− endif
33−
34−
35−diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
36−index 529eefe..533b1b3 100644
37−--- a/src/swtpm_setup/Makefile.am
38−+++ b/src/swtpm_setup/Makefile.am
39−@@ -29,19 +29,9 @@ python-uninstall:
40− $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
41−
42− if PYTHON_INSTALLATION
43−-install-exec-local: $(PY_PACKAGE)
44−- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
45−- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
46−- else \
47−- $(MAKE) python-install; \
48−- fi
49−+install-exec-local: python-install
50−
51−-uninstall-local:
52−- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
53−- echo "Cleanup for distcheck build not implemented" ; \
54−- else \
55−- $(MAKE) python-uninstall; \
56−- fi
57−+uninstall-local: python-uninstall
58− endif
59−
60− # for out-of-tree builds we need to clean up
pkgs/tools/text/vale/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "vale";
5− version = "2.10.5";
5+ version = "2.10.6";
66
77 subPackages = [ "cmd/vale" ];
88 outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
1111 owner = "errata-ai";
1212 repo = "vale";
1313 rev = "v${version}";
14− sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ=";
14+ sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA=";
1515 };
1616
1717 vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc=";
pkgs/top-level/all-packages.nix+2
@@ -7566,6 +7566,8 @@ with pkgs;
75667566
75677567 nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
75687568
7569+ nomino = callPackage ../tools/misc/nomino { };
7570+
75697571 notable = callPackage ../applications/misc/notable { };
75707572
75717573 ntlmrecon = callPackage ../tools/security/ntlmrecon { };