From 11cd049ac85cfff5e7ee629ea57baa1da40b5c28 Mon Sep 17 00:00:00 2001 From: AntonHakansson Date: Mon, 30 Aug 2021 15:04:12 +0200 Subject: [PATCH 01/21] obinskit: 1.1.4 -> 1.1.8 New dependency `xorg.libXtst` needed for macro editing. Also updated Homepage - the previous link redirects to the new one. --- pkgs/applications/misc/obinskit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index 5e37e74902e4..c7725fbcb2fb 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -4,7 +4,7 @@ , libxkbcommon , systemd , xorg -, electron_3 +, electron_11 , makeWrapper , makeDesktopItem }: @@ -17,15 +17,15 @@ let genericName = "Obinskit keyboard configurator"; categories = "Utility"; }; - electron = electron_3; + electron = electron_11; in stdenv.mkDerivation rec { pname = "obinskit"; - version = "1.1.4"; + version = "1.1.8"; src = fetchurl { url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - sha256 = "0q422rmfn4k4ww1qlgrwdmxz4l10dxkd6piynbcw5cr4i5icnh2l"; + sha256 = "MgasbgexOdscQrUte/6OzCSrc74RvaBq44oHplQA/Gc="; }; unpackPhase = "tar -xzf $src"; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}" ''; meta = with lib; { description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; - homepage = "http://en.obins.net/obinskit/"; # https is broken + homepage = "https://www.hexcore.xyz/obinskit"; license = licenses.unfree; maintainers = with maintainers; [ shou ]; platforms = [ "x86_64-linux" ]; From 54f69db5d037984519b0d7ce88350a52a1d2c5b8 Mon Sep 17 00:00:00 2001 From: Riey Date: Sat, 4 Sep 2021 15:35:45 +0900 Subject: [PATCH 02/21] kime: 2.5.3 -> 2.5.5 --- pkgs/tools/inputmethods/kime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/tools/inputmethods/kime/default.nix index 8566143f6807..6cac37da7db2 100644 --- a/pkgs/tools/inputmethods/kime/default.nix +++ b/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl"; + sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk"; + sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; }; # Replace autostart path From a6079f83313cd26fc6f6c5d8dd0922a278fafd8d Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 7 Sep 2021 10:09:01 +0200 Subject: [PATCH 03/21] metals: 0.10.5 -> 0.10.6 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 7a53090e823c..a0b9b813f4f0 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.5"; + version = "0.10.6"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01"; + outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; }; nativeBuildInputs = [ makeWrapper ]; From 96eb6ec434cead2d6627308a61e1d2e3127dcd8e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Sep 2021 04:20:00 +0000 Subject: [PATCH 04/21] streamlink: 2.3.0 -> 2.4.0 https://github.com/streamlink/streamlink/releases/tag/2.4.0 --- .../applications/video/streamlink/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 8097c5dbe92a..1c1a0fb3d84c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,35 +1,33 @@ { lib -, python3 -, fetchFromGitHub +, python3Packages , rtmpdump , ffmpeg }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "2.3.0"; + version = "2.4.0"; - src = fetchFromGitHub { - owner = "streamlink"; - repo = "streamlink"; - rev = version; - sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g="; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af"; }; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ pytestCheckHook mock requests-mock freezegun ]; - propagatedBuildInputs = (with python3.pkgs; [ + propagatedBuildInputs = (with python3Packages; [ pycryptodome requests iso-639 iso3166 websocket-client isodate + lxml ]) ++ [ rtmpdump ffmpeg @@ -38,11 +36,11 @@ python3.pkgs.buildPythonApplication rec { # note that upstream currently uses requests 2.25.1 in Windows builds postPatch = '' substituteInPlace setup.py \ - --replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0' + --replace 'requests>=2.26.0,<3.0' 'requests' ''; meta = with lib; { - homepage = "https://github.com/streamlink/streamlink"; + homepage = "https://streamlink.github.io/"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' Streamlink is a CLI utility that pipes videos from online @@ -51,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; + changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; From ad20237f16de7fb19666554a3c17cca6b3017dc3 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 12 Sep 2021 09:36:16 +1000 Subject: [PATCH 05/21] chatty: 0.3.4 -> 0.4.0 --- .../networking/instant-messengers/chatty/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 8266434eb086..fe7881de9959 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -10,11 +10,14 @@ , wrapGAppsHook , evolution-data-server , feedbackd +, glibmm +, gspell , gtk3 , json-glib , libgcrypt , libhandy , libphonenumber +, modemmanager , olm , pidgin , protobuf @@ -24,14 +27,14 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "0910f5bw75ph576gxbsd6ysdwnlk4ysdp0pml2i3mjqpcbkqfs3w"; + sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; }; postPatch = '' @@ -51,11 +54,14 @@ stdenv.mkDerivation rec { buildInputs = [ evolution-data-server feedbackd + glibmm + gspell gtk3 json-glib libgcrypt libhandy libphonenumber + modemmanager olm pidgin protobuf From 09def9cc2fccd6aca204a4f034be32437d4b262a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 13 Sep 2021 19:50:07 -0400 Subject: [PATCH 06/21] nomino: init at 1.1.0 --- pkgs/tools/misc/nomino/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/nomino/default.nix diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix new file mode 100644 index 000000000000..d30d40527e10 --- /dev/null +++ b/pkgs/tools/misc/nomino/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "nomino"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "yaa110"; + repo = pname; + rev = version; + sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp"; + }; + + cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg"; + + meta = with lib; { + description = "Batch rename utility for developers"; + homepage = "https://github.com/yaa110/nomino"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5368427b5f63..3286754f37d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7560,6 +7560,8 @@ with pkgs; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + nomino = callPackage ../tools/misc/nomino { }; + notable = callPackage ../applications/misc/notable { }; ntlmrecon = callPackage ../tools/security/ntlmrecon { }; From e3f62ec19aaeb5cf5121b0921db64df234acd115 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 14 Sep 2021 16:23:28 +0000 Subject: [PATCH 07/21] swtpm: 0.5.2 -> 0.6.0 Signed-off-by: Arthur Gautier --- pkgs/tools/security/swtpm/default.nix | 37 +++--------- .../security/swtpm/python-installation.patch | 60 ------------------- 2 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 pkgs/tools/security/swtpm/python-installation.patch diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 2bd0326d4d92..daceff1486e3 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -1,68 +1,49 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , autoreconfHook , pkg-config -, libtasn1, openssl, fuse, glib, libseccomp +, libtasn1, openssl, fuse, glib, libseccomp, json-glib , libtpms , unixtools, expect, socat , gnutls , perl -, python3, python3Packages }: stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; }; - pythonPath = with python3Packages; requiredPythonModules [ - setuptools - cryptography - ]; - patches = [ - # upstream looks for /usr directory in $prefix to check - # whether or not to proceed with installation of python - # tools (swtpm_setup utility). - ./python-installation.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch"; + sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU="; + }) ]; - prePatch = '' - patchShebangs src/swtpm_setup/setup.py - patchShebangs samples/setup.py - ''; - nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man autoreconfHook - python3 ]; buildInputs = [ libtpms openssl libtasn1 libseccomp - fuse glib + fuse glib json-glib gnutls - python3.pkgs.wrapPython ]; - propagatedBuildInputs = pythonPath; configureFlags = [ "--with-cuse" ]; - postInstall = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" - ''; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/swtpm/python-installation.patch b/pkgs/tools/security/swtpm/python-installation.patch deleted file mode 100644 index d2689f051c5b..000000000000 --- a/pkgs/tools/security/swtpm/python-installation.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 353794feb596d95e3f8893e39b174c5a89d1013e -Author: Arthur Gautier -Date: Wed Feb 17 02:27:40 2021 +0000 - - python-install - - Signed-off-by: Arthur Gautier - -diff --git a/samples/Makefile.am b/samples/Makefile.am -index 7d69bf8..1803bb9 100644 ---- a/samples/Makefile.am -+++ b/samples/Makefile.am -@@ -39,19 +39,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - -diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am -index 529eefe..533b1b3 100644 ---- a/src/swtpm_setup/Makefile.am -+++ b/src/swtpm_setup/Makefile.am -@@ -29,19 +29,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - # for out-of-tree builds we need to clean up From 7bea76e0d219c6ca81677cfa318927628fd70263 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 17:20:49 +0000 Subject: [PATCH 08/21] nats-server: 2.4.0 -> 2.5.0 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 339c847898c3..e64a380faebe 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.4.0"; + version = "2.5.0"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-v758qj1dy8zh3zfZxKkKALxZqNAxc1XdtTW4dxU4l5A="; + sha256 = "sha256-q6TgRbIorOL9ZSLdjAbqbwY60XJ2cZhxUHMrzGGZG8I="; }; meta = { From b62c799d04d89f9ac9002cfd3886ce919a056a5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Sep 2021 19:32:03 +0200 Subject: [PATCH 09/21] ajour: 1.3.0 -> 1.3.1 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index fad140d7456a..ed75e347db0b 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70="; + sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk="; }; - cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo="; + cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E="; nativeBuildInputs = [ autoPatchelfHook From e676fdcb901455956acd04e58e88dd777871f73e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 19:53:25 +0000 Subject: [PATCH 10/21] picard-tools: 2.26.0 -> 2.26.2 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 345a38ae24a4..a5b226bd0a9f 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.0"; + version = "2.26.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w="; + sha256 = "sha256-mfqxaZpzX9BIoFl1okN3TxzJnoepsoMR1KqHLQY5BHQ="; }; nativeBuildInputs = [ makeWrapper ]; From 92cc52acb8c05609978769edd94772ffa9dba4a1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 14 Sep 2021 23:35:47 +0200 Subject: [PATCH 11/21] pyradio: 0.8.7.2 -> 0.8.9.9 --- pkgs/applications/radio/pyradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/radio/pyradio/default.nix index f23359688c6c..ec937565aa24 100644 --- a/pkgs/applications/radio/pyradio/default.nix +++ b/pkgs/applications/radio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.7.2"; + version = "0.8.9.9"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = version; - sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1"; + sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc"; }; checkPhase = '' From 38a96d8148f966934f85fe222593477be8094e71 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Sep 2021 16:38:56 -0500 Subject: [PATCH 12/21] emacs.pkgs.plz: init at unstable-2021-08-22 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../emacs/elisp-packages/plz/default.nix | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/plz/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index d792793d3643..a0db941f6373 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -284,6 +284,8 @@ perl-completion = callPackage ./perl-completion { }; + plz = callPackage ./plz { }; + pod-mode = callPackage ./pod-mode { }; power-mode = callPackage ./power-mode { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix new file mode 100644 index 000000000000..9992fb877a9f --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix @@ -0,0 +1,23 @@ +{ trivialBuild, lib, fetchFromGitHub, curl }: + +trivialBuild { + pname = "plz"; + version = "unstable-2021-08-22"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "plz.el"; + rev = "7e456638a651bab3a814e3ea81742dd917509cbb"; + sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; + }; + + postPatch = '' + substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' + ''; + + meta = { + description = "plz is an HTTP library for Emacs"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + }; +} From a7f71cd419821adc5e3d7b9ae9e5b0f558370b28 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Sep 2021 16:39:14 -0500 Subject: [PATCH 13/21] emacs.pkgs.ement: init at unstable-2021-09-08 --- .../emacs/elisp-packages/ement/default.nix | 32 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/ement/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix new file mode 100644 index 000000000000..3f6614cd2e5a --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -0,0 +1,32 @@ +{ trivialBuild +, lib +, fetchFromGitHub +, curl +, plz +, cl-lib +, ts +}: + +trivialBuild { + pname = "ement"; + version = "unstable-2021-09-08"; + + packageRequires = [ + plz + cl-lib + ts + ]; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "ement.el"; + rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d"; + sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I="; + }; + + meta = { + description = "plz is an HTTP library for Emacs"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index a0db941f6373..903d2fa15f3e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -264,6 +264,8 @@ emacspeak = callPackage ./emacspeak { }; + ement = callPackage ./ement { }; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; font-lock-plus = callPackage ./font-lock-plus { }; From dc03eeaab1df10dc4044ba9bfad1877a8a2b1360 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 23:23:39 +0000 Subject: [PATCH 14/21] slop: 7.5 -> 7.6 --- pkgs/tools/misc/slop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index a73dd8d3cbe7..69fa8d694541 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slop"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; + sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; nativeBuildInputs = [ cmake pkg-config ]; From 6875f62e49839cc52ead5b197a08fecd3710d775 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 00:14:25 +0000 Subject: [PATCH 15/21] teleport: 7.0.3 -> 7.1.0 --- pkgs/servers/teleport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 05094045fd32..158772059de7 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.3"; + version = "7.1.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk="; + sha256 = "sha256-4kXI/eOrgJQYt4D/S709bUt+x5cGiFGAOP0VEoSgIsM="; }; vendorSha256 = null; From f4383bcab4eef33cfbde4b2ac8aeedfb59d6d087 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 01:07:35 +0000 Subject: [PATCH 16/21] terraformer: 0.8.15 -> 0.8.16 --- pkgs/development/tools/misc/terraformer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index ac20ca26f808..a6dd19bf4587 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.15"; + version = "0.8.16"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-d8DOUvUj5hdc1kcd0vgMufVIOJqV0eG4sXQIX597L/w="; + sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU="; }; - vendorSha256 = "sha256-VQ3yZQqpq9KbAkBDnQAfOE+axlT0GhvUpMIjb59PYT0="; + vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA="; subPackages = [ "." ]; From 964b74f6b47b0ffb82d59856eaf527b3b1a8c129 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 15 Sep 2021 09:47:17 +0900 Subject: [PATCH 17/21] gitui: do not compile openssl --- .../version-management/git-and-tools/gitui/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 28fc7be24a20..20219be776a5 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; version = "0.17.1"; @@ -12,11 +12,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; - nativeBuildInputs = [ python3 perl ]; + nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; From 23837756205f6ca8ecc1f531323d0a842572b40e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 17:33:16 +0000 Subject: [PATCH 18/21] nextdns: 1.36.0 -> 1.37.2 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 4c0f9c1a0fb3..561a1c77b1ca 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.36.0"; + version = "1.37.2"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME="; + sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc="; }; vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; From 4e52d93305204d3ddb084d241f4d14c55bfdd404 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Sep 2021 20:58:50 -0500 Subject: [PATCH 19/21] emacs.pkgs.ement: Fix meta.description --- .../applications/editors/emacs/elisp-packages/ement/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index 3f6614cd2e5a..dba8ae330684 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -25,7 +25,7 @@ trivialBuild { }; meta = { - description = "plz is an HTTP library for Emacs"; + description = "Ement.el is a Matrix client for Emacs"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; }; From 1628a1c78b3cf6564c82993fe7d6cebebb8791e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 Sep 2021 16:43:38 -0700 Subject: [PATCH 20/21] numberstation: 0.4.0 -> 0.5.0 https://git.sr.ht/~martijnbraam/numberstation/refs/0.5.0 --- pkgs/applications/misc/numberstation/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index c51306bb93fe..9809a2a62058 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "0.4.0"; + version = "0.5.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv"; + sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb"; }; postPatch = '' @@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec { description = "TOTP Authentication application for mobile"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda tomfitzhenry ]; }; } From ed74ad630c05b43b6af685a5e1eeba6136b8f04f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 04:10:11 +0000 Subject: [PATCH 21/21] vale: 2.10.5 -> 2.10.6 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index d5c64aa9f7b2..25a98d299a75 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.10.5"; + version = "2.10.6"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ="; + sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; }; vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc=";