From cba915574fcb3566cf6398600342c5551f4a9ed7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 14 Apr 2021 23:08:13 +0000 Subject: [PATCH 01/17] dnsproxy: 0.37.0 -> 0.37.1 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 20256aa006bd..4c784d005426 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3zsEEq6pVo5yHY4v5TXhZo4jo6htjCYypzxMMv8zQGE="; + sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8="; }; vendorSha256 = null; From 65bb97ee72bf9d0b19f5ee2895389cc0ced441b5 Mon Sep 17 00:00:00 2001 From: Stijn DW Date: Sat, 17 Apr 2021 14:00:52 +0200 Subject: [PATCH 02/17] sdcc: 4.0.0 -> 4.1.0 --- pkgs/development/compilers/sdcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 500c0b4d3951..0506cf21ec3d 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "sdcc"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8"; + sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1"; }; buildInputs = [ autoconf bison boost flex gputils texinfo zlib ]; From 4e3361e2a785179339d389f9da2a13188a776db2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 17 Apr 2021 12:37:43 -0400 Subject: [PATCH 03/17] pythonPackages.awkward: 1.1.2 -> 1.2.2 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index a343306a5b9e..2acec8ccc6f1 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.1.2"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "4ae8371d9e6d5bd3e90f3686b433cebc0541c88072655d2c75ec58e79b5d6943"; + sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b"; }; nativeBuildInputs = [ cmake ]; From 345986786907f12ca3838b1918c1fff34585bccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Apr 2021 00:51:08 +0200 Subject: [PATCH 04/17] ytfzf: 1.1.3 -> 1.1.4 https://github.com/pystardust/ytfzf/releases/tag/v1.1.4 --- pkgs/tools/misc/ytfzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index ca211cff131c..ba1658f3d1de 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs="; + sha256 = "sha256-zRzd+rZxT5IJoFJl9sutTdQC4eMDUCBld5bTGfQWtco="; }; patches = [ From e58ec08048c6d5aadf14957be80e413862ed9e34 Mon Sep 17 00:00:00 2001 From: Parasrah Date: Sat, 17 Apr 2021 17:12:33 -0600 Subject: [PATCH 05/17] go-task: 3.3.0 -> 3.4.1 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index d2ea8a4f6bd5..2e8988ec7881 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk="; + sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA="; }; - vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI="; + vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU="; doCheck = false; From 5752d0b1c14a57fbda0a37e4c9b9777ca9499dba Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 15 Apr 2021 12:45:51 +0200 Subject: [PATCH 06/17] searx: 0.18.0 -> 1.0.0 --- pkgs/servers/web-apps/searx/default.nix | 42 ++++++++++++++++--------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index bb9944ea3772..43fb374fe117 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,23 +1,21 @@ -{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }: with python3Packages; toPythonModule (buildPythonApplication rec { pname = "searx"; - version = "0.18.0"; + version = "1.0.0"; - # Can not use PyPI because certain test files are missing. + # pypi doesn't receive updates src = fetchFromGitHub { owner = "searx"; repo = "searx"; rev = "v${version}"; - sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn"; + sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh"; }; postPatch = '' sed -i 's/==.*$//' requirements.txt - # skip failing test - sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py ''; preBuild = '' @@ -25,16 +23,32 @@ toPythonModule (buildPythonApplication rec { ''; propagatedBuildInputs = [ - pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil pygments - pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks - jinja2 werkzeug + Babel + certifi + dateutil + flask + flaskbabel + gevent + grequests + jinja2 + langdetect + lxml + ndg-httpsclient + pyasn1 + pyasn1-modules + pygments + pysocks + pytz + pyyaml + requests + speaklater + werkzeug ]; - checkInputs = [ - Babel mock nose2 covCore pep8 plone-testing splinter - unittest2 zope_testrunner selenium - ]; + # tests try to connect to network + doCheck = false; + + pythonImportsCheck = [ "searx" ]; postInstall = '' # Create a symlink for easier access to static data From 760b1438804ab38837649f41dcaf37215fe2625e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 11:12:38 -0700 Subject: [PATCH 07/17] discord: fix autoPatchelfHook not finding libXdamage.so.1 --- pkgs/applications/networking/instant-messengers/discord/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index e4c588e6c18e..b29e1cfc124c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -18,6 +18,7 @@ in stdenv.mkDerivation rec { cups libdrm libuuid + libXdamage libX11 libXScrnSaver libXtst From cb605fc83a3649bd335c1ac06652bbb0b0817d88 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Apr 2021 20:26:30 +0200 Subject: [PATCH 08/17] foot: 1.7.1 -> 1.7.2 https://codeberg.org/dnkl/foot/releases/tag/1.7.2 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 08ef2f13734a..23531908a60f 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -25,7 +25,7 @@ }: let - version = "1.7.1"; + version = "1.7.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka"; + sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh"; }; nativeBuildInputs = [ From b66295b80a423953a02d1d8d23613c2a6f6ba9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Apr 2021 20:35:53 +0200 Subject: [PATCH 09/17] python3Packages.pytest-subprocess: 1.0.1 -> 1.1.0 https://github.com/aklajnert/pytest-subprocess/releases/tag/1.1.0 --- .../python-modules/pytest-subprocess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index d0c54c1acfb4..aeacd084eec1 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.0.1"; + version = "1.1.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - sha256 = "16ghwyv1vy45dd9cysjvcvvpm45958x071id2qrvgaziy2j6yx3j"; + sha256 = "sha256-r6WNDdvZAHMG1kPtLJlCwvhbVG1gC1NEvRfta+Chxnk="; }; buildInputs = [ From 722abdd9632bace23977a1e84a7f5b8ba6a1fb06 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 18 Apr 2021 20:55:09 +0200 Subject: [PATCH 10/17] kissfft: 131 -> 131.1.0 --- .../kissfft/0001-pkgconfig-darwin.patch | 48 ++++++++++ .../development/libraries/kissfft/default.nix | 87 +++++++++++++------ 2 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch diff --git a/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch b/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch new file mode 100644 index 000000000000..534d46f0c8ba --- /dev/null +++ b/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch @@ -0,0 +1,48 @@ +From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sun, 18 Apr 2021 01:45:20 +0200 +Subject: [PATCH] pkgconfig darwin + +--- + Makefile | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 971c6d6..0f4be0c 100644 +--- a/Makefile ++++ b/Makefile +@@ -153,7 +153,6 @@ endif + # -DKISS_FFT_BUILD to TYPEFLAGS + # + +-ifneq ($(shell uname -s),Darwin) + PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH) + PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME) + PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS) +@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin) + PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR) + endif + PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft +-endif + + export TYPEFLAGS + +@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1) + ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME) + endif + endif +-ifneq ($(shell uname -s),Darwin) + mkdir "$(ABS_LIBDIR)/pkgconfig" + sed \ + -e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \ +@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin) + -e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \ + -e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \ + kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)" +-endif + ifneq ($(KISSFFT_TOOLS), 0) + make -C tools install + endif +-- +2.29.3 + diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index fe52adfa20d7..abc96a40a970 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -1,45 +1,80 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch +, fftw +, fftwFloat +, python3 +, datatype ? "double" +, withTools ? false +, libpng +, enableStatic ? stdenv.hostPlatform.isStatic +, enableOpenmp ? false +, llvmPackages }: - +let + py = python3.withPackages (ps: with ps; [ numpy ]); + option = cond: if cond then "1" else "0"; +in stdenv.mkDerivation rec { - pname = "kissfft"; - version = "131"; + pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}"; + version = "131.1.0"; src = fetchFromGitHub { owner = "mborgerding"; - repo = pname; - rev = "v${version}"; - sha256 = "0axmqav2rclw02mix55cch9xl5py540ac15xbmq7xq6n3k492ng2"; + repo = "kissfft"; + rev = version; + sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s"; }; patches = [ - # Allow installation into our prefix - # Fix installation on Darwin - # Create necessary directories - # Make datatype configurable - (fetchpatch { - url = "https://github.com/mborgerding/kissfft/pull/38.patch"; - sha256 = "0cp1awl7lr2vqmcwm9lfjs4b4dv9da8mg4hfd821r5ryadpyijj6"; - }) - # Install headers as well - (fetchpatch { - url = "https://github.com/mborgerding/kissfft/commit/71df949992d2dbbe15ce707cf56c3fa1e43b1080.patch"; - sha256 = "13h4kzsj388mxxv6napp4gx2ymavz9xk646mnyp1i852dijpmapm"; - }) + ./0001-pkgconfig-darwin.patch ]; - postPatch = '' - substituteInPlace Makefile \ - --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ - --replace "ar" "${stdenv.cc.targetPrefix}ar" + # https://bugs.llvm.org/show_bug.cgi?id=45034 + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") '' + substituteInPlace test/Makefile \ + --replace "-ffast-math" "" + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + substituteInPlace test/Makefile \ + --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" + # Don't know how to make math.h's double long constants available + substituteInPlace test/testcpp.cc \ + --replace "M_PIl" "M_PI" ''; + makeFlags = [ "PREFIX=${placeholder "out"}" - "DATATYPE=double" + "KISSFFT_DATATYPE=${datatype}" + "KISSFFT_TOOLS=${option withTools}" + "KISSFFT_STATIC=${option enableStatic}" + "KISSFFT_OPENMP=${option enableOpenmp}" ]; + buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ] + # TODO: This may mismatch the LLVM version in the stdenv, see #79818. + ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp; + + doCheck = true; + + checkInputs = [ + py + (if datatype == "float" then fftwFloat else fftw) + ]; + + checkFlags = [ "testsingle" ]; + + postInstall = '' + ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc + ''; + + # Tools can't find kissfft libs on Darwin + postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) '' + for bin in $out/bin/*; do + install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin + done + ''; + meta = with lib; { description = "A mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; From 1a2c0d22135a64ceedcbac8dd615f219e37202be Mon Sep 17 00:00:00 2001 From: Ulrik Date: Sun, 18 Apr 2021 14:09:33 +0200 Subject: [PATCH 11/17] ocamlPackages.x509: 0.11.2 -> 0.12.0 Adds support for EC DSA from mirage-crypto Co-authored-by: Vincent Laporte --- .../development/ocaml-modules/x509/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 23efd4bb9fcf..637105361fda 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, buildDunePackage, fetchpatch +{ lib, fetchurl, buildDunePackage , alcotest, cstruct-unix -, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk +, asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk , logs, base64 }: @@ -8,25 +8,17 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; + sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h"; }; - patches = [ - # fix tests for mirage-crypto >= 0.8.9, can be removed at next release - (fetchpatch { - url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch"; - sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr"; - }) - ]; - useDune2 = true; buildInputs = [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ]; doCheck = true; From d9d0223b863869a8c9a92a57797d220bffe2c893 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 18 Apr 2021 21:32:13 +0200 Subject: [PATCH 12/17] dbeaver: 21.0.2 -> 21.0.3 --- pkgs/applications/misc/dbeaver/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ad53599855ab..fa5240b5333a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -2,6 +2,7 @@ , stdenv , copyDesktopItems , fetchFromGitHub +, fetchpatch , makeDesktopItem , makeWrapper , fontconfig @@ -18,18 +19,18 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k="; + sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA="; }; fetchedMavenDeps = stdenv.mkDerivation { name = "dbeaver-${version}-maven-deps"; - inherit src; + inherit src patches; buildInputs = [ maven @@ -50,9 +51,18 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; + outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng="; }; + patches = [ + # Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133) + # After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io + (fetchpatch { + url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch"; + sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE="; + }) + ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper From b9e4b02b388bba1be475b16fa2681c85799fbb66 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 15 Mar 2021 01:05:48 -0700 Subject: [PATCH 13/17] zrepl: 0.3.1 -> 0.4.0 https://github.com/zrepl/zrepl/compare/v0.3.1...v0.4.0 Most notably (IMO), a new status UI! --- pkgs/tools/backup/zrepl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 8d5a51598774..a7111633545e 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "zrepl"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "zrepl"; repo = "zrepl"; rev = "v${version}"; - sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo="; + sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo="; }; - vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA="; + vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go="; subPackages = [ "." ]; From 1e0bf533d0cbf7ba018d3cfcd8cdacf9a0cbf954 Mon Sep 17 00:00:00 2001 From: Moritz Scheuren Date: Sun, 18 Apr 2021 23:07:42 +0200 Subject: [PATCH 14/17] portfolio: 0.51.2 -> 0.52.0 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 73cd5d7cd6c1..17c6398f4ff2 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.51.2"; + version = "0.52.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A="; + sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1"; }; nativeBuildInputs = [ From 286c1918da72abd71149f9e036e41661ebee4f8d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 18 Apr 2021 21:34:28 +0000 Subject: [PATCH 15/17] xorg.xf86inputlibinput: 1.0.0 -> 1.0.1 https://lists.x.org/archives/xorg-announce/2021-April/003083.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 36fe0fcb9444..441d8834e086 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-1.0.0"; + name = "xf86-input-libinput-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2"; - sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2"; + sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 355619d73a0b..093aba26f639 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 From d0d77ec032d31fb22076325b018b60bbe0dc8177 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 19 Apr 2021 00:09:55 +0200 Subject: [PATCH 16/17] nixos/tests/searx: fix for 1.0 update --- nixos/tests/searx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 7c28eea30d20..2f808cb65266 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} : "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" ) fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2" + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2" ) ''; }) From 9162925dc4e26867404a4875286cbfdbcc3d2756 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Mon, 19 Apr 2021 01:10:37 +0200 Subject: [PATCH 17/17] netbeans: Enable antialiasing for texts in NetBeans IDE (#119817) --- pkgs/applications/editors/netbeans/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 83c5bb6f9309..8931ddc37990 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation { makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ --prefix PATH : ${lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ - --add-flags "--jdkhome ${jdk.home}" + --add-flags "--jdkhome ${jdk.home} \ + -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true" # Extract pngs from the Apple icon image and create # the missing ones from the 1024x1024 image.