diff options
20 files changed, 74 insertions, 85 deletions
diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index ed988cbcb67f..eabdad3caa9c 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-tD4LsIXb2II+TNEfzXBviMR2fq/FtCSsaL2YGun1vu0="; + sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 4101ac9f3fd0..91ccf67f5579 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.1"; - commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3"; + version = "2.1.2"; + commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc"; + sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596"; }; - vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ="; + vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 7efc64e942de..42c0f1ef674c 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.8"; + version = "4.16.9"; - sha256 = "sha256-KFx01vbVeGR+0U3DkUVRhO7pTv3R2h7qSe5VQE2b+OQ="; + sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 0ed9aa204706..667d334c9026 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo="; + sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 70bd37e40d39..0bb9e58fe355 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.6"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww="; + sha256 = "sha256-EAJk3JhLdkuGKRMtspTLejck8doWPd7Z0Lv/Mvf3KFY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index e39e313baa7f..14833f7f622c 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.13"; + version = "1.10.14"; src = fetchPypi { inherit pname version; - sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435"; + sha256 = "5edfc7f615c88475b3d8549731cb57e2d9bf15d0b9bc21a43e88626b67deef4b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 5399e863f949..083d374cd1ac 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.25"; + version = "0.12.27"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE="; + sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; }; - vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; meta = with lib; { description = "An extremely fast JavaScript bundler"; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index c8882349ce27..a71f36f72376 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.05.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-nrqxfJbTkaPgKozkS6ulUZNXymkpw0bbQBHUZEFnLhs="; + sha256 = "sha256-FbHqpBiTJWeJPBHUBTOIuXRoLttmDIpip5wUvuVw8YI="; }; sourceRoot = "source/Quake"; diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff index fa6edf98b3de..d96f6c9c4fef 100644 --- a/pkgs/os-specific/darwin/trash/trash.diff +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -7,7 +7,7 @@ index 5e4306f..9c975fc 100644 @echo ---- Compiling: @echo ====================================== - $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) -+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 5a6b6342fa3b..f02a65658149 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,4 +1,5 @@ -{ lib +{ pkgs +, lib , stdenv , buildRustCrate , defaultCrateOverrides @@ -27,7 +28,7 @@ let }; }; cargo_nix = import ./Cargo.nix { - nixpkgs = ../../../..; + inherit pkgs; buildRustCrateForPkgs = customBuildRustCrateForPkgs; }; meilisearch-http = cargo_nix.workspaceMembers."meilisearch-http".build.override { diff --git a/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch deleted file mode 100644 index f2e0802f7981..000000000000 --- a/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001 -From: Adrian Gierakowski <agierakowski@gmail.com> -Date: Sun, 19 Jul 2020 08:38:05 +0100 -Subject: [PATCH] fix dirent64 et al on darwin - ---- - configure.ac | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index b8faca9..cee1e4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then - [klibc has bsd_signal instead of signal])]) - fi - -+dnl TODO: stat64 is deprecated since macOS 10.6 - dnl Check for stat64 (dietlibc/klibc). - AC_CHECK_FUNC(stat64,, [ - AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) -@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [ - AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) - ]) - -+dnl OS X apparently has stat64 but not readdir64. -+AC_CHECK_FUNC(readdir64,, [ -+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) -+]) -+ -+dnl OS X apparently has stat64 but not dirent64. -+AC_CHECK_TYPE(struct dirent64,, [ -+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) -+],[#include <dirent.h>]) -+ - dnl Check if struct stat has st_mtim. - AC_MSG_CHECKING(for stat::st_mtim) - AC_COMPILE_IFELSE( --- -2.15.1 - diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f044c41b73d6..2a0d73145607 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: +{ lib +, stdenv +, buildPackages +, autoreconfHook +, fetchurl +, fetchpatch +, libedit +}: stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.2"; + version = "0.5.11.4"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; + sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af"; }; hardeningDisable = [ "format" ]; patches = [ - (fetchurl { + (fetchpatch { # Dash executes code when noexec ("-n") is specified # https://www.openwall.com/lists/oss-security/2020/11/11/3 url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; + sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; + }) + + # aarch64-darwin fix from upstream; remove on next release + (fetchpatch { + url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; + sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; }) - ] ++ lib.optionals stdenv.isDarwin [ - # Temporary fix until a proper one is accepted upstream - ./0001-fix-dirent64-et-al-on-darwin.patch ]; + # configure.ac patched; remove on next release + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 3ded8c6b8482..7a903288c671 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; + sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b196b2948395..35d0b7af0736 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { - sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM="; + sha256 = "sha256-b64EEES7gO9s24hk3sZMd9guEhJNfc3DV4/NnBIcJYw="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 678c2607b614..bc7baa55fecd 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools +{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools , python, git }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-35476.patch"; + url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; + sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ autoconf automake curl jdk nettools python git ]; @@ -33,8 +41,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; - knownVulnerabilities = [ - "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 - ]; }; } diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 5a79a09281c3..025169a9fd35 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + # Work around error from <stdio.h> on aarch64-darwin: + # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] + # TODO: this should probably be fixed at a lower level than this? + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix"; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index f942efe6dd7b..5e46a0336875 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -36,14 +36,20 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 patches = [ + # Small fixes for ndb on darwin + # https://github.com/rpm-software-management/rpm/pull/1465 (fetchpatch { name = "darwin-support.patch"; url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; }) + # Fix build on aarch64-darwin + # https://github.com/rpm-software-management/rpm/pull/1775 + (fetchpatch { + url = "https://github.com/emilazy/rpm/commit/45120e756930b4787ea2e06fb8a9e623ea13f2f3.patch"; + sha256 = "0zzblwx9apxyjsri4cxd09y9b2hs57r2fck98939j1qgcwy732ar"; + }) ]; postPatch = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 6ff5c07721f4..8e1e51469dd1 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2102.0"; + version = "8.2108.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; + sha256 = "sha256-SCbCttCBqclfRp+wEVvj+VEgZSl9PeAOxRN1jNswsdk="; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 30482196322f..0e2c8b824f5e 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "basex"; exec = "basexgui %f"; - icon = ./basex.svg; # icon copied from Ubuntu basex package + icon = "${./basex.svg}"; # icon copied from Ubuntu basex package comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acd92efaac3e..424046b942b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6687,6 +6687,7 @@ with pkgs; meilisearch = callPackage ../servers/search/meilisearch { inherit (darwin.apple_sdk.frameworks) Security; + inherit pkgs; }; memtester = callPackage ../tools/system/memtester { }; |