From cd730282dc46bbdda292cfeaaf3b0d9dd8c3eedf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 21:33:36 +0000 Subject: [PATCH 01/25] kora-icon-theme: 1.3.4 -> 1.4.1 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 9c64ed4b4972..36aee979f0b1 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.3.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3"; + sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; }; nativeBuildInputs = [ From c803b2333b0a26c1cb986efc91ca1d5289d3c8a9 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sun, 17 Jan 2021 12:09:41 -0700 Subject: [PATCH 02/25] documentation: correct documentation help `PANDOC_LUA_FILTERS_DIR` is set in `makeFlags` in `doc/default.nix`, and needs to be explicitely passed to `make` when called manually. Signed-off-by: Pamplemousse --- doc/contributing/contributing-to-documentation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/contributing-to-documentation.xml b/doc/contributing/contributing-to-documentation.xml index b0266043775f..132fa3816e37 100644 --- a/doc/contributing/contributing-to-documentation.xml +++ b/doc/contributing/contributing-to-documentation.xml @@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc sub $ cd /path/to/nixpkgs/doc $ nix-shell -[nix-shell]$ make +[nix-shell]$ make $makeFlags If you experience problems, run make debug to help understand the docbook errors. From 6e9460fd121b0c5fcad179a7fbb5f13af27a409d Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sat, 23 Jan 2021 16:29:40 -0600 Subject: [PATCH 03/25] vivaldi: 3.5.2115.73-1 -> 3.5.2115.87-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 562b6d9f7345..2fe27c16720d 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.5.2115.73-1"; + version = "3.5.2115.87-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz"; + sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0"; }; unpackPhase = '' From 3b8f71d9a222cefff7b85251ea60877d59f41fe3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 25 Jan 2021 15:04:26 +0300 Subject: [PATCH 04/25] =?UTF-8?q?stagit:=200.9.1=20=E2=86=92=200.9.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/stagit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 1cabcfe044f3..f74698bb11ea 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.1"; + version = "0.9.4"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; + sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "git static site generator"; - homepage = "https://git.codemadness.org/stagit/"; + homepage = "https://git.codemadness.org/stagit/file/README.html"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; From 80e077f5f25aa8befd19c73e35371001b41f6a60 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 25 Jan 2021 15:12:26 +0100 Subject: [PATCH 05/25] prometheus-nextcloud-exporter: 0.3.0 -> 0.4.0 --- .../monitoring/prometheus/nextcloud-exporter.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index a04bd6d9a9a0..e07c8a5a5c0b 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,26 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "1nmw1hkxgdp7nibrn1gz0lry0666rcc55s3kkfx64ykw6bnl0l34"; + sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a"; }; - patches = [ - # fixes failing test, remove with next update - # see https://github.com/xperimental/nextcloud-exporter/pull/25 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/xperimental/nextcloud-exporter/pull/25.patch"; - sha256 = "03jvqlqbs5g6ijncx6vxkgwq646yrjlrm0lk2q5vhfjrgrkv0alv"; - includes = [ "internal/config/config_test.go" ]; - }) - ]; - - vendorSha256 = "0xdjphki0p03n6g5b4mm2x0rgm902rnbvq8r6p4r45k3mv8cggmf"; + vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d"; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; From fe1e5e369857f30dc2f8d462994aa5f8d7a86fdf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 06:24:56 +0000 Subject: [PATCH 06/25] mediathekview: 13.5.1 -> 13.7.0 --- pkgs/applications/video/mediathekview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 6a8731dd72eb..ccb512744920 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "13.5.1"; + version = "13.7.0"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0fixr6drim0wmh4q44zikcla4mrnm44nm95d5naqsgx6idalddrc"; + sha256 = "sha256-9SQUsxs/Zt7YaZo6FdeEF3MOUO3IbkDGwV5i72/X4bk="; }; nativeBuildInputs = [ makeWrapper ]; From cf6ce59701888fc055cc46fcd5e0dff1d85e0a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 26 Jan 2021 08:57:25 +0100 Subject: [PATCH 07/25] mediathekview: enable JRE preview option --- pkgs/applications/video/mediathekview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index ccb512744920..1e4f47852651 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" ''; meta = with lib; { From 3b8c2d56e022d12c8e73711d38e6b85376bb6d46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jan 2021 11:01:52 +0100 Subject: [PATCH 08/25] python3Packages.teslajsonpy: 0.10.4 -> 0.11.0 --- .../python-modules/teslajsonpy/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index c4520b1c1982..08ef9975b228 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1"; + sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4="; }; propagatedBuildInputs = [ @@ -27,7 +27,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # Not all Home Assistant related check pass - disabledTests = [ "test_values_on_init" ]; + # https://github.com/zabuldon/teslajsonpy/issues/121 + # https://github.com/zabuldon/teslajsonpy/pull/124 + disabledTests = [ + "test_values_on_init" + "test_get_value_on_init" + ]; pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { From c4f1e134ac332f4cf4a2659d8bc6de82820a3dc8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:24:17 +1000 Subject: [PATCH 09/25] gdu: 4.2.0 -> 4.3.0 https://github.com/dundee/gdu/releases/tag/v4.3.0 --- pkgs/tools/system/gdu/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 0ade0443dc0e..b938eb1df59c 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,5 +1,4 @@ { lib - , buildGoModule , fetchFromGitHub , installShellFiles @@ -7,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "0ppsz7ys08lmg5s7lszqc2zcp2vjm54aai3yr3sb4jf3knbmyg5g"; + sha256 = "0ilaywj5vz8lgvm63j2saakhmgb2134idn6l8msbif4lsawlr313"; }; vendorSha256 = "058h71gmgi3n4b697myi5890arzw8fkzmxlm1aiwzyfh3k9iv0wh"; From b60b4023d72b468ec734fba83d902a9b9f6a3625 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Tue, 26 Jan 2021 06:06:46 -0600 Subject: [PATCH 10/25] rr: Build with gcc9 To work around linking errors with gcc10 src/AddressSpace.cc:1632: undefined reference to `rr_syscall_addr' Fixes #110756 --- pkgs/development/tools/analysis/rr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index b63713f00073..c0121d242177 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: +{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { version = "5.4.0"; pname = "rr"; From 9a8bd5a0fa773365b10a8a0cae115229ed51621b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 26 Jan 2021 13:25:56 +0100 Subject: [PATCH 11/25] zz: 0.1 -> unstable-2021-01-26 --- pkgs/development/compilers/zz/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index 273873c88017..3f77c49f5561 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "0.1"; + version = "unstable-2021-01-26"; + # commit chosen by using the latest build from http://bin.zetz.it/ src = fetchFromGitHub { owner = "aep"; repo = "zz"; - rev = version; - sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad"; + rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; + sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; + cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; postInstall = '' wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" From e5db845846e4a291f631a066d9f67f6a8ccc0c3a Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 26 Jan 2021 13:55:50 +0100 Subject: [PATCH 12/25] rauc: 1.5 -> 1.5.1 New bugfix release. --- pkgs/tools/misc/rauc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index c5f84601a6dc..663768c1507c 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0"; + sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; }; passthru = { From a5f0f5dec4b8156998caffc75b60fea38b99ed5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jan 2021 14:36:40 +0100 Subject: [PATCH 13/25] python3Packages.shodan: 1.24.0 -> 1.25.0 --- pkgs/development/python-modules/shodan/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index f361659d9acb..9637602cce1f 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.24.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; + sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { # The tests require a shodan api key, so skip them. doCheck = false; + pythonImportsCheck = [ "shodan" ]; meta = with lib; { description = "Python library and command-line utility for Shodan"; From e0493922895ced62868fec7d3dd8e53cb1407e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Jan 2021 15:15:49 +0100 Subject: [PATCH 14/25] python3.pkgs.tokenizers: fix build --- pkgs/development/python-modules/transformers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 594204754408..a685f9dc721d 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py + sed -ri 's/tokenizers==[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py ''; pythonImportsCheck = [ "transformers" ]; From 38e0c5145218e1455c1224e46910ca62afb1bb83 Mon Sep 17 00:00:00 2001 From: TilCreator Date: Tue, 26 Jan 2021 15:19:42 +0100 Subject: [PATCH 15/25] waifu2x-converter-cpp: 5.3.3 -> 5.3.4 --- pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 083db90a9b08..bffd9ea0378a 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "waifu2x-converter-cpp"; - version = "5.3.3"; + version = "5.3.4"; src = fetchFromGitHub { owner = "DeadSix27"; repo = pname; rev = "v${version}"; - sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w"; + sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x"; }; patchPhase = '' From 0e56f996813df81c276c7bc7fe6afb408efa757c Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 26 Jan 2021 13:57:43 +0100 Subject: [PATCH 16/25] gensio: 2.2.1 -> 2.2.3 --- pkgs/development/libraries/gensio/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index a568078f9911..3e4b68ec79c2 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -1,6 +1,5 @@ { autoreconfHook , fetchFromGitHub -, fetchpatch , lib , nix-update-script , pkg-config @@ -9,23 +8,15 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb"; + sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; }; - patches = [ - # Fix compilation without openipmi, can be dropped for the next release. - (fetchpatch { - url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch"; - sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = pname; From 103a60223ed010969985af0888f9c4a761df9231 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 26 Jan 2021 13:57:53 +0100 Subject: [PATCH 17/25] ser2net: 4.3.0 -> 4.3.2 --- pkgs/servers/ser2net/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index bbb40844ae51..a751e0872ee7 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; + sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; }; passthru = { From ca1bc75f9f2b2fed26bbfda9f4b625a8d6560f96 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 26 Jan 2021 15:41:11 +0000 Subject: [PATCH 18/25] terragrunt: remove unused dependency and compile smaller Removed makeWrapper as it's been unused since we stopped wrapping up TF Added -s and -w ldflags to minify terragrunt --- .../networking/cluster/terragrunt/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 387165150ea3..5dd80034c826 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terragrunt"; @@ -15,9 +15,12 @@ buildGoModule rec { doCheck = false; - buildInputs = [ makeWrapper ]; - - buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ]; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.VERSION=v${version}" + ]; meta = with lib; { description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; From 135807629feb77e11f1c4d7fef0a0c296f087d36 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 26 Jan 2021 15:42:50 +0000 Subject: [PATCH 19/25] terragrunt: 0.27.1 -> 0.27.3 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 5dd80034c826..a81ccc6eb1d8 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.27.1"; + version = "0.27.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q"; + sha256 = "sha256-J1kwcguBSHTsU/kGviQaj/cX6PpZGs3UI2AJy5+/pCc="; }; vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0="; From d4e946965ca4e45ebbf5a9b8de4448187f59fd6d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 26 Jan 2021 16:56:33 +0100 Subject: [PATCH 20/25] element-web: 1.7.17 -> 1.7.18 ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.7.18 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 173977155e81..a997ea156769 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.17"; + version = "1.7.18"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-9DyA3h0sQCzOFZ9gEReJrMQOnygFvEB7PeIpkG/F5H4="; + sha256 = "sha256-fgbdlVTPPZriOoDsBbpmDWEEzHEunaDIl/sT4/6A9LM="; }; installPhase = '' From e61999b3f24da7dad685099981226e4d647bd0f6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 26 Jan 2021 16:57:01 +0100 Subject: [PATCH 21/25] element-desktop: 1.7.17 -> 1.7.18 ChangeLog: https://github.com/vector-im/element-desktop/releases/tag/v1.7.18 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f6fa30e91e5b..9f60c014c767 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.17", + "version": "1.7.18", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 274298226ec4..833d1731b727 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.17"; + version = "1.7.18"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-3GFfldQoD5plIeuAOd4OcB/q7m8tKU6so+M8MlB6Uuc="; + sha256 = "sha256-5k+VVcloFAcFvk683r7njOCuj7OOnHS9QLEHFu0g+5o="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; From 676627abaaae24a7e6d587255b81111521f4d92a Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 17 Jan 2021 08:56:22 -0500 Subject: [PATCH 22/25] rocksdb: 6.14.6 -> 6.15.2 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d6f685ff4dee..a2c91aca7001 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.6"; + version = "6.15.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "07n54dis7jy1jinxqf4qlgm35bgvpvaz3irdqr39qxz68hblhfii"; }; nativeBuildInputs = [ cmake ninja ]; From feea22fadbb4231eb90d4c7d5550b034cb615980 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 17 Jan 2021 11:26:20 -0500 Subject: [PATCH 23/25] rocksdb: fix output hash --- pkgs/development/libraries/rocksdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a2c91aca7001..efe7c0a8852a 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "07n54dis7jy1jinxqf4qlgm35bgvpvaz3irdqr39qxz68hblhfii"; + sha256 = "12ynm6ccbp6r2z71p0mvipas41928iyil12sklnafdykxgwdyv3b"; }; nativeBuildInputs = [ cmake ninja ]; From abed89b112f86733ad428dfbbc25b35c29f7d290 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 26 Jan 2021 12:53:48 -0500 Subject: [PATCH 24/25] rocksdb: 6.15.2 -> 6.15.4 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index efe7c0a8852a..dea8fcc67597 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.2"; + version = "6.15.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "12ynm6ccbp6r2z71p0mvipas41928iyil12sklnafdykxgwdyv3b"; + sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; }; nativeBuildInputs = [ cmake ninja ]; From bba47f95f187449b8dec64cc28fcd7cdf0ed0c29 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 26 Jan 2021 12:55:33 -0500 Subject: [PATCH 25/25] sortmerna: mark broken on darwin --- pkgs/applications/science/biology/sortmerna/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 2efa39ac489d..11530c6a7226 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; + broken = stdenv.isDarwin; }; }