From 563949e084caf126aec3da80c618542bb8b4443f Mon Sep 17 00:00:00 2001 From: eyjhb Date: Tue, 23 Feb 2021 22:21:30 +0100 Subject: [PATCH 001/476] php: fixed not being able to disable phpdbgSupport --- pkgs/development/interpreters/php/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 191d589aa90..7812aaa1aec 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -189,7 +189,7 @@ let "--with-libxml-dir=${libxml2.dev}" ] ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional phpdbgSupport "--enable-phpdbg" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" # Misc flags From 20ab03214057bbac8fe578f673fd4e7a29e8f5ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 14:53:10 +0000 Subject: [PATCH 002/476] gnome3.gpaste: 3.38.5 -> 3.38.6 --- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 894197ae6d5..7dbf6daffa7 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.5"; + version = "3.38.6"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-hUqFijqUQ1W8OThpbioqcxkOgYvScKUBmXN84MbMPGE="; + sha256 = "sha256-6CIzOBq/Y9XKiv/lQAtDYK6bxhT1WxjbXhu4+noO5nI="; }; patches = [ From 9eb60bee0e6d30025b74ed1c9e87108a5798019e Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Fri, 26 Mar 2021 18:18:42 +0000 Subject: [PATCH 003/476] Fix https://github.com/NixOS/nixpkgs/issues/117715 --- pkgs/applications/science/math/R/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 331faa6b147..7f238cc1cd9 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo + --without-x --with-libpng --with-jpeglib --with-libtiff From 6230936be276cd02e1e21e22ad0845582d098399 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 1 Apr 2021 19:47:27 +0200 Subject: [PATCH 004/476] nixos/gitlab: Add options to control puma worker and threads numbers --- nixos/modules/services/misc/gitlab.nix | 64 +++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index f86653f3ead..c2b8cbfbd76 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -652,6 +652,62 @@ in { description = "Extra configuration to merge into shell-config.yml"; }; + puma.workers = mkOption { + type = types.int; + default = 2; + apply = x: builtins.toString x; + description = '' + The number of worker processes Puma should spawn. This + controls the amount of parallel Ruby code can be + executed. GitLab recommends Number of CPU cores - + 1, but at least two. + + + + Each worker consumes quite a bit of memory, so + be careful when increasing this. + + + ''; + }; + + puma.threadsMin = mkOption { + type = types.int; + default = 0; + apply = x: builtins.toString x; + description = '' + The minimum number of threads Puma should use per + worker. + + + + Each thread consumes memory and contributes to Global VM + Lock contention, so be careful when increasing this. + + + ''; + }; + + puma.threadsMax = mkOption { + type = types.int; + default = 4; + apply = x: builtins.toString x; + description = '' + The maximum number of threads Puma should use per + worker. This limits how many threads Puma will automatically + spawn in response to requests. In contrast to workers, + threads will never be able to run Ruby code in parallel, but + give higher IO parallelism. + + + + Each thread consumes memory and contributes to Global VM + Lock contention, so be careful when increasing this. + + + ''; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -1145,7 +1201,13 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/puma -C ${cfg.statePath}/config/puma.rb -e production"; + ExecStart = concatStringsSep " " [ + "${cfg.packages.gitlab.rubyEnv}/bin/puma" + "-e production" + "-C ${cfg.statePath}/config/puma.rb" + "-w ${cfg.puma.workers}" + "-t ${cfg.puma.threadsMin}:${cfg.puma.threadsMax}" + ]; }; }; From 306fc0648b99682219049c95e2182f2c668f61e6 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 8 Apr 2021 19:01:22 +0200 Subject: [PATCH 005/476] nixos/gitlab: Add Sidekiq MemoryKiller support Restart sidekiq automatically when it consumes too much memory. See https://docs.gitlab.com/ee/administration/operations/sidekiq_memory_killer.html for details. --- nixos/modules/services/misc/gitlab.nix | 53 +++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index c2b8cbfbd76..1240b3e6929 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -708,6 +708,49 @@ in { ''; }; + sidekiq.memoryKiller.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether the Sidekiq MemoryKiller should be turned + on. MemoryKiller kills Sidekiq when its memory consumption + exceeds a certain limit. + + See + for details. + ''; + }; + + sidekiq.memoryKiller.maxMemory = mkOption { + type = types.int; + default = 2000; + apply = x: builtins.toString (x * 1024); + description = '' + The maximum amount of memory, in MiB, a Sidekiq worker is + allowed to consume before being killed. + ''; + }; + + sidekiq.memoryKiller.graceTime = mkOption { + type = types.int; + default = 900; + apply = x: builtins.toString x; + description = '' + The time MemoryKiller waits after noticing excessive memory + consumption before killing Sidekiq. + ''; + }; + + sidekiq.memoryKiller.shutdownWait = mkOption { + type = types.int; + default = 30; + apply = x: builtins.toString x; + description = '' + The time allowed for all jobs to finish before Sidekiq is + killed forcefully. + ''; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -1049,7 +1092,11 @@ in { ] ++ optional (cfg.databaseHost == "") "postgresql.service"; wantedBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; - environment = gitlabEnv; + environment = gitlabEnv // (optionalAttrs cfg.sidekiq.memoryKiller.enable { + SIDEKIQ_MEMORY_KILLER_MAX_RSS = cfg.sidekiq.memoryKiller.maxMemory; + SIDEKIQ_MEMORY_KILLER_GRACE_TIME = cfg.sidekiq.memoryKiller.graceTime; + SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT = cfg.sidekiq.memoryKiller.shutdownWait; + }); path = with pkgs; [ postgresqlPackage git @@ -1061,13 +1108,15 @@ in { # Needed for GitLab project imports gnutar gzip + + procps # Sidekiq MemoryKiller ]; serviceConfig = { Type = "simple"; User = cfg.user; Group = cfg.group; TimeoutSec = "infinity"; - Restart = "on-failure"; + Restart = "always"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production"; }; From 6389170b3927556ca3f2404b6525f2f57948419d Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 8 Apr 2021 19:03:44 +0200 Subject: [PATCH 006/476] nixos/gitlab: Set MALLOC_ARENA_MAX to "2" This should reduce memory fragmentation drastically and is recommended by both the Puma and the Sidekiq author. It's also the default value for Ruby deployments on Heroku. --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1240b3e6929..fbd5d0185b0 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -155,6 +155,7 @@ let GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig); prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; + MALLOC_ARENA_MAX = "2"; }; gitlab-rake = pkgs.stdenv.mkDerivation { From c219dfc43458ec104086c254e78b703b3476865d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 2 Oct 2020 12:39:15 -0700 Subject: [PATCH 007/476] scream: 3.4 -> 3.6 Renamed from scream-receivers --- pkgs/applications/audio/scream/default.nix | 43 +++++++++++++++++ pkgs/misc/scream-receivers/default.nix | 56 ---------------------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 44 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/audio/scream/default.nix delete mode 100644 pkgs/misc/scream-receivers/default.nix diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix new file mode 100644 index 00000000000..976ede5803d --- /dev/null +++ b/pkgs/applications/audio/scream/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, config, fetchFromGitHub, cmake, pkg-config +, alsaSupport ? stdenv.isLinux, alsaLib +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "scream"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "duncanthrax"; + repo = pname; + rev = version; + sha256 = "01k2zhfb781gfj3apmcjqbm5m05m6pvnh7fb5k81zwvqibai000v"; + }; + + buildInputs = lib.optional pulseSupport libpulseaudio + ++ lib.optional alsaSupport alsaLib; + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ + "-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}" + "-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}" + ]; + + cmakeDir = "../Receivers/unix"; + + doInstallCheck = true; + installCheckPhase = '' + set +o pipefail + + # Programs exit with code 1 when testing help, so grep for a string + $out/bin/scream -h 2>&1 | grep -q Usage: + ''; + + meta = with lib; { + description = "Audio receiver for the Scream virtual network sound card"; + homepage = "https://github.com/duncanthrax/scream"; + license = licenses.mspl; + platforms = platforms.linux; + maintainers = with maintainers; [ arcnmx ]; + }; +} diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix deleted file mode 100644 index 6c0f73f1b25..00000000000 --- a/pkgs/misc/scream-receivers/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, alsaLib -, pulseSupport ? false, libpulseaudio ? null -}: - -stdenv.mkDerivation rec { - pname = "scream-receivers"; - version = "3.4"; - - src = fetchFromGitHub { - owner = "duncanthrax"; - repo = "scream"; - rev = version; - sha256 = "1ig89bmzfrm57nd8lamzsdz5z81ks5vjvq3f0xhgm2dk2mrgjsj3"; - }; - - buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio; - - buildPhase = '' - (cd Receivers/alsa && make) - (cd Receivers/alsa-ivshmem && make) - '' + lib.optionalString pulseSupport '' - (cd Receivers/pulseaudio && make) - (cd Receivers/pulseaudio-ivshmem && make) - ''; - - installPhase = '' - mkdir -p $out/bin - mv ./Receivers/alsa/scream-alsa $out/bin/ - mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/ - '' + lib.optionalString pulseSupport '' - mv ./Receivers/pulseaudio/scream-pulse $out/bin/ - mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - export PATH=$PATH:$out/bin - set -o verbose - set +o pipefail - - # Programs exit with code 1 when testing help, so grep for a string - scream-alsa -h 2>&1 | grep -q Usage: - scream-ivshmem-alsa 2>&1 | grep -q Usage: - '' + lib.optionalString pulseSupport '' - scream-pulse -h 2>&1 | grep -q Usage: - scream-ivshmem-pulse 2>&1 | grep -q Usage: - ''; - - meta = with lib; { - description = "Audio receivers for the Scream virtual network sound card"; - homepage = "https://github.com/duncanthrax/scream"; - license = licenses.mspl; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c6eb4ee80..eb1372d278b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8060,9 +8060,7 @@ in scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scream-receivers = callPackage ../misc/scream-receivers { - pulseSupport = config.pulseaudio or false; - }; + scream = callPackage ../applications/audio/scream { }; scimark = callPackage ../misc/scimark { }; From c3cc679171a578eb64da2577e521d5078e4bdbc7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 14 Apr 2021 16:22:26 +0200 Subject: [PATCH 008/476] trezor-suite: 21.2.2 -> 21.4.1 --- .../blockchains/trezor-suite/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 098a948c845..e743512be69 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchurl , appimageTools , tor @@ -7,12 +8,20 @@ let pname = "trezor-suite"; - version = "21.2.2"; + version = "21.4.1"; name = "${pname}-${version}"; + suffix = { + aarch64-linux = "linux-arm64"; + x86_64-linux = "linux-x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { - url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-linux-x86_64.AppImage"; - sha256 = "0dj3azx9jvxchrpm02w6nkcis6wlnc6df04z7xc6f66fwn6r3kkw"; + url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; + sha256 = { + aarch64-linux = "51ea8a5210f008d13a729ac42085563b5e8b971b17ed766f84d69d76dcb2db0c"; + x86_64-linux = "9219168a504356152b3b807e1e7282e21952461d277596c6b82ddfe81ac2419c"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; appimageContents = appimageTools.extractType2 { @@ -48,6 +57,6 @@ appimageTools.wrapType2 rec { homepage = "https://suite.trezor.io"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } From a6439090f073f9f63642be235fcbbdb702f6ffb7 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Fri, 16 Apr 2021 11:59:43 -0400 Subject: [PATCH 009/476] python3Packages.cryptography: Update Cargo hash --- pkgs/development/python-modules/cryptography/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 4671f607bba..1bf3602a7b1 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "1wisxmq26b8ml144m2458sgcbk8jpv419j01qmffsrfy50x9i1yw"; + sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; }; cargoRoot = "src/rust"; From fbb8dbdac682296e6435e73c7568b3363f6eb0af Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 15 Apr 2021 21:21:50 +0200 Subject: [PATCH 010/476] fuse: fix mount.fuse -o setuid=... when mounting a fuse fs by fstab on can write: /nix/store/sdlflj/bin/somefuseexe#argument /mountpoint fuse setuid=someuser mount is run by root, and setuid is a way to tell mount.fuse to run somefuseexe as someuser instead. Under the hood, mount.fuse uses su. The problem is that mount is run by systemd in a seemingly very empty environment not containing /run/current-system/sw/bin nor /run/wrappers/bin in $PATH, so mount fails with "su command not found". We now patch the command to run su with an absolute path. man mount.fuse3 indicates that this option is reserved to root (or with enough capabilities) so not using /run/wrappers/bin/su is thus correct. It has the very small advantage of possibly working on non nixos. --- pkgs/os-specific/linux/fuse/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 053ea34c82e..cb4412609ff 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,7 +1,7 @@ { version, sha256Hash }: { lib, stdenv, fetchFromGitHub, fetchpatch -, fusePackages, util-linux, gettext +, fusePackages, util-linux, gettext, shadow , meson, ninja, pkg-config , autoreconfHook , python3Packages, which @@ -54,13 +54,14 @@ in stdenv.mkDerivation rec { # $PATH, so it should also work on non-NixOS systems. export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\"" - sed -e 's@/bin/@${util-linux}/bin/@g' -i lib/mount_util.c + substituteInPlace lib/mount_util.c --replace "/bin/" "${util-linux}/bin/" '' + (if isFuse3 then '' # The configure phase will delete these files (temporary workaround for # ./fuse3-install_man.patch) install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1 install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8 '' else '' + substituteInPlace util/mount.fuse.c --replace '"su"' '"${shadow.su}/bin/su"' sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh ./makeconf.sh ''); From 8bd4d8ee663ff4a61c6f80b0f02e1c9d5dbd5c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 18 Apr 2021 10:44:09 +0200 Subject: [PATCH 011/476] cudnn_cudatoolkit_11_0: 8.1.0 -> 8.1.1 Changelog: https://docs.nvidia.com/deeplearning/cudnn/release-notes/rel_8.html#rel-811 --- pkgs/development/libraries/science/math/cudnn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index b8aac46d919..d8e68a48cbf 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -53,12 +53,12 @@ in rec { cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { - version = "8.1.0"; + version = "8.1.1"; cudatoolkit = cudatoolkit_11_0; # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions - srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; - sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; + srcName = "cudnn-11.2-linux-x64-v8.1.1.33.tgz"; + sha256 = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; }; cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { From 7475b12169f459dec709c7e25c46abc4e393d4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 18 Apr 2021 10:53:22 +0200 Subject: [PATCH 012/476] cudnn_cudatoolkit: accept `hash` attribute for SRI hashes --- .../libraries/science/math/cudnn/default.nix | 2 +- .../libraries/science/math/cudnn/generic.nix | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d8e68a48cbf..f5518813cdc 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -58,7 +58,7 @@ in rec { # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions srcName = "cudnn-11.2-linux-x64-v8.1.1.33.tgz"; - sha256 = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; }; cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index d9c19e6790c..f5a4fac1a90 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,8 +1,11 @@ { version , srcName -, sha256 +, hash ? null +, sha256 ? null }: +assert (hash != null) || (sha256 != null); + { stdenv , lib , cudatoolkit @@ -22,11 +25,13 @@ stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; - src = fetchurl { + + src = let + hash_ = if hash != null then { inherit hash; } else { inherit sha256; }; + in fetchurl ({ # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}"; - inherit sha256; - }; + } // hash_); nativeBuildInputs = [ addOpenGLRunpath ]; From 389ed7fd8f92e51c4bc0d016554d2ab1b92f677a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Apr 2021 04:09:09 +0200 Subject: [PATCH 013/476] appdaemon: 4.0.5 -> 4.0.8 --- pkgs/servers/home-assistant/appdaemon.nix | 106 +++++++++------------- 1 file changed, 44 insertions(+), 62 deletions(-) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index f805d45b212..7b100b692a3 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -3,79 +3,61 @@ , fetchFromGitHub }: -let - python = python3.override { - packageOverrides = self: super: { - astral = super.astral.overridePythonAttrs (oldAttrs: rec { - version = "1.10.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1wbvnqffbgh8grxm07cabdpahlnyfq91pyyaav432cahqi1p59nj"; - }; - }); - - bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec { - version = "3.1.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "CwBpx1LsFBcsX3ggjxhj161nVab65v527CyA0TvkHkI="; - }; - }); - - yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { - version = "1.4.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "WM2cRp7O1VjNgao/SEspJOiJcEngaIno/yUQQ1t+90s="; - }; - }); - }; - }; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.0.5"; - disabled = python.pythonOlder "3.6"; + version = "4.0.8"; + disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "AppDaemon"; repo = pname; rev = version; - sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM="; + sha256 = "04a4qx0rbx2vpkzpibmwkpy7fawa6dbgqlrllryrl7dchbrf703q"; }; - propagatedBuildInputs = with python.pkgs; [ - daemonize astral requests websocket_client aiohttp yarl jinja2 - aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools - deepdiff dateutil bcrypt python-socketio pid pytz sockjs pygments - azure-mgmt-compute azure-mgmt-storage azure-mgmt-resource azure-keyvault-secrets azure-storage-blob + # relax dependencies + postPatch = '' + substituteInPlace requirements.txt \ + --replace "deepdiff==5.2.3" "deepdiff" \ + --replace "pygments==2.8.1" "pygments" + sed -i 's/==/>=/' requirements.txt + ''; + + propagatedBuildInputs = with python3.pkgs; [ + aiodns + aiohttp + aiohttp-jinja2 + astral + azure-keyvault-secrets + azure-mgmt-compute + azure-mgmt-resource + azure-mgmt-storage + azure-storage-blob + bcrypt + cchardet + deepdiff + feedparser + iso8601 + jinja2 + paho-mqtt + pid + pygments + python-dateutil + python-engineio + python-socketio + pytz + pyyaml + requests + sockjs + uvloop + voluptuous + websocket_client + yarl ]; # no tests implemented - doCheck = false; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "pyyaml==5.3" "pyyaml" \ - --replace "pid==2.2.5" "pid" \ - --replace "Jinja2==2.11.1" "Jinja2" \ - --replace "pytz==2019.3" "pytz" \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6" \ - --replace "iso8601==0.1.12" "iso8601>=0.1" \ - --replace "azure==4.0.0" "azure-mgmt-compute - azure-mgmt-storage - azure-mgmt-resource - azure-keyvault-secrets - azure-storage-blob" \ - --replace "sockjs==0.10.0" "sockjs" \ - --replace "deepdiff==4.3.1" "deepdiff" \ - --replace "voluptuous==0.11.7" "voluptuous" \ - --replace "python-socketio==4.4.0" "python-socketio" \ - --replace "feedparser==5.2.1" "feedparser>=5.2.1" \ - --replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \ - --replace "pygments==2.6.1" "pygments>=2.6.1" \ - --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0" \ - --replace "websocket-client==0.57.0" "websocket-client>=0.57.0" + checkPhase = '' + $out/bin/appdaemon -v | grep -q "${version}" ''; meta = with lib; { From fdc157bc3fa68e0bef222e5801f5cb611890695b Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Mon, 19 Apr 2021 00:57:12 +0100 Subject: [PATCH 014/476] seren: init at 0.0.21 Co-authored-by: Sandro --- .../instant-messengers/seren/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/seren/default.nix diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/applications/networking/instant-messengers/seren/default.nix new file mode 100644 index 00000000000..63cefbd2ffd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/seren/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, alsaLib +, libopus +, libogg +, gmp +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "seren"; + version = "0.0.21"; + + buildInputs = [ alsaLib libopus libogg gmp ncurses ]; + + src = fetchurl { + url = "http://holdenc.altervista.org/seren/downloads/${pname}-${version}.tar.gz"; + sha256 = "sha256-adI365McrJkvTexvnWjMzpHcJkLY3S/uWfE8u4yuqho="; + }; + + meta = with lib; { + description = "A simple ncurses VoIP program based on the Opus codec"; + longDescription = '' + Seren is a simple VoIP program based on the Opus codec + that allows you to create a voice conference from the terminal, with up to 10 + participants, without having to register accounts, exchange emails, or add + people to contact lists. All you need to join an existing conference is the + host name or IP address of one of the participants. + ''; + homepage = "http://holdenc.altervista.org/seren/"; + changelog = "http://holdenc.altervista.org/seren/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ matthewcroughan nixinator ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf28b9782c..0a4e3d99940 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11420,6 +11420,8 @@ in gputils = null; }; + seren = callPackage ../applications/networking/instant-messengers/seren { }; + serialdv = callPackage ../development/libraries/serialdv { }; serpent = callPackage ../development/compilers/serpent { }; From 3b7b70f49258d4fd6378cb56a602cbdb42fcc24f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 05:11:35 +0000 Subject: [PATCH 015/476] aws-c-common: 0.5.4 -> 0.5.5 --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 988a27a5878..580eaec2ebe 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NH66WAOqAaMm/IIu8L5R7CUFhX56yTLH7mPY1Q4jDC4="; + sha256 = "sha256-rGv+fa+UF/f6mY8CmZpkjP98CAcAQCTjL3OI7HsUHcU="; }; nativeBuildInputs = [ cmake ]; From 30f7281d99fcb6bb91d79ab178d507ed325fc0f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 06:46:13 +0000 Subject: [PATCH 016/476] buildkite-agent: 3.28.1 -> 3.29.0 --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 4a402111b08..db1f2aeabc7 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,16 +2,16 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.28.1"; + version = "3.29.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-5YOXYOAh/0fOagcqdK2IEwm5XDCxyfTeTzwBGtsQRCs="; + sha256 = "sha256-76yyqZi+ktcwRXo0ZIcdFJ9YCuHm9Te4AI+4meuhMNA="; }; - vendorSha256 = "sha256-3UXZxeiL0WO4X/3/hW8ubL1TormGbn9X/k0PX+/cLuM="; + vendorSha256 = "sha256-6cejbCbr0Rn4jWFJ0fxG4v0L0xUM8k16cbACmcQ6m4o="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From 29d94a7abefea244ffcca2df219c4067d17965cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 07:23:39 +0000 Subject: [PATCH 017/476] charliecloud: 0.22 -> 0.23 --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 3e9029cce0a..23677dddd7f 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.22"; + version = "0.23"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "sha256-+9u7WRKAJ9F70+I68xNRck5Q22XzgLKTCnjGbIcsyW8="; + sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From 9d91c855842810e0a8ccc39c7cab95d620722414 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 07:38:12 +0000 Subject: [PATCH 018/476] clevis: 16 -> 18 --- pkgs/tools/security/clevis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 7f26dcabb7d..e5415f6d09b 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "16"; + version = "18"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk="; + sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8="; }; nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; From 5c8515684866f610f69eec115d2d2bcb44a97a16 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 08:42:35 +0000 Subject: [PATCH 019/476] doppler: 3.23.2 -> 3.24.1 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index b5fa405e93e..5a8e80d6cd0 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.23.2"; + version = "3.24.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-qdBq1vjvvb55gyL4XuPDrPK58YLSSH5kLp1oP84vJsU="; + sha256 = "sha256-ZWYyi/Fv18dA8MeKzcFHHm62RF1NfPyveWIE8aI4UxU="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; From 890bc87e5f967b2269518c3f61b292c32298b3af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 09:45:40 +0000 Subject: [PATCH 020/476] fluent-bit: 1.7.3 -> 1.7.4 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 8b751237f6e..d51676f4a5a 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-a3AVem+VbYKUsxAzGNu/VPqDiqG99bmj9p1/iiG1ZFw="; + sha256 = "sha256-xOrEPZ+AUihVVaxrqCCeO6n3XFkVahCzHOuX947LRFs="; }; nativeBuildInputs = [ cmake flex bison ]; From 11dca1a38c9a3fb09e7b40f007e83548ce5571c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 10:05:38 +0000 Subject: [PATCH 021/476] geoipupdate: 4.6.0 -> 4.7.1 --- pkgs/applications/misc/geoipupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 12b5a38877a..e85ada2253f 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq"; + sha256 = "sha256-nshQxr6y3TxKsAVSA9mzL7LJfCtpv0QuuTTqk3/lENc="; }; - vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; + vendorSha256 = "sha256-fqQWFhFeyW4GntRBxEeN6WSOo0G+1hH9vSEZmBKglz8="; doCheck = false; From c3bd75c75255c993fb1ec61c590a23ac31169744 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 21 Apr 2021 10:02:36 +0200 Subject: [PATCH 022/476] ceph: 15.2.10 -> 16.2.1 --- pkgs/tools/filesystems/ceph/default.nix | 23 +++++++++++++++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e923bb6132e..d13d4915e1e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, runCommand, fetchurl -, fetchpatch , ensureNewerSourcesHook , cmake, pkg-config , which, git @@ -14,6 +13,15 @@ , libnl, libcap_ng , rdkafka , nixosTests +, cryptsetup +, sqlite +, lua +, icu +, bzip2 +, doxygen +, graphviz +, fmt +, python3 # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -123,10 +131,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.10"; + version = "16.2.1"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01"; + sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh"; }; in rec { ceph = stdenv.mkDerivation { @@ -142,12 +150,18 @@ in rec { pkg-config which git python3Packages.wrapPython makeWrapper python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) + python3 + fmt + # for building docs/man-pages presumably + doxygen + graphviz ]; buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka + cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -171,7 +185,6 @@ in rec { ''; cmakeFlags = [ - "-DWITH_PYTHON3=ON" "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" @@ -182,6 +195,8 @@ in rec { "-DWITH_TESTS=OFF" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" + # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now + ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71a063a4393..e825afd6691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3313,7 +3313,8 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost172.override { enablePython = true; python = python38; }; + boost = boost17x.override { enablePython = true; python = python3; }; + lua = lua5_4; }) ceph ceph-client; From 8a6e130c71ed25f4eae8eadd62ef48450ccf8750 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 21 Apr 2021 16:19:00 +0200 Subject: [PATCH 023/476] nixos/ceph: fix tests - 512 -> 1024MB vm memory (had sporadic oom-failures with the lower setting) - set "auth_allow_insecure_global_id_reclaim=false" as described here: https://docs.ceph.com/en/latest/security/CVE-2021-20288/ --- nixos/tests/ceph-multi-node.nix | 3 ++- nixos/tests/ceph-single-node-bluestore.nix | 3 ++- nixos/tests/ceph-single-node.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 4e6d644f96c..33736e27b98 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -37,7 +37,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 ]; vlans = [ 1 ]; }; @@ -120,6 +120,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") diff --git a/nixos/tests/ceph-single-node-bluestore.nix b/nixos/tests/ceph-single-node-bluestore.nix index cc873e8aee5..f706d4d56fc 100644 --- a/nixos/tests/ceph-single-node-bluestore.nix +++ b/nixos/tests/ceph-single-node-bluestore.nix @@ -34,7 +34,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 20480 20480 ]; vlans = [ 1 ]; }; @@ -95,6 +95,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 19919371a3c..d1d56ea6708 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -34,7 +34,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 20480 20480 ]; vlans = [ 1 ]; }; @@ -95,6 +95,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") From c01046b022329000c28e0b48b773e0d1b18d68fc Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Thu, 22 Apr 2021 21:23:52 +0900 Subject: [PATCH 024/476] services.buildkite-agents: support multi-tags The buildkite agent supports multiple tags with the same key. This functionality is used to have a [single agent listen on multiple queues](https://buildkite.com/docs/agent/v3/queues#setting-an-agents-queue). However, having the tags be of type `attrsOf str` means that we cannot suport this use case. This commit modifies the type of tags to be `attrsOf (either str (listOf str))` where the list is expanded into multiple tags with the same key. Example: ``` {tags = {queue = ["default", "testing"];};} ``` generates ``` tags="queue=default,queue=testing" ``` in the buildkite agent configuration. --- .../continuous-integration/buildkite-agents.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index b0045409ae6..3dd1c40aaa4 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -76,7 +76,7 @@ let }; tags = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf (types.either types.str (types.listOf types.str)); default = {}; example = { queue = "default"; docker = "true"; ruby2 ="true"; }; description = '' @@ -230,7 +230,11 @@ in ## don't end up in the Nix store. preStart = let sshDir = "${cfg.dataDir}/.ssh"; - tagStr = lib.concatStringsSep "," (lib.mapAttrsToList (name: value: "${name}=${value}") cfg.tags); + tagStr = name: value: + if lib.isList value + then lib.concatStringsSep "," (builtins.map (v: "${name}=${v}") value) + else "${name}=${value}"; + tagsStr = lib.concatStringsSep "," (lib.mapAttrsToList tagStr cfg.tags); in optionalString (cfg.privateSshKeyPath != null) '' mkdir -m 0700 -p "${sshDir}" @@ -241,7 +245,7 @@ in token="$(cat ${toString cfg.tokenPath})" name="${cfg.name}" shell="${cfg.shell}" - tags="${tagStr}" + tags="${tagsStr}" build-path="${cfg.dataDir}/builds" hooks-path="${cfg.hooksPath}" ${cfg.extraConfig} From 655fa33f1859b1b8c3f70a2c4a09aecefa8d0869 Mon Sep 17 00:00:00 2001 From: George Shammas Date: Wed, 21 Apr 2021 13:27:50 -0400 Subject: [PATCH 025/476] pulumi-bin: 2.24.1 -> 3.1.0 --- pkgs/tools/admin/pulumi/data.nix | 170 ++++++++++++++++-------------- pkgs/tools/admin/pulumi/update.sh | 41 +++---- 2 files changed, 110 insertions(+), 101 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 5a1dcfe16ec..3e7d11f4827 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,186 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.24.1"; + version = "3.1.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-linux-x64.tar.gz"; - sha256 = "1c3a0ibwchl0lmcb8hr4j0x9b7hfsd0pfg6ay808zg1v8ddrj3xm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-linux-x64.tar.gz"; + sha256 = "103r0rih8qzpswij3bxls9gsb832n4ykwrzbki9b21w2ymj7k3x1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-linux-amd64.tar.gz"; - sha256 = "1gqbs33mqqssymn48glm9h5qfkc1097ygk0mdanfigyhwv6rdmnc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-linux-amd64.tar.gz"; + sha256 = "1f6r59qk48x73nm17swcs3cp3qw616m7p36bvgsc1s96h23k805w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-linux-amd64.tar.gz"; - sha256 = "0dg5szlslp863slv6lfd8g98946ljvxhvq64b3j4zk6rsn0badvh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-linux-amd64.tar.gz"; + sha256 = "12rnb18p7z709gvw50hvmx9v7f2wd3pwcncwz4g3ragd7f6a4kja"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-linux-amd64.tar.gz"; - sha256 = "00ibqxb1qzwi93dsq56av0vxq80lx2rr8wll4q6d8wlph215hlqs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-linux-amd64.tar.gz"; + sha256 = "0xs7i9l871x5kr22jg7jjw0rgyvs4j4hazr4n9375xgzc8ysrk09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.9.1-linux-amd64.tar.gz"; - sha256 = "04sk6km29ssqkv0xw26vq3iik2kfzc3dnzacn324m7fddv3p9wx9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-linux-amd64.tar.gz"; + sha256 = "08588m5s6j1xhig4jprlkjgxk1sif4h3f6as7ixnvssin2vhhhl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.17.1-linux-amd64.tar.gz"; - sha256 = "0b3bz952wz7fsbk51j0mlfsyyg9ymc9wnq8kgm7dvs1p5zgzv4ni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-linux-amd64.tar.gz"; + sha256 = "01dqah12p23658awcp0sx5h696rdyjl79vd9dm5075jdaix1f648"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-linux-amd64.tar.gz"; - sha256 = "0l1y8fckx7k3lasb6rzy3v58cl1x3qzbb999wi14z16z2a63zwsw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-linux-amd64.tar.gz"; + sha256 = "0m8q1cswdml0hsc4vkq38pm2izs3lig57fg4a8ghqqi3ykni344d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-linux-amd64.tar.gz"; - sha256 = "178l4h7wj9pn1283zajaqm7fwcfwzpzq7swrgr8q880qsa611gjs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; + sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-linux-amd64.tar.gz"; - sha256 = "0iliagpyvzn63pwcdq74w8ag9vc7asqpq658b19zly4jd6z3cwkd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1bzy4zf473w49fz2n9lg5ncgblq2a5jh70nf6cfwc7kcla407in0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0zp3rwhngj009a9s6w2vyvgyhj7nd03mwm44x62ikhnz6f414kr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-linux-amd64.tar.gz"; + sha256 = "0d17ccf84jj6a9hpdrnsziyw790i0y5zk18qgqh4qq79irwz6df2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-linux-amd64.tar.gz"; - sha256 = "1xhrj950lk6qdazg4flymn3dmkbivc2rd71k8sdy9zfanyxnq8vv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-linux-amd64.tar.gz"; + sha256 = "1j8232vw457fl0jhy08abs5hcx8nd2lll3zg9bp3s352wz2r5xl4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.7.1-linux-amd64.tar.gz"; - sha256 = "0n2p14iam44icms4c8qrjfy1z7p4m6igxckvqxr0gphi8ngk4ggh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-linux-amd64.tar.gz"; + sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.3-linux-amd64.tar.gz"; - sha256 = "0l9r0gqhhjbkv4vn4cxm2s9zf93005w8vrb103w101h1gc5gh93l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-linux-amd64.tar.gz"; + sha256 = "0s7an3qvczhajs54i0ir3jjmwxpv9w94viqrik506k198j0qnl3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.5.1-linux-amd64.tar.gz"; - sha256 = "0clck5cra6bplfxd0nb6vkji50gg4ah4yfvc7202hi3w2b9hfjjg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-linux-amd64.tar.gz"; + sha256 = "0ljxjv8rm4li61vgjbpmxw8w6d2pym5li3w61dqi3kka4ix25aww"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.5.1-linux-amd64.tar.gz"; - sha256 = "1cd2bm030fa9spv7bx817id419lz1c54i8h84ifinkx88ig7ngyx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-linux-amd64.tar.gz"; + sha256 = "1mxkwcricqnnbj0dp3wqidci6rgfn7daxkjprcnrndhgcdghq7sv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.17.1-linux-amd64.tar.gz"; - sha256 = "1q9sx2lszmkcgphp3vwx0lvs5vc67sk98rn8s6ywhz0p426wakmr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; + sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.0.0-linux-amd64.tar.gz"; + sha256 = "1535c95ncgdifyz5m29gagpcr7lhhddlffmj9lmwch55w2xlk86k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-linux-amd64.tar.gz"; - sha256 = "0n486h5f683yq6z53s9l9x5air1vk4nz1skiirsprz7a12cy2xkn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.0-linux-amd64.tar.gz"; + sha256 = "13j13kp0sbwp65l73mdcqiv4cszslxin567ccdkk2rw8vs1ni7x0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-linux-amd64.tar.gz"; - sha256 = "1zpwlvdgjvhnhlzyppqg76csma8kan33amxa1svlhcai8b168878"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-linux-amd64.tar.gz"; + sha256 = "0pah7s9wwaj8zp371blmj4c1bgyhh0dgsfr9axj0k4lhpqlyikmj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.5.1-linux-amd64.tar.gz"; - sha256 = "16b1449vb6inlyjpb1iyr5j5mwg1g2d6bcd5g2kmxcsw4yhc7ai7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-linux-amd64.tar.gz"; + sha256 = "0bk26k1igqljjpwkkvri6dp14cfw9l9a2dvg2as3v5930w4jxql8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-linux-amd64.tar.gz"; - sha256 = "1z6v5vz0p9g3hrrgrchx2wnbparkbf5b8vn9pwnw69nkplr1qzff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-linux-amd64.tar.gz"; + sha256 = "1lxb03z80r8a2vfckyw5yf036ii30gdi3rch4sriksfv30il9kbc"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-darwin-x64.tar.gz"; - sha256 = "1x6z0drvaxrps47nisvw513vgskaf86mz8fzlhqfkddp2k5la5j1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-darwin-x64.tar.gz"; + sha256 = "1lfqm4s72bwrycspr9nbgfvf5i6p50x8lk81pcs6zbzz6iff4x7z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-darwin-amd64.tar.gz"; - sha256 = "05cz7b738bcai4aiya4rkjhmkh9pg6za4xp2snb9nx0jkw2vw2ms"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "0nycqlz3lkwirr8rs4sqdqbzn2igv51hjyfjjsgnhx85kjzlkas6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-darwin-amd64.tar.gz"; - sha256 = "0k74x9a6b9xngrp1cgdal86h23m95r5sa3q036ms4py0phq47r2w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1kim1lk9dycsanc2vcsr4fgfhk90zyjf24vvwmmkk70nq1lnwqp3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-darwin-amd64.tar.gz"; - sha256 = "05ggw10z0pp45yqq8bl32l3xjxvgwbs58czpw74whydqbd3qy8av"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0kvr057hdwcxf7gj788sv6ysz25ap3z0akqhhb20mlzv3shwiiji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.9.1-darwin-amd64.tar.gz"; - sha256 = "022458yxscfg56s2nqdr95wp2ffm7sni4kaksj87i6c5ddc9f1gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "14d530fbzmq5m3njl31qkgwwfyipad9iqjhv3cd8pcl87blaxxki"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.17.1-darwin-amd64.tar.gz"; - sha256 = "09nd5nfvjqgpbjs82bm5ym5wdg37mg863wvdp8s3fd8id4gdqb24"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0q29dyrnramr2bl89503gnbm4zq2x3bn7kaiwbhg6r17xa6rkji4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-darwin-amd64.tar.gz"; - sha256 = "0iflll8lkk3s3dx3xl0iqmxac9nlspjnv8gmjfqwpryzk8h1fmzy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "0v8iha0n1kqvaxrjll2mv9znc9lzqj7mqxgxig2g89qqjs6p69ql"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-darwin-amd64.tar.gz"; - sha256 = "10vp75fc41yk9lg5x7wyhs4mn2f4krfnw4jn5xys7dd475blm6rh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-darwin-amd64.tar.gz"; - sha256 = "061s8snsgz044ilh2s48810bmayypdyq9aqkhgal6v3l86jl8m95"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "1793qry84bch32zbc70c777y04qgys6n0vxsxzxqgz2j4r9vmi6a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "1p6xxhy30qzprxk3kwiwimw5m0c73fk7c9j4vrzj2z4kpgj8qx7w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1lzjjk2da1xla012xrs9jfcdsbpmkh48n6lypmbr2ixh13pdwk1b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-darwin-amd64.tar.gz"; - sha256 = "14gqwz5nalbv97vl9apwda0xxl7cgkp5mixrc10xvx6a94w5758p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1i3zmflwjjfc13j7w9acavgrbblm9fri041z6qpb3ikcq5s9lqcm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.7.1-darwin-amd64.tar.gz"; - sha256 = "0i0h1iz999pbz23gbs75bj3lxfg9a6044g4bwdwf3agxf3k9pji3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-darwin-amd64.tar.gz"; + sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.3-darwin-amd64.tar.gz"; - sha256 = "1nwwqq1nn1zr6mia2wd82lzqsa8l3rr50hl1mf6l6ffyxz1q1lzj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "10439p96wpxr13pxhii7li2cjq53pgr8c48ir63d2n4b8fn8iklr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.5.1-darwin-amd64.tar.gz"; - sha256 = "0zkd3rm6z8bc7pcbwl0bbbn0zb3jrl69b84g62ma9vzskccrxxpr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "1n35b1cqglpwvcxdcgxwmv5j1qp8gwrjzh25884l0b72krna9alr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.5.1-darwin-amd64.tar.gz"; - sha256 = "0v4qqp1x8xi0fqiczmmh2qbf3azbgf09cphia5w8r2kkrn4i0jxn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0qx4p0jz3n66r3kgpgs25qbzlmwdqf80353nywyijv3ham6hpicf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.17.1-darwin-amd64.tar.gz"; - sha256 = "1788ayj5zwlmvhd1qp6rzrcbman5i0hy1hw2fmgcrf66v5qc1f18"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0159ng9c9hshmng8ipss7hncqs5qp8plmr1qjadka6vyp1mxn2c3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "08af55rrzpm42vx7w1i1cmfk48czjfwln737prp5mwcvddmg5s1g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "0h9zdiaanvm2yds9z0c5fmz0f05apdhm4w28d2i929djxh57jqrr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "1j30gkz1m9ap8pd2r3lb3nl82bq5bq3h7y6jq2c0dmv3ksnp197f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "15pzcymjr9bzx47sq86llzfg0hydyf4cn0bb95zxjqrx8y37rql8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.5.1-darwin-amd64.tar.gz"; - sha256 = "1s5kbqri9k7cpajkgnl2s5l0nznzridj5iscwd9n1nj4bsr44lap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1wkak84yg5a4b5791pdwcl0fr089yjk853hwp44x3rhdh8xrdq1p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.13.1-darwin-amd64.tar.gz"; - sha256 = "133xspppmydjri5ba2yxc331ljzd8wj88q3hzmgvp0m50il1ks71"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "1g2q3zbhxmpk2qp3c9hz0vn0xh95pnl7pd5b5kcizbrdfgjlaabq"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 31ac38ab275..d8c5a698300 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.24.1" +VERSION="3.1.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.10.0" - "aws=3.36.0" - "cloudflare=2.14.2" - "consul=2.9.1" - "datadog=2.17.1" - "digitalocean=3.7.0" - "docker=2.9.1" - "gcp=4.19.0" - "github=3.4.0" - "gitlab=3.8.1" - "hcloud=0.7.1" - "kubernetes=2.8.3" - "mailgun=2.5.1" - "mysql=2.5.1" - "openstack=2.17.1" + "auth0=2.0.0" + "aws=4.0.0" + "cloudflare=3.0.0" + "consul=3.0.0" + "datadog=3.0.0" + "digitalocean=4.0.0" + "docker=3.0.0" + "gcp=5.0.0" + "github=4.0.0" + "gitlab=4.0.0" + "hcloud=1.0.0" + "kubernetes=3.0.0" + "linode=3.0.0" + "mailgun=3.0.0" + "mysql=3.0.0" + "openstack=3.0.0" "packet=3.2.2" - "postgresql=2.9.0" - "random=3.1.1" - "vault=3.5.1" - "vsphere=2.13.1" + "postgresql=3.0.0" + "random=4.0.0" + "vault=4.0.0" + "vsphere=3.0.0" ) function genMainSrc() { From fa7904534462c5889c77c356b6036b6776cc4871 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Apr 2021 21:16:10 +0200 Subject: [PATCH 026/476] Stackage Nightly 2021-04-23 --- .../configuration-hackage2nix.yaml | 73 ++++++++++++------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3bf834c16da..191b47acbbf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -101,7 +101,7 @@ default-package-overrides: - gi-secret < 0.0.13 - gi-vte < 2.91.28 - # Stackage Nightly 2021-04-15 + # Stackage Nightly 2021-04-23 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -437,6 +437,7 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.3.0 - can-i-haz ==0.3.1.0 + - capability ==0.4.0.0 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 @@ -531,6 +532,7 @@ default-package-overrides: - composite-aeson ==0.7.5.0 - composite-aeson-path ==0.7.5.0 - composite-aeson-refined ==0.7.5.0 + - composite-aeson-throw ==0.1.0.0 - composite-base ==0.7.5.0 - composite-binary ==0.7.5.0 - composite-ekg ==0.7.5.0 @@ -710,7 +712,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.8 + - dl-fedora ==0.9 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -902,6 +904,7 @@ default-package-overrides: - format-numbers ==0.1.0.1 - formatting ==6.3.7 - foundation ==0.0.25 + - fourmolu ==0.3.0.0 - free ==5.1.5 - free-categories ==0.2.0.2 - freenect ==1.2.1 @@ -1081,6 +1084,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.4.1 - haskeline ==0.8.1.2 + - haskell-awk ==1.2 - haskell-gi ==0.24.7 - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 @@ -1187,15 +1191,15 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.6.2 + - HsOpenSSL ==0.11.7 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - - hspec ==2.7.9 + - hspec ==2.7.10 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.9 - - hspec-discover ==2.7.9 + - hspec-core ==2.7.10 + - hspec-discover ==2.7.10 - hspec-expectations ==0.8.2 - hspec-expectations-json ==1.0.0.3 - hspec-expectations-lifted ==0.10.0 @@ -1228,7 +1232,7 @@ default-package-overrides: - html-entities ==1.1.4.5 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.6 + - http2 ==3.0.1 - HTTP ==4000.3.16 - http-api-data ==0.4.2 - http-client ==0.6.4.1 @@ -1330,7 +1334,7 @@ default-package-overrides: - inliterate ==0.1.0 - input-parsers ==0.2.2 - insert-ordered-containers ==0.2.4 - - inspection-testing ==0.4.3.0 + - inspection-testing ==0.4.4.0 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3.1 @@ -1356,6 +1360,7 @@ default-package-overrides: - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 + - ipa ==0.3 - iproute ==1.7.11 - IPv6Addr ==2.0.2 - ipynb ==0.1.0.1 @@ -1410,6 +1415,7 @@ default-package-overrides: - kind-generics ==0.4.1.0 - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 + - koji ==0.0.1 - koofr-client ==1.0.0.3 - krank ==0.2.2 - kubernetes-webhook-haskell ==0.2.0.3 @@ -1422,7 +1428,7 @@ default-package-overrides: - language-bash ==0.9.2 - language-c ==0.8.3 - language-c-quote ==0.12.2.1 - - language-docker ==9.2.0 + - language-docker ==9.3.0 - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 @@ -1689,6 +1695,7 @@ default-package-overrides: - network-ip ==0.3.0.3 - network-messagepack-rpc ==0.1.2.0 - network-messagepack-rpc-websocket ==0.1.1.1 + - network-run ==0.2.4 - network-simple ==0.4.5 - network-simple-tls ==0.4 - network-transport ==0.5.4 @@ -1713,9 +1720,9 @@ default-package-overrides: - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.6 - - nri-observability ==0.1.0.1 - - nri-prelude ==0.5.0.3 + - nri-env-parser ==0.1.0.7 + - nri-observability ==0.1.0.2 + - nri-prelude ==0.6.0.0 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1743,7 +1750,7 @@ default-package-overrides: - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - OpenAL ==1.7.0.5 - - openapi3 ==3.0.2.0 + - openapi3 ==3.1.0 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -1777,7 +1784,9 @@ default-package-overrides: - pagination ==0.2.2 - pagure-cli ==0.2 - pandoc ==2.13 + - pandoc-dhall-decoder ==0.1.0.1 - pandoc-plot ==1.1.1 + - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - pantry ==0.5.1.5 - parallel ==3.2.2.0 @@ -1861,7 +1870,7 @@ default-package-overrides: - pipes-safe ==2.3.3 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - - pkgtreediff ==0.4 + - pkgtreediff ==0.4.1 - place-cursor-at ==1.0.1 - placeholders ==0.1 - plaid ==0.1.0.4 @@ -1874,6 +1883,8 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 + - polysemy ==1.5.0.0 + - polysemy-plugin ==0.3.0.0 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 @@ -1929,7 +1940,7 @@ default-package-overrides: - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto3-wire ==1.2.0 + - proto3-wire ==1.2.1 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.17 @@ -2059,7 +2070,6 @@ default-package-overrides: - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - resourcet ==1.2.4.2 - - resourcet-pool ==0.1.0.0 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.2 @@ -2146,11 +2156,17 @@ default-package-overrides: - serf ==0.1.1.0 - serialise ==0.2.3.0 - servant ==0.18.2 + - servant-auth ==0.4.0.0 + - servant-auth-client ==0.4.1.0 + - servant-auth-docs ==0.2.10.0 + - servant-auth-server ==0.4.6.0 + - servant-auth-swagger ==0.2.10.1 - servant-blaze ==0.9.1 - servant-client ==0.18.2 - servant-client-core ==0.18.2 - servant-conduit ==0.15.1 - servant-docs ==0.11.8 + - servant-elm ==0.7.2 - servant-errors ==0.1.6.0 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 @@ -2158,13 +2174,13 @@ default-package-overrides: - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - servant-multipart ==0.12 - - servant-openapi3 ==2.0.1.1 + - servant-openapi3 ==2.0.1.2 - servant-pipes ==0.15.2 - servant-rawm ==1.0.0.0 - servant-server ==0.18.2 - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.4.3.37.2 - - servant-swagger-ui-core ==0.3.4 + - servant-swagger-ui ==0.3.5.3.47.1 + - servant-swagger-ui-core ==0.3.5 - serverless-haskell ==0.12.6 - serversession ==1.0.2 - serversession-frontend-wai ==1.0 @@ -2289,7 +2305,7 @@ default-package-overrides: - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - - store ==0.7.10 + - store ==0.7.11 - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 @@ -2459,7 +2475,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.3 + - tidal ==1.7.4 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2645,10 +2661,11 @@ default-package-overrides: - wai-rate-limit-redis ==0.1.0.0 - wai-saml2 ==0.2.1.2 - wai-session ==0.3.3 + - wai-session-redis ==0.1.0.1 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.14 + - warp ==3.3.15 - warp-tls ==3.3.0 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2670,7 +2687,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.0.0.5 + - witch ==0.1.1.0 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2707,7 +2724,7 @@ default-package-overrides: - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 - - xml-conduit ==1.9.1.0 + - xml-conduit ==1.9.1.1 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 @@ -2726,16 +2743,16 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.3 - - yesod ==1.6.1.0 - - yesod-auth ==1.6.10.2 - - yesod-auth-hashdb ==1.7.1.5 + - yesod ==1.6.1.1 + - yesod-auth ==1.6.10.3 + - yesod-auth-hashdb ==1.7.1.6 - yesod-auth-oauth2 ==0.6.3.0 - yesod-bin ==1.6.1 - yesod-core ==1.6.19.0 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.8 + - yesod-markdown ==0.12.6.9 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.6 - yesod-paginator ==1.1.1.0 From 9754c111f520ed167626e116e4f849a0c5aba438 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Apr 2021 21:16:48 +0200 Subject: [PATCH 027/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/2fedb31fe1abdbfb2f224486b4a8b689af85024d. --- .../haskell-modules/hackage-packages.nix | 635 +----------------- 1 file changed, 7 insertions(+), 628 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7869388c544..6aa8f8db38b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10852,20 +10852,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.6.2"; - sha256 = "160fpl2lcardzf4gy5dimhad69gvkkvnpp5nqbf8fcxzm4vgg76y"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10877,7 +10863,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -77910,29 +77895,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-directory, http-types, optparse-applicative, regex-posix - , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.8"; - sha256 = "1pd0cslszd9srr9bpcxzrm84cnk5r78xs79ig32528z0anc5ghcr"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-directory http-types - optparse-applicative regex-posix simple-cmd simple-cmd-args text - time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "dl-fedora_0_9" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -138675,21 +138637,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.7.9"; - sha256 = "03k8djbzkl47x1kgsplbjjrwx8qqdb31zg9aw0c6ii3d8r49gkyn"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = lib.licenses.mit; - }) {}; - - "hspec_2_7_10" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: @@ -138702,7 +138649,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -138761,33 +138707,6 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.7.9"; - sha256 = "0lqqvrdya7jszdxkzjnwd5g02w1ggmlfkh67bpcmzch6h0v609yj"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = lib.licenses.mit; - }) {}; - - "hspec-core_2_7_10" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -138812,7 +138731,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -138834,25 +138752,6 @@ self: { }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.7.9"; - sha256 = "1zr6h8r8ggi4482hnx0p2vsrkirfjimq8zy9yfiiyn5mkcqzxl4v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_10" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { @@ -138869,7 +138768,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -142241,37 +142139,6 @@ self: { }) {}; "http2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base16-bytestring, bytestring, case-insensitive, containers - , directory, doctest, filepath, gauge, Glob, heaps, hspec - , http-types, mwc-random, network, network-byte-order, psqueues - , stm, text, time-manager, unordered-containers, vector - }: - mkDerivation { - pname = "http2"; - version = "2.0.6"; - sha256 = "17m1avrppiz8i6qwjlgg77ha88sx8f8vvfa57z369aszhld6nx9a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager - ]; - testHaskellDepends = [ - aeson aeson-pretty array base base16-bytestring bytestring - case-insensitive containers directory doctest filepath Glob hspec - http-types network network-byte-order psqueues stm text - time-manager unordered-containers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - }) {}; - - "http2_3_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filepath, gauge, Glob, heaps, hspec @@ -142303,7 +142170,6 @@ self: { ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http2-client" = callPackage @@ -149038,22 +148904,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.3.0"; - sha256 = "1pba3br5vd11svk9fpg5s977q55qlvhlf95nd5ay79bwdjm10hj3"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_4_0" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -149067,7 +148917,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -159562,27 +159411,6 @@ self: { }) {}; "language-docker" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text - , time - }: - mkDerivation { - pname = "language-docker"; - version = "9.2.0"; - sha256 = "08nq78091w7dii823fy7bvp2gxn1j1fp1fj151z37hvf423w19ds"; - libraryHaskellDepends = [ - base bytestring containers data-default-class megaparsec - prettyprinter split text time - ]; - testHaskellDepends = [ - base bytestring containers data-default-class hspec HUnit - megaparsec prettyprinter QuickCheck split text time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3Only; - }) {}; - - "language-docker_9_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text , time @@ -159601,7 +159429,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -189808,20 +189635,6 @@ self: { }) {}; "nri-env-parser" = callPackage - ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text - }: - mkDerivation { - pname = "nri-env-parser"; - version = "0.1.0.6"; - sha256 = "1hmq6676w3f5mpdpd4jbd1aa6g379q6yyidcvdyhazqxcb0dhirh"; - libraryHaskellDepends = [ - base modern-uri network-uri nri-prelude text - ]; - description = "Read environment variables as settings to build 12-factor apps"; - license = lib.licenses.bsd3; - }) {}; - - "nri-env-parser_0_1_0_7" = callPackage ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text }: mkDerivation { @@ -189833,34 +189646,9 @@ self: { ]; description = "Read environment variables as settings to build 12-factor apps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-observability" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs - , bytestring, directory, hostname, http-client, http-client-tls - , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text - , time, unordered-containers - }: - mkDerivation { - pname = "nri-observability"; - version = "0.1.0.1"; - sha256 = "02baq11z5qq9lq9yh8zc29s44i44qz1m593ypn3qd8rgc1arrfjj"; - libraryHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers - ]; - description = "Report log spans collected by nri-prelude"; - license = lib.licenses.bsd3; - }) {}; - - "nri-observability_0_1_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, directory, hostname, http-client, http-client-tls , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text @@ -189882,36 +189670,9 @@ self: { ]; description = "Report log spans collected by nri-prelude"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-prelude" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base - , bytestring, containers, directory, exceptions, filepath, ghc - , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text - , safe-exceptions, terminal-size, text, time, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.5.0.3"; - sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn"; - libraryHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-exceptions terminal-size text - time vector - ]; - testHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-exceptions terminal-size text - time vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_6_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text @@ -189935,7 +189696,6 @@ self: { ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nsis" = callPackage @@ -192550,43 +192310,6 @@ self: { }) {}; "openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "openapi3"; - version = "3.0.2.0"; - sha256 = "00qpbj2lvaysbwgbax7z1vyixzd0x7yzbz26aw5zxd4asddypbfg"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - executableHaskellDepends = [ aeson base lens text ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "OpenAPI 3.0 data model"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "openapi3_3_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -204718,27 +204441,6 @@ self: { }) {}; "pkgtreediff" = callPackage - ({ mkDerivation, async, base, directory, filepath, Glob - , http-client, http-client-tls, http-directory, simple-cmd - , simple-cmd-args, text - }: - mkDerivation { - pname = "pkgtreediff"; - version = "0.4"; - sha256 = "00cah2sbfx824zvg4ywm3qw8rkibflj9lmw1z0ywsalgdmmlp460"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async base directory filepath Glob http-client http-client-tls - http-directory simple-cmd simple-cmd-args text - ]; - description = "Package tree diff tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "pkgtreediff_0_4_1" = callPackage ({ mkDerivation, async, base, directory, extra, filepath, Glob , http-client, http-client-tls, http-directory, koji, simple-cmd , simple-cmd-args, text @@ -212609,33 +212311,6 @@ self: { }) {}; "proto3-wire" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck - , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "proto3-wire"; - version = "1.2.0"; - sha256 = "1xrnrh4njnw6af8xxg9xhcxrscg0g644jx4l9an4iqz6xmjp2nk2"; - revision = "1"; - editedCabalFile = "14cjzgh364b836sg7szwrkvmm19hg8w57hdbsrsgwa7k9rhqi349"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq ghc-prim hashable - parameterized primitive QuickCheck safe text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cereal doctest QuickCheck tasty tasty-hunit - tasty-quickcheck text transformers vector - ]; - description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "proto3-wire_1_2_1" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers @@ -234901,38 +234576,6 @@ self: { }) {}; "servant-openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , lens-aeson, openapi3, QuickCheck, servant, singleton-bool - , template-haskell, text, time, unordered-containers, utf8-string - , vector - }: - mkDerivation { - pname = "servant-openapi3"; - version = "2.0.1.1"; - sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf"; - revision = "2"; - editedCabalFile = "0y214pgkfkysvdll15inf44psyqj7dmzcwp2vjynwdlywy2j0y16"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens openapi3 QuickCheck servant - singleton-bool text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - lens-aeson openapi3 QuickCheck servant template-haskell text time - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-openapi3_2_0_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -235766,22 +235409,6 @@ self: { }) {}; "servant-swagger-ui" = callPackage - ({ mkDerivation, base, bytestring, file-embed-lzma, servant - , servant-server, servant-swagger-ui-core, swagger2, text - }: - mkDerivation { - pname = "servant-swagger-ui"; - version = "0.3.4.3.37.2"; - sha256 = "1kx8i2x3ffbwbjh2i2ljha2cl6vfj1fcad9wkmc9ll9mbj6cpl8v"; - libraryHaskellDepends = [ - base bytestring file-embed-lzma servant servant-server - servant-swagger-ui-core swagger2 text - ]; - description = "Servant swagger ui"; - license = lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_3_5_3_47_1" = callPackage ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, text }: @@ -235795,28 +235422,9 @@ self: { ]; description = "Servant swagger ui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, http-media - , servant, servant-blaze, servant-server, swagger2, text - , transformers, transformers-compat, wai-app-static - }: - mkDerivation { - pname = "servant-swagger-ui-core"; - version = "0.3.4"; - sha256 = "05vi74kgsf3yhkbw9cjl1zxs5swhh9jib6bwqf1h11cg0nr5i8ab"; - libraryHaskellDepends = [ - base blaze-markup bytestring http-media servant servant-blaze - servant-server swagger2 text transformers transformers-compat - wai-app-static - ]; - description = "Servant swagger ui core components"; - license = lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui-core_0_3_5" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, text, transformers , transformers-compat, wai-app-static @@ -235831,7 +235439,6 @@ self: { ]; description = "Servant swagger ui core components"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -249833,54 +249440,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, nats, network, primitive, resourcet, safe - , smallcheck, store-core, syb, template-haskell, text, th-lift - , th-lift-instances, th-orphans, th-reify-many, th-utilities, time - , transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.7.10"; - sha256 = "0026bjff7nsw23i1l5427qnvw69ncbii5s2q1nshkrs1nrspb0i2"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable nats network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable nats network - primitive resourcet safe smallcheck store-core syb template-haskell - text th-lift th-lift-instances th-orphans th-reify-many - th-utilities time transformers unordered-containers vector void - ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable nats network primitive resourcet safe smallcheck - store-core syb template-haskell text th-lift th-lift-instances - th-orphans th-reify-many th-utilities time transformers - unordered-containers vector vector-binary-instances void weigh - ]; - description = "Fast binary serialization"; - license = lib.licenses.mit; - }) {}; - - "store_0_7_11" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -249926,7 +249485,6 @@ self: { ]; description = "Fast binary serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "store-core" = callPackage @@ -262974,28 +262532,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, network, parsec - , primitive, random, text, transformers, weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.7.3"; - sha256 = "0z0brlicisn7xpwag20vdrq6ympczxcyd886pm6am5phmifkmfif"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - network parsec primitive random text transformers - ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - }) {}; - - "tidal_1_7_4" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, weigh @@ -263015,7 +262551,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -280364,39 +279899,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; - version = "3.3.14"; - sha256 = "0whmh6dbl7321a2kg6ypngw5kgvvxqdk161li0l4hr3wqqddlc93"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_15" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -280427,7 +279929,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -282878,17 +282379,17 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck - , text + ({ mkDerivation, base, bytestring, containers, hspec + , template-haskell, text }: mkDerivation { pname = "witch"; - version = "0.0.0.5"; - sha256 = "1j12mh8zap8c0lb358bzk4sq29h64lv0jrwq9r4nssx4yybrz9gg"; - libraryHaskellDepends = [ base bytestring containers text ]; - testHaskellDepends = [ - base bytestring containers hspec QuickCheck text + version = "0.1.1.0"; + sha256 = "1i9c6fgmr1awcrkb01rs4rbfhmz51bnbqxc2piyvjc23pjl3x6np"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text ]; + testHaskellDepends = [ base bytestring containers hspec text ]; description = "Convert values from one type into another"; license = lib.licenses.isc; }) {}; @@ -285679,30 +285180,6 @@ self: { }) {}; "xml-conduit" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, Cabal, cabal-doctest, conduit, conduit-extra - , containers, data-default-class, deepseq, doctest, hspec, HUnit - , resourcet, text, transformers, xml-types - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.9.1.0"; - sha256 = "0ag0g9x5qnw1nfgc31h6bj2qv0h1c2y7n1l0g99l4dkn428dk9ca"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup bytestring conduit - conduit-extra containers data-default-class deepseq resourcet text - transformers xml-types - ]; - testHaskellDepends = [ - base blaze-markup bytestring conduit containers doctest hspec HUnit - resourcet text transformers xml-types - ]; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = lib.licenses.mit; - }) {}; - - "xml-conduit_1_9_1_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, Cabal, cabal-doctest, conduit, conduit-extra , containers, data-default-class, deepseq, doctest, hspec, HUnit @@ -285724,7 +285201,6 @@ self: { ]; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "xml-conduit-decode" = callPackage @@ -288584,27 +288060,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit - , data-default-class, directory, fast-logger, file-embed - , monad-logger, shakespeare, streaming-commons, template-haskell - , text, unix, unordered-containers, wai, wai-extra, wai-logger - , warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.6.1.0"; - sha256 = "1jk55fm58ywp69khacw8n3qk2aybsrlh4bkinjgrah3w01kflmyw"; - libraryHaskellDepends = [ - aeson base bytestring conduit data-default-class directory - fast-logger file-embed monad-logger shakespeare streaming-commons - template-haskell text unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod_1_6_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit , data-default-class, directory, fast-logger, file-embed , monad-logger, shakespeare, streaming-commons, template-haskell @@ -288623,7 +288078,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-alerts" = callPackage @@ -288705,34 +288159,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.10.2"; - sha256 = "16c4rddfmpw1smk7zayflwp1xy3avrqcr0cv6qx4aq949zpn6lz8"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_10_3" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers @@ -288758,7 +288184,6 @@ self: { ]; description = "Authentication for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -288905,31 +288330,6 @@ self: { }) {}; "yesod-auth-hashdb" = callPackage - ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers - , hspec, http-conduit, http-types, monad-logger, network-uri - , persistent, persistent-sqlite, resourcet, text - , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.7.1.5"; - sha256 = "14isl9mwxarba14aqhidi82yci36jdws6af2jirv7z8mfnrwysbi"; - libraryHaskellDepends = [ - aeson base bytestring persistent text yesod-auth yesod-core - yesod-form yesod-persistent - ]; - testHaskellDepends = [ - aeson base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text unordered-containers wai-extra yesod yesod-auth yesod-core - yesod-test - ]; - description = "Authentication plugin for Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-auth-hashdb_1_7_1_6" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , hspec, http-conduit, http-types, monad-logger, network-uri , persistent, persistent-sqlite, resourcet, text @@ -288952,7 +288352,6 @@ self: { ]; description = "Authentication plugin for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-hmac-keccak" = callPackage @@ -289916,26 +289315,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.8"; - sha256 = "1jlnci0wkfg04qvad7qx19321s8jf2rskjghirwcqy1abg3bf96p"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "yesod-markdown_0_12_6_9" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form From b84d1ee65cbef5e110e0385f90a26dd1151c11d1 Mon Sep 17 00:00:00 2001 From: Magnus Therning Date: Fri, 23 Apr 2021 23:19:37 +0200 Subject: [PATCH 028/476] haskellPackages.openapi3: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 191b47acbbf..0e8bdd9da78 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8691,7 +8691,6 @@ broken-packages: - openai-servant - openapi-petstore - openapi-typed - - openapi3 - openapi3-code-generator - opench-meteo - OpenCL From 5995d5237e3c5ed5592be753cf8870935229dab6 Mon Sep 17 00:00:00 2001 From: Magnus Therning Date: Fri, 23 Apr 2021 23:19:52 +0200 Subject: [PATCH 029/476] haskellPackages.servant-openapi3: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0e8bdd9da78..1fd7b35497f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10045,7 +10045,6 @@ broken-packages: - servant-multipart - servant-namedargs - servant-nix - - servant-openapi3 - servant-pagination - servant-pandoc - servant-polysemy From e7947f3efb269cac7bcb075986e88d28b80a3831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 08:58:47 +0200 Subject: [PATCH 030/476] prometheus-unbound-exporter: init at unstable-2021-03-17 --- .../prometheus/unbound-exporter.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/unbound-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix new file mode 100644 index 00000000000..c085226d909 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, openssl, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "unbound-telemetry"; + version = "unstable-2021-03-17"; + + src = fetchFromGitHub { + owner = "svartalf"; + repo = pname; + rev = "7f1b6d4e9e4b6a3216a78c23df745bcf8fc84021"; + sha256 = "xCelL6WGaTRhDJkkUdpdwj1zcKKAU2dyUv3mHeI4oAw="; + }; + + cargoSha256 = "P3nAtYOuwNSLMP7q1L5zKTsZ6rJA/qL1mhVHzP3szi4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Prometheus exporter for Unbound DNS resolver"; + homepage = "https://github.com/svartalf/unbound-telemetry"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6915f6bcf84..b6ecedd2f33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19110,6 +19110,7 @@ in prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; + prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; From 8ee00e6ca2910e1498d74750b55520de47c1b3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 09:11:00 +0200 Subject: [PATCH 031/476] nixos/kresd: allow package to be configured --- nixos/modules/services/networking/kresd.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 3f9be6172f1..86709874065 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -29,8 +29,6 @@ let + concatMapStrings (mkListen "doh2") cfg.listenDoH + cfg.extraConfig ); - - package = pkgs.knot-resolver; in { meta.maintainers = [ maintainers.vcunat /* upstream developer */ ]; @@ -58,6 +56,13 @@ in { and give commands interactively to kresd@1.service. ''; }; + package = mkOption { + default = pkgs.knot-resolver; + type = types.package; + description = " + knot-resolver package to use. + "; + }; extraConfig = mkOption { type = types.lines; default = ""; @@ -115,7 +120,7 @@ in { }; users.groups.knot-resolver.gid = null; - systemd.packages = [ package ]; # the units are patched inside the package a bit + systemd.packages = [ cfg.package ]; # the units are patched inside the package a bit systemd.targets.kresd = { # configure units started by default wantedBy = [ "multi-user.target" ]; @@ -123,8 +128,8 @@ in { ++ map (i: "kresd@${toString i}.service") (range 1 cfg.instances); }; systemd.services."kresd@".serviceConfig = { - ExecStart = "${package}/bin/kresd --noninteractive " - + "-c ${package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}"; + ExecStart = "${cfg.package}/bin/kresd --noninteractive " + + "-c ${cfg.package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}"; # Ensure /run/knot-resolver exists RuntimeDirectory = "knot-resolver"; RuntimeDirectoryMode = "0770"; From 25c827b3cc1dc9885f4885b68b9df83c7697b1af Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 24 Apr 2021 17:42:31 +0200 Subject: [PATCH 032/476] nixos/fail2ban: add maxretry option it's not possible to set a different default maxretry value in the DEFAULT jail because the module already does so. expose the maxretry option to the configuration to remedy this. (we can't really remove it entirely because fail2ban defaults to 5) --- nixos/modules/services/security/fail2ban.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index b901b19cf31..22abbb518ff 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -62,6 +62,12 @@ in description = "The firewall package used by fail2ban service."; }; + maxretry = mkOption { + default = 3; + type = types.ints.unsigned; + description = "Number of failures before a host gets banned."; + }; + banaction = mkOption { default = "iptables-multiport"; type = types.str; @@ -291,7 +297,7 @@ in ''} # Miscellaneous options ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP} - maxretry = 3 + maxretry = ${toString cfg.maxretry} backend = systemd # Actions banaction = ${cfg.banaction} From afb6fe2ffffbcb864ca4df92635fb9fd473cc2e1 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 24 Apr 2021 18:14:56 +0200 Subject: [PATCH 033/476] nixos/fail2ban: add extraPackages option some ban actions need additional packages (eg ipset). since actions can be provided by the user we need something general that's easy to configure. we could also enable ipset regardless of the actual configuration of the system if the iptables firewall is in use (like sshguard does), but that seems very clumsy and wouldn't easily solve the binary-not-found problems other actions may also have. --- nixos/modules/services/security/fail2ban.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 22abbb518ff..0c24972823d 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -62,6 +62,16 @@ in description = "The firewall package used by fail2ban service."; }; + extraPackages = mkOption { + default = []; + type = types.listOf types.package; + example = lib.literalExample "[ pkgs.ipset ]"; + description = '' + Extra packages to be made available to the fail2ban service. The example contains + the packages needed by the `iptables-ipset-proto6` action. + ''; + }; + maxretry = mkOption { default = 3; type = types.ints.unsigned; @@ -249,7 +259,7 @@ in restartTriggers = [ fail2banConf jailConf pathsConf ]; reloadIfChanged = true; - path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ]; + path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ] ++ cfg.extraPackages; unitConfig.Documentation = "man:fail2ban(1)"; From 5debc5776042e6eda5f87e02308a4b3998258940 Mon Sep 17 00:00:00 2001 From: ZerataX Date: Sat, 12 Dec 2020 22:37:36 +0100 Subject: [PATCH 034/476] mangohud: init at 0.4.1 --- pkgs/tools/graphics/mangohud/combined.nix | 14 ++++ pkgs/tools/graphics/mangohud/default.nix | 79 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 97 insertions(+) create mode 100644 pkgs/tools/graphics/mangohud/combined.nix create mode 100644 pkgs/tools/graphics/mangohud/default.nix diff --git a/pkgs/tools/graphics/mangohud/combined.nix b/pkgs/tools/graphics/mangohud/combined.nix new file mode 100644 index 00000000000..4947cd66e3a --- /dev/null +++ b/pkgs/tools/graphics/mangohud/combined.nix @@ -0,0 +1,14 @@ +{ stdenv, pkgs, lib +, libXNVCtrl +}: +let + mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; }; + mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; }; +in +pkgs.buildEnv rec { + name = "mangohud-${mangohud_64.version}"; + + paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ]; + + meta = mangohud_64.meta; +} diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix new file mode 100644 index 00000000000..26260af50fe --- /dev/null +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, python3Packages +, dbus +, glslang +, libglvnd +, libXNVCtrl +, mesa +, vulkan-headers +, vulkan-loader +, xorg +}: + + +stdenv.mkDerivation rec { + pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "flightlessmango"; + repo = "MangoHud"; + rev = "v${version}"; + sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6"; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + # FIXME obsolete in >=0.5.0 + url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch"; + sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh"; + }) + ]; + + mesonFlags = [ + "-Dappend_libdir_mangohud=false" + "-Duse_system_vulkan=enabled" + "--libdir=lib${lib.optionalString stdenv.is32bit "32"}" + ]; + + buildInputs = [ + dbus + glslang + libglvnd + libXNVCtrl + mesa + python3Packages.Mako + vulkan-headers + vulkan-loader + xorg.libX11 + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3Packages.Mako + python3Packages.python + ]; + + preConfigure = '' + mkdir -p "$out/share/vulkan/" + ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/ + ln -sf "${vulkan-headers}/include" $out + ''; + + meta = with lib; { + description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"; + homepage = "https://github.com/flightlessmango/MangoHud"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ zeratax ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75dc83b7256..f868e078487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6532,6 +6532,10 @@ in mandoc = callPackage ../tools/misc/mandoc { }; + mangohud = callPackage ../tools/graphics/mangohud/combined.nix { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + manix = callPackage ../tools/nix/manix { inherit (darwin.apple_sdk.frameworks) Security; }; From 64c6086db4a6c19bb9960baf165c867c1774ab3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Apr 2021 02:30:45 +0200 Subject: [PATCH 035/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/470825d7ca9852419dca19e839d583053eca486f. --- .../haskell-modules/hackage-packages.nix | 199 +++++++++++++----- 1 file changed, 151 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6aa8f8db38b..a38d4fae875 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16244,6 +16244,17 @@ self: { broken = true; }) {}; + "Probnet" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Probnet"; + version = "0.1.0.1"; + sha256 = "03svkacpi3pshiyccfmd9qavhdw782hn72q12yn7589l9vxfcm28"; + libraryHaskellDepends = [ base ]; + description = "Geometric Extrapolation of Integer Sequences with error prediction"; + license = lib.licenses.mit; + }) {}; + "PropLogic" = callPackage ({ mkDerivation, base, old-time, random }: mkDerivation { @@ -47451,18 +47462,21 @@ self: { }) {}; "bv-sized" = callPackage - ({ mkDerivation, base, bitwise, bytestring, hedgehog, panic - , parameterized-utils, tasty, tasty-hedgehog, th-lift + ({ mkDerivation, base, bitwise, bytestring, deepseq, hedgehog + , MonadRandom, panic, parameterized-utils, random, tasty + , tasty-hedgehog, th-lift }: mkDerivation { pname = "bv-sized"; - version = "1.0.2"; - sha256 = "0lx7cm7404r71ciksv8g58797k6x02zh337ra88syhj7nzlnij5w"; + version = "1.0.3"; + sha256 = "1bqzj9gmx8lvfw037y4f3hibbcq6zafhm6xhjdhnvmlyc963n9v9"; libraryHaskellDepends = [ - base bitwise bytestring panic parameterized-utils th-lift + base bitwise bytestring deepseq panic parameterized-utils random + th-lift ]; testHaskellDepends = [ - base bytestring hedgehog parameterized-utils tasty tasty-hedgehog + base bytestring hedgehog MonadRandom parameterized-utils tasty + tasty-hedgehog ]; description = "a bitvector datatype that is parameterized by the vector width"; license = lib.licenses.bsd3; @@ -58108,6 +58122,22 @@ self: { broken = true; }) {}; + "code-conjure" = callPackage + ({ mkDerivation, base, express, leancheck, speculate + , template-haskell + }: + mkDerivation { + pname = "code-conjure"; + version = "0.0.4"; + sha256 = "1wf6mq0j7qcflxzys5wnn0xvn0n1lhd722iicq0k6dgh3qla0b6d"; + libraryHaskellDepends = [ + base express leancheck speculate template-haskell + ]; + testHaskellDepends = [ base express leancheck speculate ]; + description = "conjure Haskell functions out of partial definitions"; + license = lib.licenses.bsd3; + }) {}; + "code-page" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -87533,10 +87563,8 @@ self: { }: mkDerivation { pname = "exiftool"; - version = "0.1.0.0"; - sha256 = "015f0ai0x6iv49k4ljz8058509h8z8kkgnp7p9l4s8z54sgqfw8y"; - revision = "1"; - editedCabalFile = "06w0g76jddjykbvym2zgcwjsa33alm1rwshhzaw0pqm573mqbp26"; + version = "0.1.1.0"; + sha256 = "1z0zk9axilxp3l13n0h83csia4lvahmqkwhlfp9mswbdy8v8fqm0"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific string-conversions temporary text unordered-containers vector @@ -88170,6 +88198,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "express_0_1_6" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "0.1.6"; + sha256 = "1yfbym97j3ih6zvlkg0d08qiivi7cyv61lbyc6qi094apazacq6c"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving applications and variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "expression-parser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -88648,6 +88690,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "extrapolate_0_4_4" = callPackage + ({ mkDerivation, base, express, leancheck, speculate + , template-haskell + }: + mkDerivation { + pname = "extrapolate"; + version = "0.4.4"; + sha256 = "0indkjjahlh1isnal93w3iliy59azgdmi9lmdqz4jkbpd421zava"; + libraryHaskellDepends = [ + base express leancheck speculate template-haskell + ]; + testHaskellDepends = [ base express leancheck speculate ]; + description = "generalize counter-examples of test properties"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -156606,8 +156665,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.1"; - sha256 = "1xs2jism3r2pgvir1rr318dfrjagkagvzzdrs7n9070xzv3p3c5q"; + version = "0.2.0.3"; + sha256 = "0bki6h5qk78d3qgprn8k1av2xxlb43bxb07qqk4x1x5diy92mc5x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156621,8 +156680,8 @@ self: { base bytestring optparse-applicative prettyprinter ]; testHaskellDepends = [ - base bytestring composition-prelude deepseq filepath prettyprinter - process tasty tasty-golden tasty-hunit temporary text + base bytestring composition-prelude deepseq extra filepath + prettyprinter process tasty tasty-golden tasty-hunit temporary text ]; benchmarkHaskellDepends = [ base bytestring criterion prettyprinter temporary text @@ -164038,12 +164097,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "lift-type"; - version = "0.1.0.0"; - sha256 = "0832xn7bfv1kwg02mmh6my11inljb066mci01b7p0xkcip1kmrhy"; - revision = "1"; - editedCabalFile = "1m89kzw7zrys8jjg7sbdpfq3bsqdvqr8bcszsnwvx0nmj1c6hciw"; + version = "0.1.0.1"; + sha256 = "1195iyf0s8zmibjmvd10bszyccp1a2g4wdysn7yk10d3j0q9xdxf"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; + description = "Lift a type from a Typeable constraint to a Template Haskell type"; license = lib.licenses.bsd3; }) {}; @@ -183889,6 +183947,22 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) mysql;}; + "mysql_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + }: + mkDerivation { + pname = "mysql"; + version = "0.2.0.1"; + sha256 = "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring containers ]; + librarySystemDepends = [ mysql ]; + testHaskellDepends = [ base bytestring hspec ]; + description = "A low-level MySQL client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) mysql;}; + "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql , mysql-simple @@ -191508,6 +191582,22 @@ self: { broken = true; }) {}; + "om-doh" = callPackage + ({ mkDerivation, base, base64, bytestring, http-api-data, resolv + , servant, servant-server, text + }: + mkDerivation { + pname = "om-doh"; + version = "0.1.0.1"; + sha256 = "1y9r70ppifww4ddk3rwvgwhfijn5hf9svlx4x46v1n027yjf9pgp"; + libraryHaskellDepends = [ + base base64 bytestring http-api-data resolv servant servant-server + text + ]; + description = "om-doh"; + license = lib.licenses.mit; + }) {}; + "om-elm" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , http-types, safe, safe-exceptions, template-haskell, text, unix @@ -192342,8 +192432,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "OpenAPI 3.0 data model"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "openapi3-code-generator" = callPackage @@ -194859,20 +194947,20 @@ self: { "overloaded" = callPackage ({ mkDerivation, assoc, base, bin, boring, bytestring, constraints - , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens - , optics-core, profunctors, QuickCheck, ral, record-hasfield - , semigroupoids, singleton-bool, sop-core, split, splitmix, syb - , symbols, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, th-compat, time, vec + , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit + , indexed-traversable, lens, optics-core, profunctors, QuickCheck + , ral, record-hasfield, semigroupoids, singleton-bool, sop-core + , split, splitmix, syb, symbols, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-compat, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.3"; - sha256 = "151xnpk7l1jg63m4bwr91h3dh1xb0d4xinc4vn1jsbhr96p662ap"; + version = "0.3.1"; + sha256 = "0ra33rcbjm58978gc0pjzcspyvab7g2vxnjk6z5hag7qh6ay76bg"; libraryHaskellDepends = [ - assoc base bin bytestring containers fin ghc optics-core - profunctors ral record-hasfield semigroupoids sop-core split syb - symbols template-haskell text th-compat time vec + assoc base bin bytestring containers fin ghc indexed-traversable + optics-core profunctors ral record-hasfield semigroupoids sop-core + split syb symbols template-haskell text th-compat time vec ]; testHaskellDepends = [ assoc base bin boring bytestring constraints containers fin @@ -201982,8 +202070,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.3.2.0"; - sha256 = "0r4f69ky1y45h6fys1821z45ccg30h61yc68x16cf839awfri92l"; + version = "0.3.3.0"; + sha256 = "1q4ifwzmsr09527fd70lz2ks73x5mh0r5h5gh2ky1kksnwpn49px"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; @@ -207915,6 +208003,8 @@ self: { pname = "postgresql-simple-migration"; version = "0.1.15.0"; sha256 = "0j6nhyknxlmpl0yrdj1pifw1fbb24080jgg64grnhqjwh1d44dvd"; + revision = "1"; + editedCabalFile = "1a0a5295j207x0pzbhy5inv8qimrh76dmmp26zgaw073n1i8yg8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223409,8 +223499,8 @@ self: { }: mkDerivation { pname = "request"; - version = "0.1.3.0"; - sha256 = "07ypsdmf227m6j8gkl29621z7grbsgr0pmk3dglx9zlrmq0zbn8j"; + version = "0.2.0.0"; + sha256 = "023bldkfjqbwmd6mh4vb2k7z5vi8lfkhf5an057h04dzhpgb3r9l"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-client-tls http-types @@ -228809,8 +228899,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.2"; - sha256 = "1xcw3mdl85brj6pvynz58aclaf3ya0aq0y038cps9dsz58bqhbka"; + version = "0.1.0.3"; + sha256 = "1gd8k4dx25bgqrw16dwvq9lnk7gpvpci01kvnn3s08ylkiq2qax9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228848,8 +228938,8 @@ self: { }: mkDerivation { pname = "sandwich-slack"; - version = "0.1.0.1"; - sha256 = "1c7csrdfq342733rgrfwx5rc6v14jhfb9wb44gn699pgzzj031kz"; + version = "0.1.0.3"; + sha256 = "1g8ymxy4q08jxlfbd7ar6n30wm1mcm942vr5627bpx63m83yld1y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228882,8 +228972,8 @@ self: { }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.1.0.1"; - sha256 = "10s0zb3al4ii9gm3b6by8czvr8i3s424mlfk81v2hpdv5i7a0yqb"; + version = "0.1.0.4"; + sha256 = "0vmqm2f78vd8kk0adg7ldd6rlb5rw5hks9q705gws9dj6s4nyz9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234601,8 +234691,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-options" = callPackage @@ -245239,6 +245327,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "speculate_0_4_6" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.6"; + sha256 = "0vpc2vxfpziyz0hzapni4j31g1i12m2gnsrq72zf42qbhjwif57g"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -262746,22 +262850,21 @@ self: { broken = true; }) {}; - "time_1_11_1_1" = callPackage + "time_1_11_1_2" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random - , tasty, tasty-hunit, tasty-quickcheck, unix + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "time"; - version = "1.11.1.1"; - sha256 = "0xrs9j4fskxz98zgwhgh7w4d9a6im3ipahg6ahp0689qhs61cx9p"; + version = "1.11.1.2"; + sha256 = "0r33rxxrrpyzxpdihky93adlpdj0r8k6wh2i1sx0nb7zhvfnfj27"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck - unix ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A time library"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; }) {}; From 3027fe5fb84de15eaae1ff1e260341fe1d6bbb3e Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 25 Apr 2021 01:22:44 +1000 Subject: [PATCH 036/476] configuration-ghc-9.0.x.nix: patch newer alex --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 1b8b087326e..92d26a6eb0e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -79,8 +79,8 @@ self: super: { # Apply patches from head.hackage. alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; - sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; + sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; }); doctest = dontCheck (doJailbreak super.doctest_0_18_1); generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch { From 976ca8c8e53c75ef47204f548589a6aec8ef675c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 12:36:07 +0200 Subject: [PATCH 037/476] ethminer: add myself as maintainer --- pkgs/tools/misc/ethminer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 7d2cb5c7ff2..2c14fab680c 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { description = "Ethereum miner with OpenCL, CUDA and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ nand0p atemu ]; license = licenses.gpl2; }; } From cc7ee239f786e6ff15e3c11285faf6256da7beed Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Mon, 18 Jan 2021 13:47:24 -0800 Subject: [PATCH 038/476] ethminer: 0.18.0 -> 0.19.0 (cherry picked from commit 3fcdf4ed14d489fa1e96021b037a9910a916535b) --- pkgs/tools/misc/ethminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 2c14fab680c..c43c66fcc07 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -23,14 +23,14 @@ let stdenv = clangStdenv; in stdenv.mkDerivation rec { pname = "ethminer"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ethereum-mining"; repo = "ethminer"; rev = "v${version}"; - sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707"; + sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; fetchSubmodules = true; }; From eed41443753706f4280e616bc047de3c56be5e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 15:08:18 +0200 Subject: [PATCH 039/476] libsForQt5.libopenshot: use ffmpeg instead of ffmpeg_3 --- pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 169bd33b709..8081c2766ba 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, doxygen -, libopenshot-audio, imagemagick, ffmpeg_3 +, libopenshot-audio, imagemagick, ffmpeg , swig, python3 , unittest-cpp, cppzmq, zeromq , qtbase, qtmultimedia @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = - [ imagemagick ffmpeg_3 swig python3 unittest-cpp + [ imagemagick ffmpeg swig python3 unittest-cpp cppzmq zeromq qtbase qtmultimedia ] ++ optional stdenv.isDarwin llvmPackages.openmp ; From 51ff202c23f6381bb786cabc7cc83c2ab9f1a7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 15:46:53 +0200 Subject: [PATCH 040/476] libsForQt5.libopenshot: remove unittest-cpp Tests are disabled. --- pkgs/applications/video/openshot-qt/libopenshot.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 8081c2766ba..30845faccd7 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = - [ imagemagick ffmpeg swig python3 unittest-cpp + [ imagemagick ffmpeg swig python3 cppzmq zeromq qtbase qtmultimedia ] ++ optional stdenv.isDarwin llvmPackages.openmp ; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; - "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; doCheck = false; From 3af3db2024a645c1188f5509e66c50cc5bcf7c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 15:47:43 +0200 Subject: [PATCH 041/476] libsForQt5.libopenshot: unvendor jsoncpp --- pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 30845faccd7..d635d6052cf 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg -, swig, python3 +, swig, python3, jsoncpp , unittest-cpp, cppzmq, zeromq , qtbase, qtmultimedia , llvmPackages @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = - [ imagemagick ffmpeg swig python3 + [ imagemagick ffmpeg swig python3 jsoncpp cppzmq zeromq qtbase qtmultimedia ] ++ optional stdenv.isDarwin llvmPackages.openmp ; From bdfc6247239091728ea0f95f77ae3024bc119376 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 01:01:04 +0200 Subject: [PATCH 042/476] python3packages.pyotgw: unstable-2021-03-25 --- .../python-modules/pyotgw/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pyotgw/default.nix diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix new file mode 100644 index 00000000000..b48c190ca1e --- /dev/null +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial-asyncio +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyotgw"; + version = "unstable-2021-03-25"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mvn23"; + repo = pname; + rev = "1854ef4ffb907524ff457ba558e4979ba7fabd02"; + sha256 = "0zckd85dmzpz0drcgx16ly6kzh1f1slcxb9lrcf81wh1p4q9bcaa"; + }; + + propagatedBuildInputs = [ + pyserial-asyncio + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "pyotgw" ]; + + meta = with lib; { + description = "Python module to interact the OpenTherm Gateway"; + homepage = "https://github.com/mvn23/pyotgw"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 439d4d8e4a5..7d4bb05bb3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5843,6 +5843,8 @@ in { inherit (pkgs) lz4; }; + pyotgw = callPackage ../development/python-modules/pyotgw { }; + pyotp = callPackage ../development/python-modules/pyotp { }; pyowm = callPackage ../development/python-modules/pyowm { }; From 8a6b6c106f8850796543eb0a45bec1f5aeefd370 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Apr 2021 16:35:58 +0200 Subject: [PATCH 043/476] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d3270846a53..abeacda73ba 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -598,7 +598,7 @@ "openhome" = ps: with ps; [ openhomedevice ]; "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; - "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw + "opentherm_gw" = ps: with ps; [ pyotgw ]; "openuv" = ps: with ps; [ pyopenuv ]; "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; From 98fd3adf27cfb14b085a798429134b723f8bbd2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Apr 2021 16:41:18 +0200 Subject: [PATCH 044/476] home-assistant: enable opentherm_gw tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b66fd64d109..f59979f909e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -335,6 +335,7 @@ in with py.pkgs; buildPythonApplication rec { "omnilogic" "ondilo_ico" "openerz" + "opentherm_gw" "ozw" "panel_custom" "panel_iframe" From 27f60ec4b88759aa5e7524ae9a5eb26a725971ba Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 25 Apr 2021 11:32:46 -0400 Subject: [PATCH 045/476] protontricks: 1.4.4 -> 1.5.0 - Update steam-run.patch to support Pressure Vessel runtime - Fix adding $PROTON_DIST_PATH/lib to LD_LIBRARY_PATH when using legacy runtime - Use bash instead of /bin/sh now that wrappers are non-POSIX compliant - Remove `test_run_steam_runtime_not_found` in steam-run.patch instead of using disabledTests - Add import check --- .../protontricks/default.nix | 16 +- .../protontricks/steam-run.patch | 378 ++++++++++-------- 2 files changed, 219 insertions(+), 175 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index ec5017c54c7..bc161f38f28 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , setuptools_scm , vdf +, bash , steam-run , winetricks , zenity @@ -11,13 +12,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0i7p0jj7avmq3b2qlcpwcflipndrnwsvwvhc5aal7rm95aa7xhja"; + hash = "sha256-IHgoi5VUN3ORbufkruPb6wR7pTekJFQHhhDrnjOWzWM="; }; patches = [ @@ -34,6 +35,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ + bash steam-run (winetricks.override { # Remove default build of wine to reduce closure size. @@ -45,15 +47,7 @@ buildPythonApplication rec { ]; checkInputs = [ pytestCheckHook ]; - disabledTests = [ - # Steam runtime is hard-coded with steam-run.patch and can't be configured - "test_run_steam_runtime_not_found" - "test_unknown_steam_runtime_detected" - - # Steam runtime 2 currently isn't supported - # See https://github.com/NixOS/nixpkgs/issues/100655 - "test_run_winetricks_steam_runtime_v2" - ]; + pythonImportsCheck = [ "protontricks" ]; meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 619d80bd8a7..5e91de58dbe 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,16 +1,18 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index fec0563..d158b96 100755 +index 9641970..6a2b268 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py -@@ -14,7 +14,7 @@ import os - import logging +@@ -15,8 +15,8 @@ import sys from . import __version__ --from .steam import (find_proton_app, find_steam_path, find_steam_runtime_path, -+from .steam import (find_proton_app, find_steam_path, - get_steam_apps, get_steam_lib_paths) - from .winetricks import get_winetricks_path from .gui import select_steam_app_with_gui +-from .steam import (find_legacy_steam_runtime_path, find_proton_app, +- find_steam_path, get_steam_apps, get_steam_lib_paths) ++from .steam import (find_proton_app, find_steam_path, get_steam_apps, ++ get_steam_lib_paths) + from .util import run_command + from .winetricks import get_winetricks_path + @@ -75,8 +75,7 @@ def main(args=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" @@ -21,70 +23,73 @@ index fec0563..d158b96 100755 ), formatter_class=argparse.RawTextHelpFormatter ) -@@ -133,14 +132,10 @@ def main(args=None): +@@ -138,18 +137,9 @@ def main(args=None): + ) sys.exit(-1) - # 2. Find Steam Runtime if enabled -- steam_runtime_path = None -+ steam_runtime = False - - if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime: -- steam_runtime_path = find_steam_runtime_path(steam_root=steam_root) +- # 2. Find the pre-installed legacy Steam Runtime if enabled +- legacy_steam_runtime_path = None +- use_steam_runtime = True - -- if not steam_runtime_path: ++ # 2. Use Steam Runtime if enabled + if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime: +- legacy_steam_runtime_path = find_legacy_steam_runtime_path( +- steam_root=steam_root +- ) +- +- if not legacy_steam_runtime_path: - print("Steam Runtime was enabled but couldn't be found!") - sys.exit(-1) -+ steam_runtime = True ++ use_steam_runtime = True else: + use_steam_runtime = False logger.info("Steam Runtime disabled.") - -@@ -201,7 +196,7 @@ def main(args=None): - winetricks_path=winetricks_path, +@@ -212,7 +202,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, -- steam_runtime_path=steam_runtime_path, -+ steam_runtime=steam_runtime, - command=[winetricks_path, "--gui"] + use_steam_runtime=use_steam_runtime, +- legacy_steam_runtime_path=legacy_steam_runtime_path, + command=[winetricks_path, "--gui"], + use_bwrap=use_bwrap ) - -@@ -269,7 +264,7 @@ def main(args=None): - winetricks_path=winetricks_path, +@@ -282,7 +271,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, -- steam_runtime_path=steam_runtime_path, -+ steam_runtime=steam_runtime, + use_steam_runtime=use_steam_runtime, +- legacy_steam_runtime_path=legacy_steam_runtime_path, + use_bwrap=use_bwrap, command=[winetricks_path] + args.winetricks_command) elif args.command: - run_command( -@@ -277,7 +272,7 @@ def main(args=None): - proton_app=proton_app, +@@ -292,7 +280,6 @@ def main(args=None): steam_app=steam_app, command=args.command, -- steam_runtime_path=steam_runtime_path, -+ steam_runtime=steam_runtime, + use_steam_runtime=use_steam_runtime, +- legacy_steam_runtime_path=legacy_steam_runtime_path, + use_bwrap=use_bwrap, # Pass the command directly into the shell *without* # escaping it - cwd=steam_app.install_path, diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index fa5772d..4f30cd3 100644 +index 8554e24..509afb6 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py -@@ -11,7 +11,7 @@ from .util import lower_dict - +@@ -13,8 +13,8 @@ from .util import lower_dict __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", -- "find_steam_proton_app", "find_proton_app", "find_steam_runtime_path", -+ "find_steam_proton_app", "find_proton_app", - "find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps", - "get_custom_proton_installations" + "find_steam_proton_app", "find_proton_app", +- "find_legacy_steam_runtime_path", "find_appid_proton_prefix", +- "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" ++ "find_appid_proton_prefix", "get_steam_lib_paths", ++ "get_steam_apps", "get_custom_proton_installations" ) -@@ -254,37 +254,6 @@ def find_steam_path(): + + COMMON_STEAM_DIRS = [ +@@ -283,37 +283,6 @@ def find_steam_path(): return None, None --def find_steam_runtime_path(steam_root): +-def find_legacy_steam_runtime_path(steam_root): - """ -- Find the Steam Runtime either using the STEAM_RUNTIME env or +- Find the legacy Steam Runtime either using the STEAM_RUNTIME env or - steam_root - """ - env_steam_runtime = os.environ.get("STEAM_RUNTIME", "") @@ -117,162 +122,149 @@ index fa5772d..4f30cd3 100644 APPINFO_STRUCT_SECTION = " Date: Sun, 25 Apr 2021 20:24:07 +0200 Subject: [PATCH 046/476] nixos/opendkim: Fix CapabilityBoundingSet option An empty list results in no CapabilityBoundingSet at all, an empty string however will set `CapabilityBoundingSet=`, which represents a closed set. Related: #120617 --- nixos/modules/services/mail/opendkim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 9bf6f338d93..beff57613af 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -134,7 +134,7 @@ in { ReadWritePaths = [ cfg.keyPath ]; AmbientCapabilities = []; - CapabilityBoundingSet = []; + CapabilityBoundingSet = ""; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; From 6f358fa1d48d162b529635b7e137ea562b236621 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Apr 2021 20:26:22 +0200 Subject: [PATCH 047/476] nixos/rspamd: Fix CapabilityBoundingSet option An empty list results in no CapabilityBoundingSet at all, an empty string however will set `CapabilityBoundingSet=`, which represents a closed set. Related: #120617 --- nixos/modules/services/mail/rspamd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 2f9d28195bd..473ddd52357 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -410,7 +410,7 @@ in StateDirectoryMode = "0700"; AmbientCapabilities = []; - CapabilityBoundingSet = []; + CapabilityBoundingSet = ""; DevicePolicy = "closed"; LockPersonality = true; NoNewPrivileges = true; From 977a71dca501c3e89be16dc97ab6c9f2adb6b74d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 19:55:42 +0000 Subject: [PATCH 048/476] android-udev-rules: 20210302 -> 20210425 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index e542c0dbc63..d41c3e2dc33 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20210302"; + version = "20210425"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-yIVHcaQAr2gKH/NZeN+vRmGS8OgyNeRsZkCYyqjsSsI="; + sha256 = "sha256-crNK6mZCCqD/Lm3rNtfH/4F48RuQCqHWP+qsTNVLOGY="; }; installPhase = '' From df6b666353d33cbedf3960c2465d306a718a997b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 21:14:42 +0000 Subject: [PATCH 049/476] conky: 1.12.1 -> 1.12.2 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 0e7eaa19b4d..9bd8890e713 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "sha256-qQx9+Z1OAQlbHupflzHD5JV4NqedoF8A57F1+rPT3/o="; + sha256 = "sha256-x6bR5E5LIvKWiVM15IEoUgGas/hcRp3F/O4MTOhVPb8="; }; postPatch = '' From 8795d39ce70f04e3fd609422d522e5b2594f3a70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Apr 2021 02:30:30 +0200 Subject: [PATCH 050/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7a3819ffd0724c2ad64967266a0b74353ec1816d. --- .../haskell-modules/hackage-packages.nix | 190 +++++++++++++----- 1 file changed, 144 insertions(+), 46 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a38d4fae875..d40a193e0ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16248,8 +16248,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Probnet"; - version = "0.1.0.1"; - sha256 = "03svkacpi3pshiyccfmd9qavhdw782hn72q12yn7589l9vxfcm28"; + version = "0.1.0.2"; + sha256 = "1jk1y51rda8j4lan2az906fwb5hgqb8s50p0xrhchnf654scm851"; libraryHaskellDepends = [ base ]; description = "Geometric Extrapolation of Integer Sequences with error prediction"; license = lib.licenses.mit; @@ -22092,8 +22092,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.7.1.0"; - sha256 = "18d2q9fg4ydqpnrzvpcx1arjv4yl2966aax68fz3izgmsbp95k0l"; + version = "0.8.0.0"; + sha256 = "000ziih2c33v5mbf9sljkrr0x9hxv31cq77blva6xy32zzh12yz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22120,8 +22120,8 @@ self: { }: mkDerivation { pname = "Z-MessagePack"; - version = "0.4.0.1"; - sha256 = "1i1ycf1bhahbh7d9rvz4hl5jq16mld8sya2h2xrxlvg9yqab19hy"; + version = "0.4.1.0"; + sha256 = "0sq4w488dyhk3nxgdw394i9n79j45hhxp3yzgw2fpmjh9xwfv1m9"; libraryHaskellDepends = [ base containers deepseq hashable integer-gmp primitive QuickCheck scientific tagged time unordered-containers Z-Data Z-IO @@ -22144,8 +22144,8 @@ self: { }: mkDerivation { pname = "Z-YAML"; - version = "0.3.2.0"; - sha256 = "01v0vza54lpxijg4znp2pcnjw2z6ybvx453xqy7ljwf9289csfq8"; + version = "0.3.3.0"; + sha256 = "012flgd88rwya7g5lkbla4841pzq2b1b9m4jkmggk38kpbrhf515"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO @@ -38769,6 +38769,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "basement_0_0_12" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.12"; + sha256 = "12zsnxkgv86im2prslk6ddhy0zwpawwjc1h4ff63kpxp2xdl7i2k"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "basen" = callPackage ({ mkDerivation, base, bytestring, quickcheck-instances, tasty , tasty-discover, tasty-hspec, tasty-quickcheck, text @@ -59216,23 +59228,21 @@ self: { }) {}; "combinat" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, test-framework - , test-framework-quickcheck2, transformers + ({ mkDerivation, array, base, compact-word-vectors, containers + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , test-framework, test-framework-quickcheck2, transformers }: mkDerivation { pname = "combinat"; - version = "0.2.9.0"; - sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw"; - revision = "1"; - editedCabalFile = "0yjvvxfmyzjhh0q050cc2wkhaahzixsw7hf27n8dky3n4cxd5bix"; + version = "0.2.10.0"; + sha256 = "125yf5ycya722k85iph3dqv63bpj1a862c0ahs2y0snyd2qd6h35"; libraryHaskellDepends = [ - array base containers random transformers + array base compact-word-vectors containers random transformers ]; testHaskellDepends = [ - array base containers QuickCheck random tasty tasty-hunit - tasty-quickcheck test-framework test-framework-quickcheck2 - transformers + array base compact-word-vectors containers QuickCheck random tasty + tasty-hunit tasty-quickcheck test-framework + test-framework-quickcheck2 transformers ]; description = "Generate and manipulate various combinatorial objects"; license = lib.licenses.bsd3; @@ -59881,8 +59891,8 @@ self: { }: mkDerivation { pname = "compact-word-vectors"; - version = "0.2.0.1"; - sha256 = "0ix8l6vvnf62vp6716gmypwqsrs6x5pzcx5yfj24bn4gk0xak3lm"; + version = "0.2.0.2"; + sha256 = "1yjlymp2b8is72xvdb29rf7hc1n96zmda1j3z5alzbp4py00jww8"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -67297,22 +67307,23 @@ self: { }) {}; "css-selectors" = callPackage - ({ mkDerivation, aeson, alex, array, base, blaze-markup - , data-default, Decimal, happy, QuickCheck, shakespeare + ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup + , bytestring, data-default, Decimal, happy, QuickCheck, shakespeare , template-haskell, test-framework, test-framework-quickcheck2 - , text + , text, zlib }: mkDerivation { pname = "css-selectors"; - version = "0.2.1.0"; - sha256 = "1kcxbvp96imhkdrd7w9g2z4d586lmdcpnbgl8g5w04ri85qsq162"; + version = "0.3.0.0"; + sha256 = "1p7zzp40gvl5nq2zrb19cjw47w3sf20qwi3mplxq67ryzljmbaz4"; libraryHaskellDepends = [ - aeson array base blaze-markup data-default Decimal QuickCheck - shakespeare template-haskell text + aeson array base binary blaze-markup bytestring data-default + Decimal QuickCheck shakespeare template-haskell text zlib ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 text + base binary QuickCheck test-framework test-framework-quickcheck2 + text ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; license = lib.licenses.bsd3; @@ -95203,6 +95214,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "foundation_0_0_26_1" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.26.1"; + sha256 = "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -102058,6 +102083,19 @@ self: { license = lib.licenses.mit; }) {}; + "ghc-parser_0_2_3_0" = callPackage + ({ mkDerivation, base, cpphs, ghc, happy }: + mkDerivation { + pname = "ghc-parser"; + version = "0.2.3.0"; + sha256 = "1sm93n6w2zqkp4dhr604bk67sis1rb6jb6imsxr64vjfm7bkigln"; + libraryHaskellDepends = [ base ghc ]; + libraryToolDepends = [ cpphs happy ]; + description = "Haskell source parser from GHC"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-paths" = callPackage ({ mkDerivation, base, Cabal, directory }: mkDerivation { @@ -126184,8 +126222,8 @@ self: { }: mkDerivation { pname = "hedgehog-servant"; - version = "0.0.0.1"; - sha256 = "04plk39ni5m9arcphb4464bpl12r6aw2zfnzlzhpa1i49qlpivc3"; + version = "0.0.1.1"; + sha256 = "17dnj82jgbz23is22kqc60nz46vb4rhlsn1aimaynx7cld0g63vd"; libraryHaskellDepends = [ base bytestring case-insensitive hedgehog http-client http-media http-types servant servant-client servant-server string-conversions @@ -146682,6 +146720,43 @@ self: { broken = true; }) {}; + "ihaskell_0_10_2_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, exceptions, filepath, ghc + , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec + , hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, text, time, transformers + , unix, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.2.0"; + sha256 = "061gpwclcykrs4pqhsb96hrbwnpmq0q6fx9701wk684v01xjfddk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths + haskeline hlint http-client http-client-tls ipython-kernel mtl + parsec process random shelly split stm strict text time + transformers unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -194471,8 +194546,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.1.9"; - sha256 = "09psfz4a2amgcyq00ygjp6zakzf5yx2y2kjykz62wncwpqkgnf53"; + version = "0.1.10"; + sha256 = "16p6wswh96ap4qj7n61qd3hrr0f5m84clb113vg4dncf46ivlfs6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218043,6 +218118,28 @@ self: { broken = true; }) {}; + "rattletrap_11_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , containers, filepath, http-client, http-client-tls, HUnit, text + }: + mkDerivation { + pname = "rattletrap"; + version = "11.1.0"; + sha256 = "1q915fq9bjwridd67rsmavxcbkgp3xxq9ps09z6mi62608c26987"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array base bytestring containers filepath + http-client http-client-tls text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath HUnit ]; + description = "Parse and generate Rocket League replays"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -229018,27 +229115,28 @@ self: { }) {}; "sarsi" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, bytestring, Cabal - , containers, cryptonite, data-msgpack, directory, filepath + ({ mkDerivation, ansi-terminal, async, attoparsec, base, binary + , bytestring, Cabal, containers, cryptonite, directory, filepath , fsnotify, machines, machines-binary, machines-io - , machines-process, network, process, stm, text + , machines-process, msgpack, network, process, stm, text , unordered-containers, vector }: mkDerivation { pname = "sarsi"; - version = "0.0.4.0"; - sha256 = "0lv7mlhkf894q4750x53qr7fa7479hpczhgm1xw2xm5n49z35iy9"; + version = "0.0.5.1"; + sha256 = "0hnyv3ynl5jjyx5v5l5k15p4af1g3imin5m91np8s6gp8qyfllz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary bytestring containers cryptonite - data-msgpack directory filepath fsnotify machines machines-binary - machines-io machines-process network process stm text vector + ansi-terminal async attoparsec base binary bytestring containers + cryptonite directory filepath fsnotify machines machines-binary + machines-io machines-process msgpack network process stm text + vector ]; executableHaskellDepends = [ - base binary bytestring Cabal containers data-msgpack directory - filepath machines machines-binary machines-io machines-process - network process text unordered-containers vector + async base binary bytestring Cabal containers directory filepath + machines machines-binary machines-io machines-process msgpack + network process stm text unordered-containers vector ]; description = "A universal quickfix toolkit and his protocol"; license = lib.licenses.asl20; @@ -292571,8 +292669,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.1.0"; - sha256 = "16y2j12zl8arwv2m0crllrrf09l4ar1s2v9wrfzjmxnk80vhncf1"; + version = "0.1.1.1"; + sha256 = "1mg3wz3drddxdrbr1b0yw5wayzqi99zfdlgiwvgcc5pxb98i6wk3"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; From 1af6da6ae3664661cb27c604762bbf47892c1027 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:47:41 +0000 Subject: [PATCH 051/476] gruvbox-dark-gtk: 1.0.1 -> 1.0.2 --- pkgs/data/themes/gruvbox-dark-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/pkgs/data/themes/gruvbox-dark-gtk/default.nix index 3b6f68ab475..28b55074afb 100644 --- a/pkgs/data/themes/gruvbox-dark-gtk/default.nix +++ b/pkgs/data/themes/gruvbox-dark-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gruvbox-dark-gtk"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jmattheis"; repo = pname; rev = "v${version}"; - sha256 = "1wf4ybnjdp2kbbvz7pmqdnzk94axaqx5ws18f34hrg4y267n0w4g"; + sha256 = "sha256-C681o89MTGNp1l3DLQsRpH9HQdmdCXZzk0F0rNhcyL4="; }; installPhase = '' From 25238f1ee5421a2dd30aad06d13642ff898df4ff Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 12:34:04 +0200 Subject: [PATCH 052/476] haskellPackages.orgstat: unmark as broken Upstream resolved the compilation issue with more recent base: https://github.com/volhovm/orgstat/issues/15 --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1fd7b35497f..a9a16f7ce43 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8744,7 +8744,6 @@ broken-packages: - org-mode-lucid - organize-imports - orgmode - - orgstat - origami - orizentic - OrPatterns From 85b653c9d4a54882907c8a4e31664ba523eb7e59 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 14:49:49 +0200 Subject: [PATCH 053/476] chroma: 0.8.2 -> 0.9.1 https://github.com/alecthomas/chroma/releases/tag/v0.9.0 https://github.com/alecthomas/chroma/releases/tag/v0.9.1 --- pkgs/tools/text/chroma/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 390793ffaf1..388d9b92273 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -2,15 +2,14 @@ buildGoModule rec { pname = "chroma"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "alecthomas"; repo = pname; rev = "v${version}"; - sha256 = "0vzxd0jvjaakwjvkkkjppakjb00z44k7gb5ng1i4924agh24n5ka"; + sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7"; leaveDotGit = true; - fetchSubmodules = true; }; nativeBuildInputs = [ git ]; @@ -27,7 +26,7 @@ buildGoModule rec { --replace 'date = "?"' "date = \"$date\"" ''; - vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; + vendorSha256 = "0y8mp08zccn9qxrsj9j7vambz8dwzsxbbgrlppzam53rg8rpxhrg"; subPackages = [ "cmd/chroma" ]; From e412f73251494ce4c5176dc54a5dd71fc834c812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 18:09:18 +0200 Subject: [PATCH 054/476] frescobaldi: 3.1.1 -> 3.1.3 --- pkgs/misc/frescobaldi/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 82a3aa8c7be..070babc0cbc 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "frescobaldi"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "07hjlq29npasn2bsb3qrzr1gikyvcc85avx0sxybfih329bvjk03"; + sha256 = "1p8f4vn2dpqndw1dylmg7wms6vi69zcfj544c908s4r8rrmbycyf"; }; propagatedBuildInputs = with python3Packages; [ @@ -19,6 +19,12 @@ buildPythonApplication rec { nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + # Needed because source is fetched from git + preBuild = '' + make -C i18n + make -C linux + ''; + # no tests in shipped with upstream doCheck = false; From cead5384d87d4f702034c468c03624354e025cfe Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 19:57:58 +0000 Subject: [PATCH 055/476] pythonPackages.lmdb: don't depend on ludios_wpull This makes no sense and yet was added in 65eccfad5d32328d12cf8b42d02560905a8c9bae This was breaking the build of python3Packages.lmdb because ludios_wpull does not build on 3.8, only 3.7. --- pkgs/development/python-modules/lmdb/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index fc7748765f3..6980ddcb010 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -4,7 +4,6 @@ , pytestCheckHook , cffi , lmdb -, ludios_wpull }: buildPythonPackage rec { @@ -18,8 +17,6 @@ buildPythonPackage rec { buildInputs = [ lmdb ]; - propogatedBuildInputs = [ ludios_wpull ]; - checkInputs = [ cffi pytestCheckHook ]; LMDB_FORCE_SYSTEM=1; From 96dacf13c629db8d6e628f60167939a5f5b93a61 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 19:59:28 +0000 Subject: [PATCH 056/476] pythonPackages.lmdb: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 6980ddcb010..3e78626238a 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac"; + sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc"; }; buildInputs = [ lmdb ]; From 687563983352b3b40a59f7fb857e8d843769ee60 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 20:29:03 +0000 Subject: [PATCH 057/476] lmdb: 0.9.28 -> 0.9.29 This has a fix for https://bugs.openldap.org/show_bug.cgi?id=9461, thus fixing pythonPackages.lmdb: https://github.com/jnwatson/py-lmdb/issues/278 --- pkgs/development/libraries/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 229e82c323a..d8d034b04b7 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.28"; + version = "0.9.29"; src = fetchgit { url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"; + sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; From 68ee799776fa7709c7e5c0a7f71612dfe69e3c68 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 Jul 2020 15:54:32 +0200 Subject: [PATCH 058/476] haskellPackages.pandoc-sidenote: remove broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9a16f7ce43..e94f71ba7ea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8797,7 +8797,6 @@ broken-packages: - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - - pandoc-sidenote - pandoc-unlit - pandoc-utils - PandocAgda From a170bff89a638a7c27b84a4cdfd62ef599fe5b11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Apr 2021 02:30:31 +0200 Subject: [PATCH 059/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ef920675c69d0a73d87ff602a3869faf0d5ae0d5. --- .../haskell-modules/hackage-packages.nix | 192 +++++++++++++++--- 1 file changed, 164 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d40a193e0ad..603fdb95165 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3486,6 +3486,28 @@ self: { broken = true; }) {}; + "ConClusion" = callPackage + ({ mkDerivation, aeson, attoparsec, base, cmdargs, containers + , formatting, hmatrix, massiv, optics, PSQueue, rio, text + }: + mkDerivation { + pname = "ConClusion"; + version = "0.0.1"; + sha256 = "1qdwirr2gp5aq8dl5ibj1gb9mg2qd1jhpg610wy4yx2ymy4msg1p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base containers formatting hmatrix massiv PSQueue + rio + ]; + executableHaskellDepends = [ + aeson attoparsec base cmdargs containers formatting hmatrix massiv + optics PSQueue rio text + ]; + description = "Cluster algorithms, PCA, and chemical conformere analysis"; + license = lib.licenses.agpl3Only; + }) {}; + "Concurrent-Cache" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -83794,6 +83816,36 @@ self: { broken = true; }) {}; + "ema" = callPackage + ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup + , commonmark, commonmark-extensions, commonmark-pandoc, containers + , data-default, directory, filepath, filepattern, fsnotify + , http-types, lvar, monad-logger, monad-logger-extras + , neat-interpolation, optparse-applicative, pandoc-types + , profunctors, relude, safe-exceptions, shower, stm, tagged, text + , time, unliftio, wai, wai-middleware-static, wai-websockets, warp + , websockets + }: + mkDerivation { + pname = "ema"; + version = "0.1.0.0"; + sha256 = "0b7drwqcdap52slnw59vx3mhpabcl72p7rinnfkzsh74jfx21vz0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base blaze-html blaze-markup commonmark + commonmark-extensions commonmark-pandoc containers data-default + directory filepath filepattern fsnotify http-types lvar + monad-logger monad-logger-extras neat-interpolation + optparse-applicative pandoc-types profunctors relude + safe-exceptions shower stm tagged text time unliftio wai + wai-middleware-static wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + description = "Static site generator library with hot reload"; + license = lib.licenses.agpl3Only; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -112876,6 +112928,8 @@ self: { pname = "grpc-haskell"; version = "0.1.0"; sha256 = "1qqa4qn6ql8zvacaikd1a154ib7bah2h96fjfvd3hz6j79bbfqw4"; + revision = "1"; + editedCabalFile = "06yi4isj2qcd1nnc2vf6355wbqq33amhvcwg12jh0zbxpywrs45g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131364,8 +131418,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.3"; - sha256 = "1cbmaw3ikni2fqkzyngc6qwg8k6ighy48979msfs97qg0kxjmbbd"; + version = "3.3.1"; + sha256 = "12l2p5pbgh1wcn2bh0ax36sclwaiky8hf09ivgz453pb5ss0jghc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -149940,13 +149994,17 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, time, witherable }: + ({ mkDerivation, base, containers, hspec, QuickCheck, time + , witherable + }: mkDerivation { pname = "interval-algebra"; - version = "0.3.3"; - sha256 = "0njlirr5ymsdw27snixxf3c4dgj8grffqv94a1hz97k801a3axkh"; - libraryHaskellDepends = [ base QuickCheck time witherable ]; - testHaskellDepends = [ base hspec QuickCheck time ]; + version = "0.4.0"; + sha256 = "0852yv0d7c3gh6ggab6wvnk7g1pad02nnpbmzw98c9zkzw2zk9wh"; + libraryHaskellDepends = [ + base containers QuickCheck time witherable + ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; }) {}; @@ -169518,6 +169576,17 @@ self: { broken = true; }) {}; + "lvar" = callPackage + ({ mkDerivation, base, containers, relude, stm }: + mkDerivation { + pname = "lvar"; + version = "0.1.0.0"; + sha256 = "1hllvr4nsjv3c3x5aybp05wr9pdvwlw101vq7c37ydnb91hbfdv4"; + libraryHaskellDepends = [ base containers relude stm ]; + description = "TMVar that can be listened to"; + license = lib.licenses.bsd3; + }) {}; + "lvish" = callPackage ({ mkDerivation, async, atomic-primops, base, bits-atomic , containers, deepseq, ghc-prim, HUnit, lattices, missing-foreign @@ -174282,8 +174351,8 @@ self: { pname = "memory"; version = "0.15.0"; sha256 = "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3"; - revision = "1"; - editedCabalFile = "136qfj1cbg9571mlwywaqml75ijx3pcgvbpbgwxrqsl71ssj8w5y"; + revision = "2"; + editedCabalFile = "0fd40y5byy4cq4x6m66zxadxbw96gzswplgfyvdqnjlasq28xw68"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim ]; @@ -194568,8 +194637,6 @@ self: { ]; description = "Statistics visualizer for org-mode"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "origami" = callPackage @@ -196200,8 +196267,6 @@ self: { executableHaskellDepends = [ base mtl pandoc-types text ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pandoc-stylefrommeta" = callPackage @@ -202145,8 +202210,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.3.3.0"; - sha256 = "1q4ifwzmsr09527fd70lz2ks73x5mh0r5h5gh2ky1kksnwpn49px"; + version = "0.3.4.0"; + sha256 = "1x50ah7mhqgl39f1yvf0khq1ih2w4l0jdbpfdc2v1k9cp0jh8jh4"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; @@ -202970,8 +203035,8 @@ self: { }: mkDerivation { pname = "pinch-gen"; - version = "0.4.0.0"; - sha256 = "03fpcy2mdq83mpx4hv6x57csdwd07pkqcfqc0wd10zys77i75s46"; + version = "0.4.1.0"; + sha256 = "11sk0lmzsxw0k8i8airpv7p461z25n6y2fygx0l7gv0zadaici2v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203091,6 +203156,19 @@ self: { license = lib.licenses.asl20; }) {}; + "pinned-warnings" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, ghc }: + mkDerivation { + pname = "pinned-warnings"; + version = "0.1.0.1"; + sha256 = "0yrd4lqr1sklswalpx7j1bmqjsc19y080wcgq4qd0fmc3qhcixjc"; + libraryHaskellDepends = [ + base bytestring containers directory ghc + ]; + description = "Preserve warnings in a GHCi session"; + license = lib.licenses.bsd3; + }) {}; + "pinpon" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-sns, base, bytestring, containers, doctest, exceptions @@ -222884,6 +222962,19 @@ self: { license = lib.licenses.publicDomain; }) {}; + "reorder-expression" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, optics, parsec }: + mkDerivation { + pname = "reorder-expression"; + version = "0.1.0.0"; + sha256 = "01d83j3mq2gz6maqbkzpjrz6ppyhsqrj4rj72xw49fkl2w34pa9f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec optics parsec ]; + testToolDepends = [ hspec-discover ]; + description = "Reorder expressions in a syntax tree according to operator fixities"; + license = lib.licenses.mit; + }) {}; + "reorderable" = callPackage ({ mkDerivation, base, constraints, haskell-src-exts , haskell-src-meta, template-haskell @@ -233660,6 +233751,27 @@ self: { broken = true; }) {}; + "servant-benchmark" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, hspec, http-media, http-types, QuickCheck + , servant, text, yaml + }: + mkDerivation { + pname = "servant-benchmark"; + version = "0.1.1.1"; + sha256 = "1rsj819kg17p31ky5ad28hydrkh39nsfwkq3f9zdkqm2j924idhx"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive http-media + http-types QuickCheck servant text yaml + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive hspec + http-media http-types QuickCheck servant text yaml + ]; + description = "Generate benchmark files from a Servant API"; + license = lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant , servant-server, wai, warp @@ -244727,6 +244839,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "sourcemap_0_1_6_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , process, random, text, unordered-containers, utf8-string + }: + mkDerivation { + pname = "sourcemap"; + version = "0.1.6.1"; + sha256 = "0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring process text unordered-containers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring process text unordered-containers utf8-string + ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; + description = "Implementation of source maps as proposed by Google and Mozilla"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sousit" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, QuickCheck , resourcet, stm, test-framework, test-framework-quickcheck2 @@ -271572,22 +271705,25 @@ self: { }) {}; "unicode-collation" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-lexing - , containers, filepath, parsec, QuickCheck, quickcheck-instances - , tasty, tasty-bench, tasty-hunit, template-haskell, text, text-icu + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu , th-lift-instances, unicode-transforms }: mkDerivation { pname = "unicode-collation"; - version = "0.1.2"; - sha256 = "1q77rd3d2c1r5d35f0z1mhismc3rf8bg1dwfg32wvdd9hpszc52v"; + version = "0.1.3"; + sha256 = "0nbxkpd29ivdi6vcikbaasffkcz9m2vd4nhv29p6gmvckzmhj7zi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bytestring-lexing containers filepath parsec - template-haskell text th-lift-instances unicode-transforms + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base QuickCheck quickcheck-instances tasty-bench text text-icu ]; @@ -282595,14 +282731,14 @@ self: { license = lib.licenses.isc; }) {}; - "witch_0_2_0_0" = callPackage + "witch_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, hspec , template-haskell, text }: mkDerivation { pname = "witch"; - version = "0.2.0.0"; - sha256 = "03rnpljng4vy913zm3cxnhlq3i8d5p57661wa1cwj46hkhy7rhj7"; + version = "0.2.0.2"; + sha256 = "13y5zbs9lwniamwq2cm45rsc7xp11ny2m7x3f965qd6az66ds396"; libraryHaskellDepends = [ base bytestring containers template-haskell text ]; From f812b261e2e39db31bcac09732054abf8f847108 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 03:46:57 +0200 Subject: [PATCH 060/476] python3Packages.python-gitlab: 2.6.0 -> 2.7.1 Fixes the build, disable tests, as they rely on a local GitLab instance running on docker. Adds pythonImportsCheck. --- .../python-modules/python-gitlab/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4dc3cfb5693..b3cb9aaff63 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, argcomplete +, requests +, requests-toolbelt +, pyyaml +}: buildPythonPackage rec { pname = "python-gitlab"; - version = "2.6.0"; + version = "2.7.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1"; + sha256 = "0z4amj5xhx5zc3h2m0zrkardm3z5ba9qpjx5n6dczyz77r527yg1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + argcomplete + pyyaml + requests + requests-toolbelt + ]; - checkInputs = [ mock httmock pytest responses ]; + # tests rely on a gitlab instance on a local docker setup + doCheck = false; - disabled = pythonOlder "3.6"; + pythonImportsCheck = [ + "gitlab" + ]; meta = with lib; { description = "Interact with GitLab API"; From 11cc6158710f5b4876cc93d262837c6a909fe400 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 04:43:50 +0000 Subject: [PATCH 061/476] kanboard: 1.2.18 -> 1.2.19 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index ffb787a9bd9..6dd407ab551 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.18"; + version = "1.2.19"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-raXPRoydd3CfciF7S0cZiuY7EPFKfE8IU3qj2dOztHU="; + sha256 = "sha256-48U3eRg6obRjgK06SKN2g1+0wocqm2aGyXO2yZw5fs8="; }; dontBuild = true; From a9613abb56b3ee13b3cb24f9601f71f7532c0d06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 04:58:40 +0000 Subject: [PATCH 062/476] kooha: 1.1.1 -> 1.1.2 --- pkgs/applications/video/kooha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 0a3de27f53e..1531378db89 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.1"; + version = "1.1.2"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "05515xccs6y3wy28a6lkyn2jgi0fli53548l8qs73li8mdbxzd4c"; + sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17"; }; buildInputs = [ From accee089d97e4164ade95e96cd72ee47e813b8cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 10:00:24 +0200 Subject: [PATCH 063/476] python3Packages.PyGithub: 1.54.1 -> 1.55 --- pkgs/development/python-modules/pyGithub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index c214b375ff3..0fbd26c4a44 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.54.1"; + version = "1.55"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq"; + sha256 = "sha256-PuGCBFSbM91NtSzuyf0EQUr3LiuHDq90OwkSf53rSyA="; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; From f99ab79b94477cd74a1a8a0439f67d9f53c1b8e4 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Tue, 27 Apr 2021 11:44:03 +0200 Subject: [PATCH 064/476] maintainers: add Valentin Boettcher --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee12b1a24db..163106a08f2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3991,6 +3991,16 @@ githubId = 19825977; name = "Hiren Shah"; }; + hiro98 = { + email = "hiro@protagon.space"; + github = "vale981"; + githubId = 4025991; + name = "Valentin Boettcher"; + keys = [{ + longkeyid = "rsa2048/0xC22D4DE4D7B32D19"; + fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; + }]; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; From 24320ba1ddafa08714d17619c6d84f6f144da8bc Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 27 Apr 2021 09:46:08 +0200 Subject: [PATCH 065/476] pipewire: 0.3.25 -> 0.3.26 --- .../desktops/pipewire/bluez-monitor.conf.json | 2 +- .../desktops/pipewire/media-session.conf.json | 1 + .../pipewire/pipewire-pulse.conf.json | 5 +++- .../desktops/pipewire/pipewire.conf.json | 5 +++- .../0040-alsa-profiles-use-libdir.patch | 12 +++++----- .../pipewire/0050-pipewire-pulse-path.patch | 14 +++++------ .../0055-pipewire-media-session-path.patch | 16 ++++++------- .../pipewire/0070-installed-tests-path.patch | 20 ++++++++-------- .../pipewire/0080-pipewire-config-dir.patch | 24 +++++++++---------- .../libraries/pipewire/default.nix | 4 ++-- 10 files changed, 55 insertions(+), 48 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json index bd00571bc35..6d1c23e8256 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json @@ -9,7 +9,7 @@ ], "actions": { "update-props": { - "bluez5.reconnect-profiles": [ + "bluez5.auto-connect": [ "hfp_hf", "hsp_hs", "a2dp_sink" diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session.conf.json index 62e59935dbe..24906e767d6 100644 --- a/nixos/modules/services/desktops/pipewire/media-session.conf.json +++ b/nixos/modules/services/desktops/pipewire/media-session.conf.json @@ -59,6 +59,7 @@ "with-pulseaudio": [ "with-audio", "bluez5", + "logind", "restore-stream", "streams-follow-default" ] diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json index 3e776fe75a2..17bbbdef117 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json @@ -30,7 +30,10 @@ "args": { "server.address": [ "unix:native" - ] + ], + "vm.overrides": { + "pulse.min.quantum": "1024/48000" + } } } ], diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/pipewire.conf.json index bae87dd6637..a9330f54f4f 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/pipewire.conf.json @@ -2,7 +2,10 @@ "context.properties": { "link.max-buffers": 16, "core.daemon": true, - "core.name": "pipewire-0" + "core.name": "pipewire-0", + "vm.overrides": { + "default.clock.min-quantum": 1024 + } }, "context.spa-libs": { "audio.convert.*": "audioconvert/libspa-audioconvert", diff --git a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch index c657d12f7d0..fab89c4ffd9 100644 --- a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index ffee41b4..f3e4ec74 100644 +index 99a4b2d1..d4a4cda7 100644 --- a/meson.build +++ b/meson.build -@@ -53,7 +53,7 @@ endif +@@ -55,7 +55,7 @@ endif - spa_plugindir = join_paths(pipewire_libdir, spa_name) + spa_plugindir = pipewire_libdir / spa_name --alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer') -+alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer') +-alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' ++alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - pipewire_headers_dir = join_paths(pipewire_name, 'pipewire') + pipewire_headers_dir = pipewire_name / 'pipewire' diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch index 4a6b21dd431..fd7d031ee0f 100644 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch @@ -1,8 +1,8 @@ diff --git a/meson_options.txt b/meson_options.txt -index ce364d93..a6c8af72 100644 +index 66791f3a..93b5e2a9 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -152,6 +152,9 @@ option('udev', +@@ -172,6 +172,9 @@ option('udev', option('udevrulesdir', type : 'string', description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') @@ -13,15 +13,15 @@ index ce364d93..a6c8af72 100644 type : 'string', description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 0a5e5042..4a70b0b0 100644 +index aa30a86f..1edebb2d 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -9,7 +9,7 @@ install_data( systemd_config = configuration_data() - systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) --systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse')) -+systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) - systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session')) + systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') +-systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') ++systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') + systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session') configure_file(input : 'pipewire.service.in', diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index a4fb8b41e7a..be6683c3e7b 100644 --- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -1,8 +1,8 @@ diff --git a/meson_options.txt b/meson_options.txt -index e2a1e028..310029f2 100644 +index 93b5e2a9..1b915ac3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -10,6 +10,9 @@ option('media-session', +@@ -13,6 +13,9 @@ option('media-session', description: 'Build and install pipewire-media-session', type: 'feature', value: 'auto') @@ -13,15 +13,15 @@ index e2a1e028..310029f2 100644 description: 'Build manpages', type: 'feature', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 5c4d1af0..7296220f 100644 +index 1edebb2d..251270eb 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -10,7 +10,7 @@ install_data( systemd_config = configuration_data() - systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) - systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) --systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session')) -+systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session')) - + systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') + systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') +-systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session') ++systemd_config.set('PW_MEDIA_SESSION_BINARY', get_option('media-session-prefix') / 'bin/pipewire-media-session') + configure_file(input : 'pipewire.service.in', output : 'pipewire.service', diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index cb695fa398c..926de306254 100644 --- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,23 +1,23 @@ diff --git a/meson.build b/meson.build -index 97d4d939..b17358e5 100644 +index d4a4cda7..a27569bd 100644 --- a/meson.build +++ b/meson.build @@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' - + alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) - --installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) --installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) -+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) -+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) + +-installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name +-installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name ++installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name ++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name installed_tests_enabled = not get_option('installed_tests').disabled() installed_tests_template = files('template.test.in') - + diff --git a/meson_options.txt b/meson_options.txt -index fba0d647..8c6106cd 100644 +index 1b915ac3..85beb86a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -26,6 +26,9 @@ option('installed_tests', +@@ -29,6 +29,9 @@ option('installed_tests', description: 'Install manual and automated test executables', type: 'feature', value: 'disabled') diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch index ad1ae93684b..b92e2818ea0 100644 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch @@ -1,30 +1,30 @@ diff --git a/meson.build b/meson.build -index 0073eb13..0ffc6863 100644 +index a27569bd..fcf18344 100644 --- a/meson.build +++ b/meson.build -@@ -34,7 +34,10 @@ pipewire_libexecdir = join_paths(prefix, get_option('libexecdir')) - pipewire_localedir = join_paths(prefix, get_option('localedir')) - pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir')) +@@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir') + pipewire_localedir = prefix / get_option('localedir') + pipewire_sysconfdir = prefix / get_option('sysconfdir') --pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire') +-pipewire_configdir = pipewire_sysconfdir / 'pipewire' +pipewire_configdir = get_option('pipewire_config_dir') +if pipewire_configdir == '' -+ pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire') ++ pipewire_configdir = pipewire_sysconfdir / 'pipewire' +endif - modules_install_dir = join_paths(pipewire_libdir, pipewire_name) + modules_install_dir = pipewire_libdir / pipewire_name if host_machine.system() == 'linux' diff --git a/meson_options.txt b/meson_options.txt -index 4b9e46b8..8c301459 100644 +index 85beb86a..372e8faa 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,9 @@ option('pipewire-pulseaudio', - option('libpulse-path', - description: 'Where to install the libpulse.so library', +@@ -67,6 +67,9 @@ option('jack-devel', + option('libjack-path', + description: 'Where to install the libjack.so library', type: 'string') +option('pipewire_config_dir', + type : 'string', + description : 'Directory for pipewire configuration (defaults to /etc/pipewire)') option('spa-plugins', description: 'Enable spa plugins integration', - type: 'boolean', + type: 'feature', diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 47a85c36c23..9f095c7ab78 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -42,7 +42,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.25"; + version = "0.3.26"; outputs = [ "out" @@ -60,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U="; + hash = "sha256:1rqi1sa937lp89ai79b5n7m0p66pigpj4w1mr2vq4dycfp8vppxk"; }; patches = [ From 6edd10201308a454f6145febc1b38317592ab7a3 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 27 Apr 2021 10:24:56 +0200 Subject: [PATCH 066/476] pipewire: Fix tests --- nixos/tests/installed-tests/pipewire.nix | 10 ++++++++++ pkgs/development/libraries/pipewire/test-paths.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/tests/installed-tests/pipewire.nix b/nixos/tests/installed-tests/pipewire.nix index f4154b5d2fd..b04265658fc 100644 --- a/nixos/tests/installed-tests/pipewire.nix +++ b/nixos/tests/installed-tests/pipewire.nix @@ -2,4 +2,14 @@ makeInstalledTest { tested = pkgs.pipewire; + testConfig = { + hardware.pulseaudio.enable = false; + services.pipewire = { + enable = true; + pulse.enable = true; + jack.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + }; + }; } diff --git a/pkgs/development/libraries/pipewire/test-paths.nix b/pkgs/development/libraries/pipewire/test-paths.nix index 11d00e7c2ca..939b79686e3 100644 --- a/pkgs/development/libraries/pipewire/test-paths.nix +++ b/pkgs/development/libraries/pipewire/test-paths.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, pipewire, paths-out, paths-lib }: +{ lib, runCommand, pipewire, paths-out, paths-lib, paths-out-media-session }: let check-path = output: path: '' From b95fc98718677420566f69e432352877e35d7f96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 13:18:05 +0200 Subject: [PATCH 067/476] python3Packages.PyGithub: cleanup --- .../python-modules/pyGithub/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 0fbd26c4a44..02656968d68 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -3,17 +3,16 @@ , cryptography , deprecated , fetchFromGitHub -, httpretty -, isPy3k -, parameterized +, pynacl , pyjwt -, pytestCheckHook -, requests }: +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "PyGithub"; version = "1.55"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyGithub"; @@ -22,17 +21,23 @@ buildPythonPackage rec { sha256 = "sha256-PuGCBFSbM91NtSzuyf0EQUr3LiuHDq90OwkSf53rSyA="; }; - checkInputs = [ httpretty parameterized pytestCheckHook ]; - propagatedBuildInputs = [ cryptography deprecated pyjwt requests ]; + propagatedBuildInputs = [ + cryptography + deprecated + pynacl + pyjwt + requests + ]; # Test suite makes REST calls against github.com doCheck = false; + pythonImportsCheck = [ "github" ]; meta = with lib; { + description = "Python library to access the GitHub API v3"; homepage = "https://github.com/PyGithub/PyGithub"; - description = "A Python (2 and 3) library to access the GitHub API v3"; platforms = platforms.all; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jhhuh ]; }; } From b235179807f5e898468e77de7416f5ba3e9c0db8 Mon Sep 17 00:00:00 2001 From: netcrns Date: Mon, 26 Apr 2021 18:41:59 +0200 Subject: [PATCH 068/476] maintainers: add netcrns --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68ed8a02c3e..5e420023d07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6979,6 +6979,12 @@ githubId = 628342; name = "Tim Steinbach"; }; + netcrns = { + email = "jason.wing@gmx.de"; + github = "netcrns"; + githubId = 34162313; + name = "Jason Wing"; + }; netixx = { email = "dev.espinetfrancois@gmail.com"; github = "netixx"; From 55f5842f1b5a669b5e2d43d6366680e513851319 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 27 Apr 2021 06:55:49 -0400 Subject: [PATCH 069/476] haskellPackages.HTF: Fix testsuite and mark unbroken in configuration. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 552e35b9c36..d22e7caf3d4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -284,7 +284,10 @@ self: super: { hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; hspec-server = dontCheck super.hspec-server; - HTF = dontCheck super.HTF; + HTF = overrideCabal super.HTF (orig: { + # The scripts in scripts/ are needed to build the test suite. + preBuild = "patchShebangs --build scripts"; + }); htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e94f71ba7ea..f3b254d4fa8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6962,7 +6962,6 @@ broken-packages: - htdp-image - hTensor - htestu - - HTF - HTicTacToe - htiled - htlset From 6fdd9922e5323d388dae2be68f6351d82600bb73 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 27 Apr 2021 08:46:38 -0400 Subject: [PATCH 070/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ef920675c69d0a73d87ff602a3869faf0d5ae0d5. --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 603fdb95165..5ea8f4ba404 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9491,8 +9491,6 @@ self: { ]; description = "The Haskell Test Framework"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HTTP" = callPackage From 1765c3008006e40a2795d4eea77298dfa380ccac Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 27 Apr 2021 15:13:40 +0200 Subject: [PATCH 071/476] linuxPackages.oci-seccomp-bpf-hook: 1.2.2 -> 1.2.3 Signed-off-by: Sascha Grunert --- pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 16dcfe9ba06..511dd162785 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-SRphs8zwKz6jlAixVZkHdww0jroaBNK82kSLj1gs6Wg="; + sha256 = "sha256-EKD6tkdQCPlVlb9ScvRwDxYAtbbv9PIqBHH6SvtPDsE="; }; vendorSha256 = null; @@ -56,6 +56,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ saschagrunert ]; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } From 5bf7ee0a7be1a54bc0eb860cb7e60a35f3c78767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 26 Apr 2021 13:29:16 +0200 Subject: [PATCH 072/476] maven: 3.6.3 -> 3.8.1 --- .../tools/build-managers/apache-maven/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 3a1866e0b39..9e0103170e9 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,16 +2,15 @@ assert jdk != null; -let version = "3.6.3"; in stdenv.mkDerivation rec { pname = "apache-maven"; - inherit version; + version = "3.8.1"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96"; + sha256 = "00pgmc9v2s2970wgl2ksvpqy4lxx17zhjm9fgd10fkamxc2ik2mr"; }; nativeBuildInputs = [ makeWrapper ]; From d490493d0056cd0f54e52a70bd6a4292bcb67512 Mon Sep 17 00:00:00 2001 From: Jonathan Wilkins Date: Mon, 26 Apr 2021 17:19:22 +0100 Subject: [PATCH 073/476] maintainers: add Jonathan Wilkins --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4a481b5ecf0..f2a8bbfad9c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3101,6 +3101,16 @@ githubId = 2147649; name = "Euan Kemp"; }; + evalexpr = { + name = "Jonathan Wilkins"; + email = "nixos@wilkins.tech"; + github = "evalexpr"; + githubId = 23485511; + keys = [{ + longkeyid = "rsa4096/0x2D1D402E17763DD6"; + fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; + }]; + }; evanjs = { email = "evanjsx@gmail.com"; github = "evanjs"; From 87d77c6d886ccee6993f502c2f02c1e7462d1499 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 27 Apr 2021 07:03:07 -0700 Subject: [PATCH 074/476] vscode: add meta.mainProgram Signed-off-by: Ana Hobden --- pkgs/applications/editors/vscode/vscode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 35637c8fc86..f517f95a812 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -45,6 +45,7 @@ in Open source source code editor developed by Microsoft for Windows, Linux and macOS ''; + mainProgram = "code"; longDescription = '' Open source source code editor developed by Microsoft for Windows, Linux and macOS. It includes support for debugging, embedded Git From fb86d324d1a6f05a6da55af6e2ae8922e7063498 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 27 Apr 2021 12:52:41 +0200 Subject: [PATCH 075/476] pipewire: Add update script --- .../services/desktops/pipewire/README.md | 6 --- .../libraries/pipewire/default.nix | 48 ++++++++++--------- pkgs/development/libraries/pipewire/update.sh | 24 ++++++++++ 3 files changed, 49 insertions(+), 29 deletions(-) delete mode 100644 nixos/modules/services/desktops/pipewire/README.md create mode 100755 pkgs/development/libraries/pipewire/update.sh diff --git a/nixos/modules/services/desktops/pipewire/README.md b/nixos/modules/services/desktops/pipewire/README.md deleted file mode 100644 index 87288a81cfe..00000000000 --- a/nixos/modules/services/desktops/pipewire/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Updating - -1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix -2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession` -3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory -4. add new files to the module config and passthru tests diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 9f095c7ab78..133853e2362 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -60,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:1rqi1sa937lp89ai79b5n7m0p66pigpj4w1mr2vq4dycfp8vppxk"; + sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec="; }; patches = [ @@ -146,29 +146,31 @@ let moveToOutput "bin/pipewire-pulse" "$pulse" ''; - passthru.tests = { - installedTests = nixosTests.installed-tests.pipewire; + passthru = { + updateScript = ./update.sh; + tests = { + installedTests = nixosTests.installed-tests.pipewire; - # This ensures that all the paths used by the NixOS module are found. - test-paths = callPackage ./test-paths.nix { - paths-out = [ - "share/alsa/alsa.conf.d/50-pipewire.conf" - "nix-support/etc/pipewire/client.conf.json" - "nix-support/etc/pipewire/client-rt.conf.json" - "nix-support/etc/pipewire/jack.conf.json" - "nix-support/etc/pipewire/pipewire.conf.json" - "nix-support/etc/pipewire/pipewire-pulse.conf.json" - ]; - paths-out-media-session = [ - "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json" - "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json" - "nix-support/etc/pipewire/media-session.d/media-session.conf.json" - "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" - ]; - paths-lib = [ - "lib/alsa-lib/libasound_module_pcm_pipewire.so" - "share/alsa-card-profile/mixer" - ]; + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + "nix-support/etc/pipewire/client.conf.json" + "nix-support/etc/pipewire/jack.conf.json" + "nix-support/etc/pipewire/pipewire.conf.json" + "nix-support/etc/pipewire/pipewire-pulse.conf.json" + ]; + paths-out-media-session = [ + "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/media-session.conf.json" + "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; }; }; diff --git a/pkgs/development/libraries/pipewire/update.sh b/pkgs/development/libraries/pipewire/update.sh new file mode 100755 index 00000000000..6d0088c206c --- /dev/null +++ b/pkgs/development/libraries/pipewire/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-update -i bash +# shellcheck shell=bash + +set -o errexit -o pipefail -o nounset -o errtrace +shopt -s inherit_errexit +shopt -s nullglob +IFS=$'\n' + +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)" + +cd "$NIXPKGS_ROOT" +nix-update pipewire +outputs=$(nix-build . -A pipewire -A pipewire.mediaSession) +for p in $outputs; do + conf_files=$(find "$p/nix-support/etc/pipewire/" -name '*.conf.json') + for c in $conf_files; do + file_name=$(basename "$c") + if [[ ! -e "nixos/modules/services/desktops/pipewire/$file_name" ]]; then + echo "New file $file_name found! Add it to the module config and passthru tests!" + fi + install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/" + done +done From 712f49a053e36feda9174edaf813fe16d37892f3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 27 Apr 2021 12:07:46 +0200 Subject: [PATCH 076/476] soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27 --- pkgs/games/soldat-unstable/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index 19ff4b5c6c0..496d51e31c4 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper +{ lib, stdenv, fetchFromGitHub, fpc, zip, makeWrapper , SDL2, freetype, physfs, openal, gamenetworkingsockets , xorg, autoPatchelfHook }: @@ -39,14 +39,14 @@ in stdenv.mkDerivation rec { pname = "soldat"; - version = "unstable-2021-02-09"; + version = "unstable-2021-04-27"; src = fetchFromGitHub { name = "soldat"; owner = "Soldat"; repo = "soldat"; - rev = "c304c3912ca7a88461970a859049d217a44c6375"; - sha256 = "09sl2zybfcmnl2n3qghp0gylmr71y01534l6nq0y9llbdy0bf306"; + rev = "4d17667c316ff08934e97448b7f290a8dc434e81"; + sha256 = "1pf557psmhfaagblfwdn36cw80j7bgs0lgjq8hmjbv58dysw3jdb"; }; nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ]; @@ -54,15 +54,6 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; runtimeDependencies = [ xorg.libX11 ]; - patches = [ - # fix an argument parsing issue which prevents - # us from passing nix store paths to soldat - (fetchpatch { - url = "https://github.com/sternenseemann/soldat/commit/9f7687430f5fe142c563b877d2206f5c9bbd5ca0.patch"; - sha256 = "0wsrazb36i7v4idg06jlzfhqwf56q9szzz7jp5cg4wsvcky3wajf"; - }) - ]; - buildPhase = '' runHook preBuild From bdfee9423ad1b72660a48d104bd8ce76306a6082 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 15:15:36 +0000 Subject: [PATCH 077/476] bctoolbox: 4.5.1 -> 4.5.7 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 5a9bbd5a49d..1d8f35cd01c 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.5.1"; + version = "4.5.7"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1mm3v01jz2mp8vajsl45s23gw90zafbgg3br5n5yz03aan08f395"; + sha256 = "sha256-JQ2HgFVqgO+LLXmN95ZTHyT+htCFUC3VRreKLwPYo9Y="; }; # Do not build static libraries From 0db1ac4ec26fee5ab19e6e1be765edbf15149be7 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 27 Apr 2021 14:33:11 +0200 Subject: [PATCH 078/476] plasma-pass: init at 1.2.0 Reviewed-by: William Casarin Signed-off-by: Matthias Beyer Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210427123311.517-1-mail@beyermatthias.de%3E --- pkgs/tools/security/plasma-pass/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/security/plasma-pass/default.nix diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix new file mode 100644 index 00000000000..20f64b725f1 --- /dev/null +++ b/pkgs/tools/security/plasma-pass/default.nix @@ -0,0 +1,41 @@ +{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules +, ki18n +, kitemmodels +, oathToolkit +, qgpgme +, plasma-framework +, qt5 }: + +mkDerivation rec { + pname = "plasma-pass"; + version = "1.2.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "plasma"; + repo = "plasma-pass"; + rev = "v${version}"; + sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1"; + }; + + buildInputs = [ + ki18n + kitemmodels + oathToolkit + qgpgme + plasma-framework + qt5.qtbase + qt5.qtdeclarative + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + meta = with lib; { + description = "A Plasma applet to access passwords from pass, the standard UNIX password manager"; + homepage = "https://invent.kde.org/plasma/plasma-pass"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd45c2b584..d83937b4650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28606,6 +28606,8 @@ in plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; + inherit (callPackages ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; From 311dd4dc3e606dd0176c737f5b00b483cd7d0ac1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:19:24 +0000 Subject: [PATCH 079/476] armadillo: 10.3.0 -> 10.4.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 22264fe01f3..b286c7efbd8 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.3.0"; + version = "10.4.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-qx7/+lr5AAChGhmjkwL9+8XEq/b6tXipvQ6clc+B5Mc="; + sha256 = "sha256-5aRR4FXeX4sEhKzVyrLsXbrW3ihze1zHJRDYkuxppYA="; }; nativeBuildInputs = [ cmake ]; From be1392dbd9debfe1d9a72b6aeb01a7a3c625623f Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Tue, 27 Apr 2021 18:23:40 +0200 Subject: [PATCH 080/476] stm32cubemx: 6.0.1 -> 6.2.1 Fixes: STM32CubeMX uses an outdated version of xstream that is not compatible with JDK16. The derivation uses JDK11 (LTS) explicitly now. Additionally, the desktop file wasn't generated by copyDesktopItems before. This is now fixed as well. Upstream changes: - Main files moved from . to MX - JAR file has no .exe extension anymore - Icon format changed from icns to ico - There is now a bundled JRE, but we prefer not to use it Additional changes: - Move version definition into mkDerivation --- .../tools/misc/stm32cubemx/default.nix | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix index 3b754e4c91b..bca4f87f9a5 100644 --- a/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -1,52 +1,57 @@ -{ lib, stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }: - +{ lib, stdenv, makeDesktopItem, copyDesktopItems, icoutils, fdupes, imagemagick, jdk11, fetchzip }: +# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 +# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: +# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 +# If you're updating this derivation, check the link above to see if it's been fixed upstream +# and try replacing all occurrences of jdk11 with jre and test whether it works. let - version = "6.0.1"; - desktopItem = makeDesktopItem { - name = "stm32CubeMX"; - exec = "stm32cubemx"; - desktopName = "STM32CubeMX"; - categories = "Development;"; - icon = "stm32cubemx"; - }; + iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - inherit version; - + version = "6.2.1"; src = fetchzip { - url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "15vxca1pgpgxgiz4wisrw0lylffdwnn4n46z9n0q37f8hmzlrk8f"; - stripRoot= false; + url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; + sha256 = "0m5h01iq0mgrr9svj4gmykfi9lsyjpqzrkvlizff26c8dqad59c5"; + stripRoot = false; }; - nativeBuildInputs = [ libicns imagemagick ]; + nativeBuildInputs = [ icoutils fdupes imagemagick copyDesktopItems]; + desktopItems = [ + (makeDesktopItem { + name = "stm32CubeMX"; + exec = "stm32cubemx"; + desktopName = "STM32CubeMX"; + categories = "Development;"; + comment = "STM32Cube initialization code generator"; + icon = "stm32cubemx"; + }) + ]; buildCommand = '' - mkdir -p $out/{bin,opt/STM32CubeMX,share/applications} - cp -r $src/. $out/opt/STM32CubeMX/ - chmod +rx $out/opt/STM32CubeMX/STM32CubeMX.exe + mkdir -p $out/{bin,opt/STM32CubeMX} + cp -r $src/MX/. $out/opt/STM32CubeMX/ + chmod +rx $out/opt/STM32CubeMX/STM32CubeMX cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jre}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX.exe + ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} - icns2png --extract $out/opt/STM32CubeMX/${pname}.icns + icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico + fdupes -dN . > /dev/null ls for size in 16 24 32 48 64 128 256; do mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ -e ${pname}_"$size"x"$size"x32.png ]; then - mv ${pname}_"$size"x"$size"x32.png \ + if [ $size -eq 256 ]; then + mv ${iconame}_*_"$size"x"$size"x32.png \ $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png else - convert -resize "$size"x"$size" ${pname}_256x256x32.png \ + convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \ $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png fi done; - - ln -s ${desktopItem}/share/applications/* $out/share/applications ''; meta = with lib; { From 088b3db523734fa60388148e36c7d3ad2e7e8a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 27 Apr 2021 18:33:48 +0200 Subject: [PATCH 081/476] mpfi: use autoreconfHook --- pkgs/development/libraries/mpfi/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index db36ed38a95..5ff0dcd29e7 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, autoconf, automake, libtool, texinfo, mpfr}: +{lib, stdenv, fetchurl, autoreconfHook, texinfo, mpfr}: stdenv.mkDerivation rec { pname = "mpfi"; version = "1.5.4"; @@ -12,13 +12,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ozk4WV1yCvF5c96vcnz8DdQcixbCCtwQOpcPSkOuOlY="; }; - nativeBuildInputs = [ autoconf automake libtool texinfo ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ mpfr ]; - preConfigure = '' - ./autogen.sh - ''; - meta = { inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; From f3709c804dc48c1071c6e3369e19bfc207756748 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 27 Apr 2021 16:15:08 +0100 Subject: [PATCH 082/476] opera: add libdrm and mesa dependencies Fixes #120873 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index eefe7af26a1..3598f7b617a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -26,9 +26,11 @@ , libXrandr , libXrender , libXtst +, libdrm , libnotify , libpulseaudio , libuuid +, mesa , nspr , nss , pango @@ -88,9 +90,11 @@ in stdenv.mkDerivation rec { libXrandr libXrender libXtst + libdrm libnotify libuuid libxcb + mesa nspr nss pango From d8bc7c0dbeab183c077d2cfc26084c2e021dc12b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 17:04:15 +0000 Subject: [PATCH 083/476] cargo-deb: 1.29.1 -> 1.29.2 --- pkgs/tools/package-management/cargo-deb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index f171a150045..6a71189314d 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8="; + sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y"; + cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM="; preCheck = '' substituteInPlace tests/command.rs \ From 8298d66e42228e66758733b436339505001b322d Mon Sep 17 00:00:00 2001 From: erikbackman Date: Tue, 27 Apr 2021 19:05:57 +0200 Subject: [PATCH 084/476] (maintainer-list): add myself --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cdd23872a0..aacdb42fedb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3017,6 +3017,12 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + erikbackman = { + email = "contact@ebackman.net"; + github = "erikbackman"; + githubId = 46724898; + name = "Erik Backman"; + }; erikryb = { email = "erik.rybakken@math.ntnu.no"; github = "erikryb"; From 95b40e4143c3f1eccbeb54631b042fdbcfb9cdd4 Mon Sep 17 00:00:00 2001 From: erikbackman Date: Tue, 27 Apr 2021 19:07:25 +0200 Subject: [PATCH 085/476] (numworks-epsilon): init at 15.3.2 --- .../science/math/numworks-epsilon/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/math/numworks-epsilon/default.nix diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix new file mode 100644 index 00000000000..9ec41386da5 --- /dev/null +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, libpng +, xorg +, python3 +, imagemagick +, gcc-arm-embedded +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "numworks-epsilon"; + version = "15.3.2"; + + src = fetchFromGitHub { + owner = "numworks"; + repo = "epsilon"; + rev = version; + sha256 = "1q34dilyypiggjs16486jm122yf20wcigqxvspc77ig9albaxgh5"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libpng + xorg.libXext + python3 + imagemagick + gcc-arm-embedded + ]; + + makeFlags = [ + "PLATFORM=simulator" + ]; + + installPhase = '' + runHook preInstall + + mv ./output/release/simulator/linux/{epsilon.bin,epsilon} + mkdir -p $out/bin + cp -r ./output/release/simulator/linux/* $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Emulator for Epsilon, a High-performance graphing calculator operating system"; + homepage = "https://numworks.com/"; + license = licenses.cc-by-nc-sa-40; + maintainers = with maintainers; [ erikbackman ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61b0646ef9a..344d19b7b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,6 +569,8 @@ in nix-gitignore = callPackage ../build-support/nix-gitignore { }; + numworks-epsilon = callPackage ../applications/science/math/numworks-epsilon { }; + ociTools = callPackage ../build-support/oci-tools { }; octant = callPackage ../applications/networking/cluster/octant { }; From 45995d8d9e4c9b1149c8a00137f0cb03ce876a3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 17:45:54 +0000 Subject: [PATCH 086/476] cargo-outdated: 0.9.14 -> 0.9.15 --- pkgs/tools/package-management/cargo-outdated/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 80c69d74abf..fe8f743c71c 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-80H0yblEcxP6TTil0dJPZhvMivDLuyvoV0Rmcrykgjs="; + sha256 = "sha256-Cd0QWFeAAHSkeCVQvb+Fsg5nBoutV1k1kQpMkWpci2E="; }; - cargoSha256 = "sha256-RACdzaCWfm5rrIX0wrvKSmhLQt1a+2MQqrjTx+etpGo="; + cargoSha256 = "sha256-VngJMDVKIV8+ODHia2U2gKKPKskyKiuKhSnO6NJsJHI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 91ba4016a05a63c394eea5b6aac3a3f9c562f6f2 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Tue, 27 Apr 2021 10:28:33 -0700 Subject: [PATCH 087/476] libdnf: 0.60.0 -> 0.61.1 --- .../package-management/libdnf/darwin.patch | 57 ------------------- .../package-management/libdnf/default.nix | 6 +- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 pkgs/tools/package-management/libdnf/darwin.patch diff --git a/pkgs/tools/package-management/libdnf/darwin.patch b/pkgs/tools/package-management/libdnf/darwin.patch deleted file mode 100644 index 53f2c04f9ef..00000000000 --- a/pkgs/tools/package-management/libdnf/darwin.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git src/libdnf/config.h src/libdnf/config.h -index 16121f6f..737d0bc4 100644 ---- src/libdnf/config.h -+++ src/libdnf/config.h -@@ -18,7 +18,12 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+ -+#ifdef __APPLE__ -+#include -+#else - #include -+#endif - - - #if __WORDSIZE == 32 - #include "config-32.h" -diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp -index 497c560d..5de077fa 100644 ---- src/libdnf/hy-iutil.cpp -+++ src/libdnf/hy-iutil.cpp -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp -index 295fdc1b..9d584b8a 100644 ---- src/libdnf/hy-util.cpp -+++ src/libdnf/hy-util.cpp -@@ -24,7 +24,20 @@ - #include - #include - #include --#include -+ -+// Darwin compatibility hacks -+typedef int auxv_t; -+#ifndef AT_HWCAP2 -+#define AT_HWCAP2 26 -+#endif -+#ifndef AT_HWCAP -+#define AT_HWCAP 16 -+#endif -+static unsigned long getauxval(unsigned long type) -+{ -+ unsigned long ret = 0; -+ return ret; -+} - - // hawkey - #include "dnf-types.h" diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 5d4a0716cc7..446761cca1d 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,17 +3,15 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.60.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s="; + sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc="; }; - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; - nativeBuildInputs = [ cmake gettext From 14f7c5a4ec3a149672715745a2a1ae686af97c36 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 27 Apr 2021 18:49:28 +0100 Subject: [PATCH 088/476] just: 0.9.0 -> 0.9.1 --- pkgs/development/tools/just/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5b3f966399f..247d055f578 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY="; + sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY="; }; - cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw="; + cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -32,15 +32,21 @@ rustPlatform.buildRustPackage rec { export USER=just-user export USERNAME=just-user + # Prevent string.rs from being changed + cp tests/string.rs $TMPDIR/string.rs + sed -i src/justfile.rs \ -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + + # Return unchanged string.rs + cp $TMPDIR/string.rs tests/string.rs ''; - # Skip "edit" when running "cargo test", since this test case needs "cat". + # Skip "edit" when running "cargo test", since this test case needs "cat" and "vim". # Skip "choose" when running "cargo test", since this test case needs "fzf". checkFlags = [ "--skip=choose" "--skip=edit" ]; From ec4efadb830d3b174dcdc244c6d962b90126443b Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 27 Apr 2021 20:04:18 +0200 Subject: [PATCH 089/476] trilium: 0.46.9 -> 0.47.2 --- pkgs/applications/office/trilium/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index dab4367b3ae..1cf7f8769d5 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, libxshmfence, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.46.9"; + version = "0.47.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1qpk5z8w4wbkxs1lpnz3g8w30zygj4wxxlwj6gp1pip09xgiksm9"; + sha256 = "04fyi0gbih6iw61b6d8lprf9qhxb6zb1pgckmi016wgv8x5ck02p"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1n8g7l6hiw9bhzylvzlfcn2pk4i8pqkqp9lj3lcxwwqb8va52phg"; + sha256 = "1f8csjgqq4yw1qcnlrfy5ysarazmvj2fnmnxj4sr1xjbfa78y2rr"; }; in { @@ -55,7 +55,7 @@ in { wrapGAppsHook ]; - buildInputs = atomEnv.packages ++ [ gtk3 ]; + buildInputs = atomEnv.packages ++ [ gtk3 libxshmfence ]; installPhase = '' runHook preInstall From 3931eaceab781d76833d3ddc74da75f71cf651dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 18:40:39 +0000 Subject: [PATCH 090/476] air: 1.27.2 -> 1.27.3 --- pkgs/development/tools/air/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 28cb6bf7a46..1950b969d66 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.27.2"; + version = "1.27.3"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-VQymiDge42JBQwAHfHMF8imBC90uPout0fZRuQVOP5w="; + sha256 = "sha256-QO3cPyr2FqCdoiax/V0fe7kRwT61T3efnfO8uWp8rRM="; }; vendorSha256 = "sha256-B7AgUFjiW3P1dU88u3kswbCQJ7Qq7rgPlX+b+3Pq1L4="; From bb0df45c45c422568adf1205ca937fa7fe7888df Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 27 Apr 2021 22:08:49 +0300 Subject: [PATCH 091/476] =?UTF-8?q?libosmium:=202.16.0=20=E2=86=92=202.17.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index c5b801f5d47..976c39a9ef1 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h"; + sha256 = "sha256-q938WA+vJDqGVutVzWdEP7ujDAmfj3vluliomVd0om0="; }; nativeBuildInputs = [ cmake ]; From 261069c2500d62f0bd5f6eb652ea4959f96f3dba Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 27 Apr 2021 22:25:01 +0300 Subject: [PATCH 092/476] =?UTF-8?q?lagrange:=201.3.2=20=E2=86=92=201.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index abb0bd15515..93e5da02e57 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-90MN7JH84h10dSXt5Kwc2V3FKVutQ7AmNcR4TK2bpBY="; + sha256 = "sha256-hPNqyTH2oMPytvYAF9sjEQ9ibaJYDODA33ZrDuWnloU="; fetchSubmodules = true; }; From 9cbe07c1b24423cdba9fa239a0e2a0687877c1de Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 20 Apr 2021 16:08:20 -0400 Subject: [PATCH 093/476] yabridge, yabridgectl: hard code wine path --- pkgs/tools/audio/yabridge/default.nix | 28 +++++++++++++++++++ pkgs/tools/audio/yabridge/hardcode-wine.patch | 13 +++++++++ pkgs/tools/audio/yabridgectl/default.nix | 14 +++++++++- pkgs/top-level/all-packages.nix | 6 ++-- 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/audio/yabridge/hardcode-wine.patch diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index c09045bdb6e..d8ddf3ee561 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, substituteAll , meson , ninja , pkg-config @@ -77,6 +79,24 @@ in stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${vst3.src} vst3 )''; + patches = [ + # Fix printing wine version when using absolute path (remove patches in next release): + (fetchpatch { + url = "https://github.com/robbert-vdh/yabridge/commit/2aadf5256b3eafeb86efa8626247972dd33baa13.patch"; + sha256 = "sha256-Nq9TQJxa22vJLmf+USyPBkF8cKyEzb1Lp2Rx86pDxnY="; + }) + (fetchpatch { + url = "https://github.com/robbert-vdh/yabridge/commit/93df3fa1da6ffcc69a5b384ba04e3da7c5ef23ef.patch"; + sha256 = "sha256-//8Dxolqe6n+aFo4yVnnMR9kSq/iEFE0qZPvcIBehvI="; + }) + + # Hard code wine path so wine version is correct in logs + (substituteAll { + src = ./hardcode-wine.patch; + inherit wine; + }) + ]; + postPatch = '' patchShebangs . ''; @@ -117,6 +137,14 @@ in stdenv.mkDerivation rec { cp libyabridge-vst3.so "$out/lib" ''; + # Hard code wine path in wrapper scripts generated by winegcc + postFixup = '' + for exe in "$out"/bin/*.exe; do + substituteInPlace "$exe" \ + --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"' + done + ''; + meta = with lib; { description = "Yet Another VST bridge, run Windows VST2 plugins under Linux"; homepage = "https://github.com/robbert-vdh/yabridge"; diff --git a/pkgs/tools/audio/yabridge/hardcode-wine.patch b/pkgs/tools/audio/yabridge/hardcode-wine.patch new file mode 100644 index 00000000000..2b6ce1f448f --- /dev/null +++ b/pkgs/tools/audio/yabridge/hardcode-wine.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp +index 1ff05bc..0723456 100644 +--- a/src/plugin/utils.cpp ++++ b/src/plugin/utils.cpp +@@ -351,7 +351,7 @@ std::string get_wine_version() { + access(wineloader_path.c_str(), X_OK) == 0) { + wine_path = wineloader_path; + } else { +- wine_path = bp::search_path("wine").string(); ++ wine_path = "@wine@/bin/wine"; + } + + bp::ipstream output; diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 4548b288b69..2cbaf3f4ad5 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -1,4 +1,9 @@ -{ lib, rustPlatform, yabridge }: +{ lib +, rustPlatform +, yabridge +, makeWrapper +, wine +}: rustPlatform.buildRustPackage rec { pname = "yabridgectl"; @@ -17,6 +22,13 @@ rustPlatform.buildRustPackage rec { patchFlags = [ "-p3" ]; + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/yabridgectl" \ + --prefix PATH : ${lib.makeBinPath [ wine ]} + ''; + meta = with lib; { description = "A small, optional utility to help set up and update yabridge for several directories at once"; homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b7420896f8..19dade77b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -803,10 +803,12 @@ in xtrt = callPackage ../tools/archivers/xtrt { }; yabridge = callPackage ../tools/audio/yabridge { - wine = wineWowPackages.minimal; + wine = wineWowPackages.staging; }; - yabridgectl = callPackage ../tools/audio/yabridgectl { }; + yabridgectl = callPackage ../tools/audio/yabridgectl { + wine = wineWowPackages.staging; + }; ### APPLICATIONS/TERMINAL-EMULATORS From a4749b11d4eef29b07c33d3036ca7e06a990cb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 Apr 2021 21:38:30 +0200 Subject: [PATCH 094/476] nixos/kresd.package: improve the generated docs --- nixos/modules/services/networking/kresd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 86709874065..9b94c390e98 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -57,11 +57,13 @@ in { ''; }; package = mkOption { - default = pkgs.knot-resolver; type = types.package; description = " knot-resolver package to use. "; + default = pkgs.knot-resolver; + defaultText = "pkgs.knot-resolver"; + example = literalExample "pkgs.knot-resolver.override { extraFeatures = true; }"; }; extraConfig = mkOption { type = types.lines; From 3c6aaded1e900a567371d7709ad158eea0dabe35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:11 +0200 Subject: [PATCH 095/476] python3Packages.archinfo: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 7802df99ebe..3a5db77cd47 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.6852"; + version = "9.0.6885"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo="; + sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0="; }; checkInputs = [ From 2227e06a29c7ab4edb9fd162dbdf17f69551c2da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:13 +0200 Subject: [PATCH 096/476] python3Packages.ailment: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f7194f8dd2f..51419440792 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.6852"; + version = "9.0.6885"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo="; + sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0="; }; propagatedBuildInputs = [ pyvex ]; From 527f966b6017ab842919186a5805cd63b9feac9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:15 +0200 Subject: [PATCH 097/476] python3Packages.pyvex: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fa3d2119ae8..310170d040d 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.6852"; + version = "9.0.6885"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM="; + sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E="; }; propagatedBuildInputs = [ From 7b1f0cfbc687223e3672b499dbc123923cbd0529 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:18 +0200 Subject: [PATCH 098/476] python3Packages.claripy: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c3a715c1527..4d8a79a8c99 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.6852"; + version = "9.0.6885"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng="; + sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE="; }; # Use upstream z3 implementation From 589e8ae8559ee1a696bc932c451620337d2cd334 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:21 +0200 Subject: [PATCH 099/476] python3Packages.cle: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 4daab505962..51d0c263d30 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.6852"; + version = "9.0.6885"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs="; + sha256 = "sha256-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80="; }; propagatedBuildInputs = [ From 9d97b741945b7e409dcaa438331216f0a4b56ab7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:24 +0200 Subject: [PATCH 100/476] python3Packages.angr: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 588e647647d..5f545c96c9c 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6852"; + version = "9.0.6885"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8="; + sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8="; }; propagatedBuildInputs = [ From d0569c9626ca62ed2de3995745341610be7944c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 22:08:27 +0200 Subject: [PATCH 101/476] python3Packages.angrop: 9.0.6852 -> 9.0.6885 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1237ed6fa46..d1c80772bc3 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.6852"; + version = "9.0.6885"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo="; + sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY="; }; propagatedBuildInputs = [ From b0f0e1d175655a529a250aa6ec1a73c703803e0a Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Tue, 27 Apr 2021 22:26:25 +0200 Subject: [PATCH 102/476] dotty: 0.26.0-RC1 -> 3.0.0-RC3 --- pkgs/development/compilers/scala/dotty-bare.nix | 6 +++--- pkgs/development/compilers/scala/dotty.nix | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 66a634914df..66b6cf7737a 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.26.0-RC1"; + version = "3.0.0-RC3"; pname = "dotty-bare"; src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "16njy9f0lk7q5x5w1k4yqy644005w4cxhq20r8i2qslhxjndz66f"; + url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; + sha256 = "1xp9nql2l62fra8p29fgk3srdbvza9g5inxr8p0sihsrp0bgxa0m"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index 7bc7fa3d4c2..c99ed24c214 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - ln -s ${dotty-bare}/bin/dotc $out/bin/dotc - ln -s ${dotty-bare}/bin/dotd $out/bin/dotd - ln -s ${dotty-bare}/bin/dotr $out/bin/dotr + ln -s ${dotty-bare}/bin/scalac $out/bin/scalac + ln -s ${dotty-bare}/bin/scaladoc $out/bin/scaladoc + ln -s ${dotty-bare}/bin/scala $out/bin/scala + ln -s ${dotty-bare}/bin/common $out/bin/common ''; inherit (dotty-bare) meta; From ed3270a36f0bdc9baca89a784a5d8936814329b6 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Tue, 27 Apr 2021 08:14:58 -0700 Subject: [PATCH 103/476] aws-sam-cli: 1.14.0 -> 1.23.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 1429fcab4c6..3837e2e3707 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.14.0"; + version = "1.23.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; + sha256 = "0j0q6p08c3l9z0yc2cggw797k47cjh6ljpchiqgg0fh6mk32215f"; }; # Tests are not included in the PyPI package @@ -40,10 +40,8 @@ python3.pkgs.buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.14.23" "boto3~=1.14" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ --replace "watchdog==0.10.3" "watchdog" ''; From a48b4f4088726c09978aa04d08a1252a09766167 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 27 Apr 2021 21:01:53 +0200 Subject: [PATCH 104/476] openmpi: 4.1.0 -> 4.1.1 --- pkgs/development/libraries/openmpi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 46b2748cad9..2df08426368 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.1.0"; + version = "4.1.1"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; + sha256 = "1nkwq123vvmggcay48snm9qqmrh0bdzpln0l1jnp26niidvplkz2"; }; postPatch = '' From a053eae5619bc5613a155e89ed1d155065e35371 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 12:46:56 +0200 Subject: [PATCH 105/476] ethminer: provide a CUDA-free version CUDA is only needed for Nvidia GPUs; AMD has a fully open stack --- pkgs/tools/misc/ethminer/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index c43c66fcc07..52bf592a987 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -8,6 +8,7 @@ boost, makeWrapper, cudatoolkit, + cudaSupport, mesa, ethash, opencl-info, @@ -41,6 +42,8 @@ in stdenv.mkDerivation rec { "-DAPICORE=ON" "-DETHDBUS=OFF" "-DCMAKE_BUILD_TYPE=Release" + ] ++ lib.optionals (!cudaSupport) [ + "-DETHASHCUDA=OFF" # on by default ]; nativeBuildInputs = [ @@ -54,12 +57,13 @@ in stdenv.mkDerivation rec { boost opencl-headers mesa - cudatoolkit ethash opencl-info ocl-icd openssl jsoncpp + ] ++ lib.optionals cudaSupport [ + cudatoolkit ]; preConfigure = '' @@ -71,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Ethereum miner with OpenCL, CUDA and stratum support"; + description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c97493219..1b6967c5eeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3470,7 +3470,9 @@ in ethash = callPackage ../development/libraries/ethash { }; - ethminer = callPackage ../tools/misc/ethminer { }; + ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; + ethminer-cuda = ethminer.override { cudaSupport = true; }; + ethminer-free = ethminer.override { cudaSupport = false; }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; From 101e5cdceb0dd702705e85da2db68154905a0a1b Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 13:04:23 +0200 Subject: [PATCH 106/476] ethminer: use regular stdenv when CUDA isn't used --- pkgs/tools/misc/ethminer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 52bf592a987..f357a4a9c60 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, clangStdenv, fetchFromGitHub, opencl-headers, @@ -16,11 +17,11 @@ openssl, pkg-config, cli11 -}: +}@args: # Note that this requires clang < 9.0 to build, and currently # clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = clangStdenv; +let stdenv = if cudaSupport then clangStdenv else args.stdenv; in stdenv.mkDerivation rec { pname = "ethminer"; From 7787089f1de027b91837eb6f5c3b917a0dc12b29 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 13:03:33 +0200 Subject: [PATCH 107/476] ethminer: mark cuda version as broken Doesn't build on my machine, needs https://github.com/NixOS/nixpkgs/pull/109838 --- pkgs/tools/misc/ethminer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index f357a4a9c60..08ec9d8a78d 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -81,5 +81,6 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; license = licenses.gpl2; + broken = cudaSupport; }; } From 3c678b70983fdba53d0e998ed9df527b317721a4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 15:18:23 +0200 Subject: [PATCH 108/476] ethminer: correct license --- pkgs/tools/misc/ethminer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 08ec9d8a78d..22278cb9a4d 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; - license = licenses.gpl2; + license = licenses.gpl3Only; broken = cudaSupport; }; } From d1af4bf97ec3f594836d443ca246a04469602abe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Apr 2021 00:22:39 +0200 Subject: [PATCH 109/476] python3Packages.graphql-core: 3.1.3 -> 3.1.4 --- .../python-modules/graphql-core/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 5c29a1135a9..85021d126a1 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -1,27 +1,21 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, pythonOlder - -, coveralls -, promise -, pytestCheckHook , pytest-benchmark -, pytest-mock -, rx -, six +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.3"; + version = "3.1.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps"; + sha256 = "sha256-lamV5Rd37WvFBJ+zJUb+UhqxoNUrRhoMJx1NodbQUjs="; }; checkInputs = [ @@ -29,12 +23,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "graphql" ]; + meta = with lib; { description = "Port of graphql-js to Python"; homepage = "https://github.com/graphql-python/graphql-core"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } From 2bab1bfc5ba2d955c30967623cddd097ace19716 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 27 Apr 2021 19:27:02 -0300 Subject: [PATCH 110/476] argocd: 1.8.6 -> 2.0.1 --- .../networking/cluster/argocd/default.nix | 70 ++++++++++++++----- 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f1c98e0ed84..05ba4187ce1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,40 +1,74 @@ -{ lib, buildGoModule, fetchFromGitHub, packr }: +{ lib, buildGoModule, fetchFromGitHub, packr, makeWrapper, installShellFiles, helm, kustomize }: buildGoModule rec { pname = "argocd"; - version = "1.8.6"; - commit = "28aea3dfdede00443b52cc584814d80e8f896200"; + version = "2.0.1"; + commit = "33eaf11e3abd8c761c726e815cbb4b6af7dcb030"; + tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; - rev = "v${version}"; - sha256 = "sha256-kJ3/1owK5T+FbcvjmK2CO+i/KwmVZRSGzF6fCt8J9E8="; + rev = tag; + sha256 = "sha256-j/RdiMeaYxlmEvo5CKrGvkp25MrFsSYh+XNYWNcs0PE="; }; - vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA="; + vendorSha256 = "sha256-8j5v99wOHM/SndJwpmGWiCFEyw4K513HEEbkPrD8C90="; - doCheck = false; - - nativeBuildInputs = [ packr ]; - - buildFlagsArray = '' - -ldflags= - -X github.com/argoproj/argo-cd/common.version=${version} - -X github.com/argoproj/argo-cd/common.buildDate=unknown - -X github.com/argoproj/argo-cd/common.gitCommit=${commit} - -X github.com/argoproj/argo-cd/common.gitTreeState=clean - ''; + nativeBuildInputs = [ packr makeWrapper installShellFiles ]; # run packr to embed assets preBuild = '' packr ''; + buildFlagsArray = + let package_url = "github.com/argoproj/argo-cd/v2/common"; in + [ + "-ldflags=" + "-s -w" + "-X ${package_url}.version=${version}" + "-X ${package_url}.buildDate=unknown" + "-X ${package_url}.gitCommit=${commit}" + "-X ${package_url}.gitTag=${tag}" + "-X ${package_url}.gitTreeState=clean" + ]; + + # Test is disabled because ksonnet is missing from nixpkgs. + # Log: https://gist.github.com/superherointj/79cbdc869dfd44d28a10dc6746ecb3f9 + doCheck = false; + checkInputs = [ + helm + kustomize + #ksonnet + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/argocd version --client | grep ${tag} > /dev/null + $out/bin/argocd-util version | grep ${tag} > /dev/null + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/cmd" -T $out/bin/argocd + runHook postInstall + ''; + + postInstall = '' + for appname in argocd-util argocd-server argocd-repo-server argocd-application-controller argocd-dex ; do + makeWrapper $out/bin/argocd $out/bin/$appname --set ARGOCD_BINARY_NAME $appname + done + installShellCompletion --cmd argocd \ + --bash <($out/bin/argocd completion bash) \ + --zsh <($out/bin/argocd completion zsh) + ''; + meta = with lib; { description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes"; homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; - maintainers = with maintainers; [ shahrukh330 ]; + maintainers = with maintainers; [ shahrukh330 superherointj ]; }; } From 220c54fc29a8630678a0217157ae4bcfde01c08f Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Sun, 25 Apr 2021 14:46:45 -0600 Subject: [PATCH 111/476] xineLib: 1.2.9 -> 1.2.11 --- .../libraries/xine-lib/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index cbdc1a2dcf0..97fb83e4e2a 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib +{ lib, stdenv, fetchurl, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager -, libmpcdec +, libmpcdec, ncurses }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.9"; + pname = "xine-lib"; + version = "1.2.11"; src = fetchurl { - url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; + url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz"; + sha256 = "01bhq27g5zbgy6y36hl7lajz1nngf68vs4fplxgh98fx20fv4lgg"; }; nativeBuildInputs = [ pkg-config perl ]; @@ -17,15 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac - libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec - ]; - - patches = [ - (fetchpatch { - name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch"; - url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/"; - sha256 = "0nrsdn7myvjs8fl9rj6k4g1bnv0a84prsscg1q9n49gwn339v5rc"; - }) + libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ncurses ]; NIX_LDFLAGS = "-lxcb-shm"; @@ -35,9 +28,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.xine-project.org/"; + homepage = "http://xine.sourceforge.net/home"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; }; } From f2a5083dc7f970ad124d296225a3a51bc0495628 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 14:22:18 +0200 Subject: [PATCH 112/476] fastd: fix build on aarch64 --- pkgs/tools/networking/fastd/default.nix | 38 ++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index ed7bb0b01d3..af75641a5b9 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, bison, meson, ninja, pkg-config -, libuecc, libsodium, libcap, json_c, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, bison +, meson +, ninja +, pkg-config +, libuecc +, libsodium +, libcap +, json_c +, openssl +}: stdenv.mkDerivation rec { pname = "fastd"; @@ -12,8 +23,27 @@ stdenv.mkDerivation rec { sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw"; }; - nativeBuildInputs = [ pkg-config bison meson ninja ]; - buildInputs = [ libuecc libsodium libcap json_c openssl ]; + nativeBuildInputs = [ + bison + meson + ninja + pkg-config + ]; + + buildInputs = [ + json_c + libcap + libsodium + libuecc + openssl + ]; + + # some options are only available on x86 + mesonFlags = lib.optionals (!stdenv.isx86_64 && !stdenv.isi686) [ + "-Dcipher_salsa20_xmm=disabled" + "-Dcipher_salsa2012_xmm=disabled" + "-Dmac_ghash_pclmulqdq=disabled" + ]; enableParallelBuilding = true; From 3297bbf0dec9cadba208363a40f88824a77ab6df Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 28 Apr 2021 02:03:36 +0200 Subject: [PATCH 113/476] svd2rust: 0.14.0 -> 0.18.0 --- .../tools/rust/svd2rust/cargo-lock.patch | 463 +++++++++++++----- .../tools/rust/svd2rust/default.nix | 9 +- 2 files changed, 330 insertions(+), 142 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch b/pkgs/development/tools/rust/svd2rust/cargo-lock.patch index 5cd1f685fc1..acc9b053593 100644 --- a/pkgs/development/tools/rust/svd2rust/cargo-lock.patch +++ b/pkgs/development/tools/rust/svd2rust/cargo-lock.patch @@ -2,102 +2,149 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,278 @@ +@@ -0,0 +1,469 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "anyhow" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "atty" -+version = "0.2.11" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bitflags" -+version = "0.7.0" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "bitflags" -+version = "1.0.4" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cast" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cc" -+version = "1.0.28" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "cfg-if" -+version = "0.1.6" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "clap" -+version = "2.32.0" ++version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "either" -+version = "1.5.0" ++version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "error-chain" -+version = "0.11.0" ++name = "env_logger" ++version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -106,115 +153,232 @@ new file mode 100644 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "libc" -+version = "0.2.46" ++version = "0.2.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "quote" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.1" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "rustc-demangle" -+version = "0.1.13" ++name = "rayon" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "strsim" ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "svd-parser" -+version = "0.6.0" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "svd2rust" -+version = "0.14.0" ++version = "0.18.0" +dependencies = [ -+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" -+version = "0.11.11" ++version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "synom" -+version = "0.11.3" ++name = "termcolor" ++version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "textwrap" -+version = "0.10.0" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-width" -+version = "0.1.5" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-xid" -+version = "0.0.4" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" -+version = "0.3.6" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -227,57 +391,84 @@ new file mode 100644 +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "xml-rs" -+version = "0.3.6" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "xmltree" -+version = "0.3.2" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[metadata] ++"checksum aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727" -+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" -+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" -+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -+"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" -+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" -+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" -+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -+"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" -+"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" ++"checksum anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++"checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" ++"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++"checksum clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++"checksum crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++"checksum crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++"checksum crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++"checksum crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++"checksum either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++"checksum hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -+"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" -+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" -+"checksum svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22b4579485b26262f36086d6b74903befc043a57f8377dfcf05bcf5335cb251" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" -+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)" = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" ++"checksum log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++"checksum memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++"checksum memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" ++"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++"checksum once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" ++"checksum proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++"checksum quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++"checksum rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++"checksum rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++"checksum regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" ++"checksum regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)" = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6b787831d8f6a1549ccd1b0d62772d0526425a7da687f0f98591ab18e53bfe98" ++"checksum syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" ++"checksum termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++"checksum thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562" -+"checksum xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "472a9d37c7c53ab2391161df5b89b1f3bf76dab6ab150d7941ecbdd832282082" ++"checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" ++"checksum xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70" diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 6ec06fffe21..8afb9c033cb 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -4,20 +4,17 @@ with rustPlatform; buildRustPackage rec { pname = "svd2rust"; - version = "0.14.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "rust-embedded"; repo = "svd2rust"; rev = "v${version}"; - sha256 = "1a0ldmjkhyv5c52gcq8p8avkj0cgj1b367w6hm85bxdf5j4y8rra"; + sha256 = "1p0zq3q4g9lr0ghavp7v1dwsqq19lkljkm1i2hsb1sk3pxa1f69n"; }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg"; - - # doc tests fail due to missing dependency - doCheck = false; + cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; From a1b136eff39e70e6b414f2469305a95681fb1c09 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 00:27:12 +0000 Subject: [PATCH 114/476] kube-capacity: 0.5.1 -> 0.6.0 --- .../applications/networking/cluster/kube-capacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 78cbaca80ab..de4cdcce44f 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "127583hmpj04y522wir76a39frm6zg9z7mb4ny5lxxjqhn0q0cd5"; + sha256 = "sha256-IwlcxlzNNYWNANszTM+s6/SA1C2LXrydSTtAvniNKXE="; }; vendorSha256 = "sha256-EgLWZs282IV1euCUCc5ucf267E2Z7GF9SgoImiGvuVM="; From 538cd825e67c65bc6cd6d96a8523507a2b7ea4ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Apr 2021 02:30:31 +0200 Subject: [PATCH 115/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5ddc13836f9d266484b1b439c1a56749fdb6b0db. --- .../haskell-modules/hackage-packages.nix | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 603fdb95165..6de57452920 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6527,8 +6527,8 @@ self: { }: mkDerivation { pname = "Frames-map-reduce"; - version = "0.4.0.0"; - sha256 = "1ajqkzg3q59hg1gwbamff72j9sxljqq7sghrqw5xbnxfd4867dcf"; + version = "0.4.1.1"; + sha256 = "0cxk86bbl6mbpg7ywb5cm8kfixl508gww8yxq6vwyrxbs7q4j25z"; libraryHaskellDepends = [ base containers foldl Frames hashable map-reduce-folds newtype profunctors vinyl @@ -50449,8 +50449,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.4"; - sha256 = "07ibhr3xngpwl7pq9ykbf6pxzlp8yx49d0qrlhyn7hj5xbswkv3f"; + version = "0.1.28.5"; + sha256 = "09ja2imqhz7kr97fhfskj1g7s7q88yrpa0p2s1n55fwkn1f2d3bs"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -143279,6 +143279,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "hvega_0_11_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , filepath, tasty, tasty-golden, text, unordered-containers + }: + mkDerivation { + pname = "hvega"; + version = "0.11.0.1"; + sha256 = "13w2637ylmmwv4kylf1rc2rvd85281a50p82x3888bc1cnzv536x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath tasty + tasty-golden text unordered-containers + ]; + description = "Create Vega-Lite visualizations (version 4) in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hvega-theme" = callPackage ({ mkDerivation, base, hvega, text }: mkDerivation { @@ -171629,8 +171649,8 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.5"; - sha256 = "0a0xavn4dlcpkjw75lc8k9f8w8620m60s8q9r4c157010mb4w829"; + version = "0.1.0.7"; + sha256 = "0khwcxw5cxx3y9rryak7qb65q055lg6b7gsbj20rvskq300asbk0"; libraryHaskellDepends = [ base containers discrimination foldl hashable hashtables parallel profunctors split streaming streamly text unordered-containers @@ -200893,7 +200913,7 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-mysql_2_12_0_0" = callPackage + "persistent-mysql_2_12_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql , mysql-simple, persistent, persistent-qq, persistent-test @@ -200902,8 +200922,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.12.0.0"; - sha256 = "0bvwlkch8pr94dv1fib85vdsdrjpdla1rm4lslrmpg0dysgni9p3"; + version = "2.12.1.0"; + sha256 = "08494wc935gfr3007w2x9lvqcp8y2jvapgwjxz1l0mnl120vh8hw"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -229214,8 +229234,8 @@ self: { }: mkDerivation { pname = "sarsi"; - version = "0.0.5.1"; - sha256 = "0hnyv3ynl5jjyx5v5l5k15p4af1g3imin5m91np8s6gp8qyfllz5"; + version = "0.0.5.2"; + sha256 = "1xqnpqq2hhqkp4y9lp11l0lmp61v19wfqx0g5dfaq8z7k0dq41fm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From b7387c5cf4618fb9642ac1da3a4a182659addd91 Mon Sep 17 00:00:00 2001 From: blargg Date: Tue, 20 Apr 2021 19:12:28 -0700 Subject: [PATCH 116/476] yadm: 2.5.0 -> 3.1.0 Updated completions to pull from the new location. Switch to using the install helpers. Update license, gpl3 -> gpl3Plus. --- .../version-management/yadm/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index b75af94af56..fc8bee5fcb7 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, git, gnupg }: +{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }: -let version = "2.5.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "yadm"; - inherit version; + version = "3.1.0"; buildInputs = [ git gnupg ]; + nativeBuildInputs = [ installShellFiles ]; + src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; + sha256 = "0ga0p28nvqilswa07bzi93adk7wx6d5pgxlacr9wl9v1h6cds92s"; }; dontConfigure = true; @@ -20,12 +21,16 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall install -Dt $out/bin yadm - install -Dt $out/share/man/man1 yadm.1 - install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash runHook postInstall ''; + postInstall = '' + installManPage yadm.1 + installShellCompletion --cmd yadm \ + --zsh completion/zsh/_yadm \ + --bash completion/bash/yadm + ''; + meta = { homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; @@ -35,7 +40,7 @@ stdenv.mkDerivation { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; }; From b5b575d2763c3480a35a73ce46a42329cce6c3f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 04:11:32 +0000 Subject: [PATCH 117/476] bpytop: 1.0.63 -> 1.0.64 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index f10c3f628b8..4940c45e3ff 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.63"; + version = "1.0.64"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw="; + sha256 = "sha256-BwpMBPTWSrfmz7SHYa1+SZ79V2YZdIkZcOTLtlVlgr8="; }; nativeBuildInputs = [ makeWrapper ]; From f669f72a56e265ddf750fa87485151f03ef377cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 04:57:32 +0000 Subject: [PATCH 118/476] cdogs-sdl: 0.11.0 -> 0.11.1 --- pkgs/games/cdogs-sdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 1c35e1e86e7..08af6bd74a8 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-zWwlcEM2KsYiB48cmRTjou0C86SqeoOLrbacCR0SfIA="; + sha256 = "sha256-POioDqmbWj+lYATp/3v14FoKZfR9GjLQyHq3nwDOywA="; }; postPatch = '' From 347df4662c7b5f970b86e87f028cca46eb39f171 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 05:21:15 +0000 Subject: [PATCH 119/476] enlightenment.evisum: 0.5.11 -> 0.5.13 --- pkgs/desktops/enlightenment/evisum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index 0c2ff79ddbd..4e21bc67910 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-jCOYnG/+xz9qK6npOPT+tw1tp/K0QaFCmsBRO9J4bjE="; + sha256 = "sha256-TMVxx7D9wdujyN6PcbIxC8M6zby5myvxO9AqolrcWOY="; }; nativeBuildInputs = [ From ab9c6c9529322161b6e5cf3502999a124457ed20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 05:29:41 +0000 Subject: [PATCH 120/476] eksctl: 0.41.0 -> 0.46.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index e24f0022483..83f62a2f1c1 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.41.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8="; + sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI="; }; - vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY="; + vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk="; doCheck = false; From 60ed2deee53be29ab25fa994059adfc6906d013d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 28 Apr 2021 14:40:23 +0900 Subject: [PATCH 121/476] openblas: Allow setting DYNAMIC_ARCH --- .../science/math/openblas/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index c66e4ba44ef..f464a755f6e 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -15,6 +15,8 @@ # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null +# Select whether DYNAMIC_ARCH is enabled or not. +, dynamicArch ? null , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -25,27 +27,28 @@ let blas64_ = blas64; in let setTarget = x: if target == null then x else target; + setDynamicArch = x: if dynamicArch == null then x else dynamicArch; # To add support for a new platform, add an element to this set. configs = { armv6l-linux = { BINARY = 32; TARGET = setTarget "ARMV6"; - DYNAMIC_ARCH = false; + DYNAMIC_ARCH = setDynamicArch false; USE_OPENMP = true; }; armv7l-linux = { BINARY = 32; TARGET = setTarget "ARMV7"; - DYNAMIC_ARCH = false; + DYNAMIC_ARCH = setDynamicArch false; USE_OPENMP = true; }; aarch64-darwin = { BINARY = 64; TARGET = setTarget "VORTEX"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "11.0"; }; @@ -53,21 +56,21 @@ let aarch64-linux = { BINARY = 64; TARGET = setTarget "ARMV8"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = true; }; i686-linux = { BINARY = 32; TARGET = setTarget "P2"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = true; }; x86_64-darwin = { BINARY = 64; TARGET = setTarget "ATHLON"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; }; @@ -75,14 +78,14 @@ let x86_64-linux = { BINARY = 64; TARGET = setTarget "ATHLON"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; powerpc64le-linux = { BINARY = 64; TARGET = setTarget "POWER5"; - DYNAMIC_ARCH = true; + DYNAMIC_ARCH = setDynamicArch true; USE_OPENMP = !stdenv.hostPlatform.isMusl; }; }; From 98b372b860203e15b8f51cf5bfe24754da147e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 28 Apr 2021 07:40:27 +0200 Subject: [PATCH 122/476] nginxQuic: 47a43b011dec -> 12f18e0bca09 --- pkgs/servers/http/nginx/quic.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 062520a3d13..38a4bd9cdf4 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -1,10 +1,13 @@ -{ callPackage, fetchhg, boringssl, ... } @ args: +{ callPackage +, fetchhg +, ... +} @ args: callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "47a43b011dec"; # branch=quic - sha256 = "1d4d1v4zbnf5qlfl79pi7sficn1h7zm6kk7llm24yyhlsvssz10x"; + rev = "12f18e0bca09"; # branch=quic + sha256 = "1lr6zlny26kamczgk8ddscmy5fp5mzxqcppwhjhvq1a029a0r4b7"; }; preConfigure = '' From b3efb61263179f7cbe2abc6a3a33199099b56123 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Apr 2021 08:49:32 +0200 Subject: [PATCH 123/476] bpytop: remove unused input --- pkgs/tools/system/bpytop/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 4940c45e3ff..ca53a1956e0 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, makeWrapper +}: stdenv.mkDerivation rec { pname = "bpytop"; @@ -12,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3Packages; [ python psutil ]; dontBuild = true; From a0b0f9945806b6a0d1840b193f4eb2a5a633540a Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 28 Mar 2021 12:34:29 +0000 Subject: [PATCH 124/476] julia: drop julia_13 as it lacks support upstream Closes #82008. --- pkgs/development/compilers/julia/1.3.nix | 161 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 - 3 files changed, 1 insertion(+), 166 deletions(-) delete mode 100644 pkgs/development/compilers/julia/1.3.nix diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix deleted file mode 100644 index 5e431a55233..00000000000 --- a/pkgs/development/compilers/julia/1.3.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, cmake -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, blas, lapack, arpack -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -with lib; - -let - majorVersion = "1"; - minorVersion = "3"; - maintenanceVersion = "1"; - src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; - version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in - -stdenv.mkDerivation rec { - pname = "julia"; - inherit version; - - src = fetchzip { - url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz"; - sha256 = src_sha256; - }; - - prePatch = '' - export PATH=$PATH:${cmake}/bin - ''; - - patches = [ - ./use-system-utf8proc-julia-1.3.patch - - # Julia recompiles a precompiled file if the mtime stored *in* the - # .ji file differs from the mtime of the .ji file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So patch Julia to accept mtimes of 1. - ./allow_nix_mtime.patch - ]; - - postPatch = '' - patchShebangs . contrib - for i in backtrace cmdlineargs; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl - rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl - sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl - ''; - - buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev blas lapack openlibm openspecfun readline utf8proc - zlib - ] - ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; - - makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = { - x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; - i686 = "pentium4"; - aarch64 = "armv8-a"; - }.${arch} - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") - "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" - - "USE_SYSTEM_LAPACK=1" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - - "USE_BINARYBUILDER=0" - ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm - openspecfun pcre2 lapack - ]; - - # Other versions of Julia pass the tests, but we are not sure why these fail. - doCheck = false; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - postInstall = '' - # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, - # as using a wrapper with LD_LIBRARY_PATH causes segmentation - # faults when program returns an error: - # $ julia -e 'throw(Error())' - find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do - if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then - ln -sv $lib $out/lib/julia/$(basename $lib) - fi - done - ''; - - passthru = { - inherit majorVersion minorVersion maintenanceVersion; - site = "share/julia/site/v${majorVersion}.${minorVersion}"; - }; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "https://julialang.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin rob garrison ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8f2ff5cc4f7..ccce9a3efc8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -339,6 +339,7 @@ mapAliases ({ jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 + julia_13 = throw "julia_13 is deprecated in favor of the latest stable version"; # added 2021-03-13 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb8e38fb489..37200d26f12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10985,11 +10985,6 @@ in libgit2 = libgit2_0_27; }; - julia_13 = callPackage ../development/compilers/julia/1.3.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - }; - julia_15 = callPackage ../development/compilers/julia/1.5.nix { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; From 2632a33605976c3da6d849a5a14d98f286433e2c Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Fri, 12 Mar 2021 16:02:53 +0000 Subject: [PATCH 125/476] julia: clean up grammar for deprecated aliases --- pkgs/top-level/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ccce9a3efc8..d171f0d5e05 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -338,8 +338,8 @@ mapAliases ({ kodiPlainWayland = kodi-wayland; jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 - julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 - julia_13 = throw "julia_13 is deprecated in favor of the latest stable version"; # added 2021-03-13 + julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 + julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 From fc3c17c5acc1e29825c7a8e918747033db6b60f4 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Fri, 12 Mar 2021 16:07:29 +0000 Subject: [PATCH 126/476] julia: introduce LTS and stable aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the Julia release process [1] there will only ever be two supported release branches at any given time: stable and LTS. Once a new version of either is released, support for the previous release will be dropped upstream. Introducing aliases for these branches allows our users to easily track either depending on their need for stability. [1]: https://julialang.org/blog/2019/08/release-process/#long_term_support --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37200d26f12..c6e0b67e587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10989,8 +10989,10 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia_1 = julia_10; julia = julia_15; + julia-lts = julia_10; + julia-stable = julia_15; + julia_1 = julia_10; jwasm = callPackage ../development/compilers/jwasm { }; From 0f3096d03925f3e17d9f30ccebd78bef71e40b0a Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Fri, 12 Mar 2021 16:14:11 +0000 Subject: [PATCH 127/476] julia: deprecate julia_1 alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is potentially controversial, but it is unclear to me whether julia_1 should refer to either the latest stable or LTS release of 1.x. We may want to revisit this when/if we get 2.x, but as it stands the Julia release process [1] makes it clear that there will only ever be a single supported stable and LTS release at any given time which should speak in favour of using the julia-stable and julia-lts aliases instead. [1]: https://julialang.org/blog/2019/08/release-process/#long_term_support --- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d171f0d5e05..e48652ab555 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -337,7 +337,8 @@ mapAliases ({ kodiPlain = kodi; kodiPlainWayland = kodi-wayland; jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 - julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 + julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15 + julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e0b67e587..69b917d05ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10992,7 +10992,6 @@ in julia = julia_15; julia-lts = julia_10; julia-stable = julia_15; - julia_1 = julia_10; jwasm = callPackage ../development/compilers/jwasm { }; From a4f2b97a24d5788778eb73d80ca8256cd0d6ff0b Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sat, 13 Mar 2021 05:55:49 +0000 Subject: [PATCH 128/476] julia: enable parallel building Erroneously disabled by 3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af as it mistook Julia for using CMake (it is used by some of the vendored dependencies). --- pkgs/development/compilers/julia/1.0.nix | 2 ++ pkgs/development/compilers/julia/1.5.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 5b1a4674a88..d68f56faf2e 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -184,6 +184,8 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ''; + enableParallelBuilding = true; + postInstall = '' # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, # as using a wrapper with LD_LIBRARY_PATH causes segmentation diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index b4c33faa44c..f32c55bf1e2 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -129,6 +129,8 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ''; + enableParallelBuilding = true; + postInstall = '' # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, # as using a wrapper with LD_LIBRARY_PATH causes segmentation From d51713378b62d32bd63466023308e6615cb5bedc Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 28 Mar 2021 09:37:02 +0000 Subject: [PATCH 129/476] julia: make the LTS release the default version Reverts the non-syntax part of 1e4c335a94b2df4e74a1e447d2f7074a09ada478. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69b917d05ad..34146884862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10989,9 +10989,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - julia = julia_15; julia-lts = julia_10; julia-stable = julia_15; + julia = julia-lts; jwasm = callPackage ../development/compilers/jwasm { }; From 4c97cf823f025cfee3f8c2fc028ca0c0ab3369f2 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 28 Mar 2021 09:43:31 +0000 Subject: [PATCH 130/476] julia: remove redundant Nix-specific mtime patch As far as I can tell this patch is redundant as all pre-compiled code generated at build time is baked into the Julia system image and will thus never get invalidated: Note that for both julia_10 and julia_15 there are no `.ji` files produced in the derivations. --- pkgs/development/compilers/julia/1.0.nix | 5 ---- pkgs/development/compilers/julia/1.5.nix | 6 ----- .../compilers/julia/allow_nix_mtime.patch | 25 ------------------- 3 files changed, 36 deletions(-) delete mode 100644 pkgs/development/compilers/julia/allow_nix_mtime.patch diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index d68f56faf2e..445e079502e 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -88,11 +88,6 @@ stdenv.mkDerivation rec { ; patches = [ - # Julia recompiles a precompiled file if the mtime stored *in* the - # .ji file differs from the mtime of the .ji file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So patch Julia to accept mtimes of 1. - ./allow_nix_mtime.patch ./diagonal-test.patch ./use-system-utf8proc-julia-1.0.patch ]; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index f32c55bf1e2..be8200a0ded 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { patches = [ ./use-system-utf8proc-julia-1.3.patch - - # Julia recompiles a precompiled file if the mtime stored *in* the - # .ji file differs from the mtime of the .ji file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So patch Julia to accept mtimes of 1. - ./allow_nix_mtime.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/julia/allow_nix_mtime.patch b/pkgs/development/compilers/julia/allow_nix_mtime.patch deleted file mode 100644 index e4a164cfa1a..00000000000 --- a/pkgs/development/compilers/julia/allow_nix_mtime.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f79775378a9eeec5b99f18cc95735b12d172aba3 Mon Sep 17 00:00:00 2001 -From: Tom McLaughlin -Date: Wed, 12 Dec 2018 13:01:32 -0800 -Subject: [PATCH] Patch to make work better with nix - ---- - base/loading.jl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/loading.jl b/base/loading.jl -index 51201b98b6..b40c0690f6 100644 ---- a/base/loading.jl -+++ b/base/loading.jl -@@ -1384,7 +1384,7 @@ function stale_cachefile(modpath::String, cachefile::String) - # Issue #13606: compensate for Docker images rounding mtimes - # Issue #20837: compensate for GlusterFS truncating mtimes to microseconds - ftime = mtime(f) -- if ftime != ftime_req && ftime != floor(ftime_req) && ftime != trunc(ftime_req, digits=6) -+ if ftime != ftime_req && ftime != floor(ftime_req) && ftime != trunc(ftime_req, digits=6) && ftime != 1.0 - @debug "Rejecting stale cache file $cachefile (mtime $ftime_req) because file $f (mtime $ftime) has changed" - return true - end --- -2.17.1 - From 5926635765ccab3c2710ab4df117fce1c1b3d2a1 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 28 Mar 2021 09:54:37 +0000 Subject: [PATCH 131/476] julia: remove redundant diagonal test patch Fix merged upstream and backported to Julia 1.0.5: https://github.com/JuliaLang/julia/pull/31443 --- pkgs/development/compilers/julia/1.0.nix | 1 - .../compilers/julia/diagonal-test.patch | 27 ------------------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/julia/diagonal-test.patch diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 445e079502e..a7f6be6a167 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { ; patches = [ - ./diagonal-test.patch ./use-system-utf8proc-julia-1.0.patch ]; diff --git a/pkgs/development/compilers/julia/diagonal-test.patch b/pkgs/development/compilers/julia/diagonal-test.patch deleted file mode 100644 index dd31e67e9d3..00000000000 --- a/pkgs/development/compilers/julia/diagonal-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9eb180c523b877a53b9e1cf53a4d5e6dad3d7bfe Mon Sep 17 00:00:00 2001 -From: Lars Jellema -Date: Sat, 19 Sep 2020 13:52:20 +0200 -Subject: [PATCH] Use approximate comparisons for diagonal tests - ---- - stdlib/LinearAlgebra/test/diagonal.jl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/stdlib/LinearAlgebra/test/diagonal.jl b/stdlib/LinearAlgebra/test/diagonal.jl -index e420d5bc6d..7f1b5d0aec 100644 ---- a/stdlib/LinearAlgebra/test/diagonal.jl -+++ b/stdlib/LinearAlgebra/test/diagonal.jl -@@ -450,8 +450,8 @@ end - M = randn(T, 5, 5) - MM = [randn(T, 2, 2) for _ in 1:2, _ in 1:2] - for transform in (identity, adjoint, transpose, Adjoint, Transpose) -- @test lmul!(transform(D), copy(M)) == *(transform(Matrix(D)), M) -- @test rmul!(copy(M), transform(D)) == *(M, transform(Matrix(D))) -+ @test lmul!(transform(D), copy(M)) ≈ *(transform(Matrix(D)), M) -+ @test rmul!(copy(M), transform(D)) ≈ *(M, transform(Matrix(D))) - @test lmul!(transform(DD), copy(MM)) == *(transform(fullDD), MM) - @test rmul!(copy(MM), transform(DD)) == *(MM, transform(fullDD)) - end --- -2.28.0 - From 75a93dfecc6c77ed7c35cc7f906175aca93facb4 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Tue, 13 Apr 2021 14:42:31 +0000 Subject: [PATCH 132/476] julia: move patches into separate directories Makes the top-level directory organisation easier with an increasing number of patches. --- pkgs/development/compilers/julia/1.0.nix | 2 +- pkgs/development/compilers/julia/1.5.nix | 2 +- .../julia/{ => patches/1.0}/use-system-utf8proc-julia-1.0.patch | 0 .../julia/{ => patches/1.5}/use-system-utf8proc-julia-1.3.patch | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/julia/{ => patches/1.0}/use-system-utf8proc-julia-1.0.patch (100%) rename pkgs/development/compilers/julia/{ => patches/1.5}/use-system-utf8proc-julia-1.3.patch (100%) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index a7f6be6a167..4f05329f595 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ; patches = [ - ./use-system-utf8proc-julia-1.0.patch + ./patches/1.0/use-system-utf8proc-julia-1.0.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index be8200a0ded..271ea64a094 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; patches = [ - ./use-system-utf8proc-julia-1.3.patch + ./patches/1.5/use-system-utf8proc-julia-1.3.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch b/pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch similarity index 100% rename from pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch rename to pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch similarity index 100% rename from pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch rename to pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch From e633d97cb382f237e33e98f2a9efd3b86cfabd8a Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 11 Apr 2021 13:59:38 +0000 Subject: [PATCH 133/476] julia: remove julia_15 update script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Provides very little comfort compared what is outlined in the manual [1], only supports a single version, and would probably be better to implement as a general Nixpkg tool. [1]: https://nixos.org/manual/nixpkgs/stable/#sec-source-hashes --- .../development/compilers/julia/update-1.5.py | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100755 pkgs/development/compilers/julia/update-1.5.py diff --git a/pkgs/development/compilers/julia/update-1.5.py b/pkgs/development/compilers/julia/update-1.5.py deleted file mode 100755 index e37f37d456b..00000000000 --- a/pkgs/development/compilers/julia/update-1.5.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 python3Packages.requests - -import os -import re -import requests -import subprocess - -latest = requests.get("https://api.github.com/repos/JuliaLang/julia/releases/latest").json()["tag_name"] -assert latest[0] == "v" -major, minor, patch = latest[1:].split(".") -assert major == "1" -# When a new minor version comes out we'll have to refactor/copy this update script. -assert minor == "5" - -sha256 = subprocess.check_output(["nix-prefetch-url", "--unpack", f"https://github.com/JuliaLang/julia/releases/download/v{major}.{minor}.{patch}/julia-{major}.{minor}.{patch}-full.tar.gz"], text=True).strip() - -nix_path = os.path.join(os.path.dirname(__file__), "1.5.nix") -nix0 = open(nix_path, "r").read() -nix1 = re.sub("maintenanceVersion = \".*\";", f"maintenanceVersion = \"{patch}\";", nix0) -nix2 = re.sub("src_sha256 = \".*\";", f"src_sha256 = \"{sha256}\";", nix1) -open(nix_path, "w").write(nix2) From 5167e0347c5a79f1c0073a90087d68b5a148fa7c Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Sun, 11 Apr 2021 14:04:03 +0000 Subject: [PATCH 134/476] julia: sort arguments in top-level package collection No change in semantics, but makes it consistent with the expressions. This is a fairly pedantic thing to do to be honest. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34146884862..739090b7696 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10981,12 +10981,12 @@ in julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; libgit2 = libgit2_0_27; }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; julia-lts = julia_10; From dd88dcee620ebefe9afe9c4326defe92976891f2 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Mon, 19 Apr 2021 06:22:51 +0000 Subject: [PATCH 135/476] julia: add README Provides a few hopefully helpful pointers that would not work well as inline comments in the expressions themselves. Most likely the README will need to be expanded upon over time to cover how we handle the Julia release process, but I hope this is a good starting point. --- pkgs/development/compilers/julia/README.md | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/development/compilers/julia/README.md diff --git a/pkgs/development/compilers/julia/README.md b/pkgs/development/compilers/julia/README.md new file mode 100644 index 00000000000..d37c01bc8ce --- /dev/null +++ b/pkgs/development/compilers/julia/README.md @@ -0,0 +1,24 @@ +Julia +===== + +[Julia][julia], as a full-fledged programming language with an extensive +standard library that covers numerical computing, can be somewhat challenging to +package. This file aims to provide pointers which could not easily be included +as comments in the expressions themselves. + +[julia]: https://julialang.org + +For Nixpkgs, the manual is as always your primary reference, and for the Julia +side of things you probably want to familiarise yourself with the [README +][readme], [build instructions][build], and [release process][release_process]. +Remember that these can change between Julia releases, especially if the LTS and +release branches have deviated greatly. A lot of the build process is +underdocumented and thus there is no substitute for digging into the code that +controls the build process. You are very likely to need to use the test suite to +locate and address issues and in the end passing it, while only disabling a +minimal set of broken or incompatible tests you think you have a good reason to +disable, is your best bet at arriving at a solid derivation. + +[readme]: https://github.com/JuliaLang/julia/blob/master/README.md +[build]: https://github.com/JuliaLang/julia/blob/master/doc/build/build.md +[release_process]: https://julialang.org/blog/2019/08/release-process From 1437eee5bb0b8b82ef5ca9b3bea1263546b209c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Apr 2021 20:18:06 +0200 Subject: [PATCH 136/476] coqPackages.paramcoq: enable for Coq 8.13 --- pkgs/development/coq-modules/paramcoq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 342e4225a3c..8f2ef30d37c 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,9 +3,10 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = if versions.range "8.7" "8.12" coq.coq-version + defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.1.2+coq${coq.coq-version}" else null; displayVersion = { paramcoq = "1.1.2"; }; + release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22"; release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; release."1.1.2+coq8.10".sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; From 5c5ec0bff67f139944c7d17bfd20a983485e3927 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 25 Apr 2021 12:25:19 +0200 Subject: [PATCH 137/476] maiko: init at 2021-04-14 --- pkgs/misc/emulators/maiko/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/misc/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/misc/emulators/maiko/default.nix new file mode 100644 index 00000000000..e78b680d617 --- /dev/null +++ b/pkgs/misc/emulators/maiko/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: + +stdenv.mkDerivation rec { + pname = "maiko"; + version = "2021-04-14"; + src = fetchFromGitHub { + owner = "Interlisp"; + repo = "maiko"; + rev = "91fe7d51f9d607bcedde0e78e435ee188a8c84c0"; + hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 ]; + installPhase = '' + runHook preInstall + find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; + runHook postInstall + ''; + meta = with lib; { + description = "Medley Interlisp virtual machine"; + homepage = "https://interlisp.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry ]; + inherit (libX11.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17440ea8474..4610cce7a00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29971,6 +29971,8 @@ in loop = callPackage ../tools/misc/loop { }; + maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; }; From 7313fac88d68cbde6d4dbee86cbb47641fb6e324 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Apr 2021 10:16:24 +0200 Subject: [PATCH 138/476] Stackage Nightly 2021-04-28 --- .../configuration-hackage2nix.yaml | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f3b254d4fa8..e37c4b35a2a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -101,7 +101,7 @@ default-package-overrides: - gi-secret < 0.0.13 - gi-vte < 2.91.28 - # Stackage Nightly 2021-04-23 + # Stackage Nightly 2021-04-28 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -319,7 +319,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 - - basement ==0.0.11 + - basement ==0.0.12 - base-orphans ==0.8.4 - base-prelude ==1.4 - base-unicode-symbols ==0.2.4.2 @@ -827,13 +827,13 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.4 + - express ==0.1.6 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - extra ==1.7.9 - extractable-singleton ==0.0.1 - - extrapolate ==0.4.2 + - extrapolate ==0.4.4 - fail ==4.9.0.0 - failable ==1.2.4.0 - fakedata ==0.8.0 @@ -903,7 +903,7 @@ default-package-overrides: - forma ==1.1.3 - format-numbers ==0.1.0.1 - formatting ==6.3.7 - - foundation ==0.0.25 + - foundation ==0.0.26.1 - fourmolu ==0.3.0.0 - free ==5.1.5 - free-categories ==0.2.0.2 @@ -991,7 +991,7 @@ default-package-overrides: - ghc-lib ==8.10.4.20210206 - ghc-lib-parser ==8.10.4.20210206 - ghc-lib-parser-ex ==8.10.0.19 - - ghc-parser ==0.2.2.0 + - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.8 - ghc-source-gen ==0.4.0.0 @@ -1093,6 +1093,7 @@ default-package-overrides: - haskell-lsp ==0.22.0.0 - haskell-lsp-types ==0.22.0.0 - haskell-names ==0.9.9 + - HaskellNet ==0.6 - haskell-src ==1.0.3.1 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 @@ -1256,7 +1257,7 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.4 - hvect ==0.4.0.0 - - hvega ==0.11.0.0 + - hvega ==0.11.0.1 - hw-balancedparens ==0.4.1.1 - hw-bits ==0.7.2.1 - hw-conduit ==0.2.1.0 @@ -1306,7 +1307,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.10.1.2 + - ihaskell ==0.10.2.0 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -1446,7 +1447,7 @@ default-package-overrides: - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.4 - - leancheck ==0.9.3 + - leancheck ==0.9.4 - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1476,6 +1477,7 @@ default-package-overrides: - lifted-async ==0.10.2 - lifted-base ==0.2.3.12 - lift-generics ==0.2 + - lift-type ==0.1.0.1 - line ==4.0.1 - linear ==1.21.5 - linear-circuit ==0.1.0.2 @@ -1665,7 +1667,7 @@ default-package-overrides: - mwc-random ==0.14.0.0 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - - mysql ==0.2 + - mysql ==0.2.0.1 - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 @@ -2009,7 +2011,7 @@ default-package-overrides: - rate-limit ==1.4.2 - ratel-wai ==1.1.5 - rattle ==0.2 - - rattletrap ==11.0.1 + - rattletrap ==11.1.0 - Rattus ==0.5 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -2113,6 +2115,9 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 + - sandwich ==0.1.0.3 + - sandwich-slack ==0.1.0.3 + - sandwich-webdriver ==0.1.0.4 - say ==0.1.0.1 - sbp ==2.6.3 - scalpel ==0.6.2 @@ -2256,7 +2261,7 @@ default-package-overrides: - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - - sourcemap ==0.1.6 + - sourcemap ==0.1.6.1 - sox ==0.2.3.1 - soxlib ==0.0.3.1 - spacecookie ==1.0.0.0 @@ -2264,7 +2269,7 @@ default-package-overrides: - sparse-tensor ==0.2.1.5 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - - speculate ==0.4.4 + - speculate ==0.4.6 - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 @@ -2687,7 +2692,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.1.1.0 + - witch ==0.2.0.2 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 From 4ee54f160b95541c2b76d0b8d086d7f7c9116284 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Apr 2021 10:17:14 +0200 Subject: [PATCH 139/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bbe9c771211c7a54c4e91431a29c76b2c8850d3b. --- .../haskell-modules/hackage-packages.nix | 298 +++--------------- 1 file changed, 52 insertions(+), 246 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8fc85abac9a..b0aff6d6f74 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6543,18 +6543,24 @@ self: { }) {}; "Frames-streamly" = callPackage - ({ mkDerivation, base, exceptions, Frames, primitive, streamly - , text, vinyl + ({ mkDerivation, base, binary, bytestring + , bytestring-strict-builder, cereal, clock, exceptions + , fast-builder, foldl, Frames, mtl, primitive, relude, streamly + , streamly-bytestring, strict, text, vector, vinyl }: mkDerivation { pname = "Frames-streamly"; - version = "0.1.0.2"; - sha256 = "0i007clm5q2rjmj7qfyig4sajk2bi1fc57w132j4vrvgp3p9p4rr"; + version = "0.1.0.3"; + sha256 = "10dzkkacf25fz2g26c21g1plag252hlcanpyx9m9bmkla8n0ggmv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base exceptions Frames primitive streamly text vinyl + base exceptions Frames primitive relude streamly strict text vinyl + ]; + testHaskellDepends = [ + base binary bytestring bytestring-strict-builder cereal clock + fast-builder foldl Frames mtl primitive relude streamly + streamly-bytestring strict text vector vinyl ]; - testHaskellDepends = [ base Frames streamly text vinyl ]; description = "A streamly layer for Frames I/O"; license = lib.licenses.bsd3; }) {}; @@ -38777,19 +38783,6 @@ self: { }) {}; "basement" = callPackage - ({ mkDerivation, base, ghc-prim }: - mkDerivation { - pname = "basement"; - version = "0.0.11"; - sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; - revision = "3"; - editedCabalFile = "1indgsrk0yhkbqlxj39qqb5xqicwkmcliggb8wn87vgfswxpi1dn"; - libraryHaskellDepends = [ base ghc-prim ]; - description = "Foundation scrap box of array & string"; - license = lib.licenses.bsd3; - }) {}; - - "basement_0_0_12" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; @@ -38798,7 +38791,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "basen" = callPackage @@ -88247,19 +88239,6 @@ self: { }) {}; "express" = callPackage - ({ mkDerivation, base, leancheck, template-haskell }: - mkDerivation { - pname = "express"; - version = "0.1.4"; - sha256 = "0rhrlynb950n2c79s3gz0vyd6b34crlhzlva0w91qbzn9dpfrays"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base leancheck ]; - benchmarkHaskellDepends = [ base leancheck ]; - description = "Dynamically-typed expressions involving applications and variables"; - license = lib.licenses.bsd3; - }) {}; - - "express_0_1_6" = callPackage ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; @@ -88270,7 +88249,6 @@ self: { benchmarkHaskellDepends = [ base leancheck ]; description = "Dynamically-typed expressions involving applications and variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "expression-parser" = callPackage @@ -88736,22 +88714,6 @@ self: { }) {}; "extrapolate" = callPackage - ({ mkDerivation, base, express, leancheck, speculate - , template-haskell - }: - mkDerivation { - pname = "extrapolate"; - version = "0.4.2"; - sha256 = "1dhljcsqahpyn3khxjbxc15ih1r6kgqcagr5gbpg1d705ji7y3j0"; - libraryHaskellDepends = [ - base express leancheck speculate template-haskell - ]; - testHaskellDepends = [ base express leancheck speculate ]; - description = "generalize counter-examples of test properties"; - license = lib.licenses.bsd3; - }) {}; - - "extrapolate_0_4_4" = callPackage ({ mkDerivation, base, express, leancheck, speculate , template-haskell }: @@ -88765,7 +88727,6 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "generalize counter-examples of test properties"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -89463,6 +89424,27 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; + "fast-logger_3_0_4" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.0.4"; + sha256 = "1a6h7mn34lw732ajlyc6bf7cybw2khs1cr4gj9dg2dd571q00rx1"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ sternenseemann ]; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -95250,21 +95232,6 @@ self: { }) {}; "foundation" = callPackage - ({ mkDerivation, base, basement, gauge, ghc-prim }: - mkDerivation { - pname = "foundation"; - version = "0.0.25"; - sha256 = "0q6kx57ygmznlpf8n499hid4x6mj3180paijx0a8dgi9hh7man61"; - revision = "1"; - editedCabalFile = "1ps5sk50sf4b5hd87k3jqykqrwcw2wzyp50rcy6pghd61h83cjg2"; - libraryHaskellDepends = [ base basement ghc-prim ]; - testHaskellDepends = [ base basement ]; - benchmarkHaskellDepends = [ base basement gauge ]; - description = "Alternative prelude with batteries and no dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "foundation_0_0_26_1" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; @@ -95275,7 +95242,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -102122,18 +102088,6 @@ self: { }) {}; "ghc-parser" = callPackage - ({ mkDerivation, base, cpphs, ghc, happy }: - mkDerivation { - pname = "ghc-parser"; - version = "0.2.2.0"; - sha256 = "1pygg0538nah42ll0zai081y8hv8z7lwl0vr9l2k273i4fdif7hb"; - libraryHaskellDepends = [ base ghc ]; - libraryToolDepends = [ cpphs happy ]; - description = "Haskell source parser from GHC"; - license = lib.licenses.mit; - }) {}; - - "ghc-parser_0_2_3_0" = callPackage ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; @@ -102143,7 +102097,6 @@ self: { libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-paths" = callPackage @@ -143259,25 +143212,6 @@ self: { }) {}; "hvega" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, tasty, tasty-golden, text, unordered-containers - }: - mkDerivation { - pname = "hvega"; - version = "0.11.0.0"; - sha256 = "1lz5f04yi97wkqhyxvav262ayyvvl96xrgvgzyk1ca1g299dw866"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ aeson base text unordered-containers ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring containers filepath tasty - tasty-golden text unordered-containers - ]; - description = "Create Vega-Lite visualizations (version 4) in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "hvega_0_11_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: @@ -143294,7 +143228,6 @@ self: { ]; description = "Create Vega-Lite visualizations (version 4) in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hvega-theme" = callPackage @@ -146756,43 +146689,6 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , cmdargs, containers, directory, filepath, ghc, ghc-boot - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, mtl, parsec, process, random, raw-strings-qq - , setenv, shelly, split, stm, strict, text, time, transformers - , unix, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "ihaskell"; - version = "0.10.1.2"; - sha256 = "1gs2j0qgxzf346nlnq0zx12yj528ykxia5r3rlldpf6f01zs89v8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cereal cmdargs containers - directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline - haskell-src-exts hlint http-client http-client-tls ipython-kernel - mtl parsec process random shelly split stm strict text time - transformers unix unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory ghc ipython-kernel - process strict text transformers unix unordered-containers - ]; - testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit - raw-strings-qq setenv shelly text transformers - ]; - description = "A Haskell backend kernel for the IPython project"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ihaskell_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , cmdargs, containers, directory, exceptions, filepath, ghc , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec @@ -149125,6 +149021,23 @@ self: { license = lib.licenses.mit; }) {}; + "inspection-testing_0_4_5_0" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.5.0"; + sha256 = "1d8bi60m97yw4vxmajclg66xhaap8nj4dli8bxni0mf4mcm0px01"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -161642,18 +161555,6 @@ self: { }) {}; "leancheck" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; - version = "0.9.3"; - sha256 = "14wi7h07pipd56grhaqmhb8wmr52llgd3xb7fm8hi9fb1sfzmvg0"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = lib.licenses.bsd3; - }) {}; - - "leancheck_0_9_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; @@ -161663,7 +161564,6 @@ self: { testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "leancheck-enum-instances" = callPackage @@ -184095,21 +183995,6 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql - }: - mkDerivation { - pname = "mysql"; - version = "0.2"; - sha256 = "09b1rhv16g8npjblq9jfi29bffsplvq4hnksdhknd39anr5gpqzc"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; - testHaskellDepends = [ base bytestring hspec ]; - description = "A low-level MySQL client library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; - - "mysql_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql }: mkDerivation { @@ -184122,7 +184007,6 @@ self: { testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -218193,28 +218077,6 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , containers, filepath, http-client, http-client-tls, HUnit, text - }: - mkDerivation { - pname = "rattletrap"; - version = "11.0.1"; - sha256 = "1s9n89i6mh3lw9mni5lgs8qnq5c1981hrz5bv0n9cffnnp45av6a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty array base bytestring containers filepath - http-client http-client-tls text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring filepath HUnit ]; - description = "Parse and generate Rocket League replays"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "rattletrap_11_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, HUnit, text }: @@ -235004,8 +234866,8 @@ self: { }: mkDerivation { pname = "servant-polysemy"; - version = "0.1.2"; - sha256 = "05qk2kl90lqszwhi1yqnj63zkx3qvd6jbaxsxjw68k7ppsjvnyks"; + version = "0.1.3"; + sha256 = "132yf6fp0hl6k3859sywkfzsca8xsaqd3a4ca4vdqqjrllk0m88i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244836,28 +244698,6 @@ self: { }) {}; "sourcemap" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , process, random, text, unordered-containers, utf8-string - }: - mkDerivation { - pname = "sourcemap"; - version = "0.1.6"; - sha256 = "0ynfm44ym8y592wnzdwa0d05dbkffyyg5sm26y5ylzpynk64r85r"; - revision = "1"; - editedCabalFile = "1f7q44ar6qfip8fsllg43jyn7r15ifn2r0vz32cbmx0sb0d38dax"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring process text unordered-containers - utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring process text unordered-containers utf8-string - ]; - benchmarkHaskellDepends = [ base bytestring criterion random ]; - description = "Implementation of source maps as proposed by Google and Mozilla"; - license = lib.licenses.bsd3; - }) {}; - - "sourcemap_0_1_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , process, random, text, unordered-containers, utf8-string }: @@ -244875,7 +244715,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Implementation of source maps as proposed by Google and Mozilla"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sousit" = callPackage @@ -245562,21 +245401,6 @@ self: { }) {}; "speculate" = callPackage - ({ mkDerivation, base, cmdargs, containers, express, leancheck }: - mkDerivation { - pname = "speculate"; - version = "0.4.4"; - sha256 = "0vmxi8rapbld7b3llw2v6fz1v6vqyv90rpbnzjdfa29kdza4m5sf"; - libraryHaskellDepends = [ - base cmdargs containers express leancheck - ]; - testHaskellDepends = [ base express leancheck ]; - benchmarkHaskellDepends = [ base express leancheck ]; - description = "discovery of properties about Haskell functions"; - license = lib.licenses.bsd3; - }) {}; - - "speculate_0_4_6" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; @@ -245589,7 +245413,6 @@ self: { benchmarkHaskellDepends = [ base express leancheck ]; description = "discovery of properties about Haskell functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "speculation" = callPackage @@ -282734,22 +282557,6 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec - , template-haskell, text - }: - mkDerivation { - pname = "witch"; - version = "0.1.1.0"; - sha256 = "1i9c6fgmr1awcrkb01rs4rbfhmz51bnbqxc2piyvjc23pjl3x6np"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text - ]; - testHaskellDepends = [ base bytestring containers hspec text ]; - description = "Convert values from one type into another"; - license = lib.licenses.isc; - }) {}; - - "witch_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, hspec , template-haskell, text }: @@ -282763,7 +282570,6 @@ self: { testHaskellDepends = [ base bytestring containers hspec text ]; description = "Convert values from one type into another"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "with-index" = callPackage From 14f66d60a789da5cc48d0602b390a267f016143d Mon Sep 17 00:00:00 2001 From: regnat Date: Mon, 26 Apr 2021 17:21:17 +0200 Subject: [PATCH 140/476] Make the bootsrap respect the contentAddressedByDefault setting Patch every `derivation` call in the bootsrap process to add it a conditional `__contentAddressed` parameter. That way, passing `contentAddressedByDefault` means that the entire build closure of a system can be content addressed --- pkgs/stdenv/darwin/default.nix | 8 ++++++-- pkgs/stdenv/freebsd/default.nix | 8 ++++++-- pkgs/stdenv/generic/default.nix | 5 +++++ pkgs/stdenv/linux/bootstrap-tools-musl/default.nix | 6 +++--- pkgs/stdenv/linux/bootstrap-tools/default.nix | 6 +++--- pkgs/stdenv/linux/default.nix | 11 ++++++++++- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index a7b91a82a9d..d50b60b0ba1 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -44,7 +44,7 @@ in rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" ''; - bootstrapTools = derivation { + bootstrapTools = derivation ({ inherit system; name = "bootstrap-tools"; @@ -54,7 +54,11 @@ in rec { inherit (bootstrapFiles) mkdir bzip2 cpio tarball; __impureHostDeps = commonImpureHostDeps; - }; + } // lib.optionalAttrs (config.contentAddressedByDefault or false) { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }); stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash", overrides ? (self: super: {}), diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 9a890532b79..ddcdc6a66e0 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -170,7 +170,7 @@ in ({}: { __raw = true; - bootstrapTools = derivation { + bootstrapTools = derivation ({ inherit system; inherit make bash coreutils findutils diffutils grep patch gawk cpio sed @@ -182,7 +182,11 @@ in buildInputs = [ make ]; mkdir = "/bin/mkdir"; ln = "/bin/ln"; - }; + } // lib.optionalAttrs (config.contentAddressedByDefault or false) { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }); }) ({ bootstrapTools, ... }: rec { diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c3582b16677..516d2d3c177 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -84,6 +84,11 @@ let allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs ++ defaultBuildInputs; } + // lib.optionalAttrs (config.contentAddressedByDefault or false) { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + } // { inherit name; diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix index 6118585d545..d690f402672 100644 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix @@ -1,6 +1,6 @@ -{ system, bootstrapFiles }: +{ system, bootstrapFiles, extraAttrs }: -derivation { +derivation ({ name = "bootstrap-tools"; builder = bootstrapFiles.busybox; @@ -15,4 +15,4 @@ derivation { langC = true; langCC = true; isGNU = true; -} +} // extraAttrs) diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix index 6118585d545..d690f402672 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/default.nix +++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix @@ -1,6 +1,6 @@ -{ system, bootstrapFiles }: +{ system, bootstrapFiles, extraAttrs }: -derivation { +derivation ({ name = "bootstrap-tools"; builder = bootstrapFiles.busybox; @@ -15,4 +15,4 @@ derivation { langC = true; langCC = true; isGNU = true; -} +} // extraAttrs) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index f753af49926..6d6d0384a7f 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -61,7 +61,16 @@ let # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; }; + bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { + inherit system bootstrapFiles; + extraAttrs = lib.optionalAttrs + (config.contentAddressedByDefault or false) + { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + }; getLibc = stage: stage.${localSystem.libc}; From 2751cdfe0971b1ca6af8dd445f2f2fcfbc44b024 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 28 Apr 2021 00:09:09 +0200 Subject: [PATCH 141/476] kitty: remove unused variable --- pkgs/applications/terminal-emulators/kitty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 91d7b48738e..3cf282fbb15 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, From 4d098d6b39b21c44f5a48f9db737c2d205e59074 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 27 Apr 2021 23:06:42 +0200 Subject: [PATCH 142/476] kitty: clarify license --- pkgs/applications/terminal-emulators/kitty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 3cf282fbb15..463998c2f68 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -135,7 +135,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; - license = licenses.gpl3; + license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; From 47f4780fc3a73372971af7c09049c46769738a57 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 27 Apr 2021 23:04:54 +0200 Subject: [PATCH 143/476] kitty: 0.19.3 -> 0.20.2 https://github.com/kovidgoyal/kitty/releases/tag/v0.20.2 --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 463998c2f68..5324dc8a10b 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.19.3"; + version = "0.20.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s"; + sha256 = "sha256-FquvC3tL565711OQmq2ddNwpyJQGgn4dhG/TYZdCRU0="; }; buildInputs = [ From 9b2ec3bc7244bab24d268a9f6b13691ececf4e78 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Mon, 26 Apr 2021 12:42:59 +0300 Subject: [PATCH 144/476] ffsend: fix build on darwin --- pkgs/tools/misc/ffsend/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index ff1c4c7b892..75e1084e0bd 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl -, darwin, installShellFiles +, installShellFiles +, CoreFoundation, CoreServices, Security, AppKit, libiconv , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null @@ -29,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = - if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) + if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ] else [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30b49b3f71f..d5be7a9defb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4451,7 +4451,9 @@ in ferm = callPackage ../tools/networking/ferm { }; - ffsend = callPackage ../tools/misc/ffsend { }; + ffsend = callPackage ../tools/misc/ffsend { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit; + }; fgallery = callPackage ../tools/graphics/fgallery { }; From 377bda4b7527cb941648ad8b5735c91704e82493 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 21:00:28 +0000 Subject: [PATCH 145/476] erlang: 23.3.1 -> 23.3.2 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 0e8e402ab3b..5334429fbba 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.1"; - sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq"; + version = "23.3.2"; + sha256 = "eU3BmBJqrcg3FmkuAIfB3UoSNfQQfvGNyC2jBffwm/w="; } From e6ce32f74347065c1c043be641236478bd805b84 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Wed, 28 Apr 2021 11:21:23 +0200 Subject: [PATCH 146/476] xdg-desktop-portal-wlr: 0.2.0 -> 0.3.0 --- .../libraries/xdg-desktop-portal-wlr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index da60f2b27fc..b51d179f95c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm }: +, pipewire, wayland, systemd, libdrm, iniparser, scdoc }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "1vjz0y3ib1xw25z8hl679l2p6g4zcg7b8fcd502bhmnqgwgdcsfx"; + sha256 = "sha256-6ArUQfWx5rNdpsd8Q22MqlpxLT8GTSsymAf21zGe1KI="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; - buildInputs = [ pipewire wayland systemd libdrm ]; + buildInputs = [ pipewire wayland systemd libdrm iniparser scdoc ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" From 752f7a0e8321a5747b8be03e93d8fda0e90f0073 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 10:43:04 +0000 Subject: [PATCH 147/476] filezilla: 3.53.0 -> 3.53.1 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index f8e9fcc87b0..df993625e6d 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.53.0"; + version = "3.53.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-MJXnYN9PVADttNqj3hshLElHk2Dy9FzE67clMMh85CA="; + sha256 = "sha256-ZWh08ursVGcscvQepeoUnFAZfFDeXWdIu0HXIr/D93k="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 From 4105c06bf384de1d4da4459bfcc634bcca85ecca Mon Sep 17 00:00:00 2001 From: regnat Date: Wed, 28 Apr 2021 12:46:43 +0200 Subject: [PATCH 148/476] Also make the bootstrap tools generation CA (And fix an ofborg eval error btw) --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e4db92b7717..4db40a2e516 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -224,15 +224,24 @@ in with pkgs; rec { bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; - bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then + bootstrapTools = + let extraAttrs = lib.optionalAttrs + (config.contentAddressedByDefault or false) + { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + in + if (stdenv.hostPlatform.libc == "glibc") then import ./bootstrap-tools { inherit (stdenv.buildPlatform) system; # Used to determine where to build - inherit bootstrapFiles; + inherit bootstrapFiles extraAttrs; } else if (stdenv.hostPlatform.libc == "musl") then import ./bootstrap-tools-musl { inherit (stdenv.buildPlatform) system; # Used to determine where to build - inherit bootstrapFiles; + inherit bootstrapFiles extraAttrs; } else throw "unsupported libc"; From 8e87d34abcde3e406625d47b6f30b914f1ff7166 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 27 Apr 2021 00:14:55 +0200 Subject: [PATCH 149/476] kgt: init at 2021-04-07 --- pkgs/development/tools/kgt/default.nix | 81 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/tools/kgt/default.nix diff --git a/pkgs/development/tools/kgt/default.nix b/pkgs/development/tools/kgt/default.nix new file mode 100644 index 00000000000..94f72ceac10 --- /dev/null +++ b/pkgs/development/tools/kgt/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchFromGitHub, bmake, cleanPackaging }: + +stdenv.mkDerivation { + pname = "kgt"; + version = "2021-04-07"; + + src = fetchFromGitHub { + owner = "katef"; + repo = "kgt"; + # 2021-04-07, no version tags (yet) + rev = "a7cbc52d368e413a3f1212c0fafccc05b2a42606"; + sha256 = "1x6q30xb8ihxi26rzk3s2hqd827fim4l4wn3qq252ibrwcq6lqyj"; + fetchSubmodules = true; + }; + + outputs = [ "bin" "doc" "out" ]; + + nativeBuildInputs = [ bmake ]; + enableParallelBuilding = true; + + makeFlags = [ "-r" "PREFIX=$(bin)" ]; + + installPhase = '' + runHook preInstall + + ${cleanPackaging.commonFileActions { + docFiles = [ + "README.md" + "LICENCE" + "examples" + # TODO: this is just a docbook file, not a mangpage yet + # https://github.com/katef/kgt/issues/50 + "man" + "examples" + "doc" + ]; + noiseFiles = [ + "build/src" + "build/lib" + "Makefile" + "src/**/*.c" + "src/**/*.h" + "src/**/Makefile" + "src/**/lexer.lx" + "src/**/parser.sid" + "src/**/parser.act" + "share/git" + "share/css" + "share/xsl" + ".gitignore" + ".gitmodules" + ".gitattributes" + ".github" + ]; + }} $doc/share/doc/kgt + + install -Dm755 build/bin/kgt $bin/bin/kgt + rm build/bin/kgt + + runHook postInstall + ''; + + postFixup = '' + ${cleanPackaging.checkForRemainingFiles} + ''; + + meta = with lib; { + description = "BNF wrangling and railroad diagrams"; + longDescription = '' + KGT: Kate's Grammar Tool + + Input: Various BNF-like syntaxes + Output: Various BNF-like syntaxes, AST dumps, and Railroad Syntax Diagrams + ''; + homepage = "https://github.com/katef/kgt"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ Profpatsch ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4610cce7a00..a8616e41e6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24120,6 +24120,10 @@ in kexi = libsForQt514.callPackage ../applications/office/kexi { }; + kgt = callPackage ../development/tools/kgt { + inherit (skawarePackages) cleanPackaging; + }; + khronos = callPackage ../applications/office/khronos { }; keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; From 9a991af2db1dc11e9f00f24a89e984a7b0e4e849 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 22 Apr 2021 11:54:59 +0200 Subject: [PATCH 150/476] amdvlk: 2021.Q1.6 -> 2021.Q2.2 --- pkgs/development/libraries/amdvlk/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 1d0256f3b27..5693a5968b6 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.6"; + version = "2021.Q2.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w="; + sha256 = "4k9ZkBxJGuNUO44F9D+u54eUREl5/8zxjxhaShhzGv0="; }; buildInputs = [ @@ -70,12 +70,8 @@ in stdenv.mkDerivation rec { installPhase = '' install -Dm755 -t $out/lib icd/amdvlk${suffix}.so - install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json - - substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ - "/usr/lib64" "$out/lib" - substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ - "/usr/lib" "$out/lib" + install -Dm644 -t $out/share/vulkan/icd.d icd/amd_icd${suffix}.json + install -Dm644 -t $out/share/vulkan/implicit_layer.d icd/amd_icd${suffix}.json patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so ''; From 6b14de16225eadc9042a3778f139f8239126fcdf Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 28 Apr 2021 13:15:23 +0200 Subject: [PATCH 151/476] opensmtpd: set --with-path-pidfile Set this to `/run`, like we also do with `--with-path-socket`, so opensmtp doesn't try to use /var/run for pidfiles. --- pkgs/servers/mail/opensmtpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index ab2bdae0add..6a9fc815fd9 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { "--with-auth-pam" "--without-auth-bsdauth" "--with-path-socket=/run" + "--with-path-pidfile=/run" "--with-user-smtpd=smtpd" "--with-user-queue=smtpq" "--with-group-queue=smtpq" From d0fec23e2c2ab3c155be231c549947b7651c7f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 28 Apr 2021 13:51:34 +0200 Subject: [PATCH 152/476] pythonPackages.pyface: fix build --- pkgs/development/python-modules/pyface/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 7ad1fb41526..3a29fd79f77 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, setuptools, six, traits +, importlib-metadata, importlib-resources, six, traits }: buildPythonPackage rec { @@ -11,10 +11,12 @@ buildPythonPackage rec { sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; }; - propagatedBuildInputs = [ setuptools six traits ]; + propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; doCheck = false; # Needs X server + pythonImportsCheck = [ "pyface" ]; + meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/pyface"; From 82931ea446e5fde9ae4d2fe58c2988790d91a880 Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 25 Apr 2021 19:36:51 +0200 Subject: [PATCH 153/476] nixos/nix-containers: use SIGTERM to stop containers systemd-nspawn can react to SIGTERM and send a shutdown signal to the container init process. use that instead of going through dbus and machined to request nspawn sending the signal, since during host shutdown machined or dbus may have gone away by the point a container unit is stopped. to solve the issue that a container that is still starting cannot be stopped cleanly we must also handle this signal in containerInit/stage-2. --- .../virtualisation/nixos-containers.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index f15d5875841..43eca142e02 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -35,6 +35,9 @@ let '' #! ${pkgs.runtimeShell} -e + # Exit early if we're asked to shut down. + trap "exit 0" SIGRTMIN+3 + # Initialise the container side of the veth pair. if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || @@ -60,8 +63,12 @@ let ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} - # Start the regular stage 1 script. - exec "$1" + # Start the regular stage 2 script. + # We source instead of exec to not lose an early stop signal, which is + # also the only _reliable_ shutdown signal we have since early stop + # does not execute ExecStop* commands. + set +e + . "$1" '' ); @@ -127,12 +134,16 @@ let ''} # Run systemd-nspawn without startup notification (we'll - # wait for the container systemd to signal readiness). + # wait for the container systemd to signal readiness) + # Kill signal handling means systemd-nspawn will pass a system-halt signal + # to the container systemd when it receives SIGTERM for container shutdown; + # containerInit and stage2 have to handle this as well. exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ -M "$INSTANCE" -D "$root" $extraFlags \ $EXTRA_NSPAWN_FLAGS \ --notify-ready=yes \ + --kill-signal=SIGRTMIN+3 \ --bind-ro=/nix/store \ --bind-ro=/nix/var/nix/db \ --bind-ro=/nix/var/nix/daemon-socket \ @@ -259,13 +270,10 @@ let Slice = "machine.slice"; Delegate = true; - # Hack: we don't want to kill systemd-nspawn, since we call - # "machinectl poweroff" in preStop to shut down the - # container cleanly. But systemd requires sending a signal - # (at least if we want remaining processes to be killed - # after the timeout). So send an ignored signal. + # We rely on systemd-nspawn turning a SIGTERM to itself into a shutdown + # signal (SIGRTMIN+3) for the inner container. KillMode = "mixed"; - KillSignal = "WINCH"; + KillSignal = "TERM"; DevicePolicy = "closed"; DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; @@ -752,8 +760,6 @@ in postStart = postStartScript dummyConfig; - preStop = "machinectl poweroff $INSTANCE"; - restartIfChanged = false; serviceConfig = serviceDirectives dummyConfig; From d4c9e08bfed47c13e97f3ad41a25385ec063fe63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 12:38:03 +0000 Subject: [PATCH 154/476] gitlab-pages: 1.35.0 -> 1.38.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index 920a3299929..0f1372742bc 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.35.0"; + version = "1.38.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-5AkzbOutBXy59XvMwfyH6A8ETwjP2QokG/Rz31/nCpk="; + sha256 = "sha256-QaqZGTkNAzQEqlwccAWPDP91BSc9vRDEsCBca/lEXW4="; }; - vendorSha256 = "sha256-g8FDWpZmbZSkJAzoEiI8/JZLTTgG7uJ4sS35axaEXLY="; + vendorSha256 = "sha256-uuwuiGQWLIQ5UJuCKDBEvCPo2+AXtJ54ARK431qiakc="; subPackages = [ "." ]; doCheck = false; # Broken From 715f47fe0641f1232b9d1dbaf381928f7eaef692 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Mon, 26 Apr 2021 16:38:00 -0700 Subject: [PATCH 155/476] eternal-terminal: 6.0.13 -> 6.1.7 --- .../networking/eternal-terminal/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 78884a23cbb..01dbc32eb8d 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -3,27 +3,38 @@ , cmake , gflags , libsodium +, openssl , protobuf +, zlib }: stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.13"; + version = "6.1.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r"; + sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q"; }; + cmakeFlags= [ + "-DDISABLE_VCPKG=TRUE" + "-DDISABLE_SENTRY=TRUE" + "-DDISABLE_CRASH_LOG=TRUE" + ]; + + CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17"; + LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs"; + nativeBuildInputs = [ cmake ]; - buildInputs = [ gflags libsodium protobuf ]; + buildInputs = [ gflags openssl zlib libsodium protobuf ]; meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; - homepage = "https://mistertea.github.io/EternalTerminal/"; + homepage = "https://eternalterminal.dev/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg pingiun ]; }; From af9430180e6811b31555f79f1052ed9e5e23ee67 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Apr 2021 20:46:18 +0900 Subject: [PATCH 156/476] broot: 1.2.9 -> 1.3.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 90039d17802..46baee7477c 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.2.9"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5tM8ywLBPPjCKEfXIfUZ5aF4t9YpYA3tzERxC1NEsso="; + sha256 = "sha256-2FF/oB341PPGfSlXpLEs4mswjVk+3ty/jNsVJKu+fhs="; }; - cargoHash = "sha256-P5ukwtRUpIJIqJjwTXIB2xRnpyLkzMeBMHmUz4Ery3s="; + cargoHash = "sha256-+UT9cz8OPA1jpFv7HafabxJ3NmLl57K1ODydfcV1FUM"; nativeBuildInputs = [ makeWrapper From 51729ed34997d3da0590e675b613d4efd0776829 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 28 Apr 2021 21:32:20 +0900 Subject: [PATCH 157/476] broot: remove stale substitute --- pkgs/tools/misc/broot/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 46baee7477c..b89dbb2b907 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -33,8 +33,6 @@ rustPlatform.buildRustPackage rec { ]; postPatch = '' - substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/' - # Fill the version stub in the man page. We can't fill the date # stub reproducibly. substitute man/page man/broot.1 \ From bb3d2fcd32195e653e2753099c8ad18ac35ce44f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 13:00:24 +0000 Subject: [PATCH 158/476] gpxsee: 8.9 -> 9.0 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index c9c815771a8..b99b6460f4f 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.9"; + version = "9.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-nl9iu8ezgMZ1wy2swDXYRDLlkSz1II+C65UUWNvGBxg="; + sha256 = "sha256-4MzRXpxvJcj5KptTBH6rSr2ZyQ13nV7Yq96ti+CMytw="; }; patches = (substituteAll { From 5e2bfae1b80d6beb42130bdddfbd4820dd0123c2 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 28 Apr 2021 15:16:06 +0200 Subject: [PATCH 159/476] gitlab: 13.10.2 -> 13.11.2 (#120947) --- .../version-management/gitlab/data.json | 12 +- .../version-management/gitlab/default.nix | 6 +- .../version-management/gitlab/gitaly/Gemfile | 8 +- .../gitlab/gitaly/Gemfile.lock | 34 +-- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitaly/gemset.nix | 40 +-- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/remove-hardcoded-locations.patch | 22 +- .../version-management/gitlab/rubyEnv/Gemfile | 51 ++-- .../gitlab/rubyEnv/Gemfile.lock | 239 +++++++-------- .../gitlab/rubyEnv/gemset.nix | 227 +++++++------- .../version-management/gitlab/yarnPkgs.nix | 280 +++++++++--------- 12 files changed, 472 insertions(+), 457 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index aa5338ea7c6..6b0a98848bf 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.10.2", - "repo_hash": "1q3qnfzhikbbsmzzbldwn6xvsyxr1jgv5lj7mgcji11j8qv1a625", + "version": "13.11.2", + "repo_hash": "0xian17q8h5qdcvndyd27w278zqi3455svwycqfcv830g27c0csh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.10.2-ee", + "rev": "v13.11.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.10.2", - "GITLAB_PAGES_VERSION": "1.36.0", + "GITALY_SERVER_VERSION": "13.11.2", + "GITLAB_PAGES_VERSION": "1.38.0", "GITLAB_SHELL_VERSION": "13.17.0", - "GITLAB_WORKHORSE_VERSION": "13.10.2" + "GITLAB_WORKHORSE_VERSION": "13.11.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 89a2ac6ec95..3e70e47dc95 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -32,7 +32,7 @@ let openssl = x.openssl // { buildInputs = [ openssl ]; }; - ruby-magic-static = x.ruby-magic-static // { + ruby-magic = x.ruby-magic // { buildInputs = [ file ]; buildFlags = [ "--enable-system-libraries" ]; }; @@ -131,8 +131,8 @@ stdenv.mkDerivation { # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602 (fetchpatch { name = "secrets_db_key_base_length.patch"; - url = "https://gitlab.com/gitlab-org/gitlab/-/commit/dea620633d446ca0f53a75674454ff0dd4bd8f99.patch"; - sha256 = "19m4z4np3sai9kqqqgabl44xv7p8lkcyqr6s5471axfxmf9m2023"; + url = "https://gitlab.com/gitlab-org/gitlab/-/commit/a5c78650441c31a522b18e30177c717ffdd7f401.patch"; + sha256 = "1qcxr5f59slgzmpcbiwabdhpz1lxnq98yngg1xkyihk2zhv0g1my"; }) ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 00215cc55e9..adee2020f6f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,23 +3,23 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.4' +gem 'activesupport', '~> 6.0.3.6' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false gem 'grpc', '~> 1.30.2' gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.15.0' +gem 'gitlab-labkit', '~> 0.16.2' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' -gem 'google-protobuf', '~> 3.12' +gem 'google-protobuf', '~> 3.14.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 32d761f9f3f..a8e2f3f5a67 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.3.6) + actionview (= 6.0.3.6) + activesupport (= 6.0.3.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.3.6) + activesupport (= 6.0.3.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.4) + activesupport (6.0.3.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) diff-lcs (1.3) dotenv (2.7.6) @@ -62,10 +62,10 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1) + gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.15.0) + gitlab-labkit (0.16.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) @@ -74,14 +74,14 @@ GEM pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.12.4) + google-protobuf (3.14.0) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) grpc (1.30.2) google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) grpc-tools (1.30.2) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -94,7 +94,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.9.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -196,7 +196,7 @@ GEM stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.13.0) + thrift (0.14.1) timecop (0.9.1) tzinfo (1.2.9) thread_safe (~> 0.1) @@ -215,15 +215,15 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.4) + activesupport (~> 6.0.3.6) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) - gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1) - gitlab-labkit (~> 0.15.0) + gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) + gitlab-labkit (~> 0.16.2) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.12) + google-protobuf (~> 3.14.0) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 9.14.1) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 260b3b49399..4fc298ba33d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,17 +21,17 @@ let }; }; in buildGoModule rec { - version = "13.10.2"; + version = "13.11.2"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs="; + sha256 = "sha256-qcrvNmnlrdJYXAlt65bA0Ij7zuX7QwVukC3A4KGL3sk="; }; - vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE="; + vendorSha256 = "sha256-VAXQPVyB+XdfOqGaT1H/83ed6xV+4Tr5fkBu1eyPe2k="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 90655ef9e93..c3c742b6669 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; + sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; + sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; + sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -122,10 +122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; crass = { groups = ["default"]; @@ -258,10 +258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj"; + sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg"; type = "gem"; }; - version = "0.4.4.3.gitlab.1"; + version = "0.4.4.4.gitlab.1"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71"; + sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.2"; }; gitlab-markup = { groups = ["default"]; @@ -289,10 +289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj"; + sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; type = "gem"; }; - version = "3.12.4"; + version = "3.14.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.10"; }; ice_nine = { source = { @@ -383,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; + sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -898,10 +898,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; + sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.1"; }; timecop = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ff34a2d3595..abef022f01c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.10.2"; + version = "13.11.2"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-UCkUSv1ZjDHmTFnETU8dz4moYRDCvy6AYTTfjHBGKeE="; + vendorSha256 = "sha256-m/Mx4Nr4tPK6yfcHxAFbjh9DI/1WnKReaaylWpNSrc8="; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 83e3d7fe141..2026808875d 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index d9b3ee354b0..1eb0507488b 100644 +index e1a7db8d860..5823f170410 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -69,10 +69,10 @@ +@@ -71,10 +71,10 @@ config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -18,10 +18,10 @@ index d9b3ee354b0..1eb0507488b 100644 config.action_mailer.raise_delivery_errors = true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 92e7501d49d..4ee5a1127df 100644 +index da1a15302da..c846db93e5c 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -1168,7 +1168,7 @@ production: &base +@@ -1191,7 +1191,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -31,19 +31,19 @@ index 92e7501d49d..4ee5a1127df 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index bbed08f5044..2906e5c44af 100644 +index 99335321f28..9d9d1c48af4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir - rescue ArgumentError # no user configured -- '/home/' + Settings.gitlab['user'] -+ '/homeless-shelter' + rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] ++ '/homeless-shelter' end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -751,7 +751,7 @@ +@@ -794,7 +794,7 @@ # Git # Settings['git'] ||= Settingslogic.new({}) @@ -97,7 +97,7 @@ index 9fc354a8fe8..2352ca9b58c 100644 json_formatter = Gitlab::PumaLogging::JSONFormatter.new log_formatter do |str| diff --git a/lib/api/api.rb b/lib/api/api.rb -index ada0da28749..8a3f5824008 100644 +index a287ffbfcd8..1a5ca59183a 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -4,7 +4,7 @@ module API diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index af00e6e7af6..94b6204dac2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0.3.1' +gem 'rails', '~> 6.0.3.6' gem 'bootsnap', '~> 1.4.6' @@ -28,6 +28,8 @@ gem 'devise', '~> 4.7.2' gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper-openid_connect', '~> 1.7.5' +gem 'rexml', '~> 3.2.5' +gem 'ruby-saml', '~> 1.12.1' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 0.1' @@ -59,7 +61,7 @@ gem 'akismet', '~> 3.0' gem 'invisible_captcha', '~> 1.1.0' # Two-factor authentication -gem 'devise-two-factor', '~> 3.1.0' +gem 'devise-two-factor', '~> 4.0.0' gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' @@ -108,7 +110,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.14.4' +gem 'hamlit', '~> 2.15.0' # Files attachments gem 'carrierwave', '~> 1.3' @@ -150,7 +152,7 @@ gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.21' -gem 'kramdown', '~> 2.3.0' +gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' gem 'org-ruby', '~> 0.9.12' @@ -198,7 +200,7 @@ gem 'acts-as-taggable-on', '~> 7.0' gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.7.0' -gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' @@ -274,10 +276,7 @@ gem 'licensee', '~> 9.14.1' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'ruby-magic-static', '~> 0.3.4' - -# Fake version of the gem to trick bundler -gem 'mimemagic', '~> 0.3.10' +gem 'ruby-magic', '~> 0.4' # Faster blank gem 'fast_blank' @@ -294,11 +293,11 @@ gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' gem 'gemojione', '~> 3.3' -gem 'gon', '~> 6.2' +gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem "gitlab-license", "~> 1.3" +gem "gitlab-license", "~> 1.4" # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' @@ -312,7 +311,7 @@ gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.16.1' +gem 'gitlab-labkit', '~> 0.16.2' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -343,13 +342,12 @@ group :metrics do end group :development do - gem 'brakeman', '~> 4.2', require: false - gem 'lefthook', '~> 0.7', require: false + gem 'lefthook', '~> 0.7.0', require: false - gem 'letter_opener_web', '~> 1.3.4' + gem 'letter_opener_web', '~> 1.4.0' # Better errors handler - gem 'better_errors', '~> 2.7.1' + gem 'better_errors', '~> 2.9.0' # thin instead webrick gem 'thin', '~> 1.8.0' @@ -366,7 +364,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 6.1.0' - gem 'rspec-rails', '~> 4.0.2' + gem 'rspec-rails', '~> 5.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -377,14 +375,14 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.1.0', require: false + gem 'gitlab-styles', '~> 6.2.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'knapsack', '~> 1.17' + gem 'knapsack', '~> 1.21.1' gem 'crystalball', '~> 0.7.0', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -396,11 +394,12 @@ group :development, :test do gem 'parallel', '~> 1.19', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false + + gem 'test_file_finder', '~> 0.1.3' end group :development, :test, :danger do - gem 'danger-gitlab', '~> 8.0', require: false - gem 'gitlab-dangerfiles', '~> 0.8.0', require: false + gem 'gitlab-dangerfiles', '~> 1.1.1', require: false end group :development, :test, :coverage do @@ -414,6 +413,7 @@ group :development, :test, :omnibus do end group :test do + gem 'json-schema', '~> 2.8.0' gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.6' @@ -475,11 +475,11 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.9.0.pre.rc1' +gem 'gitaly', '~> 13.11.0.pre.rc1' gem 'grpc', '~> 1.30.2' -gem 'google-protobuf', '~> 3.12' +gem 'google-protobuf', '~> 3.14.0' gem 'toml-rb', '~> 1.0.0' @@ -488,7 +488,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.5.0' +gem 'gitlab-experiment', '~> 0.5.3' # Structured logging gem 'lograge', '~> 0.5' @@ -513,14 +513,13 @@ gem 'erubi', '~> 1.9.0' gem 'mail', '= 2.7.1' # File encryption -gem 'lockbox', '~> 0.3.3' +gem 'lockbox', '~> 0.6.2' # Email validation gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.3.0' -gem 'json-schema', '~> 2.8.0' gem 'json_schemer', '~> 0.2.12' gem 'oj', '~> 3.10.6' gem 'multi_json', '~> 1.14.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 203d52ddb67..98ef5870054 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -5,59 +5,59 @@ GEM abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.3.6) + actionpack (= 6.0.3.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.3.6) + actionpack (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.3.6) + actionview (= 6.0.3.6) + activesupport (= 6.0.3.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.3.6) + actionpack (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.3.6) + activesupport (= 6.0.3.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.3.6) + activesupport (= 6.0.3.6) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) + activemodel (6.0.3.6) + activesupport (= 6.0.3.6) + activerecord (6.0.3.6) + activemodel (= 6.0.3.6) + activesupport (= 6.0.3.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - marcel (~> 0.3.1) - activesupport (6.0.3.4) + activestorage (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) + marcel (~> 1.0.0) + activesupport (6.0.3.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -133,7 +133,7 @@ GEM benchmark-ips (2.3.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) - better_errors (2.7.1) + better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -144,7 +144,6 @@ GEM bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) - brakeman (4.2.1) browser (4.2.0) builder (3.2.4) bullet (6.1.3) @@ -165,10 +164,11 @@ GEM capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy - carrierwave (1.3.1) + carrierwave (1.3.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) + ssrf_filter (~> 1.0) cbor (0.5.9.6) character_set (1.4.0) charlock_holmes (0.7.7) @@ -259,12 +259,12 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (3.1.0) - activesupport (< 6.1) + devise-two-factor (4.0.0) + activesupport (< 6.2) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties (< 6.1) - rotp (~> 2.0) + railties (< 6.2) + rotp (~> 6.0) diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) @@ -428,7 +428,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.9.0.pre.rc1) + gitaly (13.11.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -436,11 +436,11 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (0.8.0) - danger - gitlab-experiment (0.5.0) + gitlab-dangerfiles (1.1.1) + danger-gitlab + gitlab-experiment (0.5.3) activesupport (>= 3.0) - scientist (~> 1.5, >= 1.5.0) + scientist (~> 1.6, >= 1.6.0) gitlab-fog-azure-rm (1.0.1) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -455,7 +455,7 @@ GEM fog-xml (~> 0.1.0) google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) - gitlab-labkit (0.16.1) + gitlab-labkit (0.16.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) @@ -463,16 +463,16 @@ GEM opentracing (~> 0.4) pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) - gitlab-license (1.3.1) + gitlab-license (1.4.0) gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - gitlab-sidekiq-fetcher (0.5.5) + gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) - gitlab-styles (6.1.0) + gitlab-styles (6.2.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-performance (~> 1.9.2) @@ -487,8 +487,9 @@ GEM rubyntlm (~> 0.5) globalid (0.4.2) activesupport (>= 4.2.0) - gon (6.2.0) - actionpack (>= 3.0) + gon (6.4.0) + actionpack (>= 3.0.20) + i18n (>= 0.7) multi_json request_store (>= 1.0) google-api-client (0.50.0) @@ -502,7 +503,7 @@ GEM signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.12.4) + google-protobuf (3.14.0) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) googleauth (0.14.0) @@ -579,7 +580,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.14.4) + hamlit (2.15.0) temple (>= 0.8.2) thor tilt @@ -614,7 +615,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -640,7 +641,7 @@ GEM activesupport (>= 4.2) aes_key_wrap bindata - json-schema (2.8.0) + json-schema (2.8.1) addressable (>= 2.4) json_schemer (0.2.12) ecma-re-validator (~> 0.2) @@ -664,9 +665,9 @@ GEM kaminari-core (= 1.2.1) kaminari-core (1.2.1) kgio (2.11.3) - knapsack (1.17.0) + knapsack (1.21.1) rake - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -675,12 +676,12 @@ GEM jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) - launchy (2.4.3) - addressable (~> 2.3) + launchy (2.5.0) + addressable (~> 2.7) lefthook (0.7.2) letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.3.4) + letter_opener_web (1.4.0) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -702,21 +703,20 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) locale (2.1.3) - lockbox (0.3.3) + lockbox (0.6.2) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.8.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lumberjack (1.2.7) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) marginalia (1.10.0) actionpack (>= 2.3) activerecord (>= 2.3) @@ -728,12 +728,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) - mimemagic (0.3.10) - nokogiri (~> 1) - rake mini_histogram (0.3.1) mini_magick (4.10.1) - mini_mime (1.0.2) + mini_mime (1.1.0) mini_portile2 (2.5.0) minitest (5.11.3) mixlib-cli (2.1.8) @@ -772,7 +769,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.1) + nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -951,20 +948,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.3.6) + actioncable (= 6.0.3.6) + actionmailbox (= 6.0.3.6) + actionmailer (= 6.0.3.6) + actionpack (= 6.0.3.6) + actiontext (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) + activemodel (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.3.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -978,9 +975,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.3.6) + actionpack (= 6.0.3.6) + activesupport (= 6.0.3.6) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -1040,9 +1037,9 @@ GEM retriable (3.1.2) reverse_markdown (1.4.0) nokogiri - rexml (3.2.4) + rexml (3.2.5) rinku (2.0.0) - rotp (2.1.2) + rotp (6.2.0) rouge (3.26.0) rqrcode (0.7.0) chunky_png @@ -1066,10 +1063,10 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) + rspec-rails (5.0.1) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) rspec-core (~> 3.10) rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) @@ -1111,12 +1108,13 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-magic-static (0.3.5) + ruby-magic (0.4.0) mini_portile2 (~> 2.5.0) ruby-prof (1.3.1) ruby-progressbar (1.11.0) - ruby-saml (1.7.2) - nokogiri (>= 1.5.10) + ruby-saml (1.12.1) + nokogiri (>= 1.10.5) + rexml ruby-statistics (2.1.2) ruby2_keywords (0.0.2) ruby_parser (3.15.0) @@ -1201,6 +1199,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (2.0.0) + ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) state_machines-activemodel (0.8.0) @@ -1222,6 +1221,8 @@ GEM terser (1.0.2) execjs (>= 0.3.0, < 3) test-prof (0.12.0) + test_file_finder (0.1.3) + faraday (~> 1.0.1) text (1.3.1) thin (1.8.0) daemons (~> 1.0, >= 1.0.9) @@ -1359,10 +1360,9 @@ DEPENDENCIES bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) - better_errors (~> 2.7.1) + better_errors (~> 2.9.0) bootsnap (~> 1.4.6) bootstrap_form (~> 4.2.0) - brakeman (~> 4.2) browser (~> 4.2) bullet (~> 6.1.3) bundler-audit (~> 0.7.0.1) @@ -1376,7 +1376,6 @@ DEPENDENCIES countries (~> 3.0) creole (~> 0.5.0) crystalball (~> 0.7.0) - danger-gitlab (~> 8.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.4.0) @@ -1384,7 +1383,7 @@ DEPENDENCIES derailed_benchmarks device_detector devise (~> 4.7.2) - devise-two-factor (~> 3.1.0) + devise-two-factor (~> 4.0.0) diff_match_patch (~> 0.1.0) diffy (~> 3.3) discordrb-webhooks (~> 3.4) @@ -1419,26 +1418,26 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.9.0.pre.rc1) + gitaly (~> 13.11.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 0.8.0) - gitlab-experiment (~> 0.5.0) + gitlab-dangerfiles (~> 1.1.1) + gitlab-experiment (~> 0.5.3) gitlab-fog-azure-rm (~> 1.0.1) gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.16.1) - gitlab-license (~> 1.3) + gitlab-labkit (~> 0.16.2) + gitlab-license (~> 1.4) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pry-byebug - gitlab-sidekiq-fetcher (= 0.5.5) - gitlab-styles (~> 6.1.0) + gitlab-sidekiq-fetcher (= 0.5.6) + gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) - gon (~> 6.2) + gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.12) + google-protobuf (~> 3.14.0) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.7.1) @@ -1452,7 +1451,7 @@ DEPENDENCIES gssapi guard-rspec haml_lint (~> 0.36.0) - hamlit (~> 2.14.4) + hamlit (~> 2.15.0) hangouts-chat (~> 0.0.5) hashie hashie-forbidden_attributes @@ -1470,14 +1469,14 @@ DEPENDENCIES json_schemer (~> 0.2.12) jwt (~> 2.1.0) kaminari (~> 1.0) - knapsack (~> 1.17) - kramdown (~> 2.3.0) + knapsack (~> 1.21.1) + kramdown (~> 2.3.1) kubeclient (~> 4.9.1) - lefthook (~> 0.7) - letter_opener_web (~> 1.3.4) + lefthook (~> 0.7.0) + letter_opener_web (~> 1.4.0) license_finder (~> 6.0) licensee (~> 9.14.1) - lockbox (~> 0.3.3) + lockbox (~> 0.6.2) lograge (~> 0.5) loofah (~> 2.2) lru_redux @@ -1485,7 +1484,6 @@ DEPENDENCIES marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) - mimemagic (~> 0.3.10) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) @@ -1535,7 +1533,7 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.0.3.1) + rails (~> 6.0.3.6) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1551,17 +1549,19 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) + rexml (~> 3.2.5) rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.2) + rspec-rails (~> 5.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) - ruby-magic-static (~> 0.3.4) + ruby-magic (~> 0.4) ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) + ruby-saml (~> 1.12.1) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 1.1) @@ -1588,6 +1588,7 @@ DEPENDENCIES sys-filesystem (~> 1.1.6) terser (= 1.0.2) test-prof (~> 0.12.0) + test_file_finder (~> 0.1.3) thin (~> 1.8.0) thrift (>= 0.14.0) timecop (~> 0.9.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f6c26777f4f..9118ac3d3d0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y3aa0965cdsqamxk8ac6brcvijl1zv4pvqils6xy3pbcrv0ljid"; + sha256 = "1543p34bfq7s4l83m0f84f0z5yr1ip1miyimv4gh2k136pgk23r9"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10vb9s4frq22h5j6gyw2598k1jc29lg2czm95hf284l3mi4qly6a"; + sha256 = "0dnx7mhhzwr45lsxkd7y9ld9vazcadxzs7813jp19hk3wra4jvs3"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -48,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ykn5qkwdlcv5aa1gjhhmrxpjccwa7df6n4amvkmvxv5lggyma52"; + sha256 = "1cnsv97qx7708wg00lxcl7a6h8amxn85h40s8ngszhknh8wpwj3f"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; + sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0j0m76ynjspmvj5qbzl06kl9i920v269iz62y62009xydv6rqz"; + sha256 = "13i7x4zp991sq3zsagpzs01bhm81zgy63lamqrpsp68nv584n5sx"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; + sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d0p8gjplrgym38dmchyzhv7lrrxngz0yrxl6xyvwxfxm1hgdk2k"; + sha256 = "1sy9kyl7famlwrdw7gz6sy7azhkcsn1mjja44s44libcz3fl7jpc"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00jj8namy5niq7grl5lrsr4y351rxpj1b69k1i9gvb1hnpghl099"; + sha256 = "15kq8ghmkav331dz1pak1bc8q1v5xajw6pkj20hqr8m5zl6czcld"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qvvp73z8kq9sd2mhw6p9124q5pfkswjga2fidz4c73zbr79r3g"; + sha256 = "1a3hc2rammy4mfrjwzc9rsn497yq9xc0x89c00niiq45q3qs44vz"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q734331wb7cfsh4jahj3lphpxvglzb17yvibwss1ml4g01xxm52"; + sha256 = "1jwdfqn01g7v7ssrrf2q2pvc8k6rdqccp26qkyfxiraaz9d1la62"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; + sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -527,10 +527,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn7rv81i2r462k56v29i3s8abcmfcpfj9axia736mwjvv0app2k"; + sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; type = "gem"; }; - version = "2.7.1"; + version = "2.9.1"; }; bindata = { groups = ["default"]; @@ -574,16 +574,6 @@ }; version = "4.2.0"; }; - brakeman = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; - type = "gem"; - }; - version = "4.2.1"; - }; browser = { groups = ["default"]; platforms = []; @@ -663,15 +653,15 @@ version = "1.0.22"; }; carrierwave = { - dependencies = ["activemodel" "activesupport" "mime-types"]; + dependencies = ["activemodel" "activesupport" "mime-types" "ssrf_filter"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; + sha256 = "055i3ybjv9n9hqaazxn3d9ibqhlwh93d4hdlwbpjjfy8qbrz6hiw"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; cbor = { groups = ["default"]; @@ -1084,10 +1074,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gzk7phrryxlq4k3jrcxm8faifmbqrbfxq7jx089ncsixwd69bn4"; + sha256 = "148pfr6g8dwikdq3994gsid2a3n6p5h4z1a1dzh1898shr5f9znc"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.0"; }; diff-lcs = { groups = ["default" "development" "test"]; @@ -1861,10 +1851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "137gr4nbxhcyh4s60r2z0js8q2bfnmxiggwnf122wp9csywlnyg2"; + sha256 = "1hbc2frfyxxlar9ggpnl4x090nw1nlriazzkdgjz3r4mx4ihja1b"; type = "gem"; }; - version = "13.9.0.pre.rc1"; + version = "13.11.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1899,15 +1889,15 @@ version = "0.10.5"; }; gitlab-dangerfiles = { - dependencies = ["danger"]; + dependencies = ["danger-gitlab"]; groups = ["danger" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ggs890b5gfphnz7ayavs55l6xhw323spfd22dg246g0rw9vliy"; + sha256 = "0ivkbq50fhm39zwyfac4q3y0qkrsk3hmrk1ggyhz1yphkq38qvq7"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; gitlab-experiment = { dependencies = ["activesupport" "scientist"]; @@ -1915,10 +1905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4hyva7ypi2mx5jcyxac8w7ffai1pkkjc49fk3avqh4aimlibfr"; + sha256 = "0ccjmm10pjvpzy5m7b86mxd2mg2x0k4y0c4cim0r4y7sy2c115mz"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.3"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1948,20 +1938,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03i8fc1yzm5yzqxb8bxhjkhqpj17fy71vg2z02bcj4mzbj0piflx"; + sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; type = "gem"; }; - version = "0.16.1"; + version = "0.16.2"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01z5pb6fg1j83p73vys2fhj7qh60zkqbgiyp4nvw013a6hjlv3qk"; + sha256 = "1rfyxchshl2h0c2dpsy1wa751l02i22nv5mkhygfwnbi0ndkzqmg"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; gitlab-mail_room = { groups = ["default"]; @@ -2014,10 +2004,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "055v0cxvxgy12iwhqa2xbsxa9j6ww7p1f5jqwncwsnr7l6f1f4c9"; + sha256 = "0838p0vnyl65571d8j5hljwyfyhsnfs6dlj6di57gpmwrbl9sdpr"; type = "gem"; }; - version = "0.5.5"; + version = "0.5.6"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2025,10 +2015,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y3livdpkdzp4cy47ycpwqa7nhrf6fb1ff2lwhh4l5n4dpqympwn"; + sha256 = "1lgjp6cfb92z7i03f9k519bjabnnh1k0bgzmagp5x15iza73sz4v"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2064,15 +2054,15 @@ version = "0.4.2"; }; gon = { - dependencies = ["actionpack" "multi_json" "request_store"]; + dependencies = ["actionpack" "i18n" "multi_json" "request_store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806"; + sha256 = "1w6ji15jrl4p6q0gxy5mmqspvzbmgkqj1d3xmbqr0a1rb7b1i9p3"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.0"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; @@ -2101,10 +2091,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj"; + sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; type = "gem"; }; - version = "3.12.4"; + version = "3.14.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2319,10 +2309,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjbdni9jdpsdahrx2q7cvrc6jkrzpf9rdi0rli8mdvwi9xjafz5"; + sha256 = "13n3v9kbyrrm48hn1v0028cdrsq7pswb4s4w63x4b29kc99m1s6j"; type = "gem"; }; - version = "2.14.4"; + version = "2.15.0"; }; hana = { groups = ["default"]; @@ -2509,10 +2499,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; i18n_data = { groups = ["default"]; @@ -2635,10 +2625,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz"; + sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -2731,21 +2721,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92"; + sha256 = "056g86ndhq51303k4g3fhdfwhpr6cpzypxhlnp0wxjpbmli09xw2"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.1"; }; kramdown = { dependencies = ["rexml"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -2775,10 +2765,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; type = "gem"; }; - version = "2.4.3"; + version = "2.5.0"; }; lefthook = { groups = ["development"]; @@ -2807,10 +2797,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb"; + sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q"; type = "gem"; }; - version = "1.3.4"; + version = "1.4.0"; }; libyajl2 = { groups = ["default"]; @@ -2870,10 +2860,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sgbs0frk601yc7bb33pz5z9cyadvj077vwy9k5zapsbn2rxf5aj"; + sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1"; type = "gem"; }; - version = "0.3.3"; + version = "0.6.2"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -2892,10 +2882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; + sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.1"; }; lru_redux = { groups = ["default"]; @@ -2929,15 +2919,14 @@ version = "2.7.1"; }; marcel = { - dependencies = ["mimemagic"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; type = "gem"; }; - version = "0.3.3"; + version = "1.0.1"; }; marginalia = { dependencies = ["actionpack" "activerecord"]; @@ -3016,17 +3005,6 @@ }; version = "3.2020.0512"; }; - mimemagic = { - dependencies = ["nokogiri" "rake"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41"; - type = "gem"; - }; - version = "0.3.10"; - }; mini_histogram = { groups = ["default" "test"]; platforms = []; @@ -3052,10 +3030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -3321,10 +3299,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.3"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -4093,10 +4071,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs4kfgp5pr5032nnhdapq60ga6karann06ilq1yjx8qck87cfxg"; + sha256 = "01mwx4q9yz792dbi61j378iz6p7q63sxj3267jwwccjqmn6hf2kr"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4148,10 +4126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x28620cvfja8r06lk6f90pw5lvijz9qi4bjsa4z1d1rkr3v4r3w"; + sha256 = "0i50vbscdk6wqxd2p0xwsyi07lwda612njqk8pn1f56snz5z0dcr"; type = "gem"; }; - version = "6.0.3.4"; + version = "6.0.3.6"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4453,14 +4431,14 @@ version = "1.4.0"; }; rexml = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rinku = { groups = ["default"]; @@ -4477,10 +4455,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; + sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; type = "gem"; }; - version = "2.1.2"; + version = "6.2.0"; }; rouge = { groups = ["default"]; @@ -4575,10 +4553,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aw5knjij21kzwis3vkcmqc16p55lbig1wq0i37093qga7zfsdg1"; + sha256 = "1pj2a9vrkp2xzlq0810q90sdc2zcqc7k92n57hxzhri2vcspy7n6"; type = "gem"; }; - version = "4.0.2"; + version = "5.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4711,16 +4689,16 @@ }; version = "0.2.1"; }; - ruby-magic-static = { + ruby-magic = { dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0whs2i868g1bgglrxl6aba47h8n9zqglsipskk6l83rfkm85ik3g"; + sha256 = "1mn1m682l6hv54afh1an5lh623zbllgl2aqjz2f62v892slzkq57"; type = "gem"; }; - version = "0.3.5"; + version = "0.4.0"; }; ruby-prof = { groups = ["default"]; @@ -4743,15 +4721,15 @@ version = "1.11.0"; }; ruby-saml = { - dependencies = ["nokogiri"]; + dependencies = ["nokogiri" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; + sha256 = "0hczs2s490x6lj8z9xczlgi4c159nk9b10njsnl37nqbgjfkjgsw"; type = "gem"; }; - version = "1.7.2"; + version = "1.12.1"; }; ruby-statistics = { groups = ["default"]; @@ -5184,6 +5162,16 @@ }; version = "2.0.0"; }; + ssrf_filter = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0flmg6f444liaxjgdwdrwcfwyyhc54a7wp26kqih2cklwll5gp40"; + type = "gem"; + }; + version = "1.0.7"; + }; stackprof = { groups = ["default"]; platforms = []; @@ -5300,6 +5288,17 @@ }; version = "0.12.0"; }; + test_file_finder = { + dependencies = ["faraday"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mbhiz7g7nd3v1ai4cgwzp2zr34k1h5am0vn9bny5qqn1408rlgi"; + type = "gem"; + }; + version = "0.1.3"; + }; text = { groups = ["default" "development"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 8084d2ebb6d..f20ea3cbb0f 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -794,11 +794,11 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_8.2.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.1.0.tgz"; - sha1 = "a98ac4219da3316d30ee717ef0603c8fa0c4d5d8"; + name = "_gitlab_eslint_plugin___eslint_plugin_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.2.0.tgz"; + sha1 = "caccf2777febd89420c0225e000a789376ecaba2"; }; } { @@ -818,11 +818,11 @@ }; } { - name = "_gitlab_svgs___svgs_1.185.0.tgz"; + name = "_gitlab_svgs___svgs_1.189.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.185.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.185.0.tgz"; - sha1 = "15b5c6d680b5fcfc2deb2a5decef427939e34ed7"; + name = "_gitlab_svgs___svgs_1.189.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.189.0.tgz"; + sha1 = "1ba972bfbcf46e52321c50fd57d00315535c3d1b"; }; } { @@ -834,11 +834,11 @@ }; } { - name = "_gitlab_ui___ui_28.9.1.tgz"; + name = "_gitlab_ui___ui_29.6.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_28.9.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-28.9.1.tgz"; - sha1 = "7d4d4502ff09fca19ab815504f80afbf03dd2fc1"; + name = "_gitlab_ui___ui_29.6.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.6.0.tgz"; + sha1 = "5e8369d7aeab56edab570ef148dbc289b51901fc"; }; } { @@ -1009,6 +1009,14 @@ sha1 = "11d8944dcf2d526e31660bb69570be03f8fb72b7"; }; } + { + name = "_polka_url___url_1.0.0_next.12.tgz"; + path = fetchurl { + name = "_polka_url___url_1.0.0_next.12.tgz"; + url = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.12.tgz"; + sha1 = "431ec342a7195622f86688bbda82e3166ce8cb28"; + }; + } { name = "_rails_actioncable___actioncable_6.1.0.tgz"; path = fetchurl { @@ -1138,19 +1146,19 @@ }; } { - name = "_toast_ui_editor___editor_2.5.1.tgz"; + name = "_toast_ui_editor___editor_2.5.2.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz"; - sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7"; + name = "_toast_ui_editor___editor_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.2.tgz"; + sha1 = "0637e1bbdb205c1ab53b6d3722ced26399b2f0ca"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; + name = "_toast_ui_vue_editor___vue_editor_2.5.2.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz"; - sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc"; + name = "_toast_ui_vue_editor___vue_editor_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.2.tgz"; + sha1 = "0b54107a196471eacb18aabb7100101606917b27"; }; } { @@ -1657,6 +1665,14 @@ sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; }; } + { + name = "acorn_walk___acorn_walk_8.0.2.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.2.tgz"; + sha1 = "d4632bfc63fd93d0f15fd05ea0e984ffd3f5a8c3"; + }; + } { name = "acorn___acorn_6.4.2.tgz"; path = fetchurl { @@ -1673,6 +1689,14 @@ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } + { + name = "acorn___acorn_8.1.0.tgz"; + path = fetchurl { + name = "acorn___acorn_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz"; + sha1 = "52311fd7037ae119cbb134309e901aa46295b3fe"; + }; + } { name = "after___after_0.8.2.tgz"; path = fetchurl { @@ -2393,14 +2417,6 @@ sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; }; } - { - name = "bfj___bfj_6.1.1.tgz"; - path = fetchurl { - name = "bfj___bfj_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz"; - sha1 = "05a3b7784fbd72cfa3c22e56002ef99336516c48"; - }; - } { name = "big.js___big.js_5.2.2.tgz"; path = fetchurl { @@ -2889,14 +2905,6 @@ sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; } - { - name = "check_types___check_types_7.3.0.tgz"; - path = fetchurl { - name = "check_types___check_types_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz"; - sha1 = "468f571a4435c24248f5fd0cb0e8d87c3c341e7d"; - }; - } { name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { @@ -3169,6 +3177,14 @@ sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; }; } + { + name = "commander___commander_6.2.1.tgz"; + path = fetchurl { + name = "commander___commander_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; + sha1 = "0792eb682dfbc325999bb2b84fddddba110ac73c"; + }; + } { name = "commander___commander_2.9.0.tgz"; path = fetchurl { @@ -3450,11 +3466,11 @@ }; } { - name = "core_js___core_js_3.9.1.tgz"; + name = "core_js___core_js_3.10.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz"; - sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"; + name = "core_js___core_js_3.10.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.10.2.tgz"; + sha1 = "17cb038ce084522a717d873b63f2b3ee532e2cd5"; }; } { @@ -4514,11 +4530,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -4569,14 +4585,6 @@ sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; } - { - name = "ejs___ejs_2.6.1.tgz"; - path = fetchurl { - name = "ejs___ejs_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz"; - sha1 = "498ec0d495655abc6f23cd61868d926464071aa0"; - }; - } { name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz"; path = fetchurl { @@ -4930,11 +4938,11 @@ }; } { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.6.0.tgz"; path = fetchurl { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz"; - sha1 = "6c12e3aae172bfd3363b7ac8c3f3e944704867f4"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.6.0.tgz"; + sha1 = "7892cb7c086f7813156bca6bc48429825428e9eb"; }; } { @@ -5002,11 +5010,11 @@ }; } { - name = "eslint___eslint_7.21.0.tgz"; + name = "eslint___eslint_7.24.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.21.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; - sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"; + name = "eslint___eslint_7.24.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz"; + sha1 = "2e44fa62d93892bfdb100521f17345ba54b8513a"; }; } { @@ -5370,11 +5378,11 @@ }; } { - name = "file_loader___file_loader_5.1.0.tgz"; + name = "file_loader___file_loader_6.2.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz"; - sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8"; + name = "file_loader___file_loader_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz"; + sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d"; }; } { @@ -5385,14 +5393,6 @@ sha1 = "8e7548a96d3cc2327ee5e674168723a333bba2a0"; }; } - { - name = "filesize___filesize_3.6.1.tgz"; - path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; - }; - } { name = "fill_range___fill_range_4.0.0.tgz"; path = fetchurl { @@ -5889,6 +5889,14 @@ sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; }; } + { + name = "globals___globals_13.8.0.tgz"; + path = fetchurl { + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } { name = "globby___globby_11.0.2.tgz"; path = fetchurl { @@ -6002,11 +6010,11 @@ }; } { - name = "gzip_size___gzip_size_5.0.0.tgz"; + name = "gzip_size___gzip_size_6.0.0.tgz"; path = fetchurl { - name = "gzip_size___gzip_size_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz"; - sha1 = "a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"; + name = "gzip_size___gzip_size_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz"; + sha1 = "065367fd50c239c0671cbcbad5be3e2eeb10e462"; }; } { @@ -6217,14 +6225,6 @@ sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; }; } - { - name = "hoopy___hoopy_0.1.4.tgz"; - path = fetchurl { - name = "hoopy___hoopy_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz"; - sha1 = "609207d661100033a9a9402ad3dea677381c1b1d"; - }; - } { name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { @@ -8354,11 +8354,11 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -8730,11 +8730,11 @@ }; } { - name = "mermaid___mermaid_8.9.0.tgz"; + name = "mermaid___mermaid_8.9.2.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.0.tgz"; - sha1 = "e569517863ab903aa5389cd746b68ca958a8ca7c"; + name = "mermaid___mermaid_8.9.2.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.2.tgz"; + sha1 = "40bb2052cc6c4feaf5d93a5e527a8d06d0bacea7"; }; } { @@ -8778,19 +8778,19 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.27.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { @@ -8994,11 +8994,11 @@ }; } { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz"; path = fetchurl { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz"; - sha1 = "5b547281b9f404057dc5d8c5722390df9ac90be6"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz"; + sha1 = "eb4bbb1c5e5bfb554541c1ae1542e74c2a9f43fd"; }; } { @@ -9474,11 +9474,11 @@ }; } { - name = "opener___opener_1.5.1.tgz"; + name = "opener___opener_1.5.2.tgz"; path = fetchurl { - name = "opener___opener_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; - sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; }; } { @@ -11529,6 +11529,14 @@ sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } + { + name = "sirv___sirv_1.0.11.tgz"; + path = fetchurl { + name = "sirv___sirv_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.11.tgz"; + sha1 = "81c19a29202048507d6ec0d8ba8910fda52eb5a4"; + }; + } { name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { @@ -12537,6 +12545,14 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } + { + name = "totalist___totalist_1.1.0.tgz"; + path = fetchurl { + name = "totalist___totalist_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz"; + sha1 = "a4d65a3e546517701e3e5c37a47a70ac97fe56df"; + }; + } { name = "touch___touch_3.1.0.tgz"; path = fetchurl { @@ -12617,14 +12633,6 @@ sha1 = "770162dd13b9a0e55da04db5b7f888956072038a"; }; } - { - name = "tryer___tryer_1.0.0.tgz"; - path = fetchurl { - name = "tryer___tryer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz"; - sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7"; - }; - } { name = "ts_invariant___ts_invariant_0.4.4.tgz"; path = fetchurl { @@ -12713,6 +12721,14 @@ sha1 = "db4bc151a4a2cf4eebf9add5db75508db6cc841f"; }; } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -12978,11 +12994,11 @@ }; } { - name = "url_loader___url_loader_3.0.0.tgz"; + name = "url_loader___url_loader_4.1.1.tgz"; path = fetchurl { - name = "url_loader___url_loader_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-3.0.0.tgz"; - sha1 = "9f1f11b371acf6e51ed15a50db635e02eec18368"; + name = "url_loader___url_loader_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz"; + sha1 = "28505e905cae158cf07c92ca622d7f237e70a4e2"; }; } { @@ -13370,11 +13386,11 @@ }; } { - name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz"; + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.7.tgz"; path = fetchurl { - name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.4.tgz"; - sha1 = "5fca7a13f785899bbfb70471ec4fe222437d8495"; + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.7.tgz"; + sha1 = "12ee26833885f5bb4d37dc058085ccf3ce5b5a74"; }; } { @@ -13482,11 +13498,11 @@ }; } { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz"; path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz"; - sha1 = "f6f94db108fb574e415ad313de41a2707d33ef3c"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz"; + sha1 = "c71fb2eaffc10a4754d7303b224adb2342069da1"; }; } { @@ -13698,11 +13714,11 @@ }; } { - name = "ws___ws_7.3.0.tgz"; + name = "ws___ws_7.4.4.tgz"; path = fetchurl { - name = "ws___ws_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz"; - sha1 = "4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"; + name = "ws___ws_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz"; + sha1 = "383bc9742cb202292c9077ceab6f6047b17f2d59"; }; } { From d67443c742b3a20a17916af2365f23209621fb03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 13:22:30 +0000 Subject: [PATCH 160/476] hwinfo: 21.72 -> 21.73 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 9048aa966f7..5272fb8666e 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.72"; + version = "21.73"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-T/netiZqox+qa19wH+h8cbsGbiM+9VrSEIjccrPYqws="; + sha256 = "sha256-u5EXU+BrTMeDbZAv8WyBTyFcZHdBIUMpJSLTYgf3Mo8="; }; patchPhase = '' From 125bbf0752ba0260aa9d584bc50d949835aabdad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:37:24 -0400 Subject: [PATCH 161/476] linux: 4.14.230 -> 4.14.231 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5b6cc206e41..9ec576a1aa6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.230"; + version = "4.14.231"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gn5cs1ss4bfsnnv0b2s4g5ibiigpzsx0i3qfswchdbxvdag75cw"; + sha256 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From c38311d1f61ede92ffab5ad025e92122a6aa008f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:37:35 -0400 Subject: [PATCH 162/476] linux: 4.19.187 -> 4.19.188 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a0084887c50..b1140311b60 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.187"; + version = "4.19.188"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50"; + sha256 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From fde3ac0f8ea2ec684c28373639330c86c1041298 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:37:43 -0400 Subject: [PATCH 163/476] linux: 4.4.266 -> 4.4.267 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8efd28f06c6..2cc14e6cf67 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: buildLinux (args // rec { - version = "4.4.266"; + version = "4.4.267"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00x2dmjiiv9zpc0vih9xqmf78kynqzj9q9v1chc2q2hcjpqfj31c"; + sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 1904447d73c95719f216a673b248cb763a04ade0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:37:50 -0400 Subject: [PATCH 164/476] linux: 4.9.266 -> 4.9.267 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3d58bf31d08..eb6ef73dd19 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: buildLinux (args // rec { - version = "4.9.266"; + version = "4.9.267"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qzigcslfp714vaswwlw93xj0h2f8laikppw6krrhfnh5wwrp5dr"; + sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From e77d44c103e88ade78e198dfa86ecba0a28c16d7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:38:03 -0400 Subject: [PATCH 165/476] linux: 5.10.30 -> 5.10.32 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index bf7d3fa7ab3..cd09eadea1d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.30"; + version = "5.10.32"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"; + sha256 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 079fca1541d1d66a913f2452ed808ee738f9df67 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:38:21 -0400 Subject: [PATCH 166/476] linux: 5.11.14 -> 5.11.16 --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 67dd444810a..6dc3a2772a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.14"; + version = "5.11.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7"; + sha256 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; From 81ef99ec7518838815634181682b8d5d1b99f332 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:38:28 -0400 Subject: [PATCH 167/476] linux: 5.4.112 -> 5.4.114 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index d3fe5a36703..e18cf2e23fd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.112"; + version = "5.4.114"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq"; + sha256 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From d70dced4fede611315dfab494dec6daa8d142466 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:38:38 -0400 Subject: [PATCH 168/476] linux-rt_5_10: 5.10.27-rt36 -> 5.10.30-rt37 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 215d36af81c..382588c157a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.27-rt36"; # updated by ./update-rt.sh + version = "5.10.30-rt37"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr"; + sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1bx023ibav6n2di3i2m8i6n4hp7h6zmz9bva7nqxdflbdwfsma1c"; + sha256 = "1jibjfmjyn90n5jz5vq056n9xfzn9p8g9fsv7nmj5mfxxm4qhjal"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From c6963522e0cff90f4a58165703e232f85c73cdaa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:55:58 -0400 Subject: [PATCH 169/476] linux-rt: Avoid RCs --- pkgs/os-specific/linux/kernel/update-rt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh index 8cac5929252..ccb01793342 100755 --- a/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -37,6 +37,7 @@ latest-rt-version() { branch="$1" # e.g. 5.4 curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | + grep -v '\-rc' | tail -n 1 } From 2e7331db4c5d30264a0f6c741bbd77ada526a2fe Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:56:50 -0400 Subject: [PATCH 170/476] linux-rt_5_4: 5.4.106-rt54 -> 5.4.109-rt56 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 0aa63af52d8..37ea8ab86fd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.106-rt54"; # updated by ./update-rt.sh + version = "5.4.109-rt56"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; + sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0xwbpn1k1b4bxq15sw7gicrzkfg32nkja308a5pcwx1ihv9khchf"; + sha256 = "08cg8b7mwihs8zgdh0jwi8hrn3hnf9j0jyplsyc7644wd6mqby4a"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From b3e42ffea1ad7ba805f5331968d8e738c17b24be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:57:10 -0400 Subject: [PATCH 171/476] linux/hardened/patches/4.14: 4.14.230-hardened1 -> 4.14.231-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 990262ed4d3..95448292954 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.230-hardened1.patch", - "sha256": "1nhaqhjga042b69969f0jy680xlrgnms1178ni6c6xhxy6n7y4pq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.230-hardened1/linux-hardened-4.14.230-hardened1.patch" + "name": "linux-hardened-4.14.231-hardened1.patch", + "sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 00aa9ee2b403260a4441303739c90a425ba3a339 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:57:12 -0400 Subject: [PATCH 172/476] linux/hardened/patches/4.19: 4.19.187-hardened1 -> 4.19.188-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 95448292954..60218959c51 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.187-hardened1.patch", - "sha256": "1vw05qff7hvzl7krcf5kh0ynyy5gljps8qahr4jm0hsd69lmn0qk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.187-hardened1/linux-hardened-4.19.187-hardened1.patch" + "name": "linux-hardened-4.19.188-hardened1.patch", + "sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch" }, "5.10": { "extra": "-hardened1", From f99496d321067aceef38cfeef0b2371daf363b8d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:57:14 -0400 Subject: [PATCH 173/476] linux/hardened/patches/5.10: 5.10.30-hardened1 -> 5.10.31-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 60218959c51..c097b31df7c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.30-hardened1.patch", - "sha256": "0sxxzrhj41pxk01s2bcfwb47aab2by1zc7yyx9859rslq7dg5aly", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.30-hardened1/linux-hardened-5.10.30-hardened1.patch" + "name": "linux-hardened-5.10.31-hardened1.patch", + "sha256": "1cwxicwxasi8immv3k24m7l5i9iv7k70dbgfq9gl29rmjzgbkmxn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.31-hardened1/linux-hardened-5.10.31-hardened1.patch" }, "5.11": { "extra": "-hardened1", From 9d47acdbc8c58612f84dafa1c990b020c77583e0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:57:16 -0400 Subject: [PATCH 174/476] linux/hardened/patches/5.11: 5.11.14-hardened1 -> 5.11.15-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c097b31df7c..d5bc997c261 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.14-hardened1.patch", - "sha256": "1j8saj1dyflah3mjs07rvxfhhpwhxk65r1y2bd228gp5nm6305px", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.14-hardened1/linux-hardened-5.11.14-hardened1.patch" + "name": "linux-hardened-5.11.15-hardened1.patch", + "sha256": "1cy7g1dmyav91radqpna1g833bb3fgkk1imd1mn22nrvjyvsbcg8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.15-hardened1/linux-hardened-5.11.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 8ee8d6e61e82fa541829b10c63ed81b085575be2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:57:17 -0400 Subject: [PATCH 175/476] linux/hardened/patches/5.4: 5.4.112-hardened1 -> 5.4.113-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d5bc997c261..484cc404ee0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.112-hardened1.patch", - "sha256": "1l9igc68dq22nlnlls4x3zfz1h2hb6dqy7vr5r4jvbk22330m12j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.112-hardened1/linux-hardened-5.4.112-hardened1.patch" + "name": "linux-hardened-5.4.113-hardened1.patch", + "sha256": "1kpnkyssa9hgm2kpywb0dwak3h2n19qh9wzfcnz0pj5h9rwrb0ir", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.113-hardened1/linux-hardened-5.4.113-hardened1.patch" } } From 4611413ec683ead12d69fdee772db38b41476cc7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 27 Apr 2021 10:07:35 -0400 Subject: [PATCH 176/476] linux/hardened/patches/5.10: 5.10.31-hardened1 -> 5.10.32-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 484cc404ee0..2bd27dec721 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.31-hardened1.patch", - "sha256": "1cwxicwxasi8immv3k24m7l5i9iv7k70dbgfq9gl29rmjzgbkmxn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.31-hardened1/linux-hardened-5.10.31-hardened1.patch" + "name": "linux-hardened-5.10.32-hardened1.patch", + "sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch" }, "5.11": { "extra": "-hardened1", From 69984bd056eeeeaa0980f4f8e154d88df924898d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 27 Apr 2021 10:07:40 -0400 Subject: [PATCH 177/476] linux/hardened/patches/5.11: 5.11.15-hardened1 -> 5.11.16-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2bd27dec721..7dac5e93de5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.15-hardened1.patch", - "sha256": "1cy7g1dmyav91radqpna1g833bb3fgkk1imd1mn22nrvjyvsbcg8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.15-hardened1/linux-hardened-5.11.15-hardened1.patch" + "name": "linux-hardened-5.11.16-hardened1.patch", + "sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch" }, "5.4": { "extra": "-hardened1", From e1af1d1f81ad1c0e4685cce2ad9d6b02df00e8ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 27 Apr 2021 10:07:42 -0400 Subject: [PATCH 178/476] linux/hardened/patches/5.4: 5.4.113-hardened1 -> 5.4.114-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7dac5e93de5..0222fe5d5a7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.113-hardened1.patch", - "sha256": "1kpnkyssa9hgm2kpywb0dwak3h2n19qh9wzfcnz0pj5h9rwrb0ir", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.113-hardened1/linux-hardened-5.4.113-hardened1.patch" + "name": "linux-hardened-5.4.114-hardened1.patch", + "sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch" } } From 10d24382cd0ba120cd6692d0ad3a6dbc290bdacd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 28 Apr 2021 15:38:29 +0200 Subject: [PATCH 179/476] python3.pkgs.signedjson: fix build (#120669) --- .../python-modules/signedjson/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 10de67ba0ef..8409d9702e7 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, fetchpatch , canonicaljson , unpaddedbase64 , pynacl , typing-extensions +, setuptools-scm +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { pname = "signedjson"; version = "1.1.1"; - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "0y5c9v4vx9hqpnca892gc9b4xgs4gp5xk6l1wma5ciz8zswp9yfs"; + src = fetchPypi { + inherit pname version; + sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m"; }; - propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; + patches = [ + # Do not require importlib_metadata on python 3.8 + (fetchpatch { + url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch"; + sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1"; + }) + ]; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; meta = with lib; { homepage = "https://pypi.org/project/signedjson/"; From 5ba2e4e9c65d32ea3d7def475655227a3835d2dc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Apr 2021 09:50:54 +1000 Subject: [PATCH 180/476] .github/workflows/editorconfig.yml: switch to pull_request_target - use pull_request_target to avoid having to manually approve the action - use nixpkgs editorconfig-checker rather than external binary --- .github/workflows/editorconfig.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index c20ed3ab768..2d7b9d7ce84 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -1,7 +1,9 @@ name: "Checking EditorConfig" +permissions: read-all + on: - pull_request: + pull_request_target: branches-ignore: - 'release-**' @@ -21,17 +23,19 @@ jobs: >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge if: env.PR_DIFF - - name: Fetch editorconfig-checker + - uses: cachix/install-nix-action@v13 if: env.PR_DIFF - env: - ECC_VERSION: "2.3.5" - ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" + - name: install editorconfig-checker from unstable channel run: | - curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ - tar xzf ec-linux-amd64.tar.gz && \ - mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker + nix-channel --add https://nixos.org/channels/nixpkgs-unstable + nix-channel --update + nix-env -iA nixpkgs.editorconfig-checker + if: env.PR_DIFF - name: Checking EditorConfig if: env.PR_DIFF run: | - echo "$PR_DIFF" | xargs ./bin/editorconfig-checker -disable-indent-size + echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size From 9c662a39b2fe2cda5931b709c5eb8e736b03f4e2 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Wed, 28 Apr 2021 10:06:20 -0400 Subject: [PATCH 181/476] zlib: fix windows static compile --- pkgs/development/libraries/zlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index da8aac5229b..998550d1fee 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (rec { '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL # in some cases, e.g. when compiling libpng. - + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) '' ln -s zlib1.dll $out/bin/libz.dll ''; From c5e5ea90e1379aca8b1cb3bf1affeb61cd2e0821 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Wed, 28 Apr 2021 10:15:37 -0400 Subject: [PATCH 182/476] libgnurx: output libgnurx.a when static --- pkgs/os-specific/windows/libgnurx/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index 85a3c463a28..e760bddabfb 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -10,6 +10,11 @@ in stdenv.mkDerivation rec { sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; + # file looks for libgnurx.a when compiling statically + postInstall = lib.optionalString stdenv.hostPlatform.isStatic '' + ln -s $out/lib/libgnurx{.dll.a,.a} + ''; + meta = { platforms = lib.platforms.windows; }; From e9350a7d9c83780ba5e7f24575df900395a51271 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 28 Apr 2021 14:39:06 +0000 Subject: [PATCH 183/476] =?UTF-8?q?sbt-extras:=202021-04-06=20=E2=86=92=20?= =?UTF-8?q?2021-04-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index b49e5f7558a..76548e427d2 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8"; - version = "2021-04-06"; + rev = "e5a5442acf36f047a75b397d7349e6fe6835ef24"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f"; + sha256 = "0g7wyh0lhhdch7d6p118lwywy1lcdr1z631q891qhv624jnb1477"; }; dontBuild = true; From 117315c7954db50a93ad21dbd8a41058ac73983e Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Tue, 27 Apr 2021 11:44:39 +0200 Subject: [PATCH 184/476] roswell: init at 21.01.14.108 --- pkgs/development/tools/roswell/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/roswell/default.nix diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix new file mode 100644 index 00000000000..98445ea875a --- /dev/null +++ b/pkgs/development/tools/roswell/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, curl, autoconf, automake, makeWrapper, sbcl }: + +stdenv.mkDerivation rec { + pname = "roswell"; + version = "21.01.14.108"; + + src = fetchFromGitHub { + owner = "roswell"; + repo = pname; + rev = "v${version}"; + sha256 = "1hj9q3ig7naky3pb3jkl9yjc9xkg0k7js3glxicv0aqffx9hkp3p"; + }; + + preConfigure = '' + sh bootstrap + ''; + + configureFlags = [ "--prefix=${placeholder "out"}" ]; + + postInstall = '' + wrapProgram $out/bin/ros \ + --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system' \ + --prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros + ''; + + nativeBuildInputs = [ autoconf automake makeWrapper ]; + + buildInputs = [ sbcl curl ]; + + meta = with lib; { + description = "Roswell is a Lisp implementation installer/manager, launcher, and much more"; + license = licenses.mit; + maintainers = with maintainers; [ hiro98 ]; + platforms = platforms.linux; + homepage = "https://github.com/roswell/roswell"; + mainProgram = "ros"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d6636416ee..3b6f05e0e33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11496,6 +11496,8 @@ in sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; sbcl = sbcl_2_1_2; + roswell = callPackage ../development/tools/roswell/default.nix { }; + scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; }; From ae241196390e8a96de4b52d8734e892f6269c004 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 28 Apr 2021 17:42:22 +0200 Subject: [PATCH 185/476] gitlab-pages: enable tests --- pkgs/servers/http/gitlab-pages/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index 0f1372742bc..bd8d21fc1ef 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -13,7 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-uuwuiGQWLIQ5UJuCKDBEvCPo2+AXtJ54ARK431qiakc="; subPackages = [ "." ]; - doCheck = false; # Broken meta = with lib; { description = "Daemon used to serve static websites for GitLab users"; From a3c00f232b48182fc81e3f4cd91fedb970660498 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 28 Apr 2021 17:42:45 +0200 Subject: [PATCH 186/476] gitlab-pages: add myself as maintainer and add meta.changelog --- pkgs/servers/http/gitlab-pages/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index bd8d21fc1ef..33c556fb54a 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { meta = with lib; { description = "Daemon used to serve static websites for GitLab users"; homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; + changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ das_j ]; + maintainers = with maintainers; [ ajs124 das_j ]; }; } From 9078c509828254cc8629e891a551c47fd917211f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 28 Apr 2021 16:26:06 +0200 Subject: [PATCH 187/476] pythonPackages.sip_5: add `platform_tag` attribute It's value is platform dependend and needs to be specified in `pyproject.toml` for modules that use sip_5. Instead of defining it for each module, we can add it to sip_5, so it can be reused. --- pkgs/applications/misc/calibre/default.nix | 10 +--------- pkgs/development/python-modules/sip/5.x.nix | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 11667ea3950..de90e9d670c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , mkDerivation , fetchurl , poppler_utils @@ -42,18 +41,11 @@ mkDerivation rec { ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; escaped_pyqt5_dir = builtins.replaceStrings ["/"] ["\\/"] (toString python3Packages.pyqt5); - platform_tag = - if stdenv.hostPlatform.isDarwin then - "WS_MACX" - else if stdenv.hostPlatform.isWindows then - "WS_WIN" - else - "WS_X11"; prePatch = '' sed -i "s/\[tool.sip.project\]/[tool.sip.project]\nsip-include-dirs = [\"${escaped_pyqt5_dir}\/share\/sip\/PyQt5\"]/g" \ setup/build.py - sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${platform_tag}\"]/g" \ + sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip_5.platform_tag}\"]/g" \ setup/build.py # Remove unneeded files and libs diff --git a/pkgs/development/python-modules/sip/5.x.nix b/pkgs/development/python-modules/sip/5.x.nix index cebffd5765b..c15589b77bc 100644 --- a/pkgs/development/python-modules/sip/5.x.nix +++ b/pkgs/development/python-modules/sip/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, packaging, toml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }: buildPythonPackage rec { pname = "sip"; @@ -17,6 +17,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "sipbuild" ]; + # FIXME: Why isn't this detected automatically? + # Needs to be specified in pyproject.toml, e.g.: + # [tool.sip.bindings.MODULE] + # tags = [PLATFORM_TAG] + platform_tag = + if stdenv.targetPlatform.isLinux then + "WS_X11" + else if stdenv.targetPlatform.isDarwin then + "WS_MACX" + else if stdenv.targetPlatform.isWindows then + "WS_WIN" + else + throw "unsupported platform"; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; From 1a58aec6a2c9c191d7429c7cfb5d717f630831b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 17:02:10 +0000 Subject: [PATCH 188/476] haproxy: 2.3.7 -> 2.3.10 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 41f55e19abf..eefa49acb93 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.7"; + version = "2.3.10"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-Mbp6zQ14NnxxtW5Kh8nxHNI1/FYCvFuEaQd5Eg4KMFs="; + sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU="; }; buildInputs = [ openssl zlib ] From 25cd84fd1941adc3f18999ea5d322f6150a5eefa Mon Sep 17 00:00:00 2001 From: netcrns Date: Mon, 26 Apr 2021 17:28:43 +0200 Subject: [PATCH 189/476] movine: init at 0.11.0 movine: make meta.description a one-liner movine: make build on darwin work --- .../tools/database/movine/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/tools/database/movine/default.nix diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/development/tools/database/movine/default.nix new file mode 100644 index 00000000000..fd5debcb9a2 --- /dev/null +++ b/pkgs/development/tools/database/movine/default.nix @@ -0,0 +1,54 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, stdenv +, pkg-config +, postgresql +, sqlite +, openssl +, Security +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "movine"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "byronwasti"; + repo = pname; + rev = "v${version}"; + sha256 = "0rms8np8zd23xzrd5avhp2q1ndhdc8f49lfwpff9h0slw4rnzfnj"; + }; + + cargoSha256 = "sha256-4ghfenwmauR4Ft9n7dvBflwIMXPdFq1vh6FpIegHnZk="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ postgresql sqlite ] ++ ( + if !stdenv.isDarwin then [ openssl ] else [ Security libiconv ] + ); + + meta = with lib; { + description = "A migration manager written in Rust, that attempts to be smart yet minimal"; + homepage = "https://github.com/byronwasti/movine"; + license = licenses.mit; + longDescription = '' + Movine is a simple database migration manager that aims to be compatible + with real-world migration work. Many migration managers get confused + with complicated development strategies for migrations. Oftentimes + migration managers do not warn you if the SQL saved in git differs from + what was actually run on the database. Movine solves this issue by + keeping track of the unique hashes for the up.sql and + down.sql for each migration, and provides tools for + fixing issues. This allows users to easily keep track of whether their + local migration history matches the one on the database. + + This project is currently in early stages. + + Movine does not aim to be an ORM. + Consider diesel instead if + you want an ORM. + ''; + maintainers = with maintainers; [ netcrns ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf28b9782c..3775a43862c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16499,6 +16499,10 @@ in mono-addins = callPackage ../development/libraries/mono-addins { }; + movine = callPackage ../development/tools/database/movine { + inherit (darwin.apple_sdk.frameworks) Security; + }; + movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; From 3427eaac2b7646b4ac372fb3b73ef07ea4071756 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 28 Apr 2021 18:47:58 +0100 Subject: [PATCH 190/476] terragrunt: 0.29.0 -> 0.29.1 --- 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 f643ae1e673..4cab638ba67 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.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ubft+R2nBUNRx3SfksORxBbKY/mSvY+tKkz1UcGXyjw="; + sha256 = "sha256-fr33DRFZrUZQELYMf8z5ShOZobwylgoiW+yi6qdtFP4="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; From dba77f4fd00750eaf1780b1d18072cc97b96f0d8 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 27 Jul 2020 17:00:37 +0200 Subject: [PATCH 191/476] maintainers: add V --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee12b1a24db..91e8c9591fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10305,6 +10305,12 @@ githubId = 2212422; name = "uwap"; }; + V = { + name = "V"; + email = "v@anomalous.eu"; + github = "deviant"; + githubId = 68829907; + }; va1entin = { email = "github@valentinsblog.com"; github = "va1entin"; From dab2173285c58113c153b5bab332972b8bb534b0 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 26 Apr 2021 13:26:08 +0200 Subject: [PATCH 192/476] last-resort: init at 13.001 Last Resort is a fallback font that covers every Unicode codepoint. --- pkgs/data/fonts/last-resort/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/data/fonts/last-resort/default.nix diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix new file mode 100644 index 00000000000..31fb300e591 --- /dev/null +++ b/pkgs/data/fonts/last-resort/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl }: + +let + version = "13.001"; +in fetchurl { + name = "last-resort-${version}"; + + url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; + downloadToTemp = true; + + postFetch = '' + install -D -m 0644 $downloadedFile $out/share/fonts/truetype/LastResortHE-Regular.ttf + ''; + + recursiveHash = true; + sha256 = "08mi65j46fv6a3y3pqnglqdjxjnbzg25v25f7c1zyk3c285m14hq"; + + meta = with lib; { + description = "Fallback font of last resort"; + homepage = "https://github.com/unicode-org/last-resort-font"; + license = licenses.ofl; + maintainers = with maintainers; [ V ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8616e41e6f..94630b99540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5966,6 +5966,8 @@ in lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; + last-resort = callPackage ../data/fonts/last-resort {}; + ldc = callPackage ../development/compilers/ldc { }; ldgallery = callPackage ../tools/graphics/ldgallery { }; From b21d1ae87235b2adf2bdc1e1204d9a8219f32779 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 28 Apr 2021 15:19:19 +0000 Subject: [PATCH 193/476] jre_minimal: add 2 simple tests --- pkgs/development/compilers/openjdk/jre.nix | 5 ++ .../compilers/openjdk/jre_minimal_test1.nix | 16 +++++++ .../compilers/openjdk/tests/hello-logging.nix | 47 +++++++++++++++++++ .../compilers/openjdk/tests/hello.nix | 42 +++++++++++++++++ .../openjdk/tests/test_jre_minimal.nix | 16 +++++++ .../tests/test_jre_minimal_with_logging.nix | 21 +++++++++ 6 files changed, 147 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/jre_minimal_test1.nix create mode 100644 pkgs/development/compilers/openjdk/tests/hello-logging.nix create mode 100644 pkgs/development/compilers/openjdk/tests/hello.nix create mode 100644 pkgs/development/compilers/openjdk/tests/test_jre_minimal.nix create mode 100644 pkgs/development/compilers/openjdk/tests/test_jre_minimal_with_logging.nix diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix index 436bd0468c5..78dec7885d9 100644 --- a/pkgs/development/compilers/openjdk/jre.nix +++ b/pkgs/development/compilers/openjdk/jre.nix @@ -1,6 +1,7 @@ { stdenv , jdk , lib +, callPackage , modules ? [ "java.base" ] }: @@ -29,6 +30,10 @@ let passthru = { home = "${jre}"; + tests = [ + (callPackage ./tests/test_jre_minimal.nix {}) + (callPackage ./tests/test_jre_minimal_with_logging.nix {}) + ]; }; }; in jre diff --git a/pkgs/development/compilers/openjdk/jre_minimal_test1.nix b/pkgs/development/compilers/openjdk/jre_minimal_test1.nix new file mode 100644 index 00000000000..eebd11fb2fd --- /dev/null +++ b/pkgs/development/compilers/openjdk/jre_minimal_test1.nix @@ -0,0 +1,16 @@ +{ runCommand +, callPackage +, jdk +, jre_minimal +}: + +let + hello = callPackage tests/hello.nix { + jdk = jdk; + jre = jre_minimal; + }; +in + runCommand "test" {} '' + ${hello}/bin/hello | grep "Hello, world!" + touch $out + '' diff --git a/pkgs/development/compilers/openjdk/tests/hello-logging.nix b/pkgs/development/compilers/openjdk/tests/hello-logging.nix new file mode 100644 index 00000000000..71f3a5543f7 --- /dev/null +++ b/pkgs/development/compilers/openjdk/tests/hello-logging.nix @@ -0,0 +1,47 @@ +{ jdk +, jre +, pkgs +}: + +/* 'Hello world' Java application derivation for use in tests */ +let + source = pkgs.writeTextDir "src/Hello.java" '' + import java.util.logging.Logger; + import java.util.logging.Level; + + class Hello { + static Logger logger = Logger.getLogger(Hello.class.getName()); + + public static void main(String[] args) { + logger.log(Level.INFO, "Hello, world!"); + } + } + ''; +in + pkgs.stdenv.mkDerivation { + pname = "hello"; + version = "1.0.0"; + + src = source; + + buildPhase = '' + runHook preBuildPhase + ${jdk}/bin/javac src/Hello.java + runHook postBuildPhase + ''; + installPhase = '' + runHook preInstallPhase + + mkdir -p $out/lib + cp src/Hello.class $out/lib + + mkdir -p $out/bin + cat >$out/bin/hello <$out/bin/hello </dev/stdout | grep "Hello, world!" + touch $out + '' From de5a69c9187bf2a89f649dc7a9b4deb3ccb2d0d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Apr 2021 21:02:11 +0200 Subject: [PATCH 194/476] nixos/promtail: Set TimeoutStopSec=10 On reboots and shutdowns promtail blocks for at least 90 seconds, because it would still try to deliver log messages for loki, which isn't possible when the network has already gone down. Upstreams example unit also uses a ten seconds timeout, something which has worked pretty well for me as well. --- nixos/modules/services/logging/promtail.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 19b12daa415..34211687dc1 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -40,6 +40,7 @@ in { serviceConfig = { Restart = "on-failure"; + TimeoutStopSec = 10; ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; From 5d1f29f0e69c406ef8beeaf5483e1549fe0d01df Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Wed, 28 Apr 2021 22:31:15 +0300 Subject: [PATCH 195/476] ombi: 4.0.1292 -> 4.0.1345 add fixDarwinDylibNames to fix darwin build --- pkgs/servers/ombi/default.nix | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index bbad311edda..a2ffc449d47 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, patchelf, openssl, libunwind, zlib, krb5, icu, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook, fixDarwinDylibNames, zlib, krb5, openssl, icu, nixosTests }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -10,20 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Cuvz9Mhwpg8RIaiSXib+QW00DM66qPRQulrchRL2BSk="; - arm64-linux_hash = "sha256-uyVwa73moHWMZScNNSOU17lALuK3PC/cvTZPJ9qg7JQ="; - x64-osx_hash = "sha256-FGXLsfEuCW94D786LJ/wvA9TakOn5sG2M1rDXPQicYw="; + x64-linux_hash = "sha256-9m5vWobkibqOHsuIJmvEHuwsuJogvQQe8h0dvFj62tw="; + arm64-linux_hash = "sha256-OBm4j5Ez04XLjp4DHyOrwSOSGanuuI8g2y2wZaotH8M="; + x64-osx_hash = "sha256-UPf6Yl0nbhmiWq9oGyi7sRhlahB6zHL7nTj7GRlKoII="; }."${arch}-${os}_hash"; - rpath = lib.makeLibraryPath [ - stdenv.cc.cc openssl libunwind zlib krb5 icu - ]; - - dynamicLinker = stdenv.cc.bintools.dynamicLinker; - in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.0.1292"; + version = "4.0.1345"; sourceRoot = "."; @@ -32,25 +26,20 @@ in stdenv.mkDerivation rec { sha256 = hash; }; - buildInputs = [ makeWrapper patchelf ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + propagatedBuildInputs = [ stdenv.cc.cc zlib krb5 ]; installPhase = '' mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version} makeWrapper $out/share/${pname}-${version}/Ombi $out/bin/Ombi \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl icu ]} \ --run "cd $out/share/${pname}-${version}" ''; - dontPatchELF = true; - postFixup = '' - patchelf --set-interpreter "${dynamicLinker}" \ - --set-rpath "$ORIGIN:${rpath}" $out/share/${pname}-${version}/Ombi - - find $out -type f -name "*.so" -exec \ - patchelf --set-rpath '$ORIGIN:${rpath}' {} ';' - ''; - passthru = { updateScript = ./update.sh; tests.smoke-test = nixosTests.ombi; From b753f7a49de7a557b63ef25ef0e5ddbdf95bc1a0 Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Wed, 28 Apr 2021 22:26:45 +0200 Subject: [PATCH 196/476] mailspring: fix build --- pkgs/applications/networking/mailreaders/mailspring/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index a27f3c87e03..29667eb52c6 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { libsecret nss xorg.libxkbfile + xorg.libXdamage xorg.libXScrnSaver xorg.libXtst ]; From eff1be4ab0478463e4c365f8e9a7904e0502e8a3 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 28 Apr 2021 13:33:23 -0700 Subject: [PATCH 197/476] ncmpcpp: enableParallelBuilding --- pkgs/applications/audio/ncmpcpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index c0fa2722878..fee5dc88403 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; }; + enableParallelBuilding = true; configureFlags = [ "BOOST_LIB_SUFFIX=" ] ++ optional outputsSupport "--enable-outputs" ++ optional visualizerSupport "--enable-visualizer --with-fftw" From 77c0a4907f1991ea70d2da07bbdccd95c83278bb Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 28 Apr 2021 22:36:17 +0200 Subject: [PATCH 198/476] croc: fix passthru.tests --- pkgs/tools/networking/croc/test-local-relay.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix index bde05d6deb0..4ddad86bd00 100644 --- a/pkgs/tools/networking/croc/test-local-relay.nix +++ b/pkgs/tools/networking/croc/test-local-relay.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & # wait for things to settle sleep 1 - # receive - MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) + # receive, as of croc 9 --overwrite is required for noninteractive use + MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple) # compare [ "$MSG" = "$MSG2" ] && touch $out ''; From 6189cc82b536f6d3ac91724ffd933058def810e8 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 28 Apr 2021 22:41:30 +0200 Subject: [PATCH 199/476] carla: remove ffmpeg as dependency FFmpeg is not strictly needed and used in legacy code. Carla also requires an old vulnerable version of FFmpeg --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index a9c0ffdfb64..04c15eca599 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, +{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, jack2, liblo, libpulseaudio, libsndfile, pkg-config, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ optional withFrontend pyqt5; buildInputs = [ - file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile + file liblo alsaLib fluidsynth jack2 libpulseaudio libsndfile ] ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; From e22d1d37cc4b3c72e22adb2d6488d2ce22648943 Mon Sep 17 00:00:00 2001 From: Las Date: Wed, 28 Apr 2021 20:29:34 +0000 Subject: [PATCH 200/476] mesa: Don't fail to build when d3d isn't built --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1186882aa80..3be50b5dbd9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -185,14 +185,14 @@ self = stdenv.mkDerivation { postFixup = optionalString stdenv.isLinux '' # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" - substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" + [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" # remove pkgconfig files for GL/EGL; they are provided by libGL. rm -f $dev/lib/pkgconfig/{gl,egl}.pc # Move development files for libraries in $drivers to $driversdev mkdir -p $driversdev/include - mv $dev/include/xa_* $dev/include/d3d* $driversdev/include + mv $dev/include/xa_* $dev/include/d3d* -t $driversdev/include || true mkdir -p $driversdev/lib/pkgconfig for pc in lib/pkgconfig/{xatracker,d3d}.pc; do if [ -f "$dev/$pc" ]; then From 8813edcc64b6d1ff577acc6e768fa28edece9f71 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 27 Apr 2021 12:24:57 +0200 Subject: [PATCH 201/476] pythonModules.Nuitka: 0.6.8.4 -> 0.6.14.5 + add runtime dep on chrpath + use system SConS instead of old Python2 version --- .../python-modules/nuitka/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index 44ee4597dbe..548565ff1d3 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,28 +1,29 @@ { lib, stdenv , buildPythonPackage -, fetchurl +, fetchFromGitHub , vmprof , pyqt4 , isPyPy , pkgs +, scons +, chrpath }: -let - # scons is needed but using it requires Python 2.7 - # Therefore we create a separate env for it. - scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); -in buildPythonPackage rec { - version = "0.6.8.4"; +buildPythonPackage rec { + version = "0.6.14.5"; pname = "Nuitka"; # Latest version is not yet on PyPi - src = fetchurl { - url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0awhwksnmqmbciimqmd11wygp7bnq57khcg4n9r4ld53s147rmqm"; + src = fetchFromGitHub { + owner = "kayhayen"; + repo = "Nuitka"; + rev = version; + sha256 = "08kcp22zdgp25kk4bp56z196mn6bdi3z4x0q2y9vyz0ywfzp9zap"; }; checkInputs = [ vmprof pyqt4 ]; nativeBuildInputs = [ scons ]; + propagatedBuildInputs = [ chrpath ]; postPatch = '' patchShebangs tests/run-tests From 716d176974034d6bf52c1418f9e35fc2a5474f78 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 28 Apr 2021 23:18:29 +0200 Subject: [PATCH 202/476] chromiumBeta: 91.0.4472.19 -> 91.0.4472.27 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c9ec1931c54..e5bcab4740e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "91.0.4472.19", - "sha256": "0p51cxz0dm9ss9k7b91c0nd560mgi2x4qdcpg12vdf8x24agai5x", - "sha256bin64": "0pf0sw8sskv4x057w7l6jh86q5mdvm800iikzy6fvambhh7bvd1i", + "version": "91.0.4472.27", + "sha256": "09mhrzfza9a2zfsnxskbdbk9cwxnswgprhnyv3pj0f215cva20sq", + "sha256bin64": "1iwjf993pmhm9r92h4hskfxqc9fhky3aabvmdsqys44251j3hvwg", "deps": { "gn": { "version": "2021-04-06", From 111ab7f7b6dec8199d0c685e64d8044a7e92dd19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 21:33:09 +0000 Subject: [PATCH 203/476] ffuf: 1.3.0 -> 1.3.1 --- pkgs/tools/security/ffuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 9c8beeab3d9..076fd78d713 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ffuf"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-0ckpEiXxen2E9IzrsmKoEKagoJ5maAbH1tHKgQjoCjo="; + sha256 = "sha256-NkRf36wFmzqFv13P0DxpzEOGyBGbSXMLjWE7URzRXGY="; }; vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; From 81e1e68eaf6c765147da964d356f704030734dd2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 27 Apr 2021 10:56:51 +0000 Subject: [PATCH 204/476] lib.trivial.warnIf: init It's a common pattern in Nixpkgs to want to emit a warning in certain cases, but not actually change behaviours. This is often expressed as either if cond then lib.warn "Don't do that thing" x else x Or (if cond then lib.warn "Don't do that thing" else lib.id) x Neither of which really expresses the intent here, because it looks like 'x' is being chosen conditionally. To make this clearer, I introduce a "warnIf" function, which makes it clear that the only thing being affected by the condition is whether the warning is generated, not the value being returned. --- lib/default.nix | 5 +++-- lib/trivial.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 50320669e28..ccae0bbc3ab 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -66,8 +66,9 @@ let stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max - importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare - splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; + importJSON importTOML warn warnIf info showWarnings nixpkgsVersion version + mod compare splitByAndCompare functionArgs setFunctionArgs isFunction + toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath diff --git a/lib/trivial.nix b/lib/trivial.nix index be6d0115f5b..f6f5da5998f 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -297,12 +297,15 @@ rec { # Usage: # { # foo = lib.warn "foo is deprecated" oldFoo; + # bar = lib.warnIf (bar == "") "Empty bar is deprecated" bar; # } # # TODO: figure out a clever way to integrate location information from # something like __unsafeGetAttrPos. warn = msg: builtins.trace "warning: ${msg}"; + warnIf = cond: msg: if cond then warn msg else id; + info = msg: builtins.trace "INFO: ${msg}"; showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings; From a8afbb45c12be27b9b93a802e9e276595899ed5a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 27 Apr 2021 13:52:15 +0000 Subject: [PATCH 205/476] treewide: use lib.warnIf where appropriate --- lib/modules.nix | 6 +++--- lib/strings.nix | 4 ++-- nixos/lib/testing-python.nix | 4 +--- pkgs/applications/networking/browsers/chromium/common.nix | 6 ++---- pkgs/development/perl-modules/generic/default.nix | 6 ++---- pkgs/servers/jellyfin/default.nix | 5 ++--- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index d3f10944e70..d515ee24d16 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -37,7 +37,7 @@ let setAttrByPath toList types - warn + warnIf ; inherit (lib.options) isOption @@ -516,8 +516,8 @@ rec { value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue; warnDeprecation = - if opt.type.deprecationMessage == null then id - else warn "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; + warnIf (opt.type.deprecationMessage != null) + "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; in warnDeprecation opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; diff --git a/lib/strings.nix b/lib/strings.nix index 5010d9159cb..0f23b6b9d41 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -644,8 +644,8 @@ rec { floatToString = float: let result = toString float; precise = float == fromJSON result; - in if precise then result - else lib.warn "Imprecise conversion from float to string ${result}" result; + in lib.warnIf (!precise) "Imprecise conversion from float to string ${result}" + result; /* Check whether a value can be coerced to a string */ isCoercibleToString = x: diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6192be1cd05..c7e45f55ce1 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -131,10 +131,8 @@ rec { "it's currently ${toString testNameLen} characters long.") else "nixos-test-driver-${name}"; - - warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in - warn (runCommand testDriverName + lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName { buildInputs = [ makeWrapper ]; testScript = testScript'; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b08ff1ac7c1..73ce022915c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -112,10 +112,8 @@ let warnObsoleteVersionConditional = min-version: result: let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; - in if versionAtLeast ungoogled-version min-version - then warn "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." - result - else result; + in warnIf (versionAtLeast ungoogled-version min-version) "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." + result; chromiumVersionAtLeast = min-version: let result = versionAtLeast upstream-info.version min-version; in warnObsoleteVersionConditional min-version result; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index c7b57eae906..9beacd65a64 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -5,10 +5,8 @@ assert attrs?pname -> attrs?version; assert attrs?pname -> !(attrs?name); -(if attrs ? name then - lib.trivial.warn "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead" - else - (x: x)) +lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead" + toPerlModule(stdenv.mkDerivation ( ( lib.recursiveUpdate diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 2b00cb50073..77406c46415 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -11,9 +11,8 @@ let else if isAarch64 then "arm64" else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown"; musl = lib.optionalString stdenv.hostPlatform.isMusl - (if (arch != "x64") - then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-" - else "musl-"); + (lib.warnIf (arch != "x64") "Some image processing features might be unavailable for non x86-64 with Musl" + "musl-"); runtimeDir = "${os}-${musl}${arch}"; in stdenv.mkDerivation rec { From 4c879a65576d4c2c53d99cdc6f349d08055b9be1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 22:03:49 +0000 Subject: [PATCH 206/476] gdu: 4.11.0 -> 4.11.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 9e522f23203..03d52c100a8 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.11.0"; + version = "4.11.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E+/Ig6+J7pJ98O+YAntBGERml2ELzkji3gworBdcSVY="; + sha256 = "sha256-e9TYArmNWnK8XXcniAQCegrfWAUfTKKuClgdSTQep0U="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; From 71b18809a4e4ac73f39a9b96278a5fd12e85ae37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 00:36:22 +0200 Subject: [PATCH 207/476] python3Packages.twitterapi: 2.7.2 -> 2.7.3 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 316709c2041..b45218219c5 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-kSL+zAWn/6itBu4T1OcIbg4k5Asatgz/dqzbnlcsqkg="; + sha256 = "sha256-82TOVrC7wX7E9lKsx3iGxaEEjHSzf5uZwePBvAw3hDk="; }; propagatedBuildInputs = [ From de5f4c6bae884676ab950e62510d57a472ce6dc8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 28 Apr 2021 16:31:37 +0000 Subject: [PATCH 208/476] gupnp-igd: disable tests Only runs one test, and that test seems to get stuck sometimes. Fixes: https://github.com/NixOS/nixpkgs/issues/119288 --- pkgs/development/libraries/gupnp-igd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 09fae015b50..233eb7e3c85 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -44,7 +44,9 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = true; + # Seems to get stuck sometimes. + # https://github.com/NixOS/nixpkgs/issues/119288 + #doCheck = true; passthru = { updateScript = gnome3.updateScript { From b3290c8952ea43f857c19fad286cd253104e59dd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 28 Apr 2021 23:06:45 +0000 Subject: [PATCH 209/476] electron_12: 12.0.4 -> 12.0.5 https://github.com/electron/electron/releases/tag/v12.0.5 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ddd51f268e2..077d6c74c8b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -104,12 +104,12 @@ rec { headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j"; }; - electron_12 = mkElectron "12.0.4" { - x86_64-linux = "6419716f614f396954981e6432afe77277dff2b64ecb84e2bbd6d740362ea01c"; - x86_64-darwin = "3072f1854eb5b91d5f24e03a313583bb85d696cda48381bdf3e40ee2c93dfe34"; - i686-linux = "fa241874aacca8fe4b4f940fa9133fe65fdcf9ef0847322332f0c67ee7b42aa0"; - armv7l-linux = "8d88d13bf117820bc3b46501d34004f18ebf402f2817836a2a7ba4fc60433653"; - aarch64-linux = "c5cbcbb5b397407e45e682480b30da4fcf94154ac92d8f6eea4c79a50d56626a"; - headers = "121falvhz0bfxc2h7wwvyfqdagr3aznida4f4phzqp0ja3rznxf3"; + electron_12 = mkElectron "12.0.5" { + x86_64-linux = "e89c97f7ee43bf08f2ddaba12c3b78fb26a738c0ea7608561f5e06c8ef37e22b"; + x86_64-darwin = "c5a5e8128478e2dd09fc7222fb0f562ed3aefa3c12470f1811345be03e9d3b76"; + i686-linux = "6ef8d93be6b05b66cb7c1f1640228dc1215d02851e190e7f16e4313d8ccd6135"; + armv7l-linux = "7312956ee48b1a8c02d778cac00e644e8cb27706cf4b387e91c3b062a1599a75"; + aarch64-linux = "7b2dc425ce70b94ef71b74ed59416e70c4285ae13ef7ea03505c1aafab44904f"; + headers = "1aqjhams0zvgq2bm9hc578ylmahi6qggzjfc69kh9vpv2sylimy9"; }; } From f1e271714bf1c51bfacbec24f63137f83de8abfa Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 29 Apr 2021 07:54:46 +0900 Subject: [PATCH 210/476] fishplugins.forgit-fish: rename fishplugins.forgit --- pkgs/shells/fish/plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 42252ccbe38..0ce172ec489 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -15,7 +15,7 @@ lib.makeScope newScope (self: with self; { foreign-env = callPackage ./foreign-env { }; - forgit-fish = callPackage ./forgit.nix { }; + forgit = callPackage ./forgit.nix { }; fzf-fish = callPackage ./fzf-fish.nix { }; From a946e4c558a34c2b3cef8cdd99f33c1f63623212 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 29 Apr 2021 07:58:10 +0900 Subject: [PATCH 211/476] fishplugins.forgit: fix dependency linking --- pkgs/shells/fish/plugins/forgit.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index b905b7a2589..5fc647c73ee 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -4,7 +4,11 @@ buildFishPlugin rec { pname = "forgit"; version = "unstable-2021-04-09"; - buildInputs = [ git fzf ]; + preFixup = '' + substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \ + --replace "fzf " "${fzf}/bin/fzf " \ + --replace "git " "${git}/bin/git " + ''; src = fetchFromGitHub { owner = "wfxr"; From 495c7d377fed8c7942360831c990d7a93d9ddb63 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Apr 2021 01:48:42 +0200 Subject: [PATCH 212/476] python3Packages.clevercsv: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/clevercsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 36944b5dbec..233b7164989 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "v${version}"; - sha256 = "0j3959bji48pkp0vnk7yls5l75ywjl77jdkvzs62n5mi5lky88p9"; + sha256 = "0jpgyh65zqr76sz2s63zsjyb49dpg2xdmf72jvpicw923bdzhqvp"; }; propagatedBuildInputs = [ From cfa0a5776588ffef986da24161a231281f03376b Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 29 Apr 2021 03:14:43 +0200 Subject: [PATCH 213/476] Add which-key-nvim (#121092) --- pkgs/misc/vim-plugins/generated.nix | 324 ++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 163 insertions(+), 162 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 651515c3150..b5b4037ee06 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-02-27"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "984d84a1bda7208587feb3d62cfec5bcab404af2"; - sha256 = "00gf2xm20wg0p1ik55jwhzlbd5sz06k3hk30415xayfa6flgh0n4"; + rev = "9cf0d261a5fb24908f6cc7588f568646dce3d712"; + sha256 = "051s3nxil63gl3y6xj047c8ifxpra1xqlp3bic3x2ww1fb3wpjz3"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-24"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e7c2807bf0c029864f346024981f1a7927044393"; - sha256 = "063jk33l7yz467b0v00s3h5gb3lbwb0x5gh4r5bignlhm518sfa3"; + rev = "270e3e1d85d400409247aa6c11445ec2e72f44ee"; + sha256 = "1i1y72v95660szv5jdcrawqqh7l493v3a1n9zigagzwz9a3sff44"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-23"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "f9c4fc96fd08f13f549c4bc0eb56f2d91ca91919"; - sha256 = "087nvvxfxrllnx2ggi8m088wgcrm1hd9c5mqfx37zmzfjqk78rw4"; + rev = "35dcebf8ba0f0b405578d3d919bc54ae2a651138"; + sha256 = "1lbnic4r0k0xxr5shmgz60b93lk462fnnl10iccns1d4363dz80a"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -690,12 +690,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-04-01"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "46b766dee43a97266741087085889751b474fb56"; - sha256 = "1034n76bg4p4yvqmz9g9clsrrhx0kvqs0z8fy6p9axmxqzi8z9rr"; + rev = "b7cc8a2e0936f3069235ed312fb89ff2a5390660"; + sha256 = "0bxbisyzpp9rrakzqp3kqx61yzgcqvg90qll76vx7s6mxp0qz9rw"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -726,12 +726,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-04-05"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "54b9cbf9da4a956dc55cd903f3b4f7b211b712a2"; - sha256 = "0ir10ff5va38ch52fvyl5cfz4mjins3lpklqyh23rrqc0hfd8154"; + rev = "6ad4f8374c1c1b06146c5c866a404cd4f2b4a8f9"; + sha256 = "0nwfzsl4g8z45mj84sck7dz5yxrdgklp9l7xz3pialaz8bqsc6vm"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -882,12 +882,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-21"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "3730b008158327d0068b8a9b19d57fd7459bb8b9"; - sha256 = "0bc1gfwsms0mrxjfp7ia4r2rw1b95ih8xgkh02l9b30wp81xdfr3"; + rev = "f0e31bf12b0dc1b8c733c3bf76fdfd9679fb63be"; + sha256 = "0js6k32jqkf4nfs7vpx6pd7ix36p2599nzd4myshfsphb470zbny"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -930,24 +930,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-04-17"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c3d1c1893bcaaa6b44135cbc8f3b809b703cf4dc"; - sha256 = "14y1fz4i7ym2f2q1lv93giq99y6jai0jwdvm5nlcr8ksrazfwq9v"; + rev = "b9ec10c07d4525001de2660ae1ee25ce572fa5c7"; + sha256 = "17vivrhyn4qhvw1a4bf5wycl136whiic1srpvvvh8fs4pzsc2yn3"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-04-12"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "b9dd634beacfda00a6d4c388867cc1348735f3a2"; - sha256 = "055k2fph67glzlx10611a6z7s10z3jsms21ixzy25hsdvr75xpda"; + rev = "2b89f3060bc0539b32ad50e2cba20de877cf960a"; + sha256 = "1hqj9gaymfkzlc0v0v0kg5ac9yn7zbv14zvwaly8bjf28q8vh5yn"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1172,12 +1172,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-04-21"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "187b2bd2beb7802e66c93900430c29b4ab9c20c8"; - sha256 = "0l6i6wybhdzbj6p0x86kygyirhnhc1fj67p4l83v3jdgypqy246a"; + rev = "0cb28652b7acab25ba85a598dfeae3829234fc6e"; + sha256 = "16arlh3xq8pfsicyc76jalvd6q2ld9k4xwdndmgkr2wsdmnc9kwz"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1305,12 +1305,12 @@ let embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2021-03-12"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "fda8867d405a93938f154fb9d70e4f4a4e6ef8c8"; - sha256 = "09kvk3wjmpvssv8j5iba2dngnfkv178gkr620pa3k1imb0m9f0bq"; + rev = "95847fbae47aa5d49b6470568b8151a93e15307a"; + sha256 = "06qvnbhwm2gl8921hyq75dwxxfbkwfvvsn4pci89831qn6w3pa6f"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1535,12 +1535,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-04-10"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "cbf64bd4869c810b92f6450ed8763456c489be87"; - sha256 = "0c7xgracnl92psc5b7m90ys9v5p20hipli8q797r495r59wnza20"; + rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; + sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1559,12 +1559,12 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-02-07"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe"; - sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics"; + rev = "9b016fd42ba37395d9299e1e811b282b29effb63"; + sha256 = "0x3rg1pxildm2mrfr28f4d41z4zzf6v2jng41nzylwm5r4c5r1gd"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1595,12 +1595,12 @@ let gina-vim = buildVimPluginFrom2Nix { pname = "gina-vim"; - version = "2020-10-07"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "gina.vim"; - rev = "97116f338f304802ce2661c2e7c0593e691736f8"; - sha256 = "1j3sc6dpnwp4fipvv3vycqb77cb450nrk5abc4wpikmj6fgi5hk0"; + rev = "699d1e9d4104c994a37cb18b730f38ff7f32f2d1"; + sha256 = "1akcpf5iyrbj4apjvp02613x328igp9gk4gaqgkx4qvwha4khbi5"; }; meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; @@ -1655,12 +1655,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-22"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0b556d0b7ab50e19dc7db903d77ac6a8376d8a49"; - sha256 = "06v2wbm582hplikjqw01r9zqgg45ji2887n288apg9yx43iknsy3"; + rev = "3d378118e442690e2e15ee6a26917a5c1871f571"; + sha256 = "1ik37ppad5dzlkl237ls58hdlcm09igkklgr6zqjpili37p32z43"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1679,12 +1679,12 @@ let glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-03-31"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "89b4edfcb70529d9c713687aa6fcfa76a2010ae0"; - sha256 = "0qq6cjzirr4zicy2n259sxi2ypz7w740qaf4a4vhphh4rd6gi18w"; + rev = "f3770dd754501139dd11566b8b739d828a773272"; + sha256 = "159arilpzv8pdwv4323gv85lwcz5libbk0drjkpbp2632bl9likh"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -2088,12 +2088,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-23"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d0bb06ffc40ff7c49dfa2548e007e9013eaeabb7"; - sha256 = "0zj12xp8djy3zr360lg9pkydz92cgkjiz33n9v5s2wyx63gk0dq4"; + rev = "b437dae505b0fbb6aac92a9aad8f4fb68ea1259b"; + sha256 = "1l2kiaa44hd7x9a0w1x5kwfvqnkkzi9i7qnjnhch083chmjjy13d"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2184,12 +2184,12 @@ let LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-04-16"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "6c49ab524b883495193ff3a4eab5c7846aba4261"; - sha256 = "19dyd148silyaiprjrcd23y62kcsp6hpvpansmpxri55x53a772w"; + rev = "86eaa396858a8da957d9f445e9d8bd4c0c304f96"; + sha256 = "0rq2f094jmz74krjszgahlx9qdhl4qghviy4qk64d9lygjjc8xln"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2388,36 +2388,36 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-04-18"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "333178b4e941eb19d9c97c0b0b5640c76363b0ad"; - sha256 = "1ygqz8mf8h48jfn17ldr5fnpir1ylf37l10kla8rp197j8acidsy"; + rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040"; + sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-23"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "e3a558bc1dfbda29cde5b356b975a8abaf3f41b2"; - sha256 = "1qwrpyjfcn23z4lw5ln5gn4lh8y0rw68gbmyd62pdqazckqhasds"; + rev = "6ba2b80b594c3ead11ab9bd1dbc94c0b4ea46c33"; + sha256 = "0xhdc18sdlbhhyd7p898n4ymyvrhjqbsj5yzb6vmjvc4d9gln1k6"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-04-11"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3db21525382fa158fba22e2a5d033d6afdbc763a"; - sha256 = "1k0678h22falk08mpvlxlfsx7z89p89clrc9hlk452dzj7wjy7wi"; + rev = "3a188f13ffcd026e1c29938ff2fb1a8177b8f953"; + sha256 = "06dk4xl1d4j06ccclzyg9nj3pcshypab5sv6wc5303by8l8j17j7"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2796,12 +2796,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-23"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "a62ce86411048e1bed471d4c4ba5f56eb5b59c50"; - sha256 = "1cnywkl21a8mw62bing202nw04y375968bggqraky1c57fpdq35j"; + rev = "cd00786925191a245c85744c84ec0749b1c8b3f7"; + sha256 = "0770p37i6r0dwyx9chfg75zy0wcw8a044xfh7vk7ddcqcmp4flhy"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3012,12 +3012,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-03-22"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "6408b859f9fac3880d82109d25874fb6656026d9"; - sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72"; + rev = "422cd80e35c81a303d16a600f549dc4d319cecf6"; + sha256 = "187q3m0llrwmrqskf14cqy9ndvvj8nfnyrw46f8mdkrslkfs9vf2"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3072,12 +3072,12 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "41b3ed55c345b56190a282b125897dc99d2292d4"; - sha256 = "1pjfani0g0wixsyxk8j0g4289jhnkbxl703fpdp9dls7c427pi8x"; + rev = "0cacd33ec635430c80fd5522bad47662d3780f55"; + sha256 = "18angbsm98zzbykdh83xkl6m8cbnrqvxg3n0v9abwi2r02wnfwqb"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3096,24 +3096,24 @@ let nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-23"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "55135d23dc8da4f75a95f425283c0080ec5a8ac6"; - sha256 = "162wa2hwq1i9v2xgdfvg1d4ab392m4jcw815cn9l3z4r10g9719p"; + rev = "56316fcc87d2654903e4213817d5fba56008c81d"; + sha256 = "11z40nm53r5nq1h4q0l1gfrly2zdaqzp4li40zxzp962b80f0wxv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-04-22"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "78ffd345d079246738ea06b04f58ad53503f48e2"; - sha256 = "08xn8s9asa6b2gpbrsw1iy80s8419bck0z6nh9nmffisr3aga1bn"; + rev = "41debce12f99970f13c16dfd4fd89da64cf6abcf"; + sha256 = "1ilsrcil3d7fwkfy1xqbcim0fc2ydal38b4xrvgv07bvih9pwflp"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3180,12 +3180,12 @@ let nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-04-24"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "f144a3bb6a39ef5c07173fe08e6f3ce8f5f184ba"; - sha256 = "1zax0vx77fqx7jr1xipfy0dp3l05gzbqdvc1wvq2cnjvqd7s8i2v"; + rev = "96b8e0423609a23cb971edb1d10c757d7930787b"; + sha256 = "0z84xisjj4a0blfy7ds5hlwvvr6yc7nwiqglli1h6lp7abxs5xx0"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -3216,12 +3216,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-23"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "2f8bd90f3b4fa7620c61f66bcddb965139eb176f"; - sha256 = "1zsvr9pba62ngchfmab7yns64mlkdqclqv516c7h62fh82fyx23a"; + rev = "a23ce7882d3caf4df00e79c515c81633055bae45"; + sha256 = "0xlz3v4zzaklnkr5sx238i7d8agxbsk9zbs3br0dfjdbrvhgii02"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3240,12 +3240,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-04-21"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "362a149dac40c90d917ac7bb78da988b8da6a971"; - sha256 = "0psd99km6kfqwdw383w41aaq1cipcfhl1v5srjw29y2v6rgvnw9p"; + rev = "f449589f6c56426a82adead43fe8fdabda0454fb"; + sha256 = "0l6f2596cdwbrwyacc6w60ad8616ivxcamjqcx3jizw5b6wlb475"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3312,12 +3312,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "902f24503ab7a754be2a1c483de1cd3428bd85ec"; - sha256 = "0b31lpzdx1z88fm60p7d5gs442h4apm2n9h098n4j0ghcs5ppvnf"; + rev = "c6e3e48352711ed6115e86901783efbce193a08f"; + sha256 = "0zi2ar2sr1v8lp4zim52hihm7qlzz4ijfgy5a6xyhns6csg3a9vf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3336,12 +3336,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-04-22"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "34cc65e594d4f4b9e0d6658a7ceb49f62820d762"; - sha256 = "1gg4iyqpy68hhk4wly9k87841zns29vh04wcddn91awj5mpigb40"; + rev = "7e153f1a636d0dc92e013da3177bbbdf34e415a3"; + sha256 = "0djjvqx52anrsdar68l4alyiyxwfbcq6bfpdjcghyhnwmnnygb3n"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3360,12 +3360,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-24"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b68f0cc70022fedec9b9190904d6035393111cdf"; - sha256 = "07zp1fbah65f7lglfkmdzi6cyfchlaf1ap02wzwixiv5hpy6zji4"; + rev = "bbf3f87884756330793510261193b0a725fb899b"; + sha256 = "1974jpw2sjz4v8vy7y665bl6avflsv7pdqmq9ahlqf2lw59x13hy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3552,12 +3552,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-04-19"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "f9dc29914f34cb2371960236d514191b9feba8b5"; - sha256 = "02vg6m7572867gahvpsc1n9363mbk2ci5cvqwwqyh2spsx5f4g88"; + rev = "c742488c5a9b5f8b04e5a85f6ab060a592a987ff"; + sha256 = "1yl9sq5qi4rbfzvm4n4ynrlvcfvca1vy8pa69c78pyx0lr3qh7z3"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3648,12 +3648,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-21"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9bd408ba679d1511e269613af840c5019de59024"; - sha256 = "1xjrd445jdjy789di6d3kdgxk9ds04mq47qigmplfsnv41d5c2nj"; + rev = "d4476cdac636f3e6ae35aa9eb9bda6cbf4e11900"; + sha256 = "1axdm1kxdzwlhkpd4p59z5fkpj0igjpwgcy5c99w83gad66z1kwb"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3829,12 +3829,12 @@ let ranger-vim = buildVimPluginFrom2Nix { pname = "ranger-vim"; - version = "2019-02-08"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "rafaqz"; repo = "ranger.vim"; - rev = "6def86f4293d170480ce62cc41f15448075d7835"; - sha256 = "0890rbmdw3p25cww6vsji7xrndcxsisfyv5przahpclk9fc9sxs8"; + rev = "aa2394bd429e98303f2273011f0429ce92105960"; + sha256 = "0kfhzamryaxhzrwg2rqipcbrnfxnjrfk2bk4f0z27a2hk6c0r7b9"; }; meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; @@ -4527,12 +4527,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6fd1b3bd255a6ebc2e44cec367ff60ce8e6e6cab"; - sha256 = "1qifrnd0fq9844vvxy9fdp90kkb094a04wcshbfdy4cv489cqfax"; + rev = "ad30a7b085afd31c66461b61e268aa88527199bb"; + sha256 = "0191bax9mpw8q4hy126wyyyxyrb79c89m01plmzh66baiahd3sxv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5056,12 +5056,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-04-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0a87d08dbdb398b2bb644b5041f68396f0c92d5d"; - sha256 = "1ihg44f3pn4v3naxlzd9gmhw7hzywv4zzc97i9smbcacg9xm6mna"; + rev = "30f8ada1d6021d89228092b3c51840916c75a542"; + sha256 = "0mriz1c0yfwavgmawj52n42rxzsmi3mchww5wlkvs6274am63da6"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5152,12 +5152,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-04-20"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "7ea00a64553854e04ce12be1fe665e02a0c7d9db"; - sha256 = "1jy5c50rd27k43rgl9wim502rp00cfnyh2zkd5bvbg0j85a9q72k"; + rev = "916f9e10461def8c71b5359c0e0b7a08f80d5fc5"; + sha256 = "1sn631dyqni3hf5psn2jhndzckw3p5vl7i57p6i5n6n3lhzzcvj7"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5332,12 +5332,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-04-17"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "8e13b23d69549c95d9c223ea5c2487d5dd9558f7"; - sha256 = "1biiq07dhrz9vhk0yg3zkkv3329nyla6lp8kavdzqrvqg0hsbr2j"; + rev = "1afdd263a862bae0641f565e3f2952e1c01cec43"; + sha256 = "0c2jrz02dsdykc3xxqw1yfnllmrpwzs6ygjqcclghw5mygfc3xcg"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6004,12 +6004,12 @@ let vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-03-07"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "904b964eb0f878e44f47d39898e72fc0b939756b"; - sha256 = "07x8xafcvpg6dgxlvmf46gh7a9xvnrxj7i326q73g3yfh5xpma6c"; + rev = "30fe977b46bee7a7005fd808d14aa425149f4563"; + sha256 = "1ap1ghyi3f61zi5kc17nc7sw4dh3r7g2mlypy19hzhrfxysdxz7b"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -6172,12 +6172,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "87fd4bf57646f984b37de5041232047fa5fdee5a"; - sha256 = "00clqf82731zz6r1h4vs15zy4dka549cbngr1j9w605k5m9hrrzs"; + rev = "a2f964d0e22b9023e1f0233b611461d64dabcd4b"; + sha256 = "1gwb2wncdqn51ifp3pkgjz1lw2c7fzavh43639scj9mdj8rr6r12"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6340,12 +6340,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2021-03-31"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "6bd30278c7af4c624bf996650d62dac404342dc7"; - sha256 = "1wimsi6pxhw410dbcgj4sr9q5k21066i762fyaaf424jyf1g8d2i"; + rev = "62324b43ea858e268fb70665f7d012ae67690f43"; + sha256 = "1qdy028i9zrldjx24blk5im35lcijvq4fwg63ks2vrrvn0dfsj01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -6858,48 +6858,48 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-03-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "2f0cbbfb8ea8997b408e447a2bc9554a3de33617"; - sha256 = "1y3r5a5mcjf8dp0pkmhgnbay10hh48w1b3wd795wwbm6nx4izjjq"; + rev = "4b0fc48037c628f14209f30616a19287d9e54823"; + sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-17"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "296fb98d198cbbb5c5c937c09b84c8c7a9605a16"; - sha256 = "1khiygamq1jirlz2hgjjksr12a7sj4x90hs7z4zkvzl83ysnbmdn"; + rev = "80f4b269b51eae778a3f3093c144ffe8b2c943a1"; + sha256 = "15zbdgns2llzjwxzwn4b8bxyjkjjlnxrjrsbdbmkz7rkvkw4bkjd"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2021-04-06"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "130fd4189e0328630be7ad4aa7e1d98a0a503170"; - sha256 = "1nsac8f2c0lj42a77wxcv3k6i8sbpm5ghip6nx7yz0dj7zd4xm10"; + rev = "ce92c8e9b1ab587eb22ad017d536619b6a100d09"; + sha256 = "01h0lmxi9ly6qhywi5n7hzq881ff4kld7gzpzci81vflmi5k1gnx"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-12-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "46730b0d818da2da005e3c8a38ff987a2dd36d7c"; - sha256 = "1lc4lysv3q7qvivfrwqggrpdgsb3zkhq1clvzfsxfsa2m1y4gr0z"; + rev = "0451d1e9dd580f50b92253c546fc7d41dc95920c"; + sha256 = "0xxn0bnhvamf7r1k3ha5qwy8169gzd23k4m56iai514bbbfy9lfx"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -6967,12 +6967,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-04-20"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "71b97bac53aa09760e8d8c36767c657b274c468d"; - sha256 = "0ign21d8w6hcrbz9j6c0p1ff0y396wl7snm5dj81m7fck2287pj3"; + rev = "a39772e2fbd464776b0aa025ca04c2504379cf72"; + sha256 = "08sj11x507nh5fi5zx88p31wx936saqvw641rdwlk3g20b99sinj"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7651,12 +7651,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2021-04-22"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "31274b11e0a658b84f220ef1f5d69e171ba53ebf"; - sha256 = "1687ih32rgjjxf84dw7yx2qkylrqwp4ir8hj6mlh1hmysfd13vvl"; + rev = "3f6acfc2de2fa06e8e61269cf6a900336552abdc"; + sha256 = "11hdq749sli3k4cp4g0s9vm7v2blp49k0s1r814drc0x5rxkj5fy"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -7699,12 +7699,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-03-29"; + version = "2021-04-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "9c3c831a089c7b4dcc4ebd8b8c73f366f754c976"; - sha256 = "15m7hhqadvpf3ryig5vifp8m0md2mg9apx71z8xrpc7hgwsvy1bi"; + rev = "c171b86845a64d9ed3f5b9b4040f1164be37f115"; + sha256 = "0jr2xif05xb4iiv18nr7xz978z246bkbabgx1djh73rpjk3683y3"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -8372,12 +8372,12 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2021-04-04"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "26237f9284c3853084fbf9e8303efb8fb62e0aa9"; - sha256 = "0pmkjwpad63gdrp0qykkcsjdavb5kxwqvlcip0ykdm6ivvzi9fy5"; + rev = "b1330e04ffb95ede8e02b2f7df1f238190c67056"; + sha256 = "19r8gslq4m70rgi51bnlazhppggiy3crnmaqyvjc25f59f1213a7"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; @@ -8420,12 +8420,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-04-19"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "256235f8b60ccae36699e92edd61dbcf26fe0b17"; - sha256 = "000wyqm06h0614k6qwr90xxrvmwfbii7jjif5fjavk474ijgwckp"; + rev = "01d4073e7f1319f223c0d5bfd1abe1e292238252"; + sha256 = "1nfwiizd8nk4pqz1jsw9nq5ngmavjdb3jra2xb5kzgjl2fbzvjda"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8612,12 +8612,12 @@ let vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-03-15"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "1f7f05039c572fde082043915953a88b77c0ddb0"; - sha256 = "0ihyfdvgiclmcric66nd54ha7ikf2c1pl1slbn4y6mkbxla02yv9"; + rev = "bb44d7fb1a098c2fd4a4d26bb213a805184f30b8"; + sha256 = "07hc6nqhka544pgag0dh4k59w6cfn3vk9969ckg9ls6ywjwfyz8x"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -8792,12 +8792,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2021-04-20"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "054f957779dff8e5fbb859e8cfbca06f1ed9e7f0"; - sha256 = "1bsfrma06mkigr1jhzic98z4v1gckzrjv908vx2wlbjq9cdv7d39"; + rev = "6d849acb977fc2d008f9cd2edf4f1356537794fe"; + sha256 = "1hy4zgxrc0zn6dnbdv7zy2cn4ny99srsvrgkyvwhg4pzd9rwcqpp"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -8865,12 +8865,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "91c011f6c156f405ed259c9749ea049726ef8912"; - sha256 = "1pwq5wxyky38nhs8ckcl6x4yxkia5lk5hcd12l1d5iimddjfsx9i"; + rev = "479152f38efb0a787de661b33838aa2dc5a6da75"; + sha256 = "0ahqys0408n7c9hzc6dy70cj3rrg4nzha38iwwvcf7my2nvldbx2"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8913,12 +8913,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-03-31"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a2236deb0a40d745f38fac4523ed6a0c86639863"; - sha256 = "14gxwqykm4cql80la3x1x7sxcfmdvpm05r9brxw3xfn9bsqy3qsk"; + rev = "3d4e2a80658467af02a6347e3dae8810e6a5f02f"; + sha256 = "05hh9hk5qcn8gd4k3zm8qz077wxamp4rja486nwm9y5p6723vqn9"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ecaa316c465..56a62d7fa1d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -132,6 +132,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main +folke/which-key.nvim freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim From ce93de4f62940d9081ed441507ea10197f6f88cd Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Apr 2021 17:10:27 +0800 Subject: [PATCH 214/476] nixos/hyperv: bail gracefully if device is missing --- nixos/modules/virtualisation/hyperv-guest.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix index a3656c307f9..b3bcfff1980 100644 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -56,6 +56,8 @@ in { systemd = { packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; + services.hv-vss.unitConfig.ConditionPathExists = [ "/dev/vmbus/hv_vss" ]; + targets.hyperv-daemons = { wantedBy = [ "multi-user.target" ]; }; From 84b65960985d578741a1de6e94caa42561aa301d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Apr 2021 03:39:40 +0200 Subject: [PATCH 215/476] bind: 9.16.13 -> 9.16.15 https://kb.isc.org/docs/cve-2021-25214 https://kb.isc.org/docs/cve-2021-25215 https://kb.isc.org/docs/cve-2021-25216 Fixes: CVE-2021-25214, CVE-2021-25215, CVE-2021-25216 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 5077ff98ecf..99366d24439 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.13"; + version = "9.16.15"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pUzHk/pbabNfYQ8glXYPgjjf9c/VJBn37hycIn2kzAg="; + sha256 = "0fbqisrh84f8wszm94cqp7v8q9r7pql3qyzbay7vz9vqv0rg9dlq"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 6d23cfd56bbecfd27f230705b709575ba9d66c26 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Apr 2021 09:17:33 +0800 Subject: [PATCH 216/476] nixos/pcscd: fix #121088 --- nixos/modules/services/hardware/pcscd.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 54b6693f85a..59c12ee12ca 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -57,6 +57,16 @@ in systemd.services.pcscd = { environment.PCSCLITE_HP_DROPDIR = pluginEnv; restartTriggers = [ "/etc/reader.conf" ]; + + # If the cfgFile is empty and not specified (in which case the default + # /etc/reader.conf is assumed), pcscd will happily start going through the + # entire confdir (/etc in our case) looking for a config file and try to + # parse everything it finds. Doesn't take a lot of imagination to see how + # well that works. It really shouldn't do that to begin with, but to work + # around it, we force the path to the cfgFile. + # + # https://github.com/NixOS/nixpkgs/issues/121088 + serviceConfig.ExecStart = [ "" "${getBin pkgs.pcsclite}/bin/pcscd -f -x -c ${cfgFile}" ]; }; }; } From ce3e0d8a2d3b57c8f4cda62a62a421ec8239c1fa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 28 Apr 2021 22:15:56 +0000 Subject: [PATCH 217/476] python3.pkgs.django_extensions: 3.1.1 -> 3.1.3 Fixes: https://github.com/NixOS/nixpkgs/issues/120941 --- pkgs/development/python-modules/django-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3e7a1163b96..8ee903bedc2 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ss5x3d21c3g8i1s79l4akazlf116yp4y50gx4vrk1dxh3jb29zj"; + sha256 = "03mhikhh49z8bxajbjf1j790b9c9vl4zf4f86iwz7g0zrd7jqlvm"; }; LC_ALL = "en_US.UTF-8"; From 2d79945d1c0d927535373dee188540f8cc883e14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 23:01:02 +0000 Subject: [PATCH 218/476] himalaya: 0.2.7 -> 0.3.0 --- .../networking/mailreaders/himalaya/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 8b601101845..7a453bdb64b 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.2.7"; + version = "0.3.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn"; + sha256 = "sha256-s2QZSusJLeo4WIorSj+e1yYqWXFqTt8YF6/Tyz9fHeY="; }; - cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn"; + cargoSha256 = "sha256-u9dLqr5CnrgYiDWAiW9u1zcUWmprOiq5+TfafO8M+WU="; nativeBuildInputs = [ ] ++ lib.optionals (enableCompletions) [ installShellFiles ] From e99e9f2d473c97516a95ecf39ded9c9dba00733c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 21:05:57 +0000 Subject: [PATCH 219/476] elan: 1.0.0 -> 1.0.2 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index a7be01ae4e8..45a1345de86 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-Ve9nd/IEHo7Gg4WyxqKLUV495U1k9LfDyClkuVkooyA="; + sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk="; }; - cargoSha256 = "sha256-InGMZdP0c/QKU6ao8qhAUIDcAhOTumLOz6wo/u2+ibA="; + cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4="; nativeBuildInputs = [ pkg-config makeWrapper ]; From cec25e93b6c444d177341e976dad02da0988148b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 00:55:16 +0000 Subject: [PATCH 220/476] belcard: 4.5.1 -> 4.5.3 --- pkgs/development/libraries/belcard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 36af06dfc55..dbc85992ba4 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14hkgwr2a9zw44v1s8xscqxa2mwin06jsxpwb3hflh9mp16ymfzv"; + sha256 = "sha256-+7vqTbg1QergWPx2LQ2wkVehOma6Ix02IfwnJTJ/E5I="; }; buildInputs = [ bctoolbox belr ]; From 6acafb97e5372c0011ffc77d20f275d04d1436e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 20:14:01 +0000 Subject: [PATCH 221/476] cheat: 4.2.0 -> 4.2.1 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 90eb38329a3..9c8f060f169 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-Q/frWu82gB15LEzwYCbJr7k0yZ+AXBvcPWxoevSpeqU="; + sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0="; }; subPackages = [ "cmd/cheat" ]; From b9029fd72cdcb3e9ffac47581e11fe5bf27c1988 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 15:58:27 +0000 Subject: [PATCH 222/476] highlight: 3.60 -> 4.0 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 56d0a234527..657dc548f86 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.60"; + version = "4.0"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-1EBdtORd9P5DJUmbZa9KjR3UUoHOKLbjqbxpFi5WFvQ="; + sha256 = "sha256-WWbT0CfrbHgpU5HQycRhU7Ymey1LKd/ruoF91F3mHdE="; }; enableParallelBuilding = true; From ab091a887ccce9b5649811e38a09d8a422afbe0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 12:46:23 +0000 Subject: [PATCH 223/476] groonga: 11.0.0 -> 11.0.1 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index ea6fd939457..6ba221f8baf 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-kgQAFa4Orvfms/trjaMrXULYy7nV+nsmLPpyZAq3cDY="; + sha256 = "sha256-Ap5DdOf3PVctMAYCP0Xr4VjqO5yEWqrKX6FbId8/FMQ="; }; buildInputs = with lib; From 512207780185be895d9678c957b1dc2a3ef446fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 12:03:33 +0000 Subject: [PATCH 224/476] gmsh: 4.8.1 -> 4.8.3 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index c0d91a28445..b85f8ba47a4 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.8.1"; + version = "4.8.3"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-1QOPXyWuhZc1NvsFzIhv6xvX1n4mBanYeJvMJSj6izU="; + sha256 = "sha256-JvJIsSmgDR6gZY8CRBDCSQvNneckVFoRRKCSxgQnZ3U="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL From f456d423860f83439f656003e35d28e7eff859c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 11:20:56 +0000 Subject: [PATCH 225/476] gpsprune: 20.2 -> 20.3 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 5df2940dff3..70645202a46 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "20.2"; + version = "20.3"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-40GrihCeDAqJCFcg4FMFxCg7bzd6CrDR5JU70e5VHDE="; + sha256 = "sha256-hmAksLPQxzB4O+ET+O/pmL/J4FG4+Dt0ulSsgjBWKxw="; }; nativeBuildInputs = [ makeWrapper ]; From ba13dc0652697b6bb05d6977d94271ea0d110de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 08:59:32 +0200 Subject: [PATCH 226/476] nixos/prometheus: add unbound exporter --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/unbound.nix | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/unbound.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index e0c5ceccfcc..ce7c215fd14 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -59,6 +59,7 @@ let "surfboard" "systemd" "tor" + "unbound" "unifi" "unifi-poller" "varnish" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix new file mode 100644 index 00000000000..56a559531c1 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.unbound; +in +{ + port = 9167; + extraOpts = { + fetchType = mkOption { + # TODO: add shm when upstream implemented it + type = types.enum [ "tcp" "uds" ]; + default = "uds"; + description = '' + Which methods the exporter uses to get the information from unbound. + ''; + }; + + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + + controlInterface = mkOption { + type = types.nullOr types.str; + default = null; + example = "/run/unbound/unbound.socket"; + description = '' + Path to the unbound socket for uds mode or the control interface port for tcp mode. + + Example: + uds-mode: /run/unbound/unbound.socket + tcp-mode: 127.0.0.1:8953 + ''; + }; + }; + + serviceOpts = mkMerge ([{ + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-unbound-exporter}/bin/unbound-telemetry \ + ${cfg.fetchType} \ + --bind ${cfg.listenAddress}:${toString cfg.port} \ + --path ${cfg.telemetryPath} \ + ${optionalString (cfg.controlInterface != null) "--control-interface ${cfg.controlInterface}"} \ + ${toString cfg.extraFlags} + ''; + }; + }] ++ [ + (mkIf config.services.unbound.enable { + after = [ "unbound.service" ]; + requires = [ "unbound.service" ]; + }) + ]); +} From da858b16b88cad1ed67662b0fa6f483bb665d498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Apr 2021 06:00:45 +0200 Subject: [PATCH 227/476] nixos/tests/prometheus-exporters: add unbound test Author: WilliButz --- nixos/tests/prometheus-exporters.nix | 23 +++++++++++++++++++ .../prometheus/unbound-exporter.nix | 6 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 62c0080dd51..55fe7db4db3 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1000,6 +1000,29 @@ let ''; }; + unbound = { + exporterConfig = { + enable = true; + fetchType = "uds"; + controlInterface = "/run/unbound/unbound.ctl"; + }; + metricProvider = { + services.unbound = { + enable = true; + localControlSocketPath = "/run/unbound/unbound.ctl"; + }; + systemd.services.prometheus-unbound-exporter.serviceConfig = { + SupplementaryGroups = [ "unbound" ]; + }; + }; + exporterTest = '' + wait_for_unit("unbound.service") + wait_for_unit("prometheus-unbound-exporter.service") + wait_for_open_port(9167) + succeed("curl -sSf localhost:9167/metrics | grep -q 'unbound_up 1'") + ''; + }; + varnish = { exporterConfig = { enable = true; diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index c085226d909..6b26379bf26 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, openssl, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests }: rustPlatform.buildRustPackage rec { pname = "unbound-telemetry"; @@ -17,6 +17,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; + passthru.tests = { + inherit (nixosTests.prometheus-exporters) unbound; + }; + meta = with lib; { description = "Prometheus exporter for Unbound DNS resolver"; homepage = "https://github.com/svartalf/unbound-telemetry"; From d3fe53a8a6a3a27f79d8e5916563b841e5e002db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Apr 2021 06:01:12 +0200 Subject: [PATCH 228/476] nixos/tests/prometheus-exporters: nixpkgs-fmt --- nixos/tests/prometheus-exporters.nix | 308 ++++++++++++++------------- 1 file changed, 160 insertions(+), 148 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 55fe7db4db3..0b6f80b5dc1 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1,65 +1,65 @@ { system ? builtins.currentSystem -, config ? {} +, config ? { } , pkgs ? import ../.. { inherit system config; } }: let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge - removeSuffix replaceChars singleton splitString; + removeSuffix replaceChars singleton splitString; -/* - * The attrset `exporterTests` contains one attribute - * for each exporter test. Each of these attributes - * is expected to be an attrset containing: - * - * `exporterConfig`: - * this attribute set contains config for the exporter itself - * - * `exporterTest` - * this attribute set contains test instructions - * - * `metricProvider` (optional) - * this attribute contains additional machine config - * - * `nodeName` (optional) - * override an incompatible testnode name - * - * Example: - * exporterTests. = { - * exporterConfig = { - * enable = true; - * }; - * metricProvider = { - * services..enable = true; - * }; - * exporterTest = '' - * wait_for_unit("prometheus--exporter.service") - * wait_for_open_port("1234") - * succeed("curl -sSf 'localhost:1234/metrics'") - * ''; - * }; - * - * # this would generate the following test config: - * - * nodes. = { - * services.prometheus. = { - * enable = true; - * }; - * services..enable = true; - * }; - * - * testScript = '' - * .start() - * .wait_for_unit("prometheus--exporter.service") - * .wait_for_open_port("1234") - * .succeed("curl -sSf 'localhost:1234/metrics'") - * .shutdown() - * ''; - */ + /* + * The attrset `exporterTests` contains one attribute + * for each exporter test. Each of these attributes + * is expected to be an attrset containing: + * + * `exporterConfig`: + * this attribute set contains config for the exporter itself + * + * `exporterTest` + * this attribute set contains test instructions + * + * `metricProvider` (optional) + * this attribute contains additional machine config + * + * `nodeName` (optional) + * override an incompatible testnode name + * + * Example: + * exporterTests. = { + * exporterConfig = { + * enable = true; + * }; + * metricProvider = { + * services..enable = true; + * }; + * exporterTest = '' + * wait_for_unit("prometheus--exporter.service") + * wait_for_open_port("1234") + * succeed("curl -sSf 'localhost:1234/metrics'") + * ''; + * }; + * + * # this would generate the following test config: + * + * nodes. = { + * services.prometheus. = { + * enable = true; + * }; + * services..enable = true; + * }; + * + * testScript = '' + * .start() + * .wait_for_unit("prometheus--exporter.service") + * .wait_for_open_port("1234") + * .succeed("curl -sSf 'localhost:1234/metrics'") + * .shutdown() + * ''; + */ exporterTests = { - apcupsd = { + apcupsd = { exporterConfig = { enable = true; }; @@ -188,20 +188,21 @@ let "plugin":"testplugin", "time":DATE }] - ''; in '' - wait_for_unit("prometheus-collectd-exporter.service") - wait_for_open_port(9103) - succeed( - 'echo \'${postData}\'> /tmp/data.json' - ) - succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json') - succeed( - "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd" - ) - succeed( - "curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'" - ) - ''; + ''; in + '' + wait_for_unit("prometheus-collectd-exporter.service") + wait_for_open_port(9103) + succeed( + 'echo \'${postData}\'> /tmp/data.json' + ) + succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json') + succeed( + "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd" + ) + succeed( + "curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'" + ) + ''; }; dnsmasq = { @@ -254,7 +255,8 @@ let ''; }; - fritzbox = { # TODO add proper test case + fritzbox = { + # TODO add proper test case exporterConfig = { enable = true; }; @@ -373,19 +375,19 @@ let ''; systemd.services.lnd = { serviceConfig.ExecStart = '' - ${pkgs.lnd}/bin/lnd \ - --datadir=/var/lib/lnd \ - --tlscertpath=/var/lib/lnd/tls.cert \ - --tlskeypath=/var/lib/lnd/tls.key \ - --logdir=/var/log/lnd \ - --bitcoin.active \ - --bitcoin.mainnet \ - --bitcoin.node=bitcoind \ - --bitcoind.rpcuser=bitcoinrpc \ - --bitcoind.rpcpass=hunter2 \ - --bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 \ - --bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 \ - --readonlymacaroonpath=/var/lib/lnd/readonly.macaroon + ${pkgs.lnd}/bin/lnd \ + --datadir=/var/lib/lnd \ + --tlscertpath=/var/lib/lnd/tls.cert \ + --tlskeypath=/var/lib/lnd/tls.key \ + --logdir=/var/log/lnd \ + --bitcoin.active \ + --bitcoin.mainnet \ + --bitcoin.node=bitcoind \ + --bitcoind.rpcuser=bitcoinrpc \ + --bitcoind.rpcpass=hunter2 \ + --bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 \ + --bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 \ + --readonlymacaroonpath=/var/lib/lnd/readonly.macaroon ''; serviceConfig.StateDirectory = "lnd"; wantedBy = [ "multi-user.target" ]; @@ -407,14 +409,14 @@ let configuration = { monitoringInterval = "2s"; mailCheckTimeout = "10s"; - servers = [ { + servers = [{ name = "testserver"; server = "localhost"; port = 25; from = "mail-exporter@localhost"; to = "mail-exporter@localhost"; detectionDir = "/var/spool/mail/mail-exporter/new"; - } ]; + }]; }; }; metricProvider = { @@ -516,15 +518,17 @@ let url = "http://localhost"; }; metricProvider = { - systemd.services.nc-pwfile = let - passfile = (pkgs.writeText "pwfile" "snakeoilpw"); - in { - requiredBy = [ "prometheus-nextcloud-exporter.service" ]; - before = [ "prometheus-nextcloud-exporter.service" ]; - serviceConfig.ExecStart = '' - ${pkgs.coreutils}/bin/install -o nextcloud-exporter -m 0400 ${passfile} /var/nextcloud-pwfile - ''; - }; + systemd.services.nc-pwfile = + let + passfile = (pkgs.writeText "pwfile" "snakeoilpw"); + in + { + requiredBy = [ "prometheus-nextcloud-exporter.service" ]; + before = [ "prometheus-nextcloud-exporter.service" ]; + serviceConfig.ExecStart = '' + ${pkgs.coreutils}/bin/install -o nextcloud-exporter -m 0400 ${passfile} /var/nextcloud-pwfile + ''; + }; services.nginx = { enable = true; virtualHosts."localhost" = { @@ -581,7 +585,7 @@ let syslog = { listen_address = "udp://127.0.0.1:10000"; format = "rfc3164"; - tags = ["nginx"]; + tags = [ "nginx" ]; }; }; } @@ -701,10 +705,10 @@ let exporterConfig = { enable = true; group = "openvpn"; - statusPaths = ["/run/openvpn-test"]; + statusPaths = [ "/run/openvpn-test" ]; }; metricProvider = { - users.groups.openvpn = {}; + users.groups.openvpn = { }; services.openvpn.servers.test = { config = '' dev tun @@ -824,19 +828,21 @@ let }; metricProvider = { # Mock rtl_433 binary to return a dummy metric stream. - nixpkgs.overlays = [ (self: super: { - rtl_433 = self.runCommand "rtl_433" {} '' - mkdir -p "$out/bin" - cat < "$out/bin/rtl_433" - #!/bin/sh - while true; do - printf '{"time" : "2020-04-26 13:37:42", "model" : "zopieux", "id" : 55, "channel" : 3, "temperature_C" : 18.000}\n' - sleep 4 - done - EOF - chmod +x "$out/bin/rtl_433" - ''; - }) ]; + nixpkgs.overlays = [ + (self: super: { + rtl_433 = self.runCommand "rtl_433" { } '' + mkdir -p "$out/bin" + cat < "$out/bin/rtl_433" + #!/bin/sh + while true; do + printf '{"time" : "2020-04-26 13:37:42", "model" : "zopieux", "id" : 55, "channel" : 3, "temperature_C" : 18.000}\n' + sleep 4 + done + EOF + chmod +x "$out/bin/rtl_433" + ''; + }) + ]; }; exporterTest = '' wait_for_unit("prometheus-rtl_433-exporter.service") @@ -852,7 +858,7 @@ let smokeping = { exporterConfig = { enable = true; - hosts = ["127.0.0.1"]; + hosts = [ "127.0.0.1" ]; }; exporterTest = '' wait_for_unit("prometheus-smokeping-exporter.service") @@ -990,7 +996,7 @@ let unifi-poller = { nodeName = "unifi_poller"; exporterConfig.enable = true; - exporterConfig.controllers = [ { } ]; + exporterConfig.controllers = [{ }]; exporterTest = '' wait_for_unit("prometheus-unifi-poller-exporter.service") wait_for_open_port(9130) @@ -1052,54 +1058,60 @@ let ''; }; - wireguard = let snakeoil = import ./wireguard/snakeoil-keys.nix; in { - exporterConfig.enable = true; - metricProvider = { - networking.wireguard.interfaces.wg0 = { - ips = [ "10.23.42.1/32" "fc00::1/128" ]; - listenPort = 23542; + wireguard = let snakeoil = import ./wireguard/snakeoil-keys.nix; in + { + exporterConfig.enable = true; + metricProvider = { + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; - inherit (snakeoil.peer0) privateKey; + inherit (snakeoil.peer0) privateKey; - peers = singleton { - allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + peers = singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; - inherit (snakeoil.peer1) publicKey; + inherit (snakeoil.peer1) publicKey; + }; }; + systemd.services.prometheus-wireguard-exporter.after = [ "wireguard-wg0.service" ]; }; - systemd.services.prometheus-wireguard-exporter.after = [ "wireguard-wg0.service" ]; + exporterTest = '' + wait_for_unit("prometheus-wireguard-exporter.service") + wait_for_open_port(9586) + wait_until_succeeds( + "curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'" + ) + ''; }; - exporterTest = '' - wait_for_unit("prometheus-wireguard-exporter.service") - wait_for_open_port(9586) - wait_until_succeeds( - "curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'" - ) - ''; - }; }; in -mapAttrs (exporter: testConfig: (makeTest (let - nodeName = testConfig.nodeName or exporter; +mapAttrs + (exporter: testConfig: (makeTest ( + let + nodeName = testConfig.nodeName or exporter; -in { - name = "prometheus-${exporter}-exporter"; + in + { + name = "prometheus-${exporter}-exporter"; - nodes.${nodeName} = mkMerge [{ - services.prometheus.exporters.${exporter} = testConfig.exporterConfig; - } testConfig.metricProvider or {}]; + nodes.${nodeName} = mkMerge [{ + services.prometheus.exporters.${exporter} = testConfig.exporterConfig; + } testConfig.metricProvider or { }]; - testScript = '' - ${nodeName}.start() - ${concatStringsSep "\n" (map (line: - if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")") - then line - else "${nodeName}.${line}" - ) (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))} - ${nodeName}.shutdown() - ''; + testScript = '' + ${nodeName}.start() + ${concatStringsSep "\n" (map (line: + if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")") + then line + else "${nodeName}.${line}" + ) (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))} + ${nodeName}.shutdown() + ''; - meta = with maintainers; { - maintainers = [ willibutz elseym ]; - }; -}))) exporterTests + meta = with maintainers; { + maintainers = [ willibutz elseym ]; + }; + } + ))) + exporterTests From 147439c5f0cb564580910a3404bad1cbbfc73f85 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 28 Apr 2021 19:18:07 +0200 Subject: [PATCH 229/476] diffoscope: 171 -> 172 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 086c1a2b540..27da4900285 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "171"; + version = "172"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA="; + sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x"; }; outputs = [ "out" "man" ]; From 7859860c5ac5c7efc4f368d060cb1150be7653cf Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 28 Apr 2021 19:11:22 +0200 Subject: [PATCH 230/476] haruna: 0.6.2 -> 0.6.3 --- pkgs/applications/video/haruna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 36c1c411591..3e45dd62d68 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "g-fb"; repo = "haruna"; rev = version; - sha256 = "sha256-YsC0ZdLwHCO9izDIk2dTMr0U/nb60MHSxKURV8Xltss="; + sha256 = "sha256-gJCLc8qJolv4Yufm/OBCTTEpyoodtySAqKH+zMHCoLU="; }; buildInputs = [ From 77a270f871cd0c1735eb6c2c6d2d65236936fcc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 07:53:04 +0000 Subject: [PATCH 231/476] freeciv: 2.6.3 -> 2.6.4 --- pkgs/games/freeciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 3ffb7e0c549..58e91a44842 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc="; + sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI="; }; postPatch = '' From 6067cfccc6f0904dfea5ac5962ff06c9af11632f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 08:09:51 +0000 Subject: [PATCH 232/476] fuzzel: 1.5.1 -> 1.5.3 --- pkgs/applications/misc/fuzzel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 3dafe8fa671..f03e8569712 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.5.1"; + version = "1.5.3"; src = fetchzip { url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; - sha256 = "0zy0icd3647jyq4xflp35vwn52yxgj3zz4n30br657xjq1l5afzl"; + sha256 = "sha256-n2eXS4NdOBgn48KOJ+0sQeNMKL7OxB8tUB99narQG0o="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; From 085a70f717d34d011e38b9425012e1f1d7b2f765 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Thu, 29 Apr 2021 10:03:28 +0530 Subject: [PATCH 233/476] xplr: 0.5.7 -> 0.5.10 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 46dfe713de1..14a50dbeb9e 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "xplr"; - version = "0.5.7"; + version = "0.5.10"; src = fetchFromGitHub { owner = "sayanarijit"; repo = name; rev = "v${version}"; - sha256 = "1j417g0isy3cpxdb2wrvrvypnx99qffi83s4a98791wyi8yqiw6b"; + sha256 = "1gy0iv39arq2ri57iqsycp1sfnn1yafnhblr7p1my2wnmqwmd4qw"; }; - cargoSha256 = "0kpwhk2f4czhilcnfqkw5hw2vxvldxqg491xkkgxjkph3w4qv3ji"; + cargoSha256 = "01b4dlbakkdn3pfyyphabzrmqyp7fjy6n1nfk38z3zap5zvx8ipl"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From b79d1b517d1afabca24b99d5f773740786dc745a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 07:20:41 +0000 Subject: [PATCH 234/476] cvs_fast_export: 1.55 -> 1.56 --- .../version-management/cvs-fast-export/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index f4957a82d44..ffd583585c0 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.55"; + version = "1.56"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.55.tar.gz"; - sha256 = "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz"; + sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU="; }; buildInputs = [ From 1cb3d84c6aeb75d2a436b027a825850241e695b6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 28 Apr 2021 08:24:32 +0200 Subject: [PATCH 235/476] hikari: 2.2.2 -> 2.3.0 --- .../window-managers/hikari/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 34016b0d756..23c7d9f680f 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.2.2"; + version = "2.3.0"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; + sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy"; }; nativeBuildInputs = [ pkg-config bmake ]; @@ -49,11 +49,13 @@ stdenv.mkDerivation { optionalString enabled "WITH_${toUpper feat}=YES" ) features; - # Can't suid in nix store - # Run hikari as root (it will drop privileges as early as possible), or create - # a systemd unit to give it the necessary permissions/capabilities. - patchPhase = '' + postPatch = '' + # Can't suid in nix store + # Run hikari as root (it will drop privileges as early as possible), or create + # a systemd unit to give it the necessary permissions/capabilities. substituteInPlace Makefile --replace '4555' '555' + + sed -i 's@@@' src/*.c ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cca30a5fb1b..a7443c56522 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23787,9 +23787,7 @@ in wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { - wlroots = wlroots_0_12; - }; + hikari = callPackage ../applications/window-managers/hikari { }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; From 7ecb53ac5b2fa50eedb2f56310ce1a83ee6aa19e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 05:06:23 +0000 Subject: [PATCH 236/476] bslizr: 1.2.12 -> 1.2.14 --- pkgs/applications/audio/bslizr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 3d8e0c8f356..01dd736dc59 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.12"; + version = "1.2.14"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-vPkcgG+pAfjsPRMyxdMRUxWGch+RG+pdaAcekP5pKEA="; + sha256 = "sha256-dut3I68tJWQH+X6acKROqb5HywufeBQ4/HkXFKsA3hY="; }; nativeBuildInputs = [ pkg-config ]; From 1c65a509fbbc17a2853a657ea1391de0aab9e793 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 05:15:17 +0000 Subject: [PATCH 237/476] dico: 2.10 -> 2.11 --- pkgs/servers/dico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 6a8c6541c2c..a48215a57d5 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "dico"; - version = "2.10"; + version = "2.11"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0qag47mzs00d53hnrmh381r0jay42766vp5xrffmzmsn2307x8vl"; + sha256 = "sha256-rB+Y4jPQ+srKrBBZ87gThKVZLib9TDCCrtAD9l4lLFo="; }; hardeningDisable = [ "format" ]; From da99ec9f3a2ddbf7da867800c79627a9e0411a4b Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 29 Apr 2021 07:13:17 +0200 Subject: [PATCH 238/476] b4: loosen versions for request and dnspython Until the next stable release, we need to loosen the version requirements ourselves by hand for dnspython, since NixOS has updated to version 2.1. While at it, adjust requests from ~=2.24.0 to ~=2.25 which effectively enables all 2.* versions for requests. Fixes the following build error: adding 'b4-0.6.2.dist-info/RECORD' removing build/bdist.linux-x86_64/wheel Finished executing setuptoolsBuildPhase installing Executing pipInstallPhase /build/b4-0.6.2/dist /build/b4-0.6.2 Processing ./b4-0.6.2-py3-none-any.whl Requirement already satisfied: dkimpy~=1.0.5 in /nix/store/3war2scyn6pnrhhcfdx48vd5023x2rkp-python3.8-dkimpy-1.0.5/lib/python3.8/site-packages (from b4==0.6.2) (1.0.5) ERROR: Could not find a version that satisfies the requirement dnspython~=2.0.0 (from b4) ERROR: No matching distribution found for dnspython~=2.0.0 --- pkgs/development/tools/b4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8210f7c409a..30d38aac2ae 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -11,7 +11,8 @@ python3Packages.buildPythonApplication rec { preConfigure = '' substituteInPlace setup.py \ - --replace 'requests~=2.24' 'requests~=2.25' + --replace 'requests~=2.24.0' 'requests~=2.25' \ + --replace 'dnspython~=2.0.0' 'dnspython~=2.1' ''; # tests make dns requests and fails From cc6e48c8ba2e7c9f0491de4acb7d43d7a3364738 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Apr 2021 08:24:35 +0200 Subject: [PATCH 239/476] =?UTF-8?q?coqPackages.coqeal:=201.0.4=20=E2=86=92?= =?UTF-8?q?=201.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coqeal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 4c978a791db..615c200c633 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -7,10 +7,12 @@ with lib; mkCoqDerivation { owner = "CoqEAL"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm"; release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; From d51942f9ecd336b4ab8f2a23e6e4fe686bb6516e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:01:55 +0200 Subject: [PATCH 240/476] python3Packages.zha-quirks: 0.0.56 -> 0.0.57 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index d9c42910e64..34335c65e1a 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.56"; + version = "0.0.57"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "1jss5pnxdjlp0kplqxgr09vv1zq9n7l9w08hsywy2vglqmd67a66"; + sha256 = "sha256-ajdluj6UIzjJUK30GtoM+e5lsMQRKnn3FPNEg+RS/DM="; }; propagatedBuildInputs = [ From 1a3b58e760a234e448ff9696f388da231ad4dc29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:07:10 +0200 Subject: [PATCH 241/476] python3Packages.hatasmota: 0.2.10 -> 0.2.11 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 9506dbb96de..f75891c2600 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-f831DKQJII1/MeF1buFihi65y3l7Vp7reVEcyzbAw3o="; + sha256 = "sha256-S2pVxYpB8NcZIbhC+gnGrJxM6tvoPS1Uh87HTYiksWI="; }; propagatedBuildInputs = [ From 77485293df3fdbb5a44d7a560adbefdc377dccda Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 29 Apr 2021 09:09:37 +0200 Subject: [PATCH 242/476] pythonPackages.xlsx2csv: fix homepage --- pkgs/development/python-modules/xlsx2csv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 6f7726da68d..47576e6ee60 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -13,10 +13,9 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "https://github.com/bitprophet/alabaster"; + homepage = "https://github.com/dilshod/xlsx2csv"; description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; }; - } From f6cc83eb75ac437aa7ad9c90e869edbac1de95ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:10:25 +0200 Subject: [PATCH 243/476] python3Packages.yalexs: 1.1.10 -> 1.1.11 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index c65c88b88d5..e20536b30eb 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.10"; + version = "1.1.11"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "1qmxiafqmh51i3l30pajaqj5h0kziq4d37fn6hl58429bb85dpp9"; + sha256 = "sha256-fVUYrzIcW4jbxdhS/Bh8eu+aJPFOqj0LXjoQKw+FZdg="; }; propagatedBuildInputs = [ From 7b7dacca890330d1d4194c08d8f0536312be579b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:12:46 +0200 Subject: [PATCH 244/476] python3Packages.screenlogicpy: 0.3.0 -> 0.4.1 --- pkgs/development/python-modules/screenlogicpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 100c487acee..be9cbc6f13e 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.3.0"; + version = "0.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0gn2mf2n2g1ffdbijrydgb7dgd60lkvckblx6s86kxlkrp1wqgrq"; + sha256 = "sha256-Hj+AS8YN7ZtmgY5sUj4TmQspzeiKiLz6dBbmjhGCgXI="; }; # Project doesn't publish tests From 4ec3123b82d7c4e96ec7f55cdfa27e74be87f108 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:19:38 +0200 Subject: [PATCH 245/476] python3Packages.screenlogicpy: enable tests --- .../python-modules/screenlogicpy/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index be9cbc6f13e..1713e4c2521 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -9,14 +10,23 @@ buildPythonPackage rec { version = "0.4.1"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-Hj+AS8YN7ZtmgY5sUj4TmQspzeiKiLz6dBbmjhGCgXI="; + src = fetchFromGitHub { + owner = "dieselrabbit"; + repo = pname; + rev = "v${version}"; + sha256 = "1rmjxqqbkfcv2xz8ilml799bzffls678fvq784fab2xdv595fndd"; }; - # Project doesn't publish tests - # https://github.com/dieselrabbit/screenlogicpy/issues/8 - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_gateway_discovery" + "test_asyncio_gateway_discovery" + ]; + pythonImportsCheck = [ "screenlogicpy" ]; meta = with lib; { From 85c333d358d1a8ee92a259077030c2e84098520f Mon Sep 17 00:00:00 2001 From: jupblb Date: Sun, 25 Apr 2021 21:12:26 +0200 Subject: [PATCH 246/476] vimPlugins.gruvbox-nvim: init at 2021-04-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b5b4037ee06..13ff034beef 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1749,6 +1749,18 @@ let meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + gruvbox-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-nvim"; + version = "2021-04-23"; + src = fetchFromGitHub { + owner = "npxbr"; + repo = "gruvbox.nvim"; + rev = "9dc9ea64fd2fb255a39210e227fc7146855434af"; + sha256 = "04d8knfhidxdm8lzc15hklq1mm6i5kmdkik4iln4cbhd3cg33iqy"; + }; + meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; version = "2021-02-21"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8b7e41ed3bd..a9f2243adab 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -273,6 +273,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care buildInputs = [ python3.pkgs.jedi ]; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 56a62d7fa1d..f923ba8759e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -437,6 +437,7 @@ norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim npxbr/glow.nvim@main +npxbr/gruvbox.nvim@main ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 From d61fc4c2a3cef14b3b945b125dbafcf1c3e5461c Mon Sep 17 00:00:00 2001 From: jupblb Date: Mon, 26 Apr 2021 09:36:39 +0200 Subject: [PATCH 247/476] Update vim-clap cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a9f2243adab..3cc8620a89c 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -605,7 +605,7 @@ self: super: { libiconv ]; - cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE="; + cargoSha256 = "1c8bwvwd23d7c3bk1ky1i8xgfz10dr8nqqcvp20g8rldjl8p2r08"; }; in '' From a2ee0a2d27f64e19739d5855e34183ae4aaff5ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:40:29 +0200 Subject: [PATCH 248/476] python3Packages.pydeconz: 78 -> 79 --- pkgs/development/python-modules/pydeconz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 73d989468c5..c202e5df19b 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -3,21 +3,21 @@ , aioresponses , buildPythonPackage , fetchFromGitHub -, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pydeconz"; - version = "78"; + version = "79"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-uIRuLNGFX7gq59/ntfks9pECiGkX7jjKh2jmjxFRcv4="; + sha256 = "sha256-I29UIyHjsIymZxcE084hQoyaEMTXIIQPFcB8lsxY+UI="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ aioresponses - pytest-asyncio + pytest-aiohttp pytestCheckHook ]; From 0e0c0a904deee3c93455f81f639484ec2eb9a4f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:48:01 +0200 Subject: [PATCH 249/476] python3Packages.pysmappee: 0.2.23 -> 0.2.24 --- pkgs/development/python-modules/pysmappee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index a3517ea87ec..c845f1bf5f0 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.23"; + version = "0.2.24"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "sha256-vxCZzkngYnc+hD3gT1x7qAQTFjpmmgRU5F6cusNDNgk="; + sha256 = "sha256-M1qzwGf8q4WgkEL0nK1yjn3JSBbP7mr75IV45Oa+ypM="; }; propagatedBuildInputs = [ From e88bf5f13b0eb099a66a3aa5a95f1e13eb1a10c4 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Thu, 29 Apr 2021 10:52:02 +0300 Subject: [PATCH 250/476] nixos/ombi: set ombi as system user --- nixos/modules/services/misc/ombi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/ombi.nix b/nixos/modules/services/misc/ombi.nix index 83f433e0be4..b5882168e51 100644 --- a/nixos/modules/services/misc/ombi.nix +++ b/nixos/modules/services/misc/ombi.nix @@ -70,6 +70,7 @@ in { users.users = mkIf (cfg.user == "ombi") { ombi = { + isSystemUser = true; group = cfg.group; home = cfg.dataDir; }; From c809b48b2f6cdfadf02a327aaacd9afb8452c2e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:54:32 +0200 Subject: [PATCH 251/476] python3Packages.aiorecollect: 1.0.3 -> 1.0.4 --- .../python-modules/aiorecollect/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 53daf1f2269..1bce60ce6af 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, async-timeout , buildPythonPackage , fetchFromGitHub , freezegun @@ -13,19 +12,23 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-S4HL8vJS/dTKsR5egKRSHqZYPClcET5Le06euHPyIkU="; + sha256 = "sha256-A4qk7eo4maCRP4UmtWrRCPvG6YrLVSOiOcfN8pEj5Po="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aresponses @@ -35,8 +38,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "aiorecollect" ]; meta = with lib; { From 315d14d8199f0d03ecc100f0306407a673955b66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 09:58:08 +0200 Subject: [PATCH 252/476] python3Packages.pyairvisual: 5.0.7 -> 5.0.8 --- pkgs/development/python-modules/pyairvisual/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index bcbb672f5c8..65f70efb7c5 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.7"; + version = "5.0.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-r/AJl36dv6+C92tc3kpX4/VzG69qdh4ERCyQxDOHdVU="; + sha256 = "sha256-QgMc0O5jk5LgKQg9ZMCZd3dNLv1typm1Rp2u8kSsqYk="; }; nativeBuildInputs = [ poetry-core ]; @@ -43,8 +43,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "pyairvisual" ]; meta = with lib; { From b3d2e6c7ea8de3c6dbad216935e2f1d1634e4461 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 10:04:48 +0200 Subject: [PATCH 253/476] python3Packages.pysma: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 39941242f1d..55b6b727845 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "da4bed38aba52fa097694bda15c7fd80ca698d9352e71a63bc29092d635de54d"; + sha256 = "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q="; }; propagatedBuildInputs = [ From a670f92186204bd1b4df11244c7b01c90ec00f11 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Thu, 29 Apr 2021 04:09:34 -0400 Subject: [PATCH 254/476] get_iplayer: 3.24 -> 3.27 (#120863) --- pkgs/applications/misc/get_iplayer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index d4f50451719..f2692243db6 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: with lib; perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "3.24"; + version = "3.27"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - sha256 = "0yd84ncb6cjrk4v4kz3zrddkl7iwkm3zlfbjyswd9hanp8fvd4q3"; + sha256 = "077y31gg020wjpx5pcivqgkqawcjxh5kjnvq97x2gd7i3wwc30qi"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg_3 flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; From 1d801e6338454089d84a0307600c0a0554bf1feb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 10:10:08 +0200 Subject: [PATCH 255/476] python3Packages.python-smarttub: 0.0.23 -> 0.0.24 --- pkgs/development/python-modules/python-smarttub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index d9d1d446d1e..380b1738964 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.23"; + version = "0.0.24"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "0maqbmk50xjhv9f0zm62ayzyf99kic3c0g5714cqkw3pfp8k75cx"; + sha256 = "sha256-XWZbfPNZ1cPsDwtJRuOwIPTHmNBMzFSYHDDcbBrXjtk="; }; propagatedBuildInputs = [ From 433df32ddb83a90f95c7b37c6fd6b68d46cb9100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 28 Apr 2021 19:58:29 +0200 Subject: [PATCH 256/476] editorconfig check: instruct user what to do --- .github/workflows/editorconfig.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 2d7b9d7ce84..a6e9eb8718b 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -39,3 +39,7 @@ jobs: if: env.PR_DIFF run: | echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size + - if: ${{ failure() }} + run: | + echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." + From 77215825ded540a994c5299b016d2e2c010c3940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 28 Apr 2021 20:07:05 +0200 Subject: [PATCH 257/476] editorconfig check: avoid channels as they might break one day --- .github/workflows/editorconfig.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index a6e9eb8718b..4960e9fd3d2 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -3,6 +3,7 @@ name: "Checking EditorConfig" permissions: read-all on: + # avoids approving first time contributors pull_request_target: branches-ignore: - 'release-**' @@ -29,11 +30,11 @@ jobs: if: env.PR_DIFF - uses: cachix/install-nix-action@v13 if: env.PR_DIFF - - name: install editorconfig-checker from unstable channel - run: | - nix-channel --add https://nixos.org/channels/nixpkgs-unstable - nix-channel --update - nix-env -iA nixpkgs.editorconfig-checker + with: + # nixpkgs commit is pinned so that it doesn't break + nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz + - name: install editorconfig-checker + run: nix-env -iA editorconfig-checker -f '' if: env.PR_DIFF - name: Checking EditorConfig if: env.PR_DIFF From 76326594f13d5b671b40fc7d32db2d230770c1be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Apr 2021 11:12:52 +0200 Subject: [PATCH 258/476] python3Packages.gym: 0.18.0 -> 0.18.1 --- .../python-modules/gym/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 126606af73a..a1cd76cd38e 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -1,19 +1,32 @@ { lib -, buildPythonPackage, fetchPypi -, numpy, requests, six, pyglet, scipy, cloudpickle +, buildPythonPackage +, fetchFromGitHub +, numpy +, requests +, pyglet +, scipy +, pillow +, cloudpickle }: buildPythonPackage rec { pname = "gym"; - version = "0.18.0"; + version = "0.18.1"; - src = fetchPypi { - inherit pname version; - sha256 = "a0dcd25c1373f3938f4cb4565f74f434fba6faefb73a42d09c9dddd0c08af53e"; + src = fetchFromGitHub { + owner = "openai"; + repo = pname; + rev = version; + sha256 = "0mv4af2y9d1y97bsda94f21nis2jm1zkzv7c806vmvzh5s4r8nfn"; }; propagatedBuildInputs = [ - numpy requests six pyglet scipy cloudpickle + cloudpickle + numpy + pillow + pyglet + requests + scipy ]; # The test needs MuJoCo that is not free library. @@ -22,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gym" ]; meta = with lib; { - description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents"; + description = "A toolkit for developing and comparing your reinforcement learning agents"; homepage = "https://gym.openai.com/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; From e337e136dde11304353327082d23374c253750d3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 29 Apr 2021 02:50:56 +0000 Subject: [PATCH 259/476] wf-config: 0.7.0 -> 0.7.1; enable tests --- .../window-managers/wayfire/wf-config.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index b8e4c6aa770..d1e653cc9e0 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -1,18 +1,25 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }: +{ stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config +, doctest, glm, libevdev, libxml2 +}: stdenv.mkDerivation rec { pname = "wf-config"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; - sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7"; + sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ libevdev libxml2 ]; + nativeBuildInputs = [ cmake meson ninja pkg-config ]; + buildInputs = [ doctest libevdev libxml2 ]; propagatedBuildInputs = [ glm ]; + # CMake is just used for finding doctest. + dontUseCmakeConfigure = true; + + doCheck = true; + meta = with lib; { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; From 6fb54f49c511f9cea7395cb118ad433dc4163625 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 29 Apr 2021 02:53:30 +0000 Subject: [PATCH 260/476] wayfire: 0.7.0 -> 0.7.1 --- pkgs/applications/window-managers/wayfire/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 303ffc35fc7..42b376a97f8 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "wayfire"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; - sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd"; + sha256 = "0wgvwbmdhn7gkdr2jl9jndgvl6w4x7ys8gmpj55gqh9b57wqhyaq"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wayfire.org/"; - description = "3D wayland compositor"; + description = "3D Wayland compositor"; license = licenses.mit; maintainers = with maintainers; [ qyliss wucke13 ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed47ecd4c42..2da323ce708 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26765,8 +26765,7 @@ in wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( - (callPackage ../applications/window-managers/wayfire/applications.nix { }). - extend (_: _: { wlroots = wlroots_0_12; }) + callPackage ../applications/window-managers/wayfire/applications.nix { } ); wayfirePlugins = recurseIntoAttrs ( callPackage ../applications/window-managers/wayfire/plugins.nix { From 3c3f328bc1f805dd1d63114ee7b16a3b016c377b Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 29 Apr 2021 10:15:14 +0000 Subject: [PATCH 261/476] vimPlugins.which-key-nvim: fix branch --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 56a62d7fa1d..dc035830bb9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -132,7 +132,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main -folke/which-key.nvim +folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim From 7e49de89e3c9fe640fd134bfb0400a6609fe93e4 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Thu, 29 Apr 2021 10:15:50 +0000 Subject: [PATCH 262/476] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 60 +++++++++++++++++------------ 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b5b4037ee06..9f9318716d3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-28"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "270e3e1d85d400409247aa6c11445ec2e72f44ee"; - sha256 = "1i1y72v95660szv5jdcrawqqh7l493v3a1n9zigagzwz9a3sff44"; + rev = "23c8aacf13be02b985455ef027fbd28896dd1ef8"; + sha256 = "1bwaxs8rgyr1w81rqygia9ab7l10vcvad0d3xx89x17z6szakj3x"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-26"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "35dcebf8ba0f0b405578d3d919bc54ae2a651138"; - sha256 = "1lbnic4r0k0xxr5shmgz60b93lk462fnnl10iccns1d4363dz80a"; + rev = "473668eabee0592e817f9c692b0509c2743fb1c3"; + sha256 = "1r6wx6bpzfbhb8a95jw1gi2xkvx4h8i4rima2ylkrdbx86hgicjz"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -3048,12 +3048,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-04-09"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "90ee71d66da58d57f0cb4a59103874bb519c79d4"; - sha256 = "0sabb0iyrmfwfld57d1mf44k69bf8pk0c1ilfi3vz2hz04imxgab"; + rev = "940f2eb232091f970e45232e9c96e5aac7d670de"; + sha256 = "1sxi0dhbqg6fg23n8m069z6issyng18hbq9v7rxnzw90mqp0y5zb"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3312,12 +3312,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-04-28"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "c6e3e48352711ed6115e86901783efbce193a08f"; - sha256 = "0zi2ar2sr1v8lp4zim52hihm7qlzz4ijfgy5a6xyhns6csg3a9vf"; + rev = "58f5ba925b51cfd7edf73e1135588403151bc719"; + sha256 = "0033r4w4lh59a0ghvpk5r7ww4s46airfgi4idgizsc6w8xkrj2yy"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6702,12 +6702,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-03-31"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "f09007be7e477a491a478444b302d079104af23d"; - sha256 = "06m9rf0c9nxmyz9qnri1lmyb7cljv3vz2njxvh3fz8q7hjghh6cd"; + rev = "50b87c4287c791addc7364dfa377605d0837d326"; + sha256 = "0z3hmgflpiv0czdrkvpc845ms7bjy9rs2a6mp7gyzlqyqrjvqzzy"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -6870,12 +6870,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-27"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "80f4b269b51eae778a3f3093c144ffe8b2c943a1"; - sha256 = "15zbdgns2llzjwxzwn4b8bxyjkjjlnxrjrsbdbmkz7rkvkw4bkjd"; + rev = "b6898841c771df0a5231f74145e0813533d44def"; + sha256 = "0r5hg2hjcmwm6mkm7s41wij6hdlfq2g5xjvgg0bn8nhyn4048mgd"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8059,12 +8059,12 @@ let vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2019-11-12"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; - sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; + rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b"; + sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; @@ -8852,12 +8852,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-22"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "a47d0b921c42be740e57d75a73ae15a8ee0141d4"; - sha256 = "05nhav31i3d16d1qdcgbkr8dfgwi53123sv3xd9pr8j7j3rdd0ix"; + rev = "0c88cc8badeeee74f9cafbf461b72769b06a15d5"; + sha256 = "1f9k0mhcaaddjdd3619m95syy4rbh5fgacya9fr1580z16vcir8p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8959,6 +8959,18 @@ let meta.homepage = "https://github.com/mattn/webapi-vim/"; }; + which-key-nvim = buildVimPluginFrom2Nix { + pname = "which-key-nvim"; + version = "2021-04-29"; + src = fetchFromGitHub { + owner = "folke"; + repo = "which-key.nvim"; + rev = "6cf68b49d48f2e07b82aee18ad01c4115d9ce0e5"; + sha256 = "06r5hlwm1i1gim12k3i5kxrwnhjbq2xfxic5z0iax9m86szb4ja3"; + }; + meta.homepage = "https://github.com/folke/which-key.nvim/"; + }; + wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire-vim"; version = "2014-11-16"; From 44ba3c22d0a3bca638057251cf51dcb5d22abcc2 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Thu, 29 Apr 2021 10:16:14 +0000 Subject: [PATCH 263/476] vimPlugins.vim-code-dark: init at 2021-04-09 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9f9318716d3..49b184a0c9b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5390,6 +5390,18 @@ let meta.homepage = "https://github.com/alvan/vim-closetag/"; }; + vim-code-dark = buildVimPluginFrom2Nix { + pname = "vim-code-dark"; + version = "2021-04-09"; + src = fetchFromGitHub { + owner = "tomasiser"; + repo = "vim-code-dark"; + rev = "670fed53a2ae67542a78ef7b642f4aca6b6326dc"; + sha256 = "0zdhhv3h8lzba8dpv0amc5abpkzayp6gbjw6qv712p638zyr99vw"; + }; + meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; + }; + vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; version = "2021-04-15"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dc035830bb9..6cfd5abe140 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -620,6 +620,7 @@ tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events +tomasiser/vim-code-dark tomasr/molokai tomlion/vim-solidity tommcdo/vim-exchange From 8c4f24dfc40e71544709530f3471021ef0af2efa Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Thu, 29 Apr 2021 10:16:41 +0000 Subject: [PATCH 264/476] vimPlugins.friendly-snippets: init at 2021-04-17 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 49b184a0c9b..ebb308cbdee 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1485,6 +1485,18 @@ let meta.homepage = "https://github.com/megaannum/forms/"; }; + friendly-snippets = buildVimPluginFrom2Nix { + pname = "friendly-snippets"; + version = "2021-04-17"; + src = fetchFromGitHub { + owner = "rafamadriz"; + repo = "friendly-snippets"; + rev = "ee28380b2300b374251b89d73e7e5b23c573e2bc"; + sha256 = "1ap2nf84gbrqlykw1l8zx01m9hm92vw57wkkzv2cqkjcbm3whqyg"; + }; + meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; + }; + fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; version = "2020-08-31"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6cfd5abe140..bd71825aaac 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -505,6 +505,7 @@ qpkorr/vim-bufkill Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim +rafamadriz/friendly-snippets@main rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/fruzzy From 668264d220377c74638dc3d14a67119837c773f0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 29 Apr 2021 12:51:10 +0200 Subject: [PATCH 265/476] palemoon: 29.1.1 -> 29.2.0 --- .../networking/browsers/palemoon/default.nix | 134 ++++++++++++++---- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 106 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 554167c3574..9bc9727dd18 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,29 +1,59 @@ -{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils -, pkg-config, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype -, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg -, libnotify, libstartup_notification, wrapGAppsHook -, libGLU, libGL, perl, python2, libpulseaudio -, unzip, xorg, wget, which, yasm, zip, zlib - -, withGTK3 ? true, gtk3 +# Compiler in stdenv MUST be a supported one for official branding +# See https://developer.palemoon.org/build/linux/ +# TODO assert if stdenv.cc is supported? +{ stdenv +, lib +, fetchFromGitHub +, writeScript +, alsaLib +, autoconf213 +, cairo +, desktop-file-utils +, dbus +, dbus-glib +, ffmpeg +, fontconfig +, freetype +, gnome2 +, gnum4 +, gtk2 +, libevent +, libGL +, libGLU +, libnotify +, libpulseaudio +, libstartup_notification +, perl +, pkg-config +, python2 +, unzip +, which +, wrapGAppsHook +, xorg +, yasm +, zip +, zlib +, withGTK3 ? true +, gtk3 }: let - - libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ]; + libPath = lib.makeLibraryPath [ + ffmpeg + libpulseaudio + ]; gtkVersion = if withGTK3 then "3" else "2"; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.1.1"; + version = "29.2.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1ppdmj816zwccb0l0mgpq14ckdwg785wmqz41wran0nl63fg6i1x"; + sha256 = "0pa9j41bbfarwi60a6hxi5vpn52mwgr4p05l98acv4fcs1ccb427"; fetchSubmodules = true; }; @@ -43,24 +73,55 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip + autoconf213 + desktop-file-utils + gnum4 + perl + pkg-config + python2 + unzip + which + wrapGAppsHook + yasm + zip ]; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype - gnome2.GConf gtk2 hunspell libevent libjpeg libnotify - libstartup_notification libGLU libGL - libpulseaudio yasm zip zlib + alsaLib + cairo + dbus + dbus-glib + ffmpeg + fontconfig + freetype + gnome2.GConf + gtk2 + libevent + libGL + libGLU + libnotify + libpulseaudio + libstartup_notification + zlib ] ++ (with xorg; [ - libX11 libXext libXft libXi libXrender libXScrnSaver - libXt pixman xorgproto + libX11 + libXext + libXft + libXi + libXrender + libXScrnSaver + libXt + pixman + xorgproto ]) ++ lib.optional withGTK3 gtk3; enableParallelBuilding = true; configurePhase = '' + runHook preConfigure + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 @@ -96,9 +157,6 @@ in stdenv.mkDerivation rec { ac_add_options --enable-official-branding export MOZILLA_OFFICIAL=1 - # For versions after 28.12.0 - ac_add_options --enable-phoenix-extensions - ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION @@ -112,24 +170,42 @@ in stdenv.mkDerivation rec { mk_add_options MOZ_MAKE_FLAGS="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" mk_add_options AUTOCONF=${autoconf213}/bin/autoconf ' + + runHook postConfigure ''; - buildPhase = "./mach build"; + buildPhase = '' + runHook preBuild + + ./mach build + + runHook postBuild + ''; installPhase = '' + runHook preInstall + ./mach install # Fix missing icon due to wrong WMClass + # TODO report upstream substituteInPlace ./palemoon/branding/official/palemoon.desktop \ --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ ./palemoon/branding/official/palemoon.desktop + # Install official branding icons for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done + + # Remove unneeded SDK data from installation + # TODO: move to a separate output? + rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} + + runHook postInstall ''; dontWrapGApps = true; @@ -154,9 +230,9 @@ in stdenv.mkDerivation rec { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - homepage = "https://www.palemoon.org/"; - license = licenses.mpl20; + homepage = "https://www.palemoon.org/"; + license = licenses.mpl20; maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd45c2b584..02f5e93b315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25232,10 +25232,7 @@ in osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://developer.palemoon.org/build/linux/ - stdenv = gcc8Stdenv; - }; + palemoon = callPackage ../applications/networking/browsers/palemoon { }; webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; From 2bd34a98af6bcb759030a9fba3a2565c65fe6725 Mon Sep 17 00:00:00 2001 From: Sameer Hoosen Date: Thu, 29 Apr 2021 12:57:49 +0200 Subject: [PATCH 266/476] tdesktop: 2.7.1 -> 2.7.4 (#120994) --- .../telegram/tdesktop/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 4d6e22bd89c..372c00196a2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -2,7 +2,7 @@ , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm +, tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie @@ -20,19 +20,19 @@ with lib; let tg_owt = callPackage ./tg_owt.nix {}; - tgcalls-gcc10-fix = fetchpatch { # "Fix build on GCC 10, second attempt." - url = "https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361958b9a61c65cb2f7cfc.patch"; - sha256 = "19n1hvn44pp01zc90g93vq2bcr2gdnscaj5il9f82klgh4llvjli"; + webviewPatch = fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/013eff77a13b6c2629a04e07a4d09dbe60c8ca48/trunk/fix-webview-includes.patch"; + sha256 = "0112zaysf3f02dd4bgqc5hwg66h1bfj8r4yjzb06sfi0pl9vl96l"; }; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.7.1"; + version = "2.7.4"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1"; + sha256 = "1cigqvxa8lp79y7sp2w2izmmikxaxzrq9bh5ns3cy16z985nyllp"; }; postPatch = '' @@ -40,7 +40,7 @@ in mkDerivation rec { --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' - patch -d Telegram/ThirdParty/tgcalls/ -p1 < "${tgcalls-gcc10-fix}" + patch -d Telegram/lib_webview -p1 < "${webviewPatch}" ''; # We want to run wrapProgram manually (with additional parameters) @@ -52,7 +52,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected hunspell glibmm + tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy From dbfd9c4942272783907289dfaa785683342db205 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Apr 2021 14:06:25 +0200 Subject: [PATCH 267/476] ungoogled-chromium: 90.0.4430.85 -> 90.0.4430.93 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e5bcab4740e..a87c6c1c06f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "90.0.4430.85", - "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", - "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir", + "version": "90.0.4430.93", + "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", + "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", "deps": { "gn": { "version": "2021-02-09", @@ -55,8 +55,8 @@ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" }, "ungoogled-patches": { - "rev": "90.0.4430.85-1", - "sha256": "04nrx6fgkizmza50xj236m4rb1j8yaw0cw5790df1vlmbsc81667" + "rev": "90.0.4430.93-1", + "sha256": "11adnd96iwkkri3yyzvxsq43gqsc12fvd87rvqqflj0irrdk98a0" } } } From 5b7a76e2a65e2fe90ee3783d04eed64eb34cae0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 12:39:03 +0000 Subject: [PATCH 268/476] jmol: 14.31.35 -> 14.31.36 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index bb523cddd19..2da5a070ee8 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.35"; + version = "14.31.36"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-uB7d27eicfmE1TpjLAxUoC8LBYAOrg3B48M1/CxWZdg="; + sha256 = "sha256-YwXgRRUZ75l1ZptscsZae2mwkRkYXJeWSrPvw+R6TkI="; }; patchPhase = '' From a4895f71832ef6fdb0a284f8a98be0559bd0a1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:21:53 +0200 Subject: [PATCH 269/476] google-chrome*: add meta.mainProgram --- .../applications/networking/browsers/google-chrome/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index d903cb3c083..b242e8a7726 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -161,5 +161,8 @@ in stdenv.mkDerivation { # will try to merge PRs and respond to issues but I'm not actually using # Google Chrome. platforms = [ "x86_64-linux" ]; + mainProgram = + if (channel == "dev") then "google-chrome-unstable" + else "google-chrome-${channel}"; }; } From 489ca03773ab3291e451d2097268f062dc8a5d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:25:57 +0200 Subject: [PATCH 270/476] lm_sensors: add meta.mainProgram --- pkgs/os-specific/linux/lm-sensors/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 34ad80a6c00..21324a5d6ce 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = with maintainers; [ pengmeiyu ]; platforms = platforms.linux; + mainProgram = "sensors"; }; } From 317cc8fad0e6c1ae72e4e870d0e7e5e92795d40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:28:44 +0200 Subject: [PATCH 271/476] p7zip: add meta.mainProgram --- pkgs/tools/archivers/p7zip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 8a01353b01b..8ba87da6b6a 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.raskin ]; + mainProgram = "7z"; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; From 5503ef1df468bfb201aa159416eab6a8c7e9ec05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:29:36 +0200 Subject: [PATCH 272/476] python3Packages.adb-enhanced: add meta.mainProgram --- pkgs/development/python-modules/adb-enhanced/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index d782de26ab7..62922efa530 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -30,5 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/ashishb/adb-enhanced"; license = licenses.asl20; maintainers = with maintainers; [ vtuan10 ]; + mainProgram = "adbe"; }; } From c63a83acf53590222b05b29d3376dab451a98985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:42:10 +0200 Subject: [PATCH 273/476] pcsx2: add meta.mainProgram --- pkgs/misc/emulators/pcsx2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 52d1010b5a4..476ea7122cb 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation { ''; homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka govanify ]; + mainProgram = "PCSX2"; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. From bbcb63c308f25ac7661a6f68fa8169c1ab68b0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:44:47 +0200 Subject: [PATCH 274/476] imagemagick7: add meta.mainProgram --- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index b2c665258cd..e0b75e74064 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ erictapen ]; license = licenses.asl20; + mainProgram = "magick"; }; } From c55ef4cf0e809a25d3ddcecacade795ba0cbdbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:45:51 +0200 Subject: [PATCH 275/476] libstrangle: add meta.mainProgram --- pkgs/tools/X11/libstrangle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index d8c220d0fd7..2d7f6b456c4 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ aske ]; + mainProgram = "strangle"; }; } From e64a451d96dbe7160de9ce18cab547faae1f8eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 27 Apr 2021 19:46:48 +0200 Subject: [PATCH 276/476] trash-cli: add meta.mainProgram --- pkgs/tools/misc/trash-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index d199fd7fda3..3689040da24 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -25,5 +25,6 @@ python3Packages.buildPythonApplication rec { maintainers = [ maintainers.rycee ]; platforms = platforms.unix; license = licenses.gpl2; + mainProgram = "trash"; }; } From 45d492b3b3967ca965e3741386fd2f59e3d9e126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 15:21:48 +0200 Subject: [PATCH 277/476] botan2: 2.17.3 -> 2.18.0 https://botan.randombit.net/news.html#version-2-18-0-2021-04-15 --- pkgs/development/libraries/botan/2.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index cb40e535b0c..a486ba49820 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.17"; - revision = "3"; - sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; + baseVersion = "2.18"; + revision = "0"; + sha256 = "09z3fy31q1pvnvpy4fswrsl2aq8ksl94lbh5rl7b6nqc3qp8ar6c"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; From 9abf4f87588ca2a3559ca712c2cf240c024cbfb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 15:28:39 +0200 Subject: [PATCH 278/476] zulu*: add meta.mainProgram --- pkgs/development/compilers/zulu/8.nix | 1 + pkgs/development/compilers/zulu/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index dd1660d9fec..591f10b3be9 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -105,5 +105,6 @@ in stdenv.mkDerivation { ''; maintainers = with maintainers; [ fpletz ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "java"; }; } diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index c7b01877ad5..cd118187748 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -108,5 +108,6 @@ in stdenv.mkDerivation { ''; maintainers = with maintainers; [ fpletz ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "java"; }; } From d4c033a206e7c275232e7d8c7724988f16b2250b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 15:32:10 +0200 Subject: [PATCH 279/476] botan: mark as insecure --- pkgs/development/libraries/botan/default.nix | 4 ++++ pkgs/development/libraries/botan/generic.nix | 2 ++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 8bcc6aaa8ef..c494fa25f77 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -9,4 +9,8 @@ callPackage ./generic.nix (args // { postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; + knownVulnerabilities = [ + # https://botan.randombit.net/security.html#id1 + "2020-03-24: Side channel during CBC padding" + ]; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 33f9daf7b50..2fc5abc2928 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -4,6 +4,7 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , postPatch ? null +, knownVulnerabilities ? [ ] , CoreServices , Security , ... @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.bsd2; + inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; } From 5ed648975c7510c4535dc48d32e36b6b4e01cb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 15:43:50 +0200 Subject: [PATCH 280/476] openjdk*: add meta.mainProgram --- pkgs/development/compilers/openjdk/11.nix | 1 + pkgs/development/compilers/openjdk/12.nix | 1 + pkgs/development/compilers/openjdk/13.nix | 1 + pkgs/development/compilers/openjdk/14.nix | 1 + pkgs/development/compilers/openjdk/15.nix | 1 + pkgs/development/compilers/openjdk/16.nix | 1 + pkgs/development/compilers/openjdk/8.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index f9dd7205659..15238e63ecb 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -142,6 +142,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 8c12b5be7f2..33169be5302 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -151,6 +151,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 7e4d9fc7d69..d3db493c5fe 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -151,6 +151,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index d98d0e9f8ee..3804999376e 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -147,6 +147,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index ddd523ad787..d5cf8fe06cd 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -147,6 +147,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index e35369e75c5..9a710ed6fa4 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -153,6 +153,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 75dc722b1b2..f10b7310df1 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -262,6 +262,7 @@ let description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + mainProgram = "java"; }; passthru = { From dd8da26322bef4b9f05a4bb203701fa54fbd56a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 15:48:57 +0200 Subject: [PATCH 281/476] adoptopenjdk-*: add meta.mainProgram --- pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 1 + pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 0bcfcafaae1..262e52c2521 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -49,6 +49,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms maintainers = with lib.maintainers; [ taku0 ]; inherit knownVulnerabilities; + mainProgram = "java"; }; }; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 95e72facaee..a433a2f1321 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -108,6 +108,7 @@ let result = stdenv.mkDerivation rec { platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms maintainers = with lib.maintainers; [ taku0 ]; inherit knownVulnerabilities; + mainProgram = "java"; }; }; in result From 25bbad9616537c66634819101203468be5d7ac3c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 29 Apr 2021 02:55:43 +0000 Subject: [PATCH 282/476] doctest: 2.4.4 -> 2.4.6 --- pkgs/development/libraries/doctest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 233e01e0380..c8e31d43e95 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.4"; + version = "2.4.6"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - hash = "sha256-NqXC5948prTCi4gsaR8bJPBTrmH+rJbHsGvwkJlpjXY="; + sha256 = "14m3q6d96zg6d99x1152jkly50gdjrn5ylrbhax53pfgfzzc5yqx"; }; nativeBuildInputs = [ cmake ]; From 86f12112bd85295893d91e3af7624c5d2dfbc274 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 29 Apr 2021 15:51:06 +0200 Subject: [PATCH 283/476] fluxcd: 0.12.0 -> 0.13.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a0593aab989..4a338ac9a42 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.12.0"; + version = "0.13.2"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "sha256-8NgKr5uRVFBD1pARaD+vH9wPA5gUNltwMe0i0icED1c="; + sha256 = "sha256-+2JvJFzH1CjU/WQ7MLtqd5Adfi/ktX9lPq4IyxPcUD8="; stripRoot = false; }; in @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-idHMijca1lYQF4aW+RPyzRraLDNdVavMuj4TP6z90Oo="; + sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps="; }; - vendorSha256 = "sha256-VrDO8y6omRKf3mPRAnRMZsSMwQHxQxShUa9HZ3dfCgM="; + vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg="; nativeBuildInputs = [ installShellFiles ]; From 84f214928c2a6d8143601db45fdc4e27bb3b2383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 16:01:18 +0200 Subject: [PATCH 284/476] oraclejdk*: add meta.mainProgram --- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 41f4befe469..2cb8a459e64 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -184,6 +184,7 @@ let result = stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms + mainProgram = "java"; }; }; in result From a325753d1c359bbf51756fbdb35ba10cffab6110 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 14:02:17 +0000 Subject: [PATCH 285/476] kodiPackages.inputstream-adaptive: 2.6.13 -> 2.6.14 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index b2a9fc33255..62ebe39788f 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.13"; + version = "2.6.14"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "1xvinmwyx7mai84i8c394dqw86zb6ib9wnxjmv7zpky6x64lvv10"; + sha256 = "sha256-5hYB9J4syY+2XOTdg9h7xLk8MMEG88EETIgkUmz4KOU="; }; extraNativeBuildInputs = [ gtest ]; From 12a07ce3d138077b0a0d4b0a4c282848f5cfb608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 16:03:42 +0200 Subject: [PATCH 286/476] prs: 0.2.9 -> 0.2.10 https://gitlab.com/timvisee/prs/-/blob/v0.2.10/CHANGELOG.md#0210-2021-04-29 --- pkgs/tools/security/prs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 1b705241458..42332e40cc3 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos="; + sha256 = "sha256-czGyBdy4emw7bUV6Nn+k+fJm+JqR6o0TEEUuIbEsml4="; }; - cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w="; + cargoSha256 = "sha256-jnBYuk7uvnbvT2OQ35DJk6WIUSqJiZCvsmpSIxw9X1U="; postPatch = '' # The GPGME backend is recommended From c7aa3db3612c3ff56983ed5d7eefaca7ad961016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 16:13:04 +0200 Subject: [PATCH 287/476] tor-browser-bundle-bin: add meta.mainProgram --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c906a0db4fd..acd10e0ea38 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -402,6 +402,7 @@ stdenv.mkDerivation rec { changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ]; + mainProgram = "tor-browser"; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From ba86df95ac97a6c6233e4ba7c6a2813db25cd4e7 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 29 Apr 2021 15:21:17 +0800 Subject: [PATCH 288/476] ecpdap: init at 0.1.5 --- pkgs/development/tools/ecpdap/default.nix | 36 ++ .../tools/ecpdap/lock-update.patch | 345 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 383 insertions(+) create mode 100644 pkgs/development/tools/ecpdap/default.nix create mode 100644 pkgs/development/tools/ecpdap/lock-update.patch diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/tools/ecpdap/default.nix new file mode 100644 index 00000000000..dbb9a2405b0 --- /dev/null +++ b/pkgs/development/tools/ecpdap/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }: + +rustPlatform.buildRustPackage rec { + pname = "ecpdap"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "adamgreig"; + repo = pname; + rev = "v${version}"; + sha256 = "1z8w37i6wjz6cr453md54ip21y26605vrx4vpq5wwd11mfvc1jsg"; + }; + + # The lock file was not up to date with cargo.toml for this release + # + # This patch is the lock file after running `cargo update` + cargoPatches = [ ./lock-update.patch ]; + + cargoSha256 = "08xcnvbxm508v03b3hmz71mpa3yd8lamvazxivp6qsv46ri163mn"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A tool to program ECP5 FPGAs"; + longDescription = '' + ECPDAP allows you to program ECP5 FPGAs and attached SPI flash + using CMSIS-DAP probes in JTAG mode. + ''; + homepage = "https://github.com/adamgreig/ecpdap"; + license = licenses.asl20; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} + diff --git a/pkgs/development/tools/ecpdap/lock-update.patch b/pkgs/development/tools/ecpdap/lock-update.patch new file mode 100644 index 00000000000..f57c1922ad1 --- /dev/null +++ b/pkgs/development/tools/ecpdap/lock-update.patch @@ -0,0 +1,345 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 91f7e0c..1610002 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -26,9 +26,9 @@ dependencies = [ + + [[package]] + name = "anyhow" +-version = "1.0.37" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" ++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" + + [[package]] + name = "atty" +@@ -49,15 +49,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "cc" +-version = "1.0.66" ++version = "1.0.67" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +- +-[[package]] +-name = "cfg-if" +-version = "0.1.10" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + + [[package]] + name = "cfg-if" +@@ -82,9 +76,9 @@ dependencies = [ + + [[package]] + name = "console" +-version = "0.14.0" ++version = "0.14.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" ++checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" + dependencies = [ + "encode_unicode", + "lazy_static", +@@ -101,14 +95,14 @@ version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + ] + + [[package]] + name = "derivative" +-version = "2.1.1" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" ++checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" + dependencies = [ + "proc-macro2", + "quote", +@@ -117,7 +111,7 @@ dependencies = [ + + [[package]] + name = "ecpdap" +-version = "0.1.4" ++version = "0.1.5" + dependencies = [ + "anyhow", + "clap", +@@ -153,11 +147,11 @@ dependencies = [ + + [[package]] + name = "filetime" +-version = "0.2.13" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" ++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if", + "libc", + "redox_syscall", + "winapi", +@@ -165,9 +159,9 @@ dependencies = [ + + [[package]] + name = "hermit-abi" +-version = "0.1.17" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" + dependencies = [ + "libc", + ] +@@ -206,9 +200,9 @@ dependencies = [ + + [[package]] + name = "jep106" +-version = "0.2.4" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f57cd08ee4fbc8043949150a59e34ea5f2afeb172f875db9607689e48600c653" ++checksum = "939876d20519325db0883757e29e9858ee02919d0f03e43c74f69296caa314f4" + dependencies = [ + "serde", + ] +@@ -221,33 +215,35 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.81" ++version = "0.2.94" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + + [[package]] + name = "libflate" +-version = "1.0.3" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914" ++checksum = "6d87eae36b3f680f7f01645121b782798b56ef33c53f83d1c66ba3a22b60bfe3" + dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +- "rle-decode-fast", + ] + + [[package]] + name = "libflate_lz77" +-version = "1.0.0" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b" ++checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" ++dependencies = [ ++ "rle-decode-fast", ++] + + [[package]] + name = "libusb1-sys" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e3b8385bdc8931a82a0865a3a7285e2c28e41287824dc92c7724b7759a0c685" ++checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703" + dependencies = [ + "cc", + "libc", +@@ -259,11 +255,11 @@ dependencies = [ + + [[package]] + name = "log" +-version = "0.4.11" ++version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if", + ] + + [[package]] +@@ -327,9 +323,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.24" ++version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" + dependencies = [ + "unicode-xid", + ] +@@ -342,36 +338,38 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + + [[package]] + name = "quote" +-version = "1.0.8" ++version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "redox_syscall" +-version = "0.1.57" ++version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" ++dependencies = [ ++ "bitflags", ++] + + [[package]] + name = "regex" +-version = "1.4.2" ++version = "1.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" + dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +- "thread_local", + ] + + [[package]] + name = "regex-syntax" +-version = "0.6.21" ++version = "0.6.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" + + [[package]] + name = "rle-decode-fast" +@@ -391,18 +389,18 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.118" ++version = "1.0.125" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.118" ++version = "1.0.125" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" + dependencies = [ + "proc-macro2", + "quote", +@@ -431,9 +429,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + + [[package]] + name = "syn" +-version = "1.0.57" ++version = "1.0.71" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" ++checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" + dependencies = [ + "proc-macro2", + "quote", +@@ -442,13 +440,12 @@ dependencies = [ + + [[package]] + name = "tar" +-version = "0.4.30" ++version = "0.4.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290" ++checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" + dependencies = [ + "filetime", + "libc", +- "redox_syscall", + "xattr", + ] + +@@ -463,9 +460,9 @@ dependencies = [ + + [[package]] + name = "terminal_size" +-version = "0.1.15" ++version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" ++checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" + dependencies = [ + "libc", + "winapi", +@@ -482,33 +479,24 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.23" ++version = "1.0.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" ++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.23" ++version = "1.0.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" ++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" + dependencies = [ + "proc-macro2", + "quote", + "syn", + ] + +-[[package]] +-name = "thread_local" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +-dependencies = [ +- "lazy_static", +-] +- + [[package]] + name = "toml" + version = "0.5.8" +@@ -532,9 +520,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + + [[package]] + name = "vcpkg" +-version = "0.2.11" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" ++checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" + + [[package]] + name = "vec_map" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7443c56522..3e05a6df011 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22695,6 +22695,8 @@ in jdk = jdk11; }); + ecpdap = callPackage ../development/tools/ecpdap { }; + ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; ed = callPackage ../applications/editors/ed { }; From cade063ddc6894c2547395c412ab8c52b0b3bbab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 14:44:15 +0000 Subject: [PATCH 289/476] leftwm: 0.2.6 -> 0.2.7 --- pkgs/applications/window-managers/leftwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index bab0439bf8b..f4b72197f54 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU="; + sha256 = "sha256-nRPt+Tyfq62o+3KjsXkHQHUMMslHFGNBd3s2pTb7l4w="; }; - cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM="; + cargoSha256 = "sha256-lmzA7XM8B5QJI4Wo0cKeMR3+np6jT6mdGzTry4g87ng="; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libX11 libXinerama ]; From c398cf6a06d3188abdbf2ce6794f9a7e239c5d44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 15:13:18 +0000 Subject: [PATCH 290/476] libmwaw: 0.3.17 -> 0.3.18 --- pkgs/development/libraries/libmwaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 17e20e3d399..1b8c30f9a8f 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.17"; + version="0.3.18"; name="${baseName}-${version}"; - hash="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.17/libmwaw-0.3.17.tar.xz"; - sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; + hash="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8="; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.18/libmwaw-0.3.18.tar.xz"; + sha256="sha256-/F0FFoD4AAvmT/68CwxYcWscm/BgA+w5k4exCdHtHg8="; }; nativeBuildInputs = [ pkg-config ]; From 1e7764255805ffacd1415a521128b8f6bc710ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Thu, 29 Apr 2021 16:34:54 +0200 Subject: [PATCH 291/476] wine*: add meta.mainProgram Fix running wine builds from `wineWowPackages` via `nix run`, this change makes it execute `bin/wine` instead of the non-existent `bin/wine-wow`. --- pkgs/misc/emulators/wine/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 6d7c2543d80..8553ab83645 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -151,5 +151,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { license = with lib.licenses; [ lgpl21Plus ]; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; maintainers = with lib.maintainers; [ avnik raskin bendlas ]; + mainProgram = "wine"; }; }) From b412b227e899cf188055537e9be9cbbd5dae2f01 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 29 Apr 2021 17:46:15 +0200 Subject: [PATCH 292/476] gnomeExtensions.unite: 52 -> 53 --- pkgs/desktops/gnome-3/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index a2f4e81924e..79d7a335239 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "52"; + version = "53"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "1zahng79m2gw27fb2sw8zyk2n07qc0hbn02g5mfqzhwk62g97v4y"; + sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6"; }; uuid = "unite@hardpixel.eu"; From 7f9a5ad257a5cd57a45ae200ee0259403de16be2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 29 Apr 2021 18:07:13 +0200 Subject: [PATCH 293/476] cage: drop maintainership (#121174) I cannot currently maintain this, as I don't have access to the hardware running it anymore. --- nixos/modules/services/wayland/cage.nix | 2 +- nixos/tests/cage.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 14d84c4ce0f..2e71abb69fc 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -93,6 +93,6 @@ in { systemd.defaultUnit = "graphical.target"; }; - meta.maintainers = with lib.maintainers; [ matthewbauer flokli ]; + meta.maintainers = with lib.maintainers; [ matthewbauer ]; } diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index 1ae07b6fd2f..2d4dacfc0e7 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "cage"; meta = with pkgs.lib.maintainers; { - maintainers = [ matthewbauer flokli ]; + maintainers = [ matthewbauer ]; }; machine = { ... }: From 732ab3d4e2eaa39fb52b15ff7f7a40978725dc77 Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Thu, 29 Apr 2021 17:34:34 +0100 Subject: [PATCH 294/476] Incorporate suggeston by collares --- pkgs/applications/science/math/R/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7f238cc1cd9..8905df8ccef 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo - --without-x --with-libpng --with-jpeglib --with-libtiff @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { R_SHELL="${stdenv.shell}" '' + lib.optionalString stdenv.isDarwin '' --disable-R-framework + --without-x OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" LDFLAGS="-L${libcxx}/lib" From e097d99f0daf73e12048d66918a0c759d3cbd07a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 29 Apr 2021 17:49:33 +0200 Subject: [PATCH 295/476] py3c: init at 1.3.1 --- pkgs/development/libraries/py3c/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/py3c/default.nix diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix new file mode 100644 index 00000000000..2a89161ef38 --- /dev/null +++ b/pkgs/development/libraries/py3c/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, python2, python3 }: + +stdenv.mkDerivation rec { + pname = "py3c"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "encukou"; + repo = pname; + rev = "v${version}"; + sha256 = "04i2z7hrig78clc59q3i1z2hh24g7z1bfvxznlzxv00d4s57nhpi"; + }; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; + + doCheck = true; + + checkInputs = [ + python2 + python3 + ]; + + meta = with lib; { + homepage = "https://github.com/encukou/py3c"; + description = "Python 2/3 compatibility layer for C extensions"; + license = licenses.mit; + maintainers = with maintainers; [ ajs124 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2da323ce708..1456529d7b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12028,6 +12028,8 @@ in pypy27Packages = pypy27.pkgs; pypy3Packages = pypy3.pkgs; + py3c = callPackage ../development/libraries/py3c { }; + pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; From 1e7720531aab24693775500065c80f54c8b13176 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Apr 2021 02:43:55 +0200 Subject: [PATCH 296/476] subversion: 1.12.2 -> 1.14.1 --- .../subversion/CVE-2020-17525.patch | 15 --------------- .../version-management/subversion/default.nix | 13 ++++++------- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/version-management/subversion/CVE-2020-17525.patch diff --git a/pkgs/applications/version-management/subversion/CVE-2020-17525.patch b/pkgs/applications/version-management/subversion/CVE-2020-17525.patch deleted file mode 100644 index c844c3773e3..00000000000 --- a/pkgs/applications/version-management/subversion/CVE-2020-17525.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch included in advisory @ https://subversion.apache.org/security/CVE-2020-17525-advisory.txt - ---- a/subversion/libsvn_repos/config_file.c -+++ b/subversion/libsvn_repos/config_file.c -@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream, - { - /* Search for a repository in the full path. */ - repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool); -+ if (repos_root_dirent == NULL) -+ return svn_error_trace(handle_missing_file(stream, checksum, access, -+ url, must_exist, -+ svn_node_none)); - - /* Attempt to open a repository at repos_root_dirent. */ - SVN_ERR(svn_repos_open3(&access->repos, repos_root_dirent, NULL, diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 9f780de748e..042dafbb674 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,13 +6,13 @@ , javahlBindings ? false , saslSupport ? false , lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc -, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null , sasl ? null, serf ? null }: assert bdbSupport -> aprutil.bdbSupport; assert httpServer -> apacheHttpd != null; -assert pythonBindings -> swig != null && python != null; +assert pythonBindings -> swig != null && python3 != null && py3c != null; assert javahlBindings -> jdk != null && perl != null; let @@ -31,7 +31,7 @@ let buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ] ++ lib.optional httpSupport serf - ++ lib.optional pythonBindings python + ++ lib.optionals pythonBindings [ python3 py3c ] ++ lib.optional perlBindings perl ++ lib.optional saslSupport sasl; @@ -91,7 +91,7 @@ let enableParallelBuilding = true; - checkInputs = [ python ]; + checkInputs = [ python3 ]; doCheck = false; # fails 10 out of ~2300 tests meta = with lib; { @@ -116,8 +116,7 @@ in { }; subversion = common { - version = "1.12.2"; - sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; - extraPatches = [ ./CVE-2020-17525.patch ]; + version = "1.14.1"; + sha256 = "1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c"; }; } From 89435196454bedc8363b4bdf727bde179b08fcf4 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 28 Apr 2021 16:48:00 +0200 Subject: [PATCH 297/476] hwinfo: update meta information --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 5272fb8666e..503df3a31f9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-u5EXU+BrTMeDbZAv8WyBTyFcZHdBIUMpJSLTYgf3Mo8="; }; - patchPhase = '' + postPatch = '' # VERSION and changelog are usually generated using Git # unless HWINFO_VERSION is defined (see Makefile) export HWINFO_VERSION="${version}" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hardware detection tool from openSUSE"; - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "https://github.com/openSUSE/hwinfo"; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; From c8aea980f0e6f61de621b2fca2d837ce3c38bd34 Mon Sep 17 00:00:00 2001 From: Ben Leggett <854255+bleggett@users.noreply.github.com> Date: Wed, 28 Apr 2021 21:37:57 -0400 Subject: [PATCH 298/476] roon-server: 100800753 -> 100800790 --- pkgs/servers/roon-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 145a1927f2c..3fcb8af65e2 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { name = "roon-server"; - version = "100800753"; + version = "100800790"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210209195555/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-uas1vqIDWlYr7jgsrlBeJSPjMxwzVnrkCD9jJljkFZs="; + url = "https://web.archive.org/web/20210428204513/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "1jhj52fmkdgr9qfang1i9qrl1z56h56x07k31n3kllknkv02lc8p"; }; buildInputs = [ From d9e18f4e7f77fffde95384d36cc8ac5d1d51b356 Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Sat, 20 Mar 2021 23:50:21 +0100 Subject: [PATCH 299/476] nixos/keycloak: use db username in db init scripts --- nixos/modules/services/web-apps/keycloak.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index a93e9327933..b6e87c89e0a 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -168,9 +168,10 @@ in type = lib.types.str; default = "keycloak"; description = '' - Username to use when connecting to an external or manually - provisioned database; has no effect when a local database is - automatically provisioned. + Username to use when connecting to the database. + This is also used for automatic provisioning of the database. + Changing this after the initial installation doesn't delete the + old user and can cause further problems. ''; }; @@ -587,8 +588,8 @@ in PSQL=${config.services.postgresql.package}/bin/psql db_password="$(<'${cfg.databasePasswordFile}')" - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${cfg.databaseUsername}'" | grep -q 1 || $PSQL -tAc "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN PASSWORD '$db_password' CREATEDB" + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "${cfg.databaseUsername}"' ''; }; @@ -606,9 +607,9 @@ in set -eu db_password="$(<'${cfg.databasePasswordFile}')" - ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" + ( echo "CREATE USER IF NOT EXISTS '${cfg.databaseUsername}'@'localhost' IDENTIFIED BY '$db_password';" echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" - echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" + echo "GRANT ALL PRIVILEGES ON keycloak.* TO '${cfg.databaseUsername}'@'localhost';" ) | ${config.services.mysql.package}/bin/mysql -N ''; }; From 14db724f1fea213e71ddc177f34f16d02dc185f8 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Fri, 23 Apr 2021 15:53:58 -0500 Subject: [PATCH 300/476] indlib: 1.8.9 -> 1.9.0 --- .../science/astronomy/indilib/default.nix | 4 +- .../astronomy/indilib/indi-3rdparty.nix | 60 ++++++++++------- .../astronomy/indilib/indi-firmware.nix | 66 +++++++++++++++++++ .../science/astronomy/indilib/indi-full.nix | 27 ++++++-- .../astronomy/indilib/indi-with-drivers.nix | 4 +- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 130 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index f7966046fa8..7a9a5a80700 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.8.9"; + version = "1.9.0"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs="; + sha256 = "sha256-YdVBzhz+Gim27/Js5MhEJNukoXp5eK9/dZ+JQVyls0M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 34ef4088713..5909a06cfb5 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchFromGitHub , cmake , cfitsio , libusb1 @@ -18,39 +17,54 @@ , libdc1394 , gpsd , ffmpeg +, version +, src +, withFirmware ? false +, firmware ? null }: stdenv.mkDerivation rec { pname = "indi-3rdparty"; - version = "1.8.9"; - src = fetchFromGitHub { - owner = "indilib"; - repo = pname; - rev = "v${version}"; - sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy"; - }; - - cmakeFlags = [ - "-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" - "-DRULES_INSTALL_DIR=lib/udev/rules.d" - "-DWITH_SX=off" - "-DWITH_SBIG=off" - "-DWITH_APOGEE=off" - "-DWITH_FISHCAMP=off" - "-DWITH_DSI=off" - "-DWITH_QHY=off" - "-DWITH_ARMADILLO=off" - "-DWITH_PENTAX=off" - ]; + inherit version src; nativeBuildInputs = [ cmake ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + ] ++ lib.optionals withFirmware [ + firmware + ]; + + postPatch = '' + for f in indi-qsi/CMakeLists.txt \ + indi-dsi/CMakeLists.txt \ + indi-armadillo-platypus/CMakeLists.txt + do + substituteInPlace $f \ + --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ + --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ + --replace "/lib/firmware" "lib/firmware" + done + ''; + + cmakeFlags = [ + "-DINDI_DATA_DIR=share/indi" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + "-DRULES_INSTALL_DIR=lib/udev/rules.d" + # Pentax, Atik, and SX cmakelists are currently broken + "-DWITH_PENTAX=off" + "-DWITH_ATIK=off" + "-DWITH_SX=off" + ] ++ lib.optionals (!withFirmware) [ + "-DWITH_APOGEE=off" + "-DWITH_DSI=off" + "-DWITH_QHY=off" + "-DWITH_ARMADILLO=off" + "-DWITH_FISHCAMP=off" + "-DWITH_SBIG=off" ]; meta = with lib; { diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix new file mode 100644 index 00000000000..d23673ac37a --- /dev/null +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, cmake +, cfitsio +, libusb1 +, zlib +, boost +, libnova +, curl +, libjpeg +, gsl +, fftw +, indilib +, libgphoto2 +, libraw +, libftdi1 +, libdc1394 +, gpsd +, ffmpeg +, version +, src +}: + +stdenv.mkDerivation rec { + pname = "indi-firmware"; + + inherit version src; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd + libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + ]; + + cmakeFlags = [ + "-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + "-DRULES_INSTALL_DIR=lib/udev/rules.d" + "-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware" + "-DCONF_DIR=etc" + "-DBUILD_LIBS=1" + "-DWITH_PENTAX=off" + ]; + + postPatch = '' + for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt + do + substituteInPlace $f --replace "/lib/firmware" "lib/firmware" + done + ''; + + postFixup = '' + rm $out/lib/udev/rules.d/99-fli.rules + ''; + + meta = with lib; { + homepage = "https://www.indilib.org/"; + description = "Third party firmware for the INDI astronomical software suite"; + changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index e52da9f2eab..50aa9fb8b4a 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,11 +1,30 @@ -{ callPackage, indilib, indi-3rdparty }: +{ stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-with-drivers = ./indi-with-drivers.nix; + indi-version = "1.9.0"; + indi-3rdparty-src = fetchFromGitHub { + owner = "indilib"; + repo = "indi-3rdparty"; + rev = "v${indi-version}"; + sha256 = "sha256-5VR1MN52a0ZtaHYw4lD6LWmnvc1oHlfE5GLGbfBKvqE="; + }; + indi-firmware = callPackage ./indi-firmware.nix { + version = indi-version; + src = indi-3rdparty-src; + }; + indi-3rdparty = callPackage ./indi-3rdparty.nix { + version = indi-version; + src = indi-3rdparty-src; + withFirmware = stdenv.isx86_64; + firmware = indi-firmware; + }; in -callPackage indi-with-drivers { - pkgName = "indi-full"; +callPackage ./indi-with-drivers.nix { + pname = "indi-full"; + version = indi-version; extraDrivers = [ indi-3rdparty + ] ++ lib.optionals stdenv.isx86_64 [ + indi-firmware ]; } diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index 27ac86ddbad..5ec1acdf21e 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -1,7 +1,7 @@ -{ buildEnv, indilib ? indilib, extraDrivers ? null , pkgName ? "indi-with-drivers" }: +{ buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: buildEnv { - name = pkgName; + name = "${pname}-${version}"; paths = [ indilib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75dc83b7256..057268cf25e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15052,7 +15052,6 @@ in indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; indilib = callPackage ../development/libraries/science/astronomy/indilib { }; - indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; From 34ad94bd360edbf48e9994c51c62ee8e09741369 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Thu, 29 Apr 2021 20:07:02 +0200 Subject: [PATCH 301/476] flip-link: init at 0.1.3 --- pkgs/development/tools/flip-link/default.nix | 22 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/flip-link/default.nix diff --git a/pkgs/development/tools/flip-link/default.nix b/pkgs/development/tools/flip-link/default.nix new file mode 100644 index 00000000000..36467848c4f --- /dev/null +++ b/pkgs/development/tools/flip-link/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "flip-link"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "knurling-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0x6l5aps0aryf3iqiyk969zrq77bm95jvm6f0f5vqqqizxjd3yfl"; + }; + + cargoSha256 = "13rgpbwaz2b928rg15lbaszzjymph54pwingxpszp5paihx4iayr"; + + meta = with lib; { + description = "Adds zero-cost stack overflow protection to your embedded programs"; + homepage = "https://github.com/knurling-rs/flip-link"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2da323ce708..7f03b5327e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4569,6 +4569,8 @@ in flawfinder = callPackage ../development/tools/flawfinder { }; + flip-link = callPackage ../development/tools/flip-link { }; + flips = callPackage ../tools/compression/flips { }; fmbt = callPackage ../development/tools/fmbt { From 52ef63a180629e27316bbc9e38ee48b181c4de45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 20:07:57 +0200 Subject: [PATCH 302/476] python3Packages.pyturbojpeg: 1.4.3 -> 1.5.0 https://github.com/lilohuang/PyTurboJPEG/releases/tag/v1.5.0 --- pkgs/development/python-modules/pyturbojpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index abfc34e6481..0011bc69bc5 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg="; + sha256 = "sha256-juy8gVqOXKSGGq+gOBO2BuJEL2RHjjCWJDrwRCvrZIE="; }; patches = [ From 855e5119a2ede3ed65c750292580b1fc442b529d Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 28 Apr 2021 22:56:05 +0200 Subject: [PATCH 303/476] jp2a: 1.0.7 -> 1.1.0 --- pkgs/applications/misc/jp2a/default.nix | 32 +++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index a48716a3dd2..96d506b556e 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,25 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, libjpeg +, libpng +, ncurses +, autoreconfHook +, autoconf-archive +, pkg-config +, bash-completion +}: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; pname = "jp2a"; src = fetchFromGitHub { - owner = "cslarsen"; + owner = "Talinx"; repo = "jp2a"; rev = "v${version}"; - sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; + sha256 = "1dz2mrhl45f0vwyfx7qc3665xma78q024c10lfsgn6farrr0c2lb"; }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libjpeg ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + bash-completion + ]; + buildInputs = [ libjpeg libpng ncurses ]; + + installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; - license = licenses.gpl2; + license = licenses.gpl2Only; + maintainers = [ maintainers.FlorianFranzen ]; platforms = platforms.unix; }; } From 03e55dac96d0fc3982e13ad2fe18240fea0a0d85 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 18:50:15 +0200 Subject: [PATCH 304/476] python3.pkgs.sphinx-markdown-parser: init at 0.2.4 --- .../sphinx-markdown-parser/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-markdown-parser/default.nix diff --git a/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix new file mode 100644 index 00000000000..e3ebac0744a --- /dev/null +++ b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +, markdown +, CommonMark +, recommonmark +, pydash +, pyyaml +, unify +, yapf +, python +}: + +buildPythonPackage rec { + pname = "sphinx-markdown-parser"; + version = "0.2.4"; + + # PyPi release does not include requirements.txt + src = fetchFromGitHub { + owner = "clayrisser"; + repo = "sphinx-markdown-parser"; + # Upstream maintainer currently does not tag releases + # https://github.com/clayrisser/sphinx-markdown-parser/issues/35 + rev = "2fd54373770882d1fb544dc6524c581c82eedc9e"; + sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv"; + }; + + propagatedBuildInputs = [ sphinx markdown CommonMark pydash pyyaml unify yapf recommonmark ]; + + # Avoids running broken tests in test_markdown.py + checkPhase = '' + ${python.interpreter} -m unittest -v tests/test_basic.py tests/test_sphinx.py + ''; + + pythonImportsCheck = [ "sphinx_markdown_parser" ]; + + meta = with lib; { + description = "Write markdown inside of docutils & sphinx projects"; + homepage = "https://github.com/clayrisser/sphinx-markdown-parser"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c7940c610..d9cd473a7fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7635,6 +7635,8 @@ in { sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; + sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { }; + sphinx-material = callPackage ../development/python-modules/sphinx-material { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; From 2f824a4e20ffe67a613e4e24f81c453e7a4d2580 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 27 Apr 2021 13:43:07 -0400 Subject: [PATCH 305/476] azure-cli: fix shell completion --- pkgs/tools/admin/azure-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 0c41f4127c8..925ed7699ae 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -152,9 +152,9 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { argcomplete ]; - # TODO: make shell completion actually work - # uses argcomplete, so completion needs PYTHONPATH to work postInstall = '' + substituteInPlace az.completion.sh \ + --replace register-python-argcomplete ${py.pkgs.argcomplete}/bin/register-python-argcomplete installShellCompletion --bash --name az.bash az.completion.sh installShellCompletion --zsh --name _az az.completion.sh From 0897eb31327ff0132ca944cd47e6ecb9cac053c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 20:39:42 +0200 Subject: [PATCH 306/476] python3Packages.ha-ffmpeg: does not depend on ffmpeg_3 The path to the binary is specified in the configuration: https://www.home-assistant.io/integrations/ffmpeg#ffmpeg_bin --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 84810fd2b53..ce1e8a9d237 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg_3, async-timeout }: +, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,8 +12,6 @@ buildPythonPackage rec { sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; }; - buildInputs = [ ffmpeg_3 ]; - propagatedBuildInputs = [ async-timeout ]; # only manual tests @@ -23,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; license = licenses.bsd3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = teams.home-assistant.members; }; } From d13741eb79c94f54105f573dbb5f27b285f46708 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 29 Apr 2021 14:30:34 +0100 Subject: [PATCH 307/476] nano: 5.6.1 -> 5.7 See https://lists.gnu.org/archive/html/info-gnu/2021-04/msg00013.html for release announcement. --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index b5525285566..1a92ca3decb 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.6.1"; + version = "5.7"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn"; + sha256 = "1ynarilx0ca0a5h6hl5bf276cymyy8s9wr5l24vyy7f15v683cfl"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From af9919437929fa35e25d2afb068067f9f7c31443 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Apr 2021 19:42:12 +0200 Subject: [PATCH 308/476] nixos/tests/cage: Increase the xterm font size to fix the test The result still looks far from ideal but at least it gets recognized now. "-fa Monospace" is required to switch to a font from the FreeType library so that "-fs 24" works. Note: Using linuxPackages_latest is not required anymore. --- nixos/tests/cage.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index 2d4dacfc0e7..69cc76d315f 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -13,18 +13,10 @@ import ./make-test-python.nix ({ pkgs, ...} : services.cage = { enable = true; user = "alice"; - program = "${pkgs.xterm}/bin/xterm -cm -pc"; # disable color and bold to make OCR easier + # Disable color and bold and use a larger font to make OCR easier: + program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24"; }; - # this needs a fairly recent kernel, otherwise: - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed - # [backend/drm/drm.c:701] Failed to initialize renderer for plane - boot.kernelPackages = pkgs.linuxPackages_latest; - virtualisation.memorySize = 1024; }; From 8e43e833f5840330b2174ab2fc54ec3934d2a202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 29 Apr 2021 16:17:25 -0300 Subject: [PATCH 309/476] tint2: 16.7 -> 17.0 --- pkgs/applications/misc/tint2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index c78fe9afeda..847b95c7874 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -8,7 +8,7 @@ , pcre , glib , imlib2 -, gtk2 +, gtk3 , libXinerama , libXrender , libXcomposite @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "tint2"; - version = "16.7"; + version = "17.0"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; + sha256 = "1gy5kki7vqrj43yl47cw5jqwmj45f7a8ppabd5q5p1gh91j7klgm"; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pcre glib imlib2 - gtk2 + gtk3 libXinerama libXrender libXcomposite @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/o9000/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; From 69c572332b53e70a738f9036c8400b4c99e3ab63 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 29 Apr 2021 20:50:37 +0200 Subject: [PATCH 310/476] svtplay-dl: 3.3 -> 3.6 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index cad7f5e3881..67548e305d7 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "3.3"; + version = "3.6"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy"; + sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb"; }; pythonPaths = [ cryptography pyyaml requests ]; From 4d79ce4091900d814d64992ef58781045bb40d30 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 29 Apr 2021 11:48:14 +0200 Subject: [PATCH 311/476] ocamlPackages.caqti-*: 1.3.0 -> 1.5.1 --- pkgs/development/ocaml-modules/caqti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 6df0af597c2..105a6a9dfe1 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "caqti"; - version = "1.3.0"; + version = "1.5.1"; useDune2 = true; minimumOCamlVersion = "4.04"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "paurkedal"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "1ksjchfjnh059wvd95my1sv9b0ild0dfaiynbf2xsaz7zg1y4xmw"; + sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; }; buildInputs = [ cppo ]; From 0d7f9f8ac38e6f1c01a6e4bfb774e9b761cf1bde Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 29 Apr 2021 21:52:59 +0200 Subject: [PATCH 312/476] chromiumDev: 92.0.4484.7 -> 92.0.4491.6 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e5bcab4740e..72a360d2555 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "92.0.4484.7", - "sha256": "1111b1vj4zqcz57c65pjbxjilvv2ps8cjz2smxxz0vjd432q2fdf", - "sha256bin64": "0qb5bngp3vwn7py38bn80k43safm395qda760nd5kzfal6c98fi1", + "version": "92.0.4491.6", + "sha256": "0dwmcqzr7ysy7555l5amzppz8rxgxbgf6fy8lq4ykn2abx4m8n8a", + "sha256bin64": "041j6nm49w03qadwlsav50avdp6pwf1a8asybgvkjaxy4fpck376", "deps": { "gn": { "version": "2021-04-06", From d8b056439e8b2ef91cd1900dc5c135b222cf256a Mon Sep 17 00:00:00 2001 From: branwright1 Date: Thu, 29 Apr 2021 21:01:54 +0100 Subject: [PATCH 313/476] river: unstable 2021-04-08 -> unstable 2021-04-27 --- pkgs/applications/window-managers/river/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 5c20bd17fc7..9b40d34b6f2 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-04-08"; + version = "unstable-2021-04-27"; src = fetchFromGitHub { owner = "ifreund"; - repo = "river"; - rev = "9e3e92050e04320949c6cd995273c30319ebd515"; - sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j"; + repo = pname; + rev = "0c8e718d95a6a621b9cba0caa9158915e567b076"; + sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk"; fetchSubmodules = true; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install - ''; + ''; nativeBuildInputs = [ zig wayland scdoc pkg-config ]; From b00ff610d5672f5c9a503dc51f02fb16d9f929a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 20:13:28 +0000 Subject: [PATCH 314/476] kubernetes-helm: 3.5.3 -> 3.5.4 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 501956ec938..0508830918f 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-7xO07JDy6ujWlDF+5Xd3myRQ8ajTppCXz9fNe4yizVw="; + sha256 = "sha256-u8GJVOubPlIG88TFG5+OvbovMz4Q595wWo2YCwuTgG8="; }; - vendorSha256 = "sha256-lpEoUgABtJczwShNdvD+zYAPDFTJqILSei2YY6mQ2mw="; + vendorSha256 = "sha256-zdZxGiwgx8c0zt9tQebJi7k/LNNYjhNInsVeBbxPsgE="; doCheck = false; From 07edccbb6ccf70fb407a25f192ab8e3795e02c7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 06:11:55 +0000 Subject: [PATCH 315/476] dar: 2.6.14 -> 2.7.0 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 172f30695d5..efb81a58adb 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.6.14"; + version = "2.7.0"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-1uzKj+q2klIdANhLzy6TStJzeQndeUvdT0Dzwijad+U="; + sha256 = "sha256-aJqNi2jZJgQmq0IObbAXZcmK2vvWePvHEUtw8O2nBwo="; }; outputs = [ "out" "dev" ]; From 0586a566ff443ba20e134f778857f5df44a6ea3a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 29 Apr 2021 21:58:42 +0200 Subject: [PATCH 316/476] trash-cli: 0.20.12.26 -> 0.21.4.18 --- pkgs/tools/misc/trash-cli/default.nix | 13 ++++++++---- pkgs/tools/misc/trash-cli/nix-paths.patch | 26 ----------------------- 2 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/misc/trash-cli/nix-paths.patch diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index d199fd7fda3..e8cf63fbccf 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,22 +2,27 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.20.12.26"; + version = "0.21.4.18"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "15iivl9xln1bw1zr2x5zvqyb6aj7mc8hfqi6dniq6xkp5m046ib7"; + sha256 = "16xmg2d9rfmm5l1dxj3dydijpv3kwswrqsbj1sihyyka4s915g61"; }; propagatedBuildInputs = [ python3Packages.psutil ]; checkInputs = with python3Packages; [ - nose mock + pytest ]; - checkPhase = "nosetests"; + + # Run tests, skipping `test_user_specified` since its result depends on the + # mount path. + checkPhase = '' + pytest -k 'not test_user_specified' + ''; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch deleted file mode 100644 index d7b485eec15..00000000000 --- a/pkgs/tools/misc/trash-cli/nix-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 -+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 -@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): - - def mount_points_from_df(): - import subprocess -- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout -+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout - return list(_mount_points_from_df_output(df_output)) - - def _mount_points_from_df_output(df_output): -@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : - ("mnt_freq", c_int), # Dump frequency (in days). - ("mnt_passno", c_int)] # Pass number for `fsck'. - -- if sys.platform == "cygwin": -- libc_name = "cygwin1.dll" -- else: -- libc_name = find_library("c") -- -- if libc_name == None : -- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 -+ libc_name = "@libc@" - - libc = cdll.LoadLibrary(libc_name) - libc.getmntent.restype = POINTER(mntent_struct) From 07484adf1169fa7822fae1d9359f2b6f01b604ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 20:46:01 +0000 Subject: [PATCH 317/476] libgpiod: 1.6.2 -> 1.6.3 --- pkgs/development/libraries/libgpiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 8f6d9fcab5e..ccf1c470364 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1k8mxkzvd6y9aawxghddrjkldzskhb6607qhbwjfl9f945ns87qa"; + sha256 = "sha256-60RgcL4URP19MtMrvKU8Lzu7CiEZPbhhmM9gULeihEE="; }; patches = [ From 0b02fa01a99bc498ab923b37addffcdda9d31367 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 29 Apr 2021 23:56:38 +0300 Subject: [PATCH 318/476] innernet: fix build on darwin --- pkgs/tools/networking/innernet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 4573db5879e..af003396838 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "innernet"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { clang installShellFiles ]; - buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; From 17d9b66346d3bf7193492f5c5857c21925e7feb2 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Thu, 29 Apr 2021 22:08:28 +0300 Subject: [PATCH 319/476] terraform-ls: 0.15.0 -> 0.16.0 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 54adb5f8296..cafa63e96bd 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/g62LSlaIK67oY6dI8S3Lni85eBBI6piqP2Fsq3HXWQ="; + sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo="; }; - vendorSha256 = "sha256-U0jVdyY4SifPWkOkq3ohY/LvfGcYm4rI+tW1QEm39oo="; + vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; From 3f16286601c3f808da91854bca3e19be622d5db5 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 29 Apr 2021 23:20:41 +0200 Subject: [PATCH 320/476] vscode-extensions.hashicorp.terraform: 2.10.0 -> 2.10.1 --- pkgs/misc/vscode-extensions/terraform/default.nix | 4 ++-- .../vscode-extensions/terraform/fix-terraform-ls.patch | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 592994c3314..ce0e1e7c3f4 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.0"; + version = "2.10.1"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f"; + sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index d91ffcc17ab..1e72b7b81ec 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,8 +1,8 @@ diff --git a/out/extension.js b/out/extension.js -index e44cef2..fba0899 100644 +index e815393..aeade0e 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -141,24 +141,6 @@ function updateLanguageServer() { +@@ -141,25 +141,6 @@ function updateLanguageServer() { return __awaiter(this, void 0, void 0, function* () { const delay = 1000 * 60 * 24; setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs @@ -16,6 +16,7 @@ index e44cef2..fba0899 100644 - yield installer.install(); - } - catch (err) { +- console.log(err); // for test failure reporting - reporter.sendTelemetryException(err); - throw err; - } @@ -27,7 +28,7 @@ index e44cef2..fba0899 100644 return startClients(); // on repeat runs with no install, this will be a no-op }); } -@@ -256,7 +238,7 @@ function pathToBinary() { +@@ -257,7 +238,7 @@ function pathToBinary() { reporter.sendTelemetryEvent('usePathToBinary'); } else { From cb5f4ca733083a9f93416337a12fed6ad27a8e2b Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Thu, 29 Apr 2021 23:52:32 +0200 Subject: [PATCH 321/476] python3Packages.karton-config-extractor: 1.0.0 -> 1.1.1 --- .../python-modules/karton-config-extractor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index bb2b9d4903b..9144a4026f6 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1v0zqa81yjz6hm17x9hp0iwkllymqzn84dd6r2yrhillbwnjg9bb"; + sha256 = "14592b9vq2iza5agxr29z1mh536if7a9p9hvyjnibsrv22mzwz7l"; }; propagatedBuildInputs = [ @@ -23,7 +23,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "karton.core==4.0.5" "karton-core" + --replace "karton-core==4.2.0" "karton-core" + substituteInPlace requirements.txt \ + --replace "malduck==4.1.0" "malduck" ''; # Project has no tests From 4c0f440fb0d83786561d263d6607d1c248e70c1d Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Fri, 30 Apr 2021 00:07:44 +0200 Subject: [PATCH 322/476] python3Packages.karton-yaramatcher: 1.0.0 -> 1.1.0 --- .../development/python-modules/karton-yaramatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index afe6f2aaa44..f64ee17f843 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "093h5hbx2ss4ly523gvf10a5ky3vvin6wipigvhx13y1rdxl6c9n"; + sha256 = "0yb9l5z826zli5cpcj234dmjdjha2g1lcwxyvpxm95whkhapc2cf"; }; propagatedBuildInputs = [ From b33572a49f1c246acd8d1ae1266ea3b2616c5d5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 00:24:49 +0200 Subject: [PATCH 323/476] python3Packages.ha-ffmpeg: add pythonImportsChecks --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index ce1e8a9d237..9fd1295733c 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { # only manual tests doCheck = false; + pythonImportsCheck = [ + "haffmpeg.camera" + "haffmpeg.sensor" + "haffmpeg.tools" + ]; + meta = with lib; { homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; From 1753a9178ea52a57f45712c3a14b7472a273aaf3 Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 17 Apr 2021 00:37:08 +0200 Subject: [PATCH 324/476] ocenaudio: 3.10.2 -> 3.10.6 --- pkgs/applications/audio/ocenaudio/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index d770396a6ad..68edf99e010 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.10.2"; + version = "3.10.6"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo="; + sha256 = "0fgvm1xw2kgrqj3w6slpfxbb3pw9k8i0dz16q9d5d8gyyvr2mh8g"; }; - nativeBuildInputs = [ autoPatchelfHook qt5.qtbase + qt5.wrapQtAppsHook libjack2 libpulseaudio bzip2 @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { dontUnpack = true; dontBuild = true; dontStrip = true; - dontWrapQtApps = true; installPhase = '' mkdir -p $out From 5ea915de464f6b71613b63900e16ecf582e280da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 20:56:39 +0200 Subject: [PATCH 325/476] pythonPackages.IMAPClient: 2.1.0 -> 2.2.0 --- .../python-modules/imapclient/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index 27667f860ff..ea4f388b6c7 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -1,35 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock , six +, pytestCheckHook +, mock }: buildPythonPackage rec { pname = "IMAPClient"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mjs"; repo = "imapclient"; rev = version; - sha256 = "1zc8qj8ify2zygbz255b6fcg7jhprswf008ccwjmbrnj08kh9l4x"; + sha256 = "sha256-q/8LFKHgrY3pQV7Coz+5pZAw696uABMTEkYoli6C2KA="; }; - # fix test failing in python 36 - postPatch = '' - substituteInPlace tests/test_imapclient.py \ - --replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):" - ''; - propagatedBuildInputs = [ six ]; - checkInputs = [ mock ]; + checkInputs = [ pytestCheckHook mock ]; meta = with lib; { homepage = "https://imapclient.readthedocs.io"; description = "Easy-to-use, Pythonic and complete IMAP client library"; license = licenses.bsd3; - maintainers = [ maintainers.almac ]; + maintainers = with maintainers; [ almac dotlambda ]; }; } From d9906b057662a2484851fa42821a592674428a81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 22:48:09 +0000 Subject: [PATCH 326/476] croc: 9.1.0 -> 9.1.1 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 187c07b040b..09edbaf7516 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.0"; + version = "9.1.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc="; + sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4="; }; - vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY="; + vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc="; doCheck = false; From d03dd5ab28445ef305ff3ff57cd3ea48a1dc9bd8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 28 Apr 2021 11:47:36 -0700 Subject: [PATCH 327/476] visualvm: 2.0.6 -> 2.0.7 --- pkgs/development/tools/java/visualvm/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 4425071cb14..c0082f46305 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.6"; + version = "2.0.7"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-HoDV8Z024+WnECw1ZVwA3dEfbKtuTd4he40UwQnpiGQ="; + sha256 = "sha256-IbiyrP3rIj3VToav1bhKnje0scEPSyLwsyclpW7nB+U="; }; desktopItem = makeDesktopItem { @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ --replace "/path/to/jdk" "${jdk.home}" \ - substituteInPlace platform/lib/nbexec \ - --replace /usr/bin/\''${awk} ${gawk}/bin/awk - cp -r . $out ''; From 77dc94f4d0545767f58a49dba92d2c52b28e986c Mon Sep 17 00:00:00 2001 From: Mitch Fossen Date: Thu, 29 Apr 2021 17:42:42 -0500 Subject: [PATCH 328/476] kopia: 0.7.3 -> 0.8.4 --- pkgs/tools/backup/kopia/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index bcf51372f6c..32f051f5ad9 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kopia"; - version = "0.7.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1dnk764y71c9k9nghn9q06f2zz9igsvm4z826azil2d58h5d06j6"; + sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g="; }; - vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq"; + vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI="; doCheck = false; @@ -23,12 +23,6 @@ buildGoModule rec { -X github.com/kopia/kopia/repo.BuildInfo=${src.rev} ''; - postConfigure = '' - # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 - substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace "/bin/stty" "${coreutils}/bin/stty" - ''; - meta = with lib; { homepage = "https://kopia.io"; description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; From 3ed601e61248299c40e507d6b39f8c7ea263ce01 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Date: Fri, 30 Apr 2021 02:49:00 +0300 Subject: [PATCH 329/476] hunter: init at 1.3.5 (#120084) Co-authored-by: Christoph Neidahl Co-authored-by: Sandro --- pkgs/applications/misc/hunter/default.nix | 77 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/misc/hunter/default.nix diff --git a/pkgs/applications/misc/hunter/default.nix b/pkgs/applications/misc/hunter/default.nix new file mode 100644 index 00000000000..6c0c9b2955a --- /dev/null +++ b/pkgs/applications/misc/hunter/default.nix @@ -0,0 +1,77 @@ +{ lib, stdenv, pkg-config, rustPlatform, fetchFromGitHub, fetchpatch +, makeWrapper, glib, gst_all_1, CoreServices, IOKit, Security }: + +rustPlatform.buildRustPackage rec { + pname = "hunter"; + version = "2020-05-25-unstable"; + + src = fetchFromGitHub { + owner = "rabite0"; + repo = "hunter"; + rev = "355d9a3101f6d8dc375807de79e368602f1cb87d"; + sha256 = "sha256-R2wNkG8bFP7X2pdlebHK6GD15qmD/zD3L0MwVthvzzQ="; + }; + + patches = [ + (fetchpatch { + name = "remove-dependencies-on-rust-nightly"; + url = "https://github.com/06kellyjac/hunter/commit/a5943578e1ee679c8bc51b0e686c6dddcf74da2a.diff"; + sha256 = "sha256-eOwBFfW5m8tPnu+whWY/53X9CaqiVj2WRr25G+Yy7qE="; + }) + (fetchpatch { + name = "fix-accessing-core-when-moved-with-another-clone"; + url = "https://github.com/06kellyjac/hunter/commit/2e95cc567c751263f8c318399f3c5bb01d36962a.diff"; + sha256 = "sha256-yTzIXUw5qEaR2QZHwydg0abyZVXfK6fhJLVHBI7EAro="; + }) + (fetchpatch { + name = "fix-resolve-breaking-changes-from-package-updates"; + url = "https://github.com/06kellyjac/hunter/commit/2484f0db580bed1972fd5000e1e949a4082d2f01.diff"; + sha256 = "sha256-K+WUxEr1eE68XejStj/JwQpMHlhkiOw6PmiSr1GO0kc="; + }) + ]; + + cargoPatches = [ + (fetchpatch { + name = "chore-cargo-update"; + url = "https://github.com/06kellyjac/hunter/commit/b0be49a82191a4420b6900737901a71140433efd.diff"; + sha256 = "sha256-ctxoDwyIJgEhMbMUfrjCTy2SeMUQqMi971szrqEOJeg="; + }) + (fetchpatch { + name = "chore-cargo-upgrade-+-cargo-update"; + url = "https://github.com/06kellyjac/hunter/commit/1b8de9248312878358afaf1dac569ebbccc4321a.diff"; + sha256 = "sha256-+4DZ8SaKwKNmr2SEgJJ7KZBIctnYFMQFKgG+yCkbUv0="; + }) + ]; + + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ + glib + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + ]) ++ lib.optionals stdenv.isDarwin [ CoreServices IOKit Security ]; + + cargoBuildFlags = [ "--no-default-features" "--features=img,video" ]; + + postInstall = '' + wrapProgram $out/bin/hunter --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + cargoSha256 = "sha256-Bd/gilebxC4H+/1A41OSSfWBlHcSczsFcU2b+USnI74="; + + meta = with lib; { + description = "The fastest file manager in the galaxy!"; + homepage = "https://github.com/rabite0/hunter"; + license = licenses.wtfpl; + maintainers = with maintainers; [ fufexan ]; + # error[E0308]: mismatched types + # --> src/files.rs:502:62 + # expected raw pointer `*const u8`, found raw pointer `*const i8` + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6c77bdab94..f4876996ca8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14994,6 +14994,10 @@ in hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; + hunter = callPackage ../applications/misc/hunter { + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit Security; + }; + hwloc = callPackage ../development/libraries/hwloc {}; inherit (callPackage ../development/tools/misc/hydra { }) From 34c288f014adaa40e46d52e3b316572861b1e066 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 14:30:48 +0000 Subject: [PATCH 330/476] kea: 1.9.5 -> 1.9.6 --- pkgs/tools/networking/kea/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index ba1be39aebf..ac8c515642f 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,18 +12,17 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-MkoG9IhkW+5YfkmkXUkbUl9TQXxWshnxyzdGH979nZE="; + sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw="; }; patches = [ ./dont-create-var.patch ]; postPatch = '' substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" - substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc" ''; configureFlags = [ From 0dde9ab531b503dbbdd2660780b94e5d64108832 Mon Sep 17 00:00:00 2001 From: Maisem Ali <3953239+maisem@users.noreply.github.com> Date: Thu, 29 Apr 2021 17:36:54 -0700 Subject: [PATCH 331/476] nsis: enable builds on darwin. (#120903) Co-authored-by: Dmitry Kalinkin Co-authored-by: Sandro --- pkgs/development/tools/nsis/default.nix | 31 +++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 2d3f54bbf75..4820d8bb4b7 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv +{ lib +, stdenv +, symlinkJoin , fetchurl , fetchzip , sconsPackages , zlib +, libiconv }: stdenv.mkDerivation rec { @@ -28,20 +31,34 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + CPPPATH = symlinkJoin { + name = "nsis-includes"; + paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + }; + + LIBPATH = symlinkJoin { + name = "nsis-libs"; + paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + }; sconsFlags = [ "SKIPSTUBS=all" "SKIPPLUGINS=all" "SKIPUTILS=all" "SKIPMISC=all" - "APPEND_CPPPATH=${zlib.dev}/include" - "APPEND_LIBPATH=${zlib}/lib" "NSIS_CONFIG_CONST_DATA=no" - ]; + ] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv"; preBuild = '' - sconsFlagsArray+=("PATH=$PATH") + sconsFlagsArray+=( + "PATH=$PATH" + "CC=$CC" + "CXX=$CXX" + "APPEND_CPPPATH=$CPPPATH/include" + "APPEND_LIBPATH=$LIBPATH/lib" + ) ''; prefixKey = "PREFIX="; @@ -51,7 +68,7 @@ stdenv.mkDerivation rec { description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pombeirp ]; }; } From e1b933ccdc67ce654d9cab658bb2970677ea20bb Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Tue, 27 Apr 2021 13:59:41 -0400 Subject: [PATCH 332/476] opusfile: fix windows compilation --- pkgs/applications/audio/opusfile/default.nix | 14 +++++--- .../audio/opusfile/disable-cert-store.patch | 35 +++++++++++++++++++ .../development/libraries/libopus/default.nix | 2 +- 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/audio/opusfile/disable-cert-store.patch diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index e4f7e6ca6b4..a6683904cb1 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,23 +1,27 @@ { lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.12"; + pname = "opusfile"; + version = "0.12"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + url = "http://downloads.xiph.org/releases/opus/opusfile-${version}.tar.gz"; sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; - patches = [ ./include-multistream.patch ]; + patches = [ ./include-multistream.patch ] + # fixes problem with openssl 1.1 dependency + # see https://github.com/xiph/opusfile/issues/13 + ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ]; configureFlags = [ "--disable-examples" ]; meta = with lib; { description = "High-level API for decoding and seeking in .opus files"; homepage = "https://www.opus-codec.org/"; license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ]; + platforms = platforms.all; + maintainers = with maintainers; [ taeer ]; }; } diff --git a/pkgs/applications/audio/opusfile/disable-cert-store.patch b/pkgs/applications/audio/opusfile/disable-cert-store.patch new file mode 100644 index 00000000000..e0a7dd4fe3d --- /dev/null +++ b/pkgs/applications/audio/opusfile/disable-cert-store.patch @@ -0,0 +1,35 @@ +diff --git a/src/http.c b/src/http.c +index bd08562..3a3592c 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -327,10 +327,12 @@ static int op_poll_win32(struct pollfd *_fds,nfds_t _nfds,int _timeout){ + typedef ptrdiff_t ssize_t; + # endif + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + /*Load certificates from the built-in certificate store.*/ + int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx); + # define SSL_CTX_set_default_verify_paths \ + SSL_CTX_set_default_verify_paths_win32 ++#endif + + # else + /*Normal Berkeley sockets.*/ +diff --git a/src/wincerts.c b/src/wincerts.c +index 409a4e0..c355952 100644 +--- a/src/wincerts.c ++++ b/src/wincerts.c +@@ -33,6 +33,8 @@ + # include + # include + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ + static int op_capi_new(X509_LOOKUP *_lu){ + HCERTSTORE h_store; + h_store=CertOpenStore(CERT_STORE_PROV_SYSTEM_A,0,0, +@@ -171,3 +173,4 @@ int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx){ + } + + #endif ++#endif diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 51179ecb9a0..8172bd38e10 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Open, royalty-free, highly versatile audio codec"; license = lib.licenses.bsd3; homepage = "https://www.opus-codec.org/"; - platforms = platforms.unix; + platforms = platforms.all; }; } From aabbf1fbb96372b9d27712b0586c8353595c5f9a Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Fri, 30 Apr 2021 01:07:29 +0000 Subject: [PATCH 333/476] lmdb: use fetchFromGitLab --- pkgs/development/libraries/lmdb/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index d8d034b04b7..d1a68cc66c6 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "lmdb"; version = "0.9.29"; - src = fetchgit { - url = "https://git.openldap.org/openldap/openldap.git"; + src = fetchFromGitLab { + domain = "git.openldap.org"; + owner = "openldap"; + repo = "openldap"; rev = "LMDB_${version}"; - sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3"; + sha256 = "19zq5s1amrv1fhw1aszcn2w2xjrk080l6jj5hc9f46yiqf98jjg3"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { offering the persistence of standard disk-based databases, and is only limited to the size of the virtual address space. ''; - homepage = "http://symas.com/mdb/"; + homepage = "https://symas.com/lmdb/"; maintainers = with maintainers; [ jb55 vcunat ]; license = licenses.openldap; platforms = platforms.all; From a37f7215b2e3ed568bc968f4a13aedca2a59969b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Apr 2021 18:05:48 +0800 Subject: [PATCH 334/476] cantata: ffmpeg_3 -> ffmpeg --- pkgs/applications/audio/cantata/default.nix | 125 ++++++++++++-------- 1 file changed, 74 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 8f02e8da893..3d594a896cf 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,22 +1,42 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, qtbase, qtsvg, qttools, perl +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qtbase +, qtsvg +, qttools +, perl -# Cantata doesn't build with cdparanoia enabled so we disable that -# default for now until I (or someone else) figure it out. -, withCdda ? false, cdparanoia -, withCddb ? false, libcddb -, withLame ? false, lame -, withMusicbrainz ? false, libmusicbrainz5 + # Cantata doesn't build with cdparanoia enabled so we disable that + # default for now until I (or someone else) figure it out. +, withCdda ? false +, cdparanoia +, withCddb ? false +, libcddb +, withLame ? false +, lame +, withMusicbrainz ? false +, libmusicbrainz5 -, withTaglib ? true, taglib, taglib_extras -, withHttpStream ? true, qtmultimedia -, withReplaygain ? true, ffmpeg_3, speex, mpg123 -, withMtp ? true, libmtp +, withTaglib ? true +, taglib +, taglib_extras +, withHttpStream ? true +, qtmultimedia +, withReplaygain ? true +, ffmpeg +, speex +, mpg123 +, withMtp ? true +, libmtp , withOnlineServices ? true -, withDevices ? true, udisks2 +, withDevices ? true +, udisks2 , withDynamic ? true , withHttpServer ? true -, withLibVlc ? false, libvlc +, withLibVlc ? false +, libvlc , withStreams ? true }: @@ -31,22 +51,25 @@ assert withReplaygain -> withTaglib; assert withLibVlc -> withHttpStream; let - version = "2.4.2"; - pname = "cantata"; - fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); - fstats = x: map (fstat x); + fstat = x: fn: + "-DENABLE_${fn}=${if x then "ON" else "OFF"}"; + + fstats = x: + map (fstat x); withUdisks = (withTaglib && withDevices); - perl' = perl.withPackages (ppkgs: [ ppkgs.URI ]); + perl' = perl.withPackages (ppkgs: with ppkgs; [ URI ]); -in mkDerivation { - name = "${pname}-${version}"; +in +mkDerivation rec { + pname = "cantata"; + version = "2.4.2"; src = fetchFromGitHub { - owner = "CDrummond"; - repo = "cantata"; - rev = "v${version}"; + owner = "CDrummond"; + repo = "cantata"; + rev = "v${version}"; sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; }; @@ -63,44 +86,44 @@ in mkDerivation { buildInputs = [ qtbase qtsvg perl' ] ++ lib.optionals withTaglib [ taglib taglib_extras ] - ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] - ++ lib.optional withHttpStream qtmultimedia - ++ lib.optional withCdda cdparanoia - ++ lib.optional withCddb libcddb - ++ lib.optional withLame lame - ++ lib.optional withMtp libmtp - ++ lib.optional withMusicbrainz libmusicbrainz5 - ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc libvlc; + ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optional withHttpStream qtmultimedia + ++ lib.optional withCdda cdparanoia + ++ lib.optional withCddb libcddb + ++ lib.optional withLame lame + ++ lib.optional withMtp libmtp + ++ lib.optional withMusicbrainz libmusicbrainz5 + ++ lib.optional withUdisks udisks2 + ++ lib.optional withLibVlc libvlc; nativeBuildInputs = [ cmake pkg-config qttools ]; cmakeFlags = lib.flatten [ - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withHttpStream "HTTP_STREAM_PLAYBACK") - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") + (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) + (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withHttpStream "HTTP_STREAM_PLAYBACK") + (fstat withCdda "CDPARANOIA") + (fstat withCddb "CDDB") + (fstat withLame "LAME") + (fstat withMtp "MTP") + (fstat withMusicbrainz "MUSICBRAINZ") (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withLibVlc "LIBVLC") - (fstat withStreams "STREAMS") - (fstat withUdisks "UDISKS2") + (fstat withDynamic "DYNAMIC") + (fstat withDevices "DEVICES_SUPPORT") + (fstat withHttpServer "HTTP_SERVER") + (fstat withLibVlc "LIBVLC") + (fstat withStreams "STREAMS") + (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" ]; meta = with lib; { - homepage = "https://github.com/cdrummond/cantata"; description = "A graphical client for MPD"; - license = licenses.gpl3; + homepage = "https://github.com/cdrummond/cantata"; + license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; - # Technically Cantata can run on Windows so if someone wants to + # Technically, Cantata should run on Darwin/Windows so if someone wants to # bother figuring that one out, be my guest. - platforms = platforms.linux; + platforms = platforms.linux; }; } From 82c31a83b874595fa102f5bd9d9959754f642193 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 30 Apr 2021 09:42:41 +0800 Subject: [PATCH 335/476] nixos/module: example referenced old ffmpeg --- nixos/modules/programs/ccache.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index 3c9e64932f1..d672e1da017 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -17,7 +17,7 @@ in { type = types.listOf types.str; description = "Nix top-level packages to be compiled using CCache"; default = []; - example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ]; + example = [ "wxGTK30" "ffmpeg" "libav_all" ]; }; }; From 9e143db30124a640ad2907b5d0083fe4741fa95d Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 28 Apr 2021 23:47:33 +0200 Subject: [PATCH 336/476] minidlna: switch from ffmpeg_3 to ffmpeg --- pkgs/tools/networking/minidlna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index df194ccaaaa..c14b8c68479 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: let version = "1.3.0"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { export makeFlags="INSTALLPREFIX=$out" ''; - buildInputs = [ ffmpeg_3 flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; postInstall = '' mkdir -p $out/share/man/man{5,8} From ea6882eddafb63db58d60da4d167540f78869ad8 Mon Sep 17 00:00:00 2001 From: Jordi Masip Date: Sun, 24 May 2020 12:59:42 +0200 Subject: [PATCH 337/476] maintainers: add masipcat --- maintainers/maintainer-list.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91e8c9591fb..15d3011659c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6134,11 +6134,11 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; - mausch = { - email = "mauricioscheffer@gmail.com"; - github = "mausch"; - githubId = 95194; - name = "Mauricio Scheffer"; + masipcat = { + email = "jordi@masip.cat"; + github = "masipcat"; + githubId = 775189; + name = "Jordi Masip"; }; matejc = { email = "cotman.matej@gmail.com"; @@ -6194,6 +6194,12 @@ githubId = 136037; name = "Matthew Maurer"; }; + mausch = { + email = "mauricioscheffer@gmail.com"; + github = "mausch"; + githubId = 95194; + name = "Mauricio Scheffer"; + }; maxdamantus = { email = "maxdamantus@gmail.com"; github = "Maxdamantus"; From 4b409860c2710fc0f5c7d5e0994549051988fd3f Mon Sep 17 00:00:00 2001 From: reedrw Date: Thu, 29 Apr 2021 22:32:32 -0400 Subject: [PATCH 338/476] shticker-book-unwritten: fix broken cargoSha256; add libXcursor (#120968) --- pkgs/games/shticker-book-unwritten/default.nix | 1 + pkgs/games/shticker-book-unwritten/unwrapped.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index dd286ce0941..0179c7c86e8 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -8,6 +8,7 @@ in buildFHSUserEnv { targetPkgs = pkgs: with pkgs; [ alsaLib xorg.libX11 + xorg.libXcursor xorg.libXext libglvnd shticker-book-unwritten-unwrapped diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index 411bea6b00a..638a9ae792e 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "1lnhdr8mri1ns9lxj6aks4vs2v4fvg7mcriwzwj78inpi1l0xqk5"; + cargoSha256 = "1d4mnfzkdbqnjmqk7fl4bsy27lr7wnq997nz0hflaybnx2d3nisn"; nativeBuildInputs = [ pkg-config ]; From 309dc32405bf0bb0d607622e245f07857963bdbe Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 29 Apr 2021 19:34:01 -0700 Subject: [PATCH 339/476] pythonPackages.pypiserver: init at 1.4.2 --- .../python-modules/pypiserver/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pypiserver/default.nix diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix new file mode 100644 index 00000000000..d1c6fee942c --- /dev/null +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage, fetchFromGitHub, lib, passlib, pytestCheckHook, setuptools +, setuptools-git, twine, webtest }: + +buildPythonPackage rec { + pname = "pypiserver"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1z5rsmqgin98m6ihy1ww42fxxr6jb4hzldn8vlc9ssv7sawdz8vz"; + }; + + nativeBuildInputs = [ setuptools-git ]; + + propagatedBuildInputs = [ setuptools ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkInputs = [ passlib pytestCheckHook twine webtest ]; + + # These tests try to use the network + disabledTests = [ + "test_pipInstall_openOk" + "test_pipInstall_authedOk" + "test_hash_algos" + ]; + + pythonImportsCheck = [ "pypiserver" ]; + + meta = with lib; { + homepage = "https://github.com/pypiserver/pypiserver"; + description = "Minimal PyPI server for use with pip/easy_install"; + license = with licenses; [ mit zlib ]; + maintainers = [ maintainers.austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c7940c610..4242d73d1ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5896,6 +5896,8 @@ in { pypinyin = callPackage ../development/python-modules/pypinyin { }; + pypiserver = callPackage ../development/python-modules/pypiserver { }; + pyplaato = callPackage ../development/python-modules/pyplaato { }; pyplatec = callPackage ../development/python-modules/pyplatec { }; From 6aa9d635d47b6e133d5bbcff02be3099cce52f22 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 29 Apr 2021 19:34:31 -0700 Subject: [PATCH 340/476] python3Packages.setuptools-declarative-requirements: init at 1.2.0 --- .../default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools-declarative-requirements/default.nix diff --git a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix new file mode 100644 index 00000000000..ba6ff1649e6 --- /dev/null +++ b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, fetchPypi, lib, pypiserver, pytestCheckHook +, setuptools-scm, virtualenv }: + +buildPythonPackage rec { + pname = "setuptools-declarative-requirements"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi"; + }; + + buildInputs = [ setuptools-scm ]; + + checkInputs = [ pypiserver pytestCheckHook virtualenv ]; + + # Tests use network + doCheck = false; + + pythonImportsCheck = [ "declarative_requirements" ]; + + meta = with lib; { + homepage = "https://github.com/s0undt3ch/setuptools-declarative-requirements"; + description = "Declarative setuptools Config Requirements Files Support"; + license = licenses.asl20; + maintainers = [ maintainers.austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4242d73d1ae..9bc3bc310fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7346,6 +7346,8 @@ in { setproctitle = callPackage ../development/python-modules/setproctitle { }; + setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; From 15b116195d328c576c6b0e12acaf49b17ced8701 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 29 Apr 2021 19:34:45 -0700 Subject: [PATCH 341/476] python3Packages.pytest-helpers-namespace: add missing dependency --- .../pytest-helpers-namespace/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 43ef2a1339f..b405afea215 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -1,30 +1,28 @@ { buildPythonPackage -, fetchFromGitHub -, pytest +, fetchPypi +, pytestCheckHook +, isPy27 , lib +, setuptools +, setuptools-declarative-requirements +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-helpers-namespace"; version = "2021.3.24"; + disabled = isPy27; - src = fetchFromGitHub { - owner = "saltstack"; - repo = pname; - rev = version; - sha256 = "0ikwiwp9ycgg7px78nxdkqvg7j97krb6vzqlb8fq8fvbwrj4q4v2"; + src = fetchPypi { + inherit pname version; + sha256 = "0pyj2d45zagmzlajzqdnkw5yz8k49pkihbydsqkzm413qnkzb38q"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest - ''; - - # The tests fail with newest pytest. They passed with pytest_3, which no longer exists - doCheck = false; + pythonImportsCheck = [ "pytest_helpers_namespace" ]; meta = with lib; { homepage = "https://github.com/saltstack/pytest-helpers-namespace"; From 7ced0d92bf634071f40f452b9550d62ed3f99ff9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 03:45:26 +0000 Subject: [PATCH 342/476] avro-c: 1.9.1 -> 1.10.2 --- pkgs/development/libraries/avro-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index a5acd7c7898..95e3053b534 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: let - version = "1.9.1"; + version = "1.10.2"; in stdenv.mkDerivation { pname = "avro-c"; inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "0hj6w1w5mqkhnhkvjc0zz5njnnrbcjv5ml4f8gq80wff2cgbrxvx"; + sha256 = "sha256-rj+zK+xKBon1Rn4JIBGS7cbo80ITTvBq1FLKhw9Wt+I="; }; postPatch = '' From 0c523b5e936147ba712c5839d6377e3058268e26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 00:49:06 +0000 Subject: [PATCH 343/476] git-quick-stats: 2.1.8 -> 2.1.9 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 7f0db1f712c..3f045046822 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-sK8HOfeiV0xn540bU7inZl/hV6uzitJ4Szqk96a8DMc="; + sha256 = "sha256-2rrwbEXwBBuussybCZFbAEjNwm/ztbXw1jUlTnxPINA="; }; nativeBuildInputs = [ makeWrapper ]; From 53193ef71690039548c2f48c5a92af1217b82561 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 30 Apr 2021 00:54:24 +0000 Subject: [PATCH 344/476] phoc: init at 0.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Blaž Hrastnik Co-authored-by: Jan Tojnar Co-authored-by: Jordi Masip --- pkgs/applications/misc/phoc/default.nix | 84 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 88 insertions(+) create mode 100644 pkgs/applications/misc/phoc/default.nix diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix new file mode 100644 index 00000000000..6ef88fb07c6 --- /dev/null +++ b/pkgs/applications/misc/phoc/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, libinput +, gnome3 +, glib +, gtk3 +, wayland +, libdrm +, libxkbcommon +, wlroots +}: + +let + phocWlroots = wlroots.overrideAttrs (old: { + patches = (old.patches or []) ++ [ + # Temporary fix. Upstream report: https://source.puri.sm/Librem5/phosh/-/issues/422 + (fetchpatch { + name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; + sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38"; + }) + # To fix missing header `EGL/eglmesaext.h` dropped upstream + (fetchpatch { + name = "0002-stop-including-eglmesaext-h.patch"; + url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch"; + sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l"; + }) + ]; + }); +in stdenv.mkDerivation rec { + pname = "phoc"; + version = "0.7.0"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "0afiyr2slg38ksrqn19zygsmjy9k5bpwv6n7zjas3s5djr6hch45"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + libdrm.dev + libxkbcommon + libinput + glib + gtk3 + gnome3.gnome-desktop + # For keybindings settings schemas + gnome3.mutter + wayland + phocWlroots + ]; + + mesonFlags = ["-Dembed-wlroots=disabled"]; + + postPatch = '' + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py + ''; + + meta = with lib; { + description = "Wayland compositor for mobile phones like the Librem 5"; + homepage = "https://source.puri.sm/Librem5/phoc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ archseer masipcat zhaofengli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74147f29f0f..c62511e5b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7530,6 +7530,10 @@ in philter = callPackage ../tools/networking/philter { }; + phoc = callPackage ../applications/misc/phoc { + wlroots = wlroots_0_12; + }; + phodav = callPackage ../tools/networking/phodav { }; pim6sd = callPackage ../servers/pim6sd { }; From d10fbc5b062f4e39b36be6fd26d7849a7ac8ba27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 30 Apr 2021 04:20:00 +0000 Subject: [PATCH 345/476] postgresqlPackages.pgvector: 0.1.0 -> 0.1.2 --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index a5c0f558c46..a93c400069b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "03i8rq9wp9j2zdba82q31lzbrqpnhrqc8867pxxy3z505fxsvfzb"; + sha256 = "1vq672ghhv0azpzgfb7azb36kbjyz9ypcly7r16lrryvjgp5lcjs"; }; buildInputs = [ postgresql ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source vector similarity search for PostgreSQL"; homepage = "https://github.com/ankane/pgvector"; + changelog = "https://github.com/ankane/pgvector/raw/v${version}/CHANGELOG.md"; license = licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = [ maintainers.marsam ]; From 147b101a635b4310d701ed62817c4eadd010c8f4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 30 Apr 2021 04:20:00 +0000 Subject: [PATCH 346/476] lxc: 4.0.6 -> 4.0.7 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index e6bdd70b915..00822dd6150 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci"; + sha256 = "0gqfc6nps8ja3iymh1mqbzakrlnzlf4lzfcxawz764w15z0214vl"; }; nativeBuildInputs = [ From ee282e4e09380b3b64e0ced34d4eb435dc9d46e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 23:03:46 +0000 Subject: [PATCH 347/476] deepdiff: 5.3.0 -> 5.5.0 --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 83140ff0bb0..e414d863350 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.3.0"; + version = "5.5.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = version; - sha256 = "1izw2qpd93nj948zakamjn7q7dlmmr7sapg0c65hxvs0nmij8sl4"; + sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w="; }; propagatedBuildInputs = [ From 4b47f1504e13e7e113ed5e71dbb7c785d2c2b8b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 04:24:12 +0000 Subject: [PATCH 348/476] bgpq4: 0.0.6 -> 0.0.7 --- pkgs/tools/networking/bgpq4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 4db2d933583..40c65b35a03 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "1n6d6xq7vafx1la0fckqv0yjr245ka9dgbcqaz9m6dcdk0fdlkks"; + sha256 = "sha256-iEm4BYlJi56Y4OBCdEDgRQ162F65PLZyvHSEQzULFww="; }; nativeBuildInputs = [ From f072e1f2e251c5ee3d4d9b3f2b0f5de844a6bf55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 00:23:58 +0000 Subject: [PATCH 349/476] flow: 0.149.0 -> 0.150.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8c8ea1a5ffc..64efad50817 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.149.0"; + version = "0.150.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/pNCEsCKfYh/jo+3x7usRyPNBRJB4gDu2TAgosSw37c="; + sha256 = "sha256-75QSM2v4xDCkDnxW6Qb2ZGiWClOSDCd0jSrUdupMXxY="; }; installPhase = '' From 600bb9d5291581b02c35fd74dd8bd5b9bec3e144 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 30 Apr 2021 10:26:29 +0800 Subject: [PATCH 350/476] togglesg-download: drop it as it is no longer maintained/working --- pkgs/tools/misc/togglesg-download/default.nix | 46 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/tools/misc/togglesg-download/default.nix diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix deleted file mode 100644 index 812ad7900d0..00000000000 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: - -pythonPackages.buildPythonApplication { - - pname = "togglesg-download-git"; - version = "2017-12-07"; - - src = fetchFromGitHub { - owner = "0x776b7364"; - repo = "toggle.sg-download"; - rev = "e64959f99ac48920249987a644eefceee923282f"; - sha256 = "0j317wmyzpwfcixjkybbq2vkg52vij21bs40zg3n1bs61rgmzrn8"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - doCheck = false; - dontBuild = true; - dontStrip = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/doc/togglesg-download} - substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \ - --replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg" - chmod 0755 $out/bin/download_toggle_video2.py - - cp LICENSE README.md $out/share/doc/togglesg-download - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/0x776b7364/toggle.sg-download"; - description = "Command-line tool to download videos from toggle.sg written in Python"; - longDescription = '' - toggle.sg requires SilverLight in order to view videos. This tool will - allow you to download the video files for viewing in your media player and - on your OS of choice. - ''; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e48652ab555..eadd95870ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -664,6 +664,7 @@ mapAliases ({ rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 + togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74147f29f0f..0173f8d9806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30931,8 +30931,6 @@ in mpvc = callPackage ../applications/misc/mpvc { }; - togglesg-download = callPackage ../tools/misc/togglesg-download { }; - discord = import ../applications/networking/instant-messengers/discord { branch = "stable"; inherit pkgs; From 750ffff97a6a32ef20663e77452e8509e7664ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 30 Apr 2021 06:41:14 +0200 Subject: [PATCH 351/476] megasync: switch to ffmpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- pkgs/applications/misc/megasync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 78cf6a07e8c..b379a04a51d 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,7 @@ , curl , doxygen , fetchFromGitHub -, ffmpeg_3 +, ffmpeg , libmediainfo , libraw , libsodium @@ -52,7 +52,7 @@ mkDerivation rec { c-ares cryptopp curl - ffmpeg_3 + ffmpeg libmediainfo libraw libsodium From 6704ec57101ecb0f74fc52fc7801632b524723cc Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 30 Apr 2021 00:59:16 +0000 Subject: [PATCH 352/476] phosh: init at 0.10.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Blaž Hrastnik Co-authored-by: Jan Tojnar Co-authored-by: Jordi Masip --- .../window-managers/phosh/default.nix | 158 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 160 insertions(+) create mode 100644 pkgs/applications/window-managers/phosh/default.nix diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix new file mode 100644 index 00000000000..95faee74dbc --- /dev/null +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -0,0 +1,158 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, libhandy +, libxkbcommon +, pulseaudio +, glib +, gtk3 +, gnome3 +, gcr +, pam +, systemd +, upower +, wayland +, dbus +, xvfb_run +, phoc +, feedbackd +, networkmanager +, polkit +, libsecret +, writeText +}: + +let + gvc = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libgnome-volume-control"; + rev = "ae1a34aafce7026b8c0f65a43c9192d756fe1057"; + sha256 = "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw"; + }; + + executable = writeText "phosh" '' + PHOC_INI=@out@/share/phosh/phoc.ini + GNOME_SESSION_ARGS="--disable-acceleration-check --session=phosh --debug" + + if [ -f /etc/phosh/phoc.ini ]; then + PHOC_INI=/etc/phosh/phoc.ini + elif [ -f /etc/phosh/rootston.ini ]; then + # honor old configs + PHOC_INI=/etc/phosh/rootston.ini + fi + + # Run gnome-session through a login shell so it picks + # variables from /etc/profile.d (XDG_*) + [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput + export WLR_BACKENDS + exec "${phoc}/bin/phoc" -C "$PHOC_INI" \ + -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome3.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" + ''; + +in stdenv.mkDerivation rec { + pname = "phosh"; + version = "0.10.2"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "07i8wpzl7311dcf9s57s96qh1v672c75wv6cllrxx7fsmpf8fhx4"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + phoc + libhandy + libsecret + libxkbcommon + pulseaudio + glib + gcr + networkmanager + polkit + gnome3.gnome-control-center + gnome3.gnome-desktop + gnome3.gnome-session + gtk3 + pam + systemd + upower + wayland + feedbackd + ]; + + checkInputs = [ + dbus + xvfb_run + ]; + + # Temporarily disabled - Test is broken (SIGABRT) + doCheck = false; + + postUnpack = '' + rmdir $sourceRoot/subprojects/gvc + ln -s ${gvc} $sourceRoot/subprojects/gvc + ''; + + postPatch = '' + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py + ''; + + checkPhase = '' + runHook preCheck + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + runHook postCheck + ''; + + # Replace the launcher script with ours + postInstall = '' + substituteAll ${executable} $out/bin/phosh + ''; + + # Depends on GSettings schemas in gnome-shell + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share/gsettings-schemas/${gnome3.gnome-shell.name}" + ) + ''; + + postFixup = '' + mkdir -p $out/share/wayland-sessions + ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/ + # The OSK0.desktop points to a dummy stub that's not needed + rm $out/share/applications/sm.puri.OSK0.desktop + ''; + + passthru = { + providedSessions = [ + "sm.puri.Phosh" + ]; + }; + + meta = with lib; { + description = "A pure Wayland shell prototype for GNOME on mobile devices"; + homepage = "https://source.puri.sm/Librem5/phosh"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ archseer jtojnar masipcat zhaofengli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c62511e5b1b..9f014274cb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7538,6 +7538,8 @@ in pim6sd = callPackage ../servers/pim6sd { }; + phosh = callPackage ../applications/window-managers/phosh { }; + pinentry = libsForQt5.callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; }; From d75d0b9c624bd0c8b3ff1865e0b5a35876e217a7 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Wed, 28 Apr 2021 21:25:28 -0700 Subject: [PATCH 353/476] gcc11: init at 11.0.0 Pretty much copy-pasted from gcc10 with changed version and sha256. --- ...thread-model-support-from-mcfgthread.patch | 306 ++++++++++++++++++ pkgs/development/compilers/gcc/11/default.nix | 299 +++++++++++++++++ pkgs/top-level/all-packages.nix | 17 +- 3 files changed, 621 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch create mode 100644 pkgs/development/compilers/gcc/11/default.nix diff --git a/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 00000000000..d9809e828f1 --- /dev/null +++ b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,306 @@ +From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 25 Apr 2018 21:54:19 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + libstdc++-v3/src/c++11/thread.cc | 9 +++++++++ + 16 files changed, 80 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 46a9029acec..112c24e95a3 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 484dc7a9e9f..a15bbeea500 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 0612b87199a..76cea94f3b7 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..52f0e00efe6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11693,7 +11693,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..4ecdba88de7 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index ea8c34f8c71..23134ad7363 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -145,7 +145,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 11b4acaff55..9fbd38650bd 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -737,6 +737,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -761,6 +764,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index b2f3f870844..eff889dc3b3 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5451,6 +5451,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index ba094be6f15..979a5ab9ace 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15187,6 +15187,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index de920d714c6..665fb74bd6b 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++extern "C" int ++__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 3a2ec3ad0d6..8b4cc96199b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc +index 8238817c2e9..0c6a1f85f6f 100644 +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -55,6 +55,15 @@ static inline int get_nprocs() + #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN) + # include + # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN) ++#elif defined(_WIN32) ++# include ++static inline int get_nprocs() ++{ ++ SYSTEM_INFO sysinfo; ++ GetSystemInfo(&sysinfo); ++ return (int)sysinfo.dwNumberOfProcessors; ++} ++# define _GLIBCXX_NPROCS get_nprocs() + #else + # define _GLIBCXX_NPROCS 0 + #endif +-- +2.17.0 + diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix new file mode 100644 index 00000000000..3a9f50be3e7 --- /dev/null +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -0,0 +1,299 @@ +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langAda ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, reproducibleBuild ? true +, profiledCompiler ? false +, langJit ? false +, staticCompiler ? false +, # N.B. the defult is intentionally not from an `isStatic`. See + # https://gcc.gnu.org/install/configure.html - this is about target + # platform libraries not host platform ones unlike normal. But since + # we can't rebuild those without also rebuilding the compiler itself, + # we opt to always build everything unlike our usual policy. + enableShared ? true +, enableLTO ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which, patchelf +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, threadsCross ? null # for MinGW +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; +assert langAda -> gnatboot != null; + +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + +with lib; +with builtins; + +let majorVersion = "11"; + version = "${majorVersion}.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + +in + +stdenv.mkDerivation ({ + pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + inherit version; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc"; + }; + + inherit patches; + + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else "") + + lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) + ; + + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = import ../common/pre-configure.nix { + inherit lib; + inherit version hostPlatform gnatboot langAda langGo langJit; + }; + + dontDisableStatic = true; + + configurePlatforms = [ "build" "host" "target" ]; + + configureFlags = import ../common/configure-flags.nix { + inherit + lib + stdenv + targetPackages + crossStageStatic libcCross + version + + gmp mpfr libmpc libelf isl + + enableLTO + enableMultilib + enablePlugin + enableShared + + langC + langCC + langFortran + langAda + langGo + langObjC + langObjCpp + langJit + ; + }; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (targetPlatform == hostPlatform && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = optional stripped "install-strip"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + inherit + (import ../common/extra-target-flags.nix { + inherit lib stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET + ; + + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = "https://gcc.gnu.org/"; + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with lib.maintainers; [ synthetica ]; + + platforms = + lib.platforms.linux ++ + lib.platforms.freebsd ++ + lib.platforms.illumos ++ + lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d79c87e39a..9f22e49b25d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10312,6 +10312,7 @@ in gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; + gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -10498,7 +10499,21 @@ in isl = if !stdenv.isDarwin then isl_0_20 else null; })); - gcc_latest = gcc10; + gcc11 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/11 { + inherit noSysDirs; + + reproducibleBuild = true; + profiledCompiler = false; + + enableLTO = !stdenv.isi686; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_20 else null; + })); + + gcc_latest = gcc11; gfortran = gfortran9; From cba5ac76a2be3228635528273bf2162e7b4b1586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 Apr 2021 14:34:35 +0200 Subject: [PATCH 354/476] qutebrowser: 2.2.0 -> 2.2.1 https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.1 --- .../networking/browsers/qutebrowser/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 5c3bbeb3c04..e5503e9d4cd 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchzip, fetchpatch, python3 +{ lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.2.0"; + version = "2.2.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256:0anxhrkxqb35mxr7jr820xcfw0v514s92wffsiqap2a2sqaj0pgs"; + sha256 = "sha256-JHymxnNPdMsVma3TUKCS+iRCe9J7I0A6iISP5OXtJm8="; }; # Needs tox @@ -69,11 +69,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { patches = [ ./fix-restart.patch - (fetchpatch { - name = "add-qtwebengine-version-override.patch"; - url = "https://github.com/qutebrowser/qutebrowser/commit/febb921040b6670d9b1694a6ce55ae39384d1306.patch"; - sha256 = "15p11kk8via7c7m14jiqgzc63qwxxzayr2bkl93jd10l2gx7pk9v"; - }) ]; dontWrapGApps = true; From 352bc1f2699fcaae0fec21eaa792d18593494b4b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 28 Apr 2021 17:51:32 +0300 Subject: [PATCH 355/476] =?UTF-8?q?josm:=2017702=20=E2=86=92=2017833?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index badda6b17ee..aa1ef4f8eff 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: +{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm +, extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true" +}: let pname = "josm"; - version = "17702"; + version = "17833"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1p7p0jd87sxrs5n0r82apkilx0phgmjw7vpdg8qrr5msda4rsmpk"; + sha256 = "sha256-i3seRVfCLXNvUkWAAPZK0XloRHuXWCNp1tqnVr7CQ7Y="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0r17cphxm852ykb8mkil29rr7sb0bj5w69qd5wz8zf2f9djk9npk"; + sha256 = "sha256-PM/wNXqtEwalhorWHqVHWsaiGv60SFrHXZrb1Mw/QqQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "1b7dryvakph8znh2ahgywch66l4bl5rmgsr79axnz1xi12g8ac12"; + sha256 = "sha256-IjCFngixh2+7SifrV3Ohi1BjIOP+QSWg/QjeqbbP7aw="; }; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; dontUnpack = true; @@ -36,8 +38,7 @@ stdenv.mkDerivation { # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ - --add-flags "-Djosm.restart=true -Djava.net.useSystemProxies=true" \ - --add-flags "-jar $out/share/josm/josm.jar" \ + --add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; From ef10ae1f4ae3ac4751d03eb12a1bf76f559b6c03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 06:21:40 +0000 Subject: [PATCH 356/476] cargo-audit: 0.14.0 -> 0.14.1 --- pkgs/tools/package-management/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index d5be54b71b0..6fa0dd38127 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g="; + sha256 = "sha256-apIhTgS7xzDGq2OE1o46bEQxGwkV7bTmzSxy85wHwyo="; }; - cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE="; + cargoSha256 = "sha256-b4x5IxoT5KZnY6Pw3VEs/DuCPen6MlgQ2lSIxRDU+5U="; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; From b3477d186b87e16d4c2d73db6e97a5ac392d49d2 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 30 Apr 2021 02:30:40 -0400 Subject: [PATCH 357/476] python37Packages.poetry: update stale substituteInPlace (#120876) --- pkgs/development/python-modules/poetry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 51e95efbee5..ad043e9f59e 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' \ + 'importlib-metadata = {version = ">=1.6", python = "<3.8"}' \ --replace 'version = "^21.2.0"' 'version = ">=21.2"' ''; From 22ad2690828c0d75321caffba393a4f11a460f5d Mon Sep 17 00:00:00 2001 From: Samuel Noordhuis Date: Fri, 30 Apr 2021 16:39:02 +1000 Subject: [PATCH 358/476] tanka: 0.15.0 -> 0.15.1 --- pkgs/applications/networking/cluster/tanka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 8e7731590aa..715f75ddc8a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ckXvDB3TU9HAXowAAr/fRmX3mylVvPKW8I74R/vUaRY="; + sha256 = "sha256-aCgr56nXZCkG8k/ZGH2/cDOaqkznnyb6JLEcImqLH64="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; From ce43e28a68ce83f8414a570addb7185368e2263d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 30 Apr 2021 09:00:16 +0200 Subject: [PATCH 359/476] pythonPackages.btrfs: 12 -> 13 (#120638) --- pkgs/development/python-modules/btrfs/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index ff21d5670d7..9bcb8f37330 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -1,17 +1,15 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi }: buildPythonPackage rec { pname = "btrfs"; - version = "12"; + version = "13"; - src = fetchFromGitHub { - owner = "knorrie"; - repo = "python-btrfs"; - rev = "v${version}"; - sha256 = "sha256-ZQSp+pbHABgBTrCwC2YsUUXAf/StP4ny7MEhBgCRqgE="; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0="; }; # no tests (in v12) @@ -23,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/knorrie/python-btrfs"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.evils ]; + maintainers = with maintainers; [ evils Luflosi ]; }; } From b8de584df4639735695da44c903be90910fcc57b Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Thu, 29 Apr 2021 00:22:20 +0200 Subject: [PATCH 360/476] pythonPackages.aioeventlet: remove The upstream repo/homepage has long gone, there are no depndencies on that package. --- .../python-modules/aioeventlet/default.nix | 35 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/development/python-modules/aioeventlet/default.nix diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix deleted file mode 100644 index ef0166e5d62..00000000000 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, eventlet -, trollius ? null -, mock -, python -}: - -buildPythonPackage rec { - pname = "aioeventlet"; - # version is called 0.5.1 on PyPI, but the filename is aioeventlet-0.5.2.tar.gz - version = "0.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a"; - }; - - propagatedBuildInputs = [ eventlet trollius ]; - buildInputs = [ mock ]; - - # 2 tests error out - doCheck = false; - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - meta = with lib; { - description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes"; - homepage = "https://pypi.org/project/aioeventlet/"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c7940c610..3798e712854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -247,8 +247,6 @@ in { aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; - aioeventlet = callPackage ../development/python-modules/aioeventlet { }; - aioextensions = callPackage ../development/python-modules/aioextensions { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; From 055a145dfe631ca8320be98c3736d3340db54303 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 30 Apr 2021 14:18:33 +0900 Subject: [PATCH 361/476] vector: 0.13.0 -> 0.13.1 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 0c4085d8296..161c28054b0 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sur5QfPIoJXkcYdyNlIHOvmV2yBedhNm7UinmaFEc2E="; + sha256 = "sha256-ige0138alZ0KAmPakPVmDVydz5qco6m0xK7AEzScyXc="; }; - cargoSha256 = "sha256-1Xm1X1pfx9J0tBck2WA+zt2OxtQsqustcWPazsPyKPY="; + cargoSha256 = "sha256-oK4M6zTfI0QVW9kQTgpP/vSxFt2VlRABmKvQ4aAqC74="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From 2a00e53bdae84e2aa371384347586c13bf3ed10c Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 30 Apr 2021 09:38:42 +0200 Subject: [PATCH 362/476] pythonpackages.pynvim: disble for python older 3.4 These python version are all end-of-life and the depndency on trollius can be dropped. --- pkgs/development/python-modules/pynvim/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 0910f601dc2..244b366081c 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,7 +4,6 @@ , nose , msgpack , greenlet -, trollius ? null , pythonOlder , isPyPy , pytestrunner @@ -13,6 +12,7 @@ buildPythonPackage rec { pname = "pynvim"; version = "0.4.3"; + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; @@ -28,8 +28,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ msgpack ] - ++ lib.optional (!isPyPy) greenlet - ++ lib.optional (pythonOlder "3.4") trollius; + ++ lib.optional (!isPyPy) greenlet; meta = { description = "Python client for Neovim"; From 8192beda59e6fe5f326109dea4b8e617a1145e8a Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 30 Apr 2021 09:40:14 +0200 Subject: [PATCH 363/476] pythonPackages.aiodns: diable for Python older than 3.5 Upstream explicitly states that minimum required version is 3.5. Compatibility dependencies can thus be removed. --- pkgs/development/python-modules/aiodns/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 05e17ec12f4..b2d725e8378 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, isPy27, isPyPy, python, pycares, typing ? null -, trollius ? null +, python, pycares, typing ? null }: buildPythonPackage rec { pname = "aiodns"; version = "2.0.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -13,8 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pycares ] - ++ lib.optional (pythonOlder "3.7") typing - ++ lib.optional (isPy27 || isPyPy) trollius; + ++ lib.optional (pythonOlder "3.7") typing; checkPhase = '' ${python.interpreter} tests.py From 1c5a02033a895fc00898c9dbe49c4091339007d8 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 30 Apr 2021 09:41:54 +0200 Subject: [PATCH 364/476] pythonPackages.autobahn: limit to Python 3 Python 2.7 is long end-of-life and dependency ond old compatibility helpers can be dropped. --- pkgs/development/python-modules/autobahn/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 386d4766bbf..19015a5729a 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,19 +1,18 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, six, txaio, twisted, zope_interface, cffi, - trollius ? null, futures ? null, mock, pytest, cryptography, pynacl }: buildPythonPackage rec { pname = "autobahn"; version = "21.3.1"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ - (lib.optionals (!isPy3k) [ trollius futures ]); + propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ]; checkInputs = [ mock pytest ]; checkPhase = '' From b4167563e0eee3cddb8e528187bd3e2cc77fbf56 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 30 Apr 2021 09:43:26 +0200 Subject: [PATCH 365/476] pythonPackages.trollius: remove trollius is deprecated (by upstream) for more than five years, all Python versions supported by trollius are end-of-life. There are no more packages depending on trollius. --- .../python-modules/trollius/default.nix | 52 ------------------- .../python-modules/trollius/tests.patch | 13 ----- pkgs/top-level/python2-packages.nix | 2 - 3 files changed, 67 deletions(-) delete mode 100644 pkgs/development/python-modules/trollius/default.nix delete mode 100644 pkgs/development/python-modules/trollius/tests.patch diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix deleted file mode 100644 index 019326c5421..00000000000 --- a/pkgs/development/python-modules/trollius/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock, unittest2, six, futures }: - -buildPythonPackage rec { - pname = "trollius"; - version = "2.2.post1"; - - src = fetchPypi { - inherit pname version; - sha256 = "06s44k6pcq35vl5j4i2pgkpb848djal818qypcvx44gyn4azjrqn"; - }; - - checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2; - - propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures; - - patches = [ - ./tests.patch - ]; - - disabled = isPy3k; - - postPatch = '' - # Overrides PYTHONPATH causing dependencies not to be found - sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py - '' + lib.optionalString stdenv.isDarwin '' - # Some of the tests fail on darwin with `error: AF_UNIX path too long' - # because of the *long* path names for sockets - sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py - sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py - sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py - sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py - sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py - sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py - sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py - sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py - sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py - sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py - sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py - sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py - sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py - ''; - - meta = with lib; { - description = "Port of the asyncio project to Python 2.7"; - homepage = "https://github.com/vstinner/trollius"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/trollius/tests.patch b/pkgs/development/python-modules/trollius/tests.patch deleted file mode 100644 index 4923bded949..00000000000 --- a/pkgs/development/python-modules/trollius/tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/tests/test_asyncio.py w/tests/test_asyncio.py -index 39d9e1a..05b7e6f 100644 ---- i/tests/test_asyncio.py -+++ w/tests/test_asyncio.py -@@ -69,7 +69,7 @@ class AsyncioTests(test_utils.TestCase): - def step_future(): - future = asyncio.Future() - self.loop.call_soon(future.set_result, "asyncio.Future") -- return (yield from future) -+ return (yield From(future)) - - # test in release mode - trollius.coroutines._DEBUG = False diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 74a15bb7ac7..915c2edec70 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -604,8 +604,6 @@ with self; with super; { traitlets = callPackage ../development/python-modules/traitlets/4.nix { }; - trollius = callPackage ../development/python-modules/trollius { }; - ttystatus = callPackage ../development/python-modules/ttystatus { }; TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; From 08b42d6aa78967d63fc8e1cd5f0882c7535f103f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 30 Apr 2021 08:52:32 +0100 Subject: [PATCH 366/476] trivy: 0.16.0 -> 0.17.1 --- pkgs/tools/admin/trivy/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index d2d2a138d65..f91b0487bb8 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,27 +2,26 @@ buildGoModule rec { pname = "trivy"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M="; + sha256 = "sha256-5TOKYxH1Tnsd1t2yoUflFUSW0QGS9l5+0JtS2Fo6vL0="; }; - vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU="; + vendorSha256 = "sha256-zVe1bTTLOHxfdbb6VcztOCWMbCbzT6igNpvPytktMWs="; - subPackages = [ "cmd/trivy" ]; + excludedPackages = "misc"; - buildFlagsArray = [ - "-ldflags=" - "-s" - "-w" - "-X main.version=v${version}" - ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") + ''; meta = with lib; { + homepage = "https://github.com/aquasecurity/trivy"; + changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; description = "A simple and comprehensive vulnerability scanner for containers, suitable for CI"; longDescription = '' Trivy is a simple and comprehensive vulnerability scanner for containers @@ -31,8 +30,6 @@ buildGoModule rec { vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and application dependencies (Bundler, Composer, npm, yarn, etc.). ''; - homepage = src.meta.homepage; - changelog = "${src.meta.homepage}/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ jk ]; }; From 3f2f7d32969aa84d6a681fdd778be6f6e736f022 Mon Sep 17 00:00:00 2001 From: seb314 Date: Fri, 30 Apr 2021 10:24:49 +0200 Subject: [PATCH 367/476] matrix-commander: init at unstable-2021-04-18 (#119895) * matrix-commander: init * matrix-commander: cleanups & potential dep fixes apply most SuperSandro2000's review comments; used python3.withPackages -- this might be the correct way to get runtime python dependencies to work even when matrix-commander is a dependency of another packages (as opposed to testing in nix-shell). I'm not sure though. aiofiles seemed to be a missing runtime dependency when called from another (nix-packaged, jvm-based) app -- there was an import error without it. cacerts might require explicit pinning, as described here: https://gist.github.com/CMCDragonkai/1ae4f4b5edeb021ca7bb1d271caca999 (relevant snippet: wrapProgram $out/bin/program \ --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" ) * add runHook {pre,post}Install (suggested by r-rmcgibbo) * add link to github issue re gpl3{Only,Plus} * Update pkgs/applications/networking/instant-messengers/matrix-commander/default.nix Co-authored-by: Sandro --- .../matrix-commander/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/matrix-commander/default.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix new file mode 100644 index 00000000000..71f98bc08a6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, cacert, python3 }: + +stdenv.mkDerivation { + pname = "matrix-commander"; + version = "unstable-2021-04-18"; + + src = fetchFromGitHub { + owner = "8go"; + repo = "matrix-commander"; + rev = "3e89a5f4c98dd191880ae371cc63eb9282d7d91f"; + sha256 = "08nwwszp1kv5b7bgf6mmfn42slxkyhy98x18xbn4pglc4bj32iql"; + }; + + buildInputs = [ + cacert + (python3.withPackages(ps: with ps; [ + matrix-nio + magic + markdown + pillow + urllib3 + aiofiles + ]))]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $src/matrix-commander.py $out/bin/matrix-commander + chmod +x $out/bin/matrix-commander + + runHook postInstall + ''; + + meta = with lib; { + description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; + homepage = "https://github.com/8go/matrix-commander"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.seb314 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f22e49b25d..e84fd338870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24525,6 +24525,8 @@ in canonicaljson; }; + matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { }; + matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; From 71d9291742854c460c379153995402fa0d7ba374 Mon Sep 17 00:00:00 2001 From: Thibault Polge Date: Fri, 30 Apr 2021 10:21:43 +0200 Subject: [PATCH 368/476] nixos/pcscd: Correctly install pcsclite (fix #121121) This makes sure that the polkit policies for pcsclite are correcly loaded. --- nixos/modules/services/hardware/pcscd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 59c12ee12ca..4fc1e351f50 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -50,6 +50,7 @@ in environment.etc."reader.conf".source = cfgFile; + environment.systemPackages = [ pkgs.pcsclite ]; systemd.packages = [ (getBin pkgs.pcsclite) ]; systemd.sockets.pcscd.wantedBy = [ "sockets.target" ]; From 226b043cefeddd689652f2e8f8d63016ea0a3fdc Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 30 Apr 2021 11:05:39 +0200 Subject: [PATCH 369/476] doc/contributing: clarify stdenv.lib deprecation --- doc/contributing/coding-conventions.chapter.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index eccf4f7436e..a95b600a420 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -171,7 +171,8 @@ - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. -- Prefer using the top-level `lib` over its alias `stdenv.lib`. `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out. +- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg. + `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out. ## Package naming {#sec-package-naming} From 3f90d41adc05678e6295a2e76349605591876d9f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 29 Apr 2021 20:50:26 +0200 Subject: [PATCH 370/476] zellij: 0.5.1 -> 0.6.0 - fix completions --- pkgs/tools/misc/zellij/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2f5f2219346..7f579a67e78 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "102zw4napzx05rpmx6scl6il55syf3lw1gzmy1y66cg1f70sij4d"; + sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk="; }; - cargoSha256 = "121fsch0an6d2hqaq0ws9cm7g5ppzfrycmmhajfacfg6wbiax1m5"; + cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1"; nativeBuildInputs = [ installShellFiles ]; @@ -22,7 +22,10 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - installShellCompletion assets/completions/zellij.{bash,fish} --zsh assets/completions/_zellij + installShellCompletion --cmd $pname \ + --bash <($out/bin/zellij generate-completion bash) \ + --fish <($out/bin/zellij generate-completion fish) \ + --zsh <($out/bin/zellij generate-completion zsh) ''; meta = with lib; { From 71b873942ef95937bed2400141c7fa2e22e406dd Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sat, 30 Apr 2011 08:23:14 +0200 Subject: [PATCH 371/476] zellij: add myself to maintainers --- pkgs/tools/misc/zellij/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 7f579a67e78..f0b6a8ba98c 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "A terminal workspace with batteries included"; homepage = "https://zellij.dev/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh ]; + maintainers = with maintainers; [ therealansh _0x4A6F ]; }; } From 849b29b4f76d66ec7aeeeed699b7e27ef3db7c02 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 30 Apr 2021 17:32:45 +0800 Subject: [PATCH 372/476] pangolin: 2017-08-02 -> 0.6 (#120735) Drop ffmpeg_3 dependency in favor of ffmpeg: https://github.com/NixOS/nixpkgs/issues/120705 --- pkgs/development/libraries/pangolin/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 0e5d705a1ce..331284021e3 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew -, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen +, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pangolin"; - version = "2017-08-02"; + version = "0.6"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; - rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; - sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + rev = "v${version}"; + sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8"; }; nativeBuildInputs = [ cmake pkg-config doxygen ]; @@ -21,8 +21,7 @@ stdenv.mkDerivation { libGL glew xorg.libX11 - ffmpeg_3 - python3 + ffmpeg libjpeg libpng libtiff From 7c9c3c88e3ccd40e3c4875e0c99b774b8c1cf3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 30 Apr 2021 11:51:51 +0200 Subject: [PATCH 373/476] postfix: 3.5.10 -> 3.6.0 http://www.postfix.org/announcements/postfix-3.6.0.html --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 579ce383319..ad704ca792b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.10"; + version = "3.6.0"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "sha256-W7TX1y11ErWPOjFCbcvTlP01TgpD3iHaiUZrBXoCKPg="; + sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4="; }; nativeBuildInputs = [ makeWrapper m4 ]; From 7409f121643c09929924679429992da643bfce12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Apr 2021 12:12:41 +0200 Subject: [PATCH 374/476] metasploit: 6.0.41 -> 6.0.42 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 30 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 50 ++++++++++----------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index ced514767e3..72917bfd0ef 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.41" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.42" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index c5ccfc5a9d0..a28b4f76688 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 451fe6ffdb90fffe3df6b788e6410217a511a3f4 - ref: refs/tags/6.0.41 + revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c + ref: refs/tags/6.0.42 specs: - metasploit-framework (6.0.41) + metasploit-framework (6.0.42) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -30,7 +30,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.43) + metasploit-payloads (= 2.0.44) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.9) mqtt @@ -123,13 +123,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.446.0) + aws-partitions (1.449.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.234.0) + aws-sdk-ec2 (1.235.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.52.0) @@ -138,7 +138,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.93.1) + aws-sdk-s3 (1.94.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -198,11 +198,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) - metasploit-concern (3.0.1) + metasploit-concern (3.0.2) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-credential (4.0.3) + metasploit-credential (4.0.5) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -212,12 +212,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (3.1.3) + metasploit-model (3.1.4) activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.43) - metasploit_data_models (4.1.3) + metasploit-payloads (2.0.44) + metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -229,7 +229,7 @@ GEM webrick metasploit_payloads-mettle (1.0.9) method_source (1.0.0) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.14.4) mqtt (0.5.0) msgpack (1.4.2) @@ -245,7 +245,7 @@ GEM nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) - octokit (4.20.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -316,7 +316,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.89) + rex-powershell (0.1.90) rex-random_identifier rex-text ruby-rc4 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 27bbaf2b7c9..fcd37ad4bb2 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.41"; + version = "6.0.42"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-6oaTc3UQayZ/ThurwFXdI1prwriz/XVS9zoeD427mj8="; + sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ed2c124450c..2aa5d4fa836 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7cr44r7fvmc3rpk5kwwsz34ym2cmih76ij5xh2w1mmfyh3bgry"; + sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4"; type = "gem"; }; - version = "1.446.0"; + version = "1.449.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,10 +134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rlq8vifcmz24v1aw8vj2czqj4dnf00smm5ndfpaxz5k6550lbz4"; + sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234"; type = "gem"; }; - version = "1.234.0"; + version = "1.235.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x424hn32ipwxy21bhqn2wziz890w2gdr1xsli9lv2rrs1ibpnq7"; + sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9"; type = "gem"; }; - version = "1.93.1"; + version = "1.94.0"; }; aws-sigv4 = { groups = ["default"]; @@ -514,62 +514,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g"; + sha256 = "0zbcnhji80cyj19jkdp8wpi1msg9xfm0lacpm8ggm8fca56234zv"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn"; + sha256 = "0wflb4r5mz2g29bzjpwc004h6vca9kd0z02v27wc378jgg6q0gna"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "451fe6ffdb90fffe3df6b788e6410217a511a3f4"; - sha256 = "0gwspf6hy7isyx97bzdkp316nni3vmaw1aqv9rzjcsqhfmrr71pa"; + rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c"; + sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.41"; + version = "6.0.42"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7"; + sha256 = "10ndgv4c30rq211f5lyngfcp87lxzgc9h8a7jx40wih43dj6faxq"; type = "gem"; }; - version = "3.1.3"; + version = "3.1.4"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rr6g3gqjsvdjkqfbgpc3wfzpq367dk9zn3rzm8h9kd09hy3i760"; + sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y"; type = "gem"; }; - version = "2.0.43"; + version = "2.0.44"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0li8lphplsmv9x1f14c22w95gjx2lscas3x5py7x7kc05pfv33bg"; + sha256 = "1gzfvfqs9mf50dcnirc1944a25920s1swjd9g97d1x340651xmmr"; type = "gem"; }; - version = "4.1.3"; + version = "4.1.4"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -596,10 +596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.1"; }; minitest = { groups = ["default"]; @@ -726,10 +726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; + sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; type = "gem"; }; - version = "4.20.0"; + version = "4.21.0"; }; openssl-ccm = { groups = ["default"]; @@ -1046,10 +1046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs"; + sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1"; type = "gem"; }; - version = "0.1.89"; + version = "0.1.90"; }; rex-random_identifier = { groups = ["default"]; From 246f329d53240a4ec82c89da19f87204f312c41f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 30 Apr 2021 17:09:45 +0900 Subject: [PATCH 375/476] rustup: 1.23.1 -> 1.24.1 --- pkgs/development/tools/rust/rustup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 56097f9b98c..edd4dd7afd5 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -10,16 +10,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.23.1"; + version = "1.24.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "1i3ipkq6j47bf9dh9j3axzj6z443jm4j651g38cxyrrx8b2s15x0"; + sha256 = "sha256-GKvKawvfm/4eBU4mn/Q9fhu3Ml+j+BsxVNPvbvcnMLU="; }; - cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig"; + cargoSha256 = "sha256-tWww+rR4DQgRacVeLqnOBcuXA7o/NYmJBcJgWX3aLRY="; nativeBuildInputs = [ makeWrapper pkg-config ]; From f3fdc971112640666e1b9e67dff462790233d9cb Mon Sep 17 00:00:00 2001 From: ikervagyok Date: Fri, 30 Apr 2021 13:07:23 +0200 Subject: [PATCH 376/476] rofi-power-menu: init at 3.0.2 (#121028) Co-authored-by: Sandro --- .../misc/rofi-power-menu/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/rofi-power-menu/default.nix diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/applications/misc/rofi-power-menu/default.nix new file mode 100644 index 00000000000..657796a5972 --- /dev/null +++ b/pkgs/applications/misc/rofi-power-menu/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, rofi }: + +stdenv.mkDerivation rec { + pname = "rofi-power-menu"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "jluttine"; + repo = "rofi-power-menu"; + rev = version; + sha256 = "sha256-Bkc87BXSnAR517wCkyOAfoACYx/5xprDGJQhLWGUNns="; + }; + + installPhase = '' + mkdir -p $out/bin + cp rofi-power-menu $out/bin/rofi-power-menu + cp dmenu-power-menu $out/bin/dmenu-power-menu + ''; + + meta = with lib; { + description = "Shows a Power/Lock menu with Rofi"; + homepage = "https://github.com/jluttine/rofi-power-menu"; + maintainers = with maintainers; [ ikervagyok ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e84fd338870..51658440cad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24750,6 +24750,8 @@ in rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; + rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { }; + ympd = callPackage ../applications/audio/ympd { }; # a somewhat more maintained fork of ympd From be99e67190f8ba704b68b88b29b64bd260c60d2c Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Fri, 30 Apr 2021 13:21:38 +0200 Subject: [PATCH 377/476] aws-vault: add wrapper and simple install check (#121155) Co-authored-by: Sandro Co-authored-by: Yurii Matsiuk --- pkgs/tools/admin/aws-vault/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index d9f20a9bc34..c1716015281 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,10 @@ -{ buildGoModule, lib, fetchFromGitHub, installShellFiles }: +{ buildGoModule +, fetchFromGitHub +, installShellFiles +, lib +, makeWrapper +, xdg-utils +}: buildGoModule rec { pname = "aws-vault"; version = "6.3.1"; @@ -12,9 +18,10 @@ buildGoModule rec { vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' + wrapProgram $out/bin/aws-vault --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} installShellCompletion --cmd aws-vault \ --bash $src/contrib/completions/bash/aws-vault.bash \ --fish $src/contrib/completions/fish/aws-vault.fish \ @@ -32,6 +39,12 @@ buildGoModule rec { -X main.Version=v${version} ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/aws-vault --version 2>&1 | grep ${version} > /dev/null + ''; + meta = with lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; From 5a1acaeb4cd354c1460205c30a233d4f313a43e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 25 Apr 2021 21:02:59 +0200 Subject: [PATCH 378/476] rizin: 0.2.0 -> 0.2.1 --- pkgs/development/tools/analysis/rizin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index 20184ac53a1..4e9543ef371 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-CGHeo247syha+rVtiAQz0XkEYK9p4DHTnLK2FhBOvE8="; + sha256 = "sha256-lxVsPI+qLenZ0pelvxtHlQ6fhWdQeqoEEHrUGZ5Rdmg="; }; mesonFlags = [ From 9d38355a4af55fa74a775511d2166bc7e438ac54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 25 Apr 2021 21:04:07 +0200 Subject: [PATCH 379/476] cutter: 2.0.1 -> 2.0.2 --- pkgs/development/tools/analysis/rizin/cutter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index a4c2d0d45c1..c1d8ab99063 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-IQCJOUgefSdMSa27E6I/CL35Kx5pHq/u+5Q0FHUAR1E="; + sha256 = "sha256-CVVUXx6wt9vH3B7NrrlRGnOIrhXQPjV7GmX3O+KtMSM="; fetchSubmodules = true; }; From ebb59d3b11712586df8a02e1e8287e31ee92b29b Mon Sep 17 00:00:00 2001 From: Timothy Klim Date: Fri, 30 Apr 2021 19:45:48 +0700 Subject: [PATCH 380/476] nvidia-x11: 460.27.04 -> 465.27 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 7d83d68e73c..765118be119 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -36,10 +36,10 @@ rec { else legacy_390; beta = generic { - version = "460.27.04"; - sha256_64bit = "plTqtc5QZQwM0f3MeMZV0N5XOiuSXCCDklL/qyy8HM8="; - settingsSha256 = "hU9J0VSrLXs7N14zq6U5LbBLZXEIyTfih/Bj6eFcMf0="; - persistencedSha256 = "PmqhoPskqhJe2FxMrQh9zX1BWQCR2kkfDwvA89+XALA="; + version = "465.27"; + sha256_64bit = "fmn/qFve5qqqa26n4dsoOwGZ+ash5Bon3JBI8kncMXE="; + settingsSha256 = "3BFLCx0dcrQY4Mv1joMsiVPwTPyufgsNT5pFgp1Mk/A="; + persistencedSha256 = "HtoFGTiBnAeQyRTOMlve5poaQh63LHRD+DHJxZO+c90="; }; # Vulkan developer beta driver From c9d89c2f55abdcbdd54c4bec532c1aba7c312f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 30 Apr 2021 14:51:18 +0200 Subject: [PATCH 381/476] google-chrome-dev: fix error on startup Fix `[..]/crashpad_handler: No such file or directory`. --- pkgs/applications/networking/browsers/google-chrome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b242e8a7726..36d97b5a87c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --add-flags ${escapeShellArg commandLineArgs} - for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,crashpad_handler,nacl_helper}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done From 5b971598f0a928185d0d9b4f3bc4ffe024a62fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 27 Apr 2021 10:34:36 -0300 Subject: [PATCH 382/476] python3Packages.pytest-sanic: mark as broken with sanic >= 21.3.0 pytest-sanic is incompatible with the current version of Sanic, see sanic-org/sanic#2095 and yunstanford/pytest-sanic#50. While it is broken, we also need it to run Sanic's tests (for which case it works just fine). --- pkgs/development/python-modules/pytest-sanic/default.nix | 4 ++++ pkgs/top-level/python-packages.nix | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 84330cfd62e..ae1c56f95b7 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -46,5 +46,9 @@ buildPythonPackage rec { homepage = "https://github.com/yunstanford/pytest-sanic/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; + # pytest-sanic is incompatible with Sanic 21.3, see + # https://github.com/sanic-org/sanic/issues/2095 and + # https://github.com/yunstanford/pytest-sanic/issues/50. + broken = lib.versionAtLeast sanic.version "21.3.0"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10c07d8d4b4..9c418635522 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7195,6 +7195,14 @@ in { samsungtvws = callPackage ../development/python-modules/samsungtvws { }; + sanic = callPackage ../development/python-modules/sanic { + # pytest-sanic is doing ok for the sole purpose of testing Sanic. + pytest-sanic = self.pytest-sanic.overridePythonAttrs (oldAttrs: { + doCheck = false; + meta.broken = false; + }); + }; + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; sanic = callPackage ../development/python-modules/sanic { }; From 550bb02269300f2c3611f9a3cefefa38a9fb9a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 27 Apr 2021 10:28:30 -0300 Subject: [PATCH 383/476] python3Packages.sanic-routing: init at 0.6.2 --- .../python-modules/sanic-routing/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/sanic-routing/default.nix diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix new file mode 100644 index 00000000000..76eb72dc708 --- /dev/null +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "sanic-routing"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "sanic-routing"; + rev = "v${version}"; + hash = "sha256-ZMl8PB9E401pUfUJ4tW7nBx1TgPQQtx9erVni3zP+lo="; + }; + + checkInputs = [ pytestCheckHook pytest-asyncio ]; + pythonImportsCheck = [ "sanic_routing" ]; + + meta = with lib; { + description = "Core routing component for the Sanic web framework"; + homepage = "https://github.com/sanic-org/sanic-routing"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c418635522..1128faed290 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7205,7 +7205,7 @@ in { sanic-auth = callPackage ../development/python-modules/sanic-auth { }; - sanic = callPackage ../development/python-modules/sanic { }; + sanic-routing = callPackage ../development/python-modules/sanic-routing { }; sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; From 192b28a75f5bc29378af96784c996d65288bd16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 27 Apr 2021 10:50:24 -0300 Subject: [PATCH 384/476] python3Packages.sanic-testing: init at 0.3.1 --- .../python-modules/sanic-testing/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/sanic-testing/default.nix diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix new file mode 100644 index 00000000000..fa1dfc6870b --- /dev/null +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, httpcore +, httpx +, pytest-asyncio +, sanic +, websockets +}: + +buildPythonPackage rec { + pname = "sanic-testing"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "sanic-testing"; + rev = "v${version}"; + hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; + }; + + propagatedBuildInputs = [ httpx sanic websockets httpcore ]; + + # `sanic` is explicitly set to null when building `sanic` itself + # to prevent infinite recursion. In that case we skip running + # the package at all. + doCheck = sanic != null; + dontUsePythonImportsCheck = sanic == null; + + checkInputs = [ pytestCheckHook pytest-asyncio ]; + pythonImportsCheck = [ "sanic_testing" ]; + + meta = with lib; { + description = "Core testing clients for the Sanic web framework"; + homepage = "https://github.com/sanic-org/sanic-testing"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1128faed290..65faa170d6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7207,6 +7207,8 @@ in { sanic-routing = callPackage ../development/python-modules/sanic-routing { }; + sanic-testing = callPackage ../development/python-modules/sanic-testing { }; + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; sarge = callPackage ../development/python-modules/sarge { }; From bd815d21219840d1aa688083179323ad0161fff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 27 Apr 2021 10:31:42 -0300 Subject: [PATCH 385/476] python3Packages.sanic: 21.3.2 -> 21.3.4 While we're at it, revise the dependencies lists; there's been a couple of break-ups with 21.3.0. --- .../python-modules/sanic/default.nix | 34 ++++++++++--------- pkgs/top-level/python-packages.nix | 3 ++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index e5995ed0b1e..31dcc86e0bc 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,42 +1,44 @@ { lib, buildPythonPackage, fetchPypi, doCheck ? true -, aiofiles, httptools, httpx, multidict, ujson, uvloop, websockets -, pytestCheckHook, beautifulsoup4, gunicorn, httpcore, uvicorn -, pytest-asyncio, pytest-benchmark, pytest-dependency, pytest-sanic, pytest-sugar, pytestcov +, aiofiles, httptools, multidict, sanic-routing, ujson, uvloop, websockets +, pytestCheckHook, beautifulsoup4, gunicorn, uvicorn, sanic-testing +, pytest-benchmark, pytest-sanic, pytest-sugar, pytestcov }: buildPythonPackage rec { pname = "sanic"; - version = "21.3.2"; + version = "21.3.4"; src = fetchPypi { inherit pname version; - sha256 = "84a04c5f12bf321bed3942597787f1854d15c18f157aebd7ced8c851ccc49e08"; + sha256 = "1cbd12b9138b3ca69656286b0be91fff02b826e8cb72dd76a2ca8c5eb1288d8e"; }; postPatch = '' + # Loosen dependency requirements. substituteInPlace setup.py \ - --replace '"multidict==5.0.0"' '"multidict"' \ - --replace '"httpx==0.15.4"' '"httpx"' \ - --replace '"httpcore==0.3.0"' '"httpcore"' \ - --replace '"pytest==5.2.1"' '"pytest"' + --replace '"pytest==5.2.1"' '"pytest"' \ + --replace '"gunicorn==20.0.4"' '"gunicorn"' \ + --replace '"pytest-sanic",' "" + # Patch a request headers test to allow brotli encoding + # (we build httpx with brotli support, upstream doesn't). + substituteInPlace tests/test_headers.py \ + --replace "deflate\r\n" "deflate, br\r\n" ''; propagatedBuildInputs = [ - aiofiles httptools httpx multidict ujson uvloop websockets + sanic-routing httptools uvloop ujson aiofiles websockets multidict ]; checkInputs = [ - pytestCheckHook beautifulsoup4 gunicorn httpcore uvicorn - pytest-asyncio pytest-benchmark pytest-dependency pytest-sanic pytest-sugar pytestcov + sanic-testing gunicorn pytestcov beautifulsoup4 pytest-sanic pytest-sugar + pytest-benchmark pytestCheckHook uvicorn ]; inherit doCheck; disabledTests = [ "test_gunicorn" # No "examples" directory in pypi distribution. - "test_logo" # Fails to filter out "DEBUG asyncio:selector_events.py:59 Using selector: EpollSelector" "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. - "test_reloader_live" # OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 42104) ]; __darwinAllowLocalNetworking = true; @@ -45,8 +47,8 @@ buildPythonPackage rec { meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; - homepage = "https://github.com/channelcat/sanic/"; + homepage = "https://github.com/sanic-org/sanic/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc AluisioASG ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65faa170d6f..90f766ed459 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7201,6 +7201,9 @@ in { doCheck = false; meta.broken = false; }); + # Don't pass any `sanic` to avoid dependency loops. `sanic-testing` + # has special logic to disable tests when this is the case. + sanic-testing = self.sanic-testing.override { sanic = null; }; }; sanic-auth = callPackage ../development/python-modules/sanic-auth { }; From a690b4e1230d98e74522655134fe3ee4d6585f4b Mon Sep 17 00:00:00 2001 From: Jonathan Wilkins Date: Mon, 26 Apr 2021 17:35:17 +0100 Subject: [PATCH 386/476] zsh-z: init at unstable-2021-02-15 --- pkgs/shells/zsh/zsh-z/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-z/default.nix diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/shells/zsh/zsh-z/default.nix new file mode 100644 index 00000000000..9623ff6648c --- /dev/null +++ b/pkgs/shells/zsh/zsh-z/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "zsh-z"; + version = "unstable-2021-02-15"; + + src = fetchFromGitHub { + owner = "agkozak"; + repo = pname; + rev = "595c883abec4682929ffe05eb2d088dd18e97557"; + sha256 = "sha256-HnwUWqzwavh/Qox+siOe5lwTp7PBdiYx+9M0NMNFx00="; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/zsh-z + cp _zshz zsh-z.plugin.zsh $out/share/zsh-z + ''; + + meta = with lib; { + description = "Jump quickly to directories that you have visited frequently in the past, or recently"; + homepage = "https://github.com/agkozak/zsh-z"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.evalexpr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcfa0b51d85..e20f64eb2d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9853,6 +9853,8 @@ in zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; + zsh-z = callPackage ../shells/zsh/zsh-z { }; + zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { From c9f15449788304ea881b67b10df4243bf93aa905 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Fri, 30 Apr 2021 15:02:09 +0200 Subject: [PATCH 387/476] sof-firmware: 1.6 -> 1.7 (#121181) --- .../linux/firmware/sof-firmware/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index b474c48e341..5ee39c5bf33 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -3,29 +3,28 @@ with lib; stdenv.mkDerivation rec { pname = "sof-firmware"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; - rev = "cbdec6963b2c2d58b0080955d3c11b96ff4c92f0"; - sha256 = "0la2pw1zpv50cywiqcfb00cxqvjc73drxwjchyzi54l508817nxh"; + rev = "v${version}"; + sha256 = "sha256-Z0Z4HLsIIuW8E1kFNhAECmzj1HkJVfbEw13B8V7PZLk="; }; - phases = [ "unpackPhase" "installPhase" ]; + dontFixup = true; # binaries must not be stripped or patchelfed installPhase = '' - mkdir -p $out/lib/firmware - - patchShebangs go.sh - ROOT=$out SOF_VERSION=v${version} ./go.sh + mkdir -p $out/lib/firmware/intel/ + cp -a sof-v${version} $out/lib/firmware/intel/sof + cp -a sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg ''; meta = with lib; { description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; license = with licenses; [ bsd3 isc ]; - maintainers = with maintainers; [ lblasc evenbrenden ]; + maintainers = with maintainers; [ lblasc evenbrenden hmenke ]; platforms = with platforms; linux; }; } From 4263479d3e02a47584d489b48b3bd39efd1337c7 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 16 Apr 2021 15:12:15 +0200 Subject: [PATCH 388/476] cage: 0.1.2.1 -> 0.1.3 --- pkgs/applications/window-managers/cage/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 103be0e53d7..1632ae027c0 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -8,20 +8,15 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.2.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "Hjdskes"; repo = "cage"; rev = "v${version}"; - sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am"; + sha256 = "0ixl45g0m8b75gvbjm3gf5qg0yplspgs0xpm2619wn5sygc47sb1"; }; - postPatch = '' - substituteInPlace meson.build --replace \ - "0.1.2" "${version}" - ''; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51658440cad..0a491914c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22317,9 +22317,7 @@ in caerbannog = callPackage ../applications/misc/caerbannog { }; - cage = callPackage ../applications/window-managers/cage { - wlroots = wlroots_0_12; - }; + cage = callPackage ../applications/window-managers/cage { }; calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; From 317a2c9f26d06ba79850f3866e8e04cd298211c4 Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 30 Apr 2021 15:43:27 +0200 Subject: [PATCH 389/476] nixos/nix-containers: add tests for early/no-machined container stop --- nixos/tests/containers-imperative.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 0ff0d3f9545..bb207165a02 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -111,6 +111,26 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed(f"nixos-container stop {id1}") machine.succeed(f"nixos-container start {id1}") + # clear serial backlog for next tests + machine.succeed("logger eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d") + machine.wait_for_console_text( + "eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d" + ) + + with subtest("Stop a container early"): + machine.succeed(f"nixos-container stop {id1}") + machine.succeed(f"nixos-container start {id1} &") + machine.wait_for_console_text("Stage 2") + machine.succeed(f"nixos-container stop {id1}") + machine.wait_for_console_text(f"Container {id1} exited successfully") + machine.succeed(f"nixos-container start {id1}") + + with subtest("Stop a container without machined (regression test for #109695)"): + machine.systemctl("stop systemd-machined") + machine.succeed(f"nixos-container stop {id1}") + machine.wait_for_console_text(f"Container {id1} has been shut down") + machine.succeed(f"nixos-container start {id1}") + with subtest("tmpfiles are present"): machine.log("creating container tmpfiles") machine.succeed( From 28b8cff301f356a7a24be1b6203f6a2e3a814e7d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Apr 2021 15:34:54 +0200 Subject: [PATCH 390/476] nixos/tests/cage: Fix the test with wlroots 0.13 See #119615 for more details. The aarch64-linux test failed with "qemu-system-aarch64: Virtio VGA not available" so I've restricted the test to x86_64-linux (the virtio paravirtualized 3D graphics driver is likely only available on very few platforms). --- nixos/tests/all-tests.nix | 2 +- nixos/tests/cage.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3aefa82301c..2347673cef1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -47,7 +47,7 @@ in buildkite-agents = handleTest ./buildkite-agents.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; - cage = handleTest ./cage.nix {}; + cage = handleTestOn ["x86_64-linux"] ./cage.nix {}; cagebreak = handleTest ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index 69cc76d315f..53476c2fbe8 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -25,6 +25,11 @@ import ./make-test-python.nix ({ pkgs, ...} : testScript = { nodes, ... }: let user = nodes.machine.config.users.users.alice; in '' + # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std): + # machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000] + # machine # [ 14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7 + os.environ["QEMU_OPTS"] = "-vga virtio" + with subtest("Wait for cage to boot up"): start_all() machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock") From 98822ee896a3a5aeb5c6747da0ea40f86d5ac167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 23 Apr 2021 15:18:07 -0300 Subject: [PATCH 391/476] python3Packages.json-logging: init at 1.3.0 --- .../python-modules/json-logging/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/json-logging/default.nix diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix new file mode 100644 index 00000000000..3d34cb2475a --- /dev/null +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, wheel +, flask +, sanic +, fastapi +, uvicorn +, requests +}: + +buildPythonPackage rec { + pname = "json-logging"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "bobbui"; + repo = "json-logging-python"; + rev = version; + hash = "sha256-0eIhOi30r3ApyVkiBdTQps5tNj7rI+q8TjNWxTnhtMQ="; + }; + patches = [ + # Fix tests picking up test modules instead of real packages. + (fetchpatch { + url = "https://github.com/bobbui/json-logging-python/commit/6fdb64deb42fe48b0b12bda0442fd5ac5f03107f.patch"; + sha256 = "sha256-BLfARsw2FdvY22NCaFfdFgL9wTmEZyVIi3CQpB5qU0Y="; + }) + ]; + + # - Quart is not packaged for Nixpkgs. + # - FastAPI is broken, see #112701 and tiangolo/fastapi#2335. + checkInputs = [ wheel flask /*quart*/ sanic /*fastapi*/ uvicorn requests pytestCheckHook ]; + disabledTests = [ "quart" "fastapi" ]; + disabledTestPaths = [ "tests/test_fastapi.py" ]; + # Tests spawn servers and try to connect to them. + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Python library to emit logs in JSON format"; + longDescription = '' + Python logging library to emit JSON log that can be easily indexed and searchable by logging infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver. + ''; + homepage = "https://github.com/bobbui/json-logging-python"; + license = licenses.asl20; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90f766ed459..dc54e6ae5fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3443,6 +3443,8 @@ in { jsonlines = callPackage ../development/python-modules/jsonlines { }; + json-logging = callPackage ../development/python-modules/json-logging { }; + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; From 0463f91e04abbe37e7a7ea46e970357529aba324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= <1904165+AluisioASG@users.noreply.github.com> Date: Fri, 30 Apr 2021 11:40:24 -0300 Subject: [PATCH 392/476] python3Packages.sanic-auth: fix tests (#121279) After #120881, packages using Sanic's `app.test_client` or `app.asgi_client` need to depend on `sanic-testing` as well. --- pkgs/development/python-modules/sanic-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index c78b6f13d15..38d73d461c2 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, sanic, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, sanic, sanic-testing, pytestCheckHook }: buildPythonPackage rec { pname = "Sanic-Auth"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sanic ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook sanic-testing ]; pythonImportsCheck = [ "sanic_auth" ]; From 932ec5518e854d4388827ea45f65284766da0317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 23 Apr 2021 16:16:43 -0300 Subject: [PATCH 393/476] python3Packages.pytest-console-scripts: init at 1.2.0 Thanks to @kvas-it for cutting a release with the patches needed to make tests work. --- .../pytest-console-scripts/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-console-scripts/default.nix diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix new file mode 100644 index 00000000000..aaecd191e93 --- /dev/null +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, python +, mock +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-console-scripts"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a2138d7d567bc581fe081b6a5975849a2a36b3925cb0f066d2380103e13741c"; + }; + postPatch = '' + # setuptools-scm is pinned to <6 because it dropped Python 3.5 + # support. That's not something that affects us. + substituteInPlace setup.py --replace "'setuptools_scm<6'" "'setuptools_scm'" + # Patch the shebang of a script generated during test. + substituteInPlace tests/test_run_scripts.py --replace "#!/usr/bin/env python" "#!${python.interpreter}" + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; + + checkInputs = [ mock pytestCheckHook ]; + + meta = with lib; { + description = "Pytest plugin for testing console scripts"; + longDescription = '' + Pytest-console-scripts is a pytest plugin for running python scripts from within tests. + It's quite similar to subprocess.run(), but it also has an in-process mode, where the scripts are executed by the interpreter that's running pytest (using some amount of sandboxing). + ''; + homepage = "https://github.com/kvas-it/pytest-console-scripts"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc54e6ae5fc..ec7afc633ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6261,6 +6261,8 @@ in { pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { }; + pytest-cov = self.pytestcov; # self 2021-01-04 pytestcov = callPackage ../development/python-modules/pytest-cov { }; From 093ab98c80be3db7b81a6ac569c6fa5e70081226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 23 Apr 2021 16:18:38 -0300 Subject: [PATCH 394/476] dyndnsc: 0.5.1 -> 0.6.1 --- pkgs/applications/networking/dyndns/dyndnsc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 65d46305741..66b1d2639d6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "dyndnsc"; - version = "0.5.1"; + version = "0.6.1"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-Sy6U0XhIQ9mPmznmWKqoyqE34vaE84fwlivouaF7Dd0="; + sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4"; }; postPatch = '' @@ -19,9 +19,10 @@ python3Packages.buildPythonApplication rec { dnspython netifaces requests + json-logging setuptools ]; - checkInputs = with python3Packages; [ bottle pytestCheckHook ]; + checkInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; disabledTests = [ # dnswanip connects to an external server to discover the From 93edfffab6b9c0b279dce1891bb31c3d3970e06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 30 Apr 2021 16:53:36 +0200 Subject: [PATCH 395/476] pythonPackages.pykeepass: run tests --- .../python-modules/pykeepass/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 294e47872fc..6e73501bfb0 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,15 +1,18 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct , argon2_cffi, dateutil, future +, python }: buildPythonPackage rec { pname = "pykeepass"; version = "4.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1b41b3277ea4e044556e1c5a21866ea4dfd36e69a4c0f14272488f098063178f"; + src = fetchFromGitHub { + owner = "libkeepass"; + repo = "pykeepass"; + rev = version; + sha256 = "1zw5hjk90zfxpgq2fz4h5qzw3kmvdnlfbd32gw57l034hmz2i08v"; }; postPatch = '' @@ -21,13 +24,15 @@ buildPythonPackage rec { argon2_cffi dateutil future ]; - # no tests in PyPI tarball - doCheck = false; + checkPhase = '' + ${python.interpreter} -m unittest tests.tests + ''; - meta = { - homepage = "https://github.com/pschmitt/pykeepass"; + meta = with lib; { + homepage = "https://github.com/libkeepass/pykeepass"; + changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; - license = lib.licenses.gpl3; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; }; - } From 93507828b235e3c1775c80653b1cbe22cc55efa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 30 Apr 2021 17:16:28 +0200 Subject: [PATCH 396/476] passExtensions.pass-import: fix tests --- pkgs/tools/security/pass/extensions/import.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index be2492112c3..655bee41ba6 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -17,9 +17,14 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA="; }; - # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..." - # This is a better way to do the same, and takes advantage of the existing Nix python environments patches = [ + (fetchpatch { + name = "support-for-keepass-4.0.0.patch"; + url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch"; + sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh"; + }) + # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..." + # This is a better way to do the same, and takes advantage of the existing Nix python environments # from https://github.com/roddhjav/pass-import/pull/138 (fetchpatch { name = "pass-import-pr-138-pimport-entrypoint.patch"; From 903e23ad362ed19e95eaf7765af719db551dfbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 30 Apr 2021 17:50:01 +0200 Subject: [PATCH 397/476] firefox-esr: use latest Rust Firefox ESR 78.x used to have a problem with Rust >= 1.46, but it works with latest Rust now! --- .../networking/browsers/firefox/common.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 24195e578bd..0b79da754f8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , hunspell, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib, pciutils -, autoconf213, which, gnused, rustPackages, rustPackages_1_45 +, autoconf213, which, gnused, rustPackages , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , debugBuild ? false @@ -90,19 +90,13 @@ let then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; - # 78 ESR won't build with rustc 1.47 - inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) - rustc cargo; + inherit (rustPackages) rustc cargo; # Darwin's stdenv provides the default llvmPackages version, match that since # clang LTO on Darwin is broken so the stdenv is not being changed. - # Target the LLVM version that rustc -Vv reports it is built with for LTO. - # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11 llvmPackages = if stdenv.isDarwin then buildPackages.llvmPackages - else if lib.versionAtLeast rustc.llvm.version "11" - then buildPackages.llvmPackages_11 - else buildPackages.llvmPackages_10; + else buildPackages.llvmPackages_11; # When LTO for Darwin is fixed, the following will need updating as lld # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. From 506bc7ba029d4c587af532aff5bc7d66bba1fe53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 03:23:55 +0200 Subject: [PATCH 398/476] nixos/nginx: update hardening settings - Set an explicit umask that allows u+rwx and g+r. - Adds `ProtectControlGroups` and `ProtectKernelLogs`, there should be no need to access either. - Adds `ProtectClock` to prevent write-access to the system clock. - `ProtectProc` hides processes from other users within the /proc filesystem and `ProcSubSet` hides all files/directories unrelated to the process management of the units process. - Sets `RemoveIPC`, as there is no SysV or POSIX IPC within nginx that I know of. - Restricts the creation of arbitrary namespaces - Adds a reasonable `SystemCallFilter` preventing calls to @privileged, @obsolete and others. And finally applies some sorting based on the order these options appear in systemd.exec(5). --- nixos/modules/services/web-servers/nginx/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 18e1263fef5..d811879b7b1 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -819,28 +819,38 @@ in # Logs directory and mode LogsDirectory = "nginx"; LogsDirectoryMode = "0750"; + # Proc filesystem + ProcSubset = "pid"; + ProtectProc = "invisible"; + # New file permissions + UMask = "0027"; # 0640 / 0750 # Capabilities AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; # Security NoNewPrivileges = true; - # Sandboxing + # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html) ProtectSystem = "strict"; ProtectHome = mkDefault true; PrivateTmp = true; PrivateDevices = true; ProtectHostname = true; + ProtectClock = true; ProtectKernelTunables = true; ProtectKernelModules = true; + ProtectKernelLogs = true; ProtectControlGroups = true; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; LockPersonality = true; MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules); RestrictRealtime = true; RestrictSUIDSGID = true; + RemoveIPC = true; PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; + SystemCallFilter = "~@chown @cpu-emulation @debug @keyring @ipc @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap"; }; }; From 7ee53c0c4fe28f81095298893c8c2fd4e7bc2886 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 28 Apr 2021 18:38:29 +0300 Subject: [PATCH 399/476] python2Packages.importlib-resources: use version 3.3.1 for python2 --- .../python-modules/importlib-resources/2.nix | 38 +++++++++++++++++++ .../importlib-resources/default.nix | 11 +++--- pkgs/top-level/python2-packages.nix | 2 + 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/importlib-resources/2.nix diff --git a/pkgs/development/python-modules/importlib-resources/2.nix b/pkgs/development/python-modules/importlib-resources/2.nix new file mode 100644 index 00000000000..1034c311130 --- /dev/null +++ b/pkgs/development/python-modules/importlib-resources/2.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, importlib-metadata +, typing +, singledispatch +, python +}: + +buildPythonPackage rec { + pname = "importlib-resources"; + version = "3.3.1"; + + src = fetchPypi { + pname = "importlib_resources"; + inherit version; + sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + importlib-metadata + singledispatch + typing + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Read resources from Python packages"; + homepage = "https://importlib-resources.readthedocs.io/"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index cd8fec1e54e..2388fb1b26d 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm -, toml +, setuptools-scm , importlib-metadata , typing ? null , singledispatch ? null @@ -11,15 +10,16 @@ }: buildPythonPackage rec { - pname = "importlib_resources"; + pname = "importlib-resources"; version = "5.1.2"; src = fetchPypi { - inherit pname version; + pname = "importlib_resources"; + inherit version; sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ] ++ lib.optional (pythonOlder "3.4") singledispatch @@ -34,5 +34,6 @@ buildPythonPackage rec { description = "Read resources from Python packages"; homepage = "https://importlib-resources.readthedocs.io/"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 915c2edec70..81bdcdb93db 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -178,6 +178,8 @@ with self; with super; { importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + importlib-resources = callPackage ../development/python-modules/importlib-resources/2.nix { }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { }; From e0f1e1f7bf7e27f92c1a0215a7cc19eeed0499dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 01:41:58 +0200 Subject: [PATCH 400/476] nixos/zigbee2mqtt: convert to rfc42 style settings --- nixos/doc/manual/release-notes/rl-2105.xml | 6 +++ nixos/modules/services/misc/zigbee2mqtt.nix | 49 +++++++++++---------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 6e4a9e7114b..b45c19fa9af 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -692,6 +692,12 @@ environment.systemPackages = [ skip-kernel-setup true and takes care of setting forwarding and rp_filter sysctls by itself as well as for each interface in services.babeld.interfaces. + + + + The option has been renamed to and + now follows RFC 0042. + diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index cd987eb76c7..63951348172 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -5,26 +5,8 @@ with lib; let cfg = config.services.zigbee2mqtt; - configJSON = pkgs.writeText "configuration.json" - (builtins.toJSON (recursiveUpdate defaultConfig cfg.config)); - configFile = pkgs.runCommand "configuration.yaml" { preferLocalBuild = true; } '' - ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out - ''; - - # the default config contains all required settings, - # so the service starts up without crashing. - defaultConfig = { - homeassistant = false; - permit_join = false; - mqtt = { - base_topic = "zigbee2mqtt"; - server = "mqtt://localhost:1883"; - }; - serial.port = "/dev/ttyACM0"; - # put device configuration into separate file because configuration.yaml - # is copied from the store on startup - devices = "devices.yaml"; - }; + format = pkgs.formats.yaml { }; + configFile = format.generate "zigbee2mqtt.yaml" cfg.settings; in { meta.maintainers = with maintainers; [ sweber ]; @@ -37,7 +19,11 @@ in default = pkgs.zigbee2mqtt.override { dataDir = cfg.dataDir; }; - defaultText = "pkgs.zigbee2mqtt"; + defaultText = literalExample '' + pkgs.zigbee2mqtt { + dataDir = services.zigbee2mqtt.dataDir + } + ''; type = types.package; }; @@ -47,9 +33,9 @@ in type = types.path; }; - config = mkOption { + settings = mkOption { + type = format.type; default = {}; - type = with types; nullOr attrs; example = literalExample '' { homeassistant = config.services.home-assistant.enable; @@ -61,11 +47,28 @@ in ''; description = '' Your configuration.yaml as a Nix attribute set. + Check the documentation + for possible options. ''; }; }; config = mkIf (cfg.enable) { + + # preset config values + services.zigbee2mqtt.settings = { + homeassistant = mkDefault config.services.home-assistant.enable; + permit_join = mkDefault false; + mqtt = { + base_topic = mkDefault "zigbee2mqtt"; + server = mkDefault "mqtt://localhost:1883"; + }; + serial.port = mkDefault "/dev/ttyACM0"; + # reference device configuration, that is kept in a separate file + # to prevent it being overwritten in the units ExecStartPre script + devices = mkDefault "devices.yaml"; + }; + systemd.services.zigbee2mqtt = { description = "Zigbee2mqtt Service"; wantedBy = [ "multi-user.target" ]; From a691549f7e2e466aa3833992de55c72bcee36885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Apr 2021 15:40:12 +0200 Subject: [PATCH 401/476] nixos/zigbee2mqtt: harden systemd unit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is what is still exposed, and it allows me to control my lamps from within home-assistant. ✗ PrivateNetwork= Service has access to the host's network 0.5 ✗ RestrictAddressFamilies=~AF_(INET|INET6) Service may allocate Internet sockets 0.3 ✗ DeviceAllow= Service has a device ACL with some special devices 0.1 ✗ IPAddressDeny= Service does not define an IP address allow list 0.2 ✗ PrivateDevices= Service potentially has access to hardware devices 0.2 ✗ RootDirectory=/RootImage= Service runs within the host's root directory 0.1 ✗ SupplementaryGroups= Service runs with supplementary groups 0.1 ✗ MemoryDenyWriteExecute= Service may create writable executable memory mappings 0.1 → Overall exposure level for zigbee2mqtt.service: 1.3 OK 🙂 --- nixos/modules/services/misc/zigbee2mqtt.nix | 41 ++++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index 63951348172..1f721910c4c 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -79,10 +79,48 @@ in User = "zigbee2mqtt"; WorkingDirectory = cfg.dataDir; Restart = "on-failure"; + + # Hardening + CapabilityBoundingSet = ""; + DeviceAllow = [ + config.services.zigbee2mqtt.settings.serial.port + ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = false; + NoNewPrivileges = true; + PrivateDevices = false; # prevents access to /dev/serial, because it is set 0700 root:root + PrivateUsers = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; ProtectSystem = "strict"; ReadWritePaths = cfg.dataDir; - PrivateTmp = true; RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SupplementaryGroups = [ + "dialout" + ]; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; }; preStart = '' cp --no-preserve=mode ${configFile} "${cfg.dataDir}/configuration.yaml" @@ -93,7 +131,6 @@ in home = cfg.dataDir; createHome = true; group = "zigbee2mqtt"; - extraGroups = [ "dialout" ]; uid = config.ids.uids.zigbee2mqtt; }; From f1e7183f69595beabacb785b2f6a3f57ff5f99a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 01:45:57 +0200 Subject: [PATCH 402/476] nixos/tests/zigbee2mqtt: relax DevicePolicy and log systemd-analye security --- nixos/tests/zigbee2mqtt.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/zigbee2mqtt.nix b/nixos/tests/zigbee2mqtt.nix index b7bb21f9227..98aadbb699b 100644 --- a/nixos/tests/zigbee2mqtt.nix +++ b/nixos/tests/zigbee2mqtt.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ pkgs, lib, ... }: { machine = { pkgs, ... }: @@ -6,6 +6,8 @@ import ./make-test-python.nix ({ pkgs, ... }: services.zigbee2mqtt = { enable = true; }; + + systemd.services.zigbee2mqtt.serviceConfig.DevicePolicy = lib.mkForce "auto"; }; testScript = '' @@ -14,6 +16,8 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.succeed( "journalctl -eu zigbee2mqtt | grep \"Error: Error while opening serialport 'Error: Error: No such file or directory, cannot open /dev/ttyACM0'\"" ) + + machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service")) ''; } ) From e20a75ec7412252daff68950126efc8ad8ff6d8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2021 20:15:57 +0200 Subject: [PATCH 403/476] hackage2nix: update list of broken packages ... so that there are no failing builds on Hydra. Ping @rkrzr because icepeak is broken. --- .../configuration-hackage2nix.yaml | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e37c4b35a2a..21d5934eed5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2879,8 +2879,6 @@ package-maintainers: cdepillabout: - pretty-simple - spago - rkrzr: - - icepeak terlar: - nix-diff maralorn: @@ -3217,6 +3215,7 @@ broken-packages: - afv - ag-pictgen - Agata + - agda-language-server - agda-server - agda-snippets - agda-snippets-hakyll @@ -3421,6 +3420,8 @@ broken-packages: - asn1-data - assert - assert4hs + - assert4hs-core + - assert4hs-hspec - assert4hs-tasty - assertions - asset-map @@ -3824,6 +3825,7 @@ broken-packages: - boring-window-switcher - bot - botpp + - bottom - bound-extras - bounded-array - bowntz @@ -4049,6 +4051,7 @@ broken-packages: - catnplus - cautious-file - cautious-gen + - cayene-lpp - cayley-client - CBOR - CC-delcont-alt @@ -4327,6 +4330,7 @@ broken-packages: - computational-algebra - computational-geometry - computations + - ConClusion - concraft - concraft-hr - concraft-pl @@ -4901,6 +4905,7 @@ broken-packages: - docker - docker-build-cacher - dockercook + - dockerfile-creator - docopt - docrecords - DocTest @@ -5565,6 +5570,7 @@ broken-packages: - funpat - funsat - funspection + - fused-effects-exceptions - fused-effects-resumable - fused-effects-squeal - fused-effects-th @@ -5634,6 +5640,7 @@ broken-packages: - generic-lens-labels - generic-lucid-scaffold - generic-maybe + - generic-optics - generic-override-aeson - generic-pretty - generic-server @@ -5721,6 +5728,7 @@ broken-packages: - ghcup - ght - gi-cairo-again + - gi-gmodule - gi-graphene - gi-gsk - gi-gstaudio @@ -5730,6 +5738,7 @@ broken-packages: - gi-gtksheet - gi-handy - gi-poppler + - gi-vips - gi-wnck - giak - Gifcurry @@ -5859,8 +5868,10 @@ broken-packages: - gpah - GPipe - GPipe-Collada + - GPipe-Core - GPipe-Examples - GPipe-GLFW + - GPipe-GLFW4 - GPipe-TextureLoad - gps - gps2htmlReport @@ -6586,6 +6597,9 @@ broken-packages: - hipchat-hs - hipe - Hipmunk-Utils + - hipsql-api + - hipsql-client + - hipsql-server - hircules - hirt - Hish @@ -7004,6 +7018,8 @@ broken-packages: - http-server - http-shed - http-wget + - http2-client + - http2-client-exe - http2-client-grpc - http2-grpc-proto-lens - http2-grpc-proto3-wire @@ -7114,6 +7130,7 @@ broken-packages: - iban - ical - ice40-prim + - icepeak - IcoGrid - iconv-typed - ide-backend @@ -7295,6 +7312,7 @@ broken-packages: - isobmff-builder - isohunt - isotope + - it-has - itcli - itemfield - iter-stats @@ -8660,6 +8678,7 @@ broken-packages: - ois-input-manager - olwrapper - om-actor + - om-doh - om-elm - om-fail - om-http-logging @@ -8930,6 +8949,9 @@ broken-packages: - perfecthash - perhaps - periodic + - periodic-client + - periodic-client-exe + - periodic-common - periodic-server - perm - permutation @@ -9104,7 +9126,10 @@ broken-packages: - polynomial - polysemy-chronos - polysemy-conc + - polysemy-extra + - polysemy-fskvstore - polysemy-http + - polysemy-kvstore-jsonfile - polysemy-log - polysemy-log-co - polysemy-log-di @@ -9116,6 +9141,8 @@ broken-packages: - polysemy-resume - polysemy-test - polysemy-time + - polysemy-vinyl + - polysemy-zoo - polyseq - polytypeable - polytypeable-utils @@ -9645,6 +9672,7 @@ broken-packages: - remote-monad - remotion - render-utf8 + - reorder-expression - repa-algorithms - repa-array - repa-bytestring @@ -9893,6 +9921,7 @@ broken-packages: - scalpel-search - scan-metadata - scan-vector-machine + - scanner-attoparsec - scc - scenegraph - scgi @@ -10013,6 +10042,7 @@ broken-packages: - servant-auth-token-rocksdb - servant-auth-wordpress - servant-avro + - servant-benchmark - servant-cassava - servant-checked-exceptions - servant-checked-exceptions-core @@ -11398,6 +11428,7 @@ broken-packages: - vector-clock - vector-conduit - vector-endian + - vector-fftw - vector-functorlazy - vector-heterogenous - vector-instances-collections @@ -11511,6 +11542,7 @@ broken-packages: - wai-session-alt - wai-session-mysql - wai-session-postgresql + - wai-session-redis - wai-static-cache - wai-thrift - wai-throttler @@ -11520,6 +11552,7 @@ broken-packages: - wallpaper - warc - warp-dynamic + - warp-grpc - warp-static - warp-systemd - warped From f5704c862d3150f6703a48674fb924177b5073a0 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 27 Apr 2021 09:41:41 +0200 Subject: [PATCH 404/476] xsimd: init at 7.5.0 xsimd: format Co-authored-by: Sandro xsimd: fix on macOS xsimd: Use fetchFromGitHub --- pkgs/development/libraries/xsimd/default.nix | 56 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/libraries/xsimd/default.nix diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix new file mode 100644 index 00000000000..745ee9ee3fc --- /dev/null +++ b/pkgs/development/libraries/xsimd/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: +let + version = "7.5.0"; + + darwin_src = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = version; + sha256 = "eGAdRSYhf7rbFdm8g1Tz1ZtSVu44yjH/loewblhv9Vs="; + # Avoid requiring apple_sdk. We're doing this here instead of in the patchPhase + # because this source is directly used in arrow-cpp. + # pyconfig.h defines _GNU_SOURCE to 1, so we need to stamp that out too. + # Upstream PR with a better fix: https://github.com/xtensor-stack/xsimd/pull/463 + postFetch = '' + mkdir $out + tar -xf $downloadedFile --directory=$out --strip-components=1 + substituteInPlace $out/include/xsimd/types/xsimd_scalar.hpp \ + --replace 'defined(__APPLE__)' 0 \ + --replace 'defined(_GNU_SOURCE)' 0 + ''; + }; + + src = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = version; + sha256 = "0c9pq5vz43j99z83w3b9qylfi66mn749k1afpv5cwfxggbxvy63f"; + }; +in stdenv.mkDerivation { + pname = "xsimd"; + inherit version; + src = if stdenv.hostPlatform.isDarwin then darwin_src else src; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + + doCheck = true; + checkInputs = [ gtest ]; + checkTarget = "xtest"; + GTEST_FILTER = let + # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 + filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "error_gamma_test/sse_double.gamma" + "error_gamma_test/avx_double.gamma" + ]; + in "-${builtins.concatStringsSep ":" filteredTests}"; + + meta = with lib; { + description = "C++ wrappers for SIMD intrinsics"; + homepage = "https://github.com/xtensor-stack/xsimd"; + license = licenses.bsd3; + maintainers = with maintainers; [ tobim ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcfa0b51d85..74ba272995d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18063,6 +18063,8 @@ in xlslib = callPackage ../development/libraries/xlslib { }; + xsimd = callPackage ../development/libraries/xsimd { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; xxHash = callPackage ../development/libraries/xxHash {}; From 2d9f3e32d9bd43b05c284aa5815463cbd790c0e7 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 27 Apr 2021 09:51:50 +0200 Subject: [PATCH 405/476] arrow-cpp: 3.0.0 -> 4.0.0 arrow-cpp: cleanup Co-authored-by: Sandro --- .../libraries/arrow-cpp/default.nix | 19 +++++++++++++------ .../python-modules/pyarrow/default.nix | 17 +++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 8a9074ccb90..ac53ae3bbd4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames +{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 -, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, zlib, zstd +, perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, xsimd +, zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -15,18 +16,18 @@ let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "e31fe1a02c9e9f271e4bfb8002d403c52f1ef8eb"; - sha256 = "02f51dvx8w5mw0bx3hn70hkn55mn1m65kzdps1ifvga9hghpy0sh"; + rev = "ddd898958803cb89b7156c6350584d1cda0fe8de"; + sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0yp2b02wrc3s50zd56fmpz4nhhbihp0zw329v4zizaipwlxwrhkk"; + sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -90,6 +91,10 @@ in stdenv.mkDerivation rec { "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_COMPUTE=ON" + "-DARROW_CSV=ON" + "-DARROW_DATASET=ON" + "-DARROW_JSON=ON" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" @@ -111,6 +116,8 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; + ARROW_XSIMD_URL = xsimd.src; + doInstallCheck = true; ARROW_TEST_DATA = if doInstallCheck then "${arrow-testing}/data" else null; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index a38d5df50dd..dabe85b9043 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -34,12 +34,17 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; - # Deselect a single test because pyarrow prints a 2-line error message where - # only a single line is expected. The additional line of output comes from - # the glog library which is an optional dependency of arrow-cpp that is - # enabled in nixpkgs. - # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 - pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ]; + pytestFlagsArray = [ + # Deselect a single test because pyarrow prints a 2-line error message where + # only a single line is expected. The additional line of output comes from + # the glog library which is an optional dependency of arrow-cpp that is + # enabled in nixpkgs. + # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 + "--deselect=pyarrow/tests/test_memory.py::test_env_var" + # Deselect the parquet dataset write test because it erroneously fails to find the + # pyarrow._dataset module. + "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem" + ]; dontUseSetuptoolsCheck = true; preCheck = '' From e3185a56b5416b9d1b24fd161895565860fc11c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2021 20:37:43 +0200 Subject: [PATCH 406/476] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/8185884e7b585302717c6c20323b3cfaaee33967. --- .../haskell-modules/hackage-packages.nix | 639 +++++++++++++++--- 1 file changed, 543 insertions(+), 96 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b0aff6d6f74..6fa8f733558 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3506,6 +3506,8 @@ self: { ]; description = "Cluster algorithms, PCA, and chemical conformere analysis"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Concurrent-Cache" = callPackage @@ -6550,8 +6552,8 @@ self: { }: mkDerivation { pname = "Frames-streamly"; - version = "0.1.0.3"; - sha256 = "10dzkkacf25fz2g26c21g1plag252hlcanpyx9m9bmkla8n0ggmv"; + version = "0.1.1.0"; + sha256 = "16cxgar58q9gfbs8apl4a9z3ghdxb6m042di7hwhldqy0gn584fp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions Frames primitive relude streamly strict text vinyl @@ -6926,6 +6928,8 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Typesafe functional GPU graphics programming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "GPipe-Examples" = callPackage @@ -6988,6 +6992,8 @@ self: { ]; description = "GLFW OpenGL context creation for GPipe"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "GPipe-TextureLoad" = callPackage @@ -13866,6 +13872,8 @@ self: { pname = "MonadRandom"; version = "0.5.3"; sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617"; + revision = "1"; + editedCabalFile = "1wpgmcv704i7x38jwalnbmx8c10vdw269gbvzjxaj4rlvff3s4sq"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -25633,6 +25641,8 @@ self: { ]; description = "LSP server for Agda"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "agda-server" = callPackage @@ -34146,6 +34156,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A set of assertion for writing more readable tests cases"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "assert4hs-hspec" = callPackage @@ -34158,6 +34170,8 @@ self: { testHaskellDepends = [ assert4hs-core base hspec HUnit ]; description = "integration point of assert4hs and hspec"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "assert4hs-tasty" = callPackage @@ -40448,6 +40462,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bifunctors_5_5_11" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.11"; + sha256 = "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -44513,8 +44550,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.3.0.0"; - sha256 = "0xh1qxfmrfjdsprl5m748j5z9w0qmww8gkj8lhghfskdzxhy0qic"; + version = "0.3.0.1"; + sha256 = "06hmk4pg5qfcj6smzpn549d1jcsvcbgi2pxgvgvn9k7lab9cb5kg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45495,6 +45532,8 @@ self: { ]; description = "Encoding and decoding for the Bottom spec"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bound" = callPackage @@ -45951,6 +45990,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_62" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.62"; + sha256 = "1f74m9yxwqv3xs1jhhpww2higfz3w0v1niff257wshhrvrkigh36"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -52452,6 +52518,8 @@ self: { testHaskellDepends = [ base base16-bytestring hspec ]; description = "Cayenne Low Power Payload"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cayenne-lpp" = callPackage @@ -58091,8 +58159,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.18"; - sha256 = "1xyri98rlg4ph9vyjicivq8vb1kk085pbpv43ydw6qvpqlp97wk5"; + version = "0.1.3.19"; + sha256 = "1gs4q04iyzzfwij58bbmhz2app3gf4xj0dnd4x4bhkgwj7gmvf4m"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58152,8 +58220,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.0.4"; - sha256 = "1wf6mq0j7qcflxzys5wnn0xvn0n1lhd722iicq0k6dgh3qla0b6d"; + version = "0.1.0"; + sha256 = "0zagchakak4mrdpgy23d2wfb357dc6fn78fpcjs1ik025wmldy88"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58797,6 +58865,17 @@ self: { broken = true; }) {}; + "collect-errors" = callPackage + ({ mkDerivation, base, containers, QuickCheck }: + mkDerivation { + pname = "collect-errors"; + version = "0.1.0.0"; + sha256 = "1zspgncbnn8zqixlxm3hrck3mk4j3n91515456w8dy220a0bzbhc"; + libraryHaskellDepends = [ base containers QuickCheck ]; + description = "Error monad with a Float instance"; + license = lib.licenses.bsd3; + }) {}; + "collection-json" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover , network-arbitrary, network-uri, network-uri-json, QuickCheck @@ -67140,8 +67219,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.4"; - sha256 = "1ca70yk13b239383q9d8fwc4qd6jm22dqinfhasd88b4iv9p46h8"; + version = "0.7.5"; + sha256 = "1ly2s8lxy4wdcvkvsj9nw71r5dbsxpb0z8kzvywj9a5clqid109y"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -67168,8 +67247,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.4"; - sha256 = "0v5mv2yhw114y7hixh3qjy88sfrry7xfyzkwwk1dpwnq8yycp0ir"; + version = "5.4.1"; + sha256 = "0dyafw91ycsr71sxf7z3fbvfbp9vh8l260l9ygfxlrg37971l4pj"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -67186,8 +67265,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.6"; - sha256 = "1s4gyn4rpkpfpb0glbb39hnzkw9vr4his3s4a4azx894cymyhzg0"; + version = "0.3.7"; + sha256 = "1qx9qig18y89k4sxpn333hvqz74c6f56nbvaf8dfbawx5asar0jm"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -67202,8 +67281,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.5.0"; - sha256 = "1qif8nx3652883zf84w4d0l2lzlbrk9n25rn4i5mxcmlv9px06ha"; + version = "0.0.5.1"; + sha256 = "0h1a9yklsqbykhdinmk8znm7kfg0jd1k394cx2lirpdxn136kbcm"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -67219,8 +67298,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.4"; - sha256 = "1hqmwlgx0dcci7z76w4i5xcq10c4jigzbm7fvf0xxwffmhf6j752"; + version = "0.2.5"; + sha256 = "1bid3wxg879l69w8c1vcana0xxrggxv30dw9bqi8zww2w23id54q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -67235,8 +67314,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.10.0"; - sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y"; + version = "0.0.10.1"; + sha256 = "1c2g83a0n4y1fvq3amj9m2hygg9rbpl5x8zsicb52qjm7vjing2i"; libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; @@ -76236,8 +76315,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.5"; - sha256 = "10336q53ghvj15gxxrdh1s10amfbyl7m69pgzg0rjxrs1p2bx7s7"; + version = "0.1.6"; + sha256 = "0hzixid47jv5jwv5rs91baa8bpfkq4hn3y8ndra34w5qvmg3nlii"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76712,8 +76791,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.5"; - sha256 = "0hp3w1d5pwfj06m72dl44cp67h99b3c43kv641vz6dff7xk75hsm"; + version = "1.8.6"; + sha256 = "0mmppadd1hmmdgbfjwzhy28kibzssbsnr5dxjiqf3hahmll74qjl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78602,6 +78681,8 @@ self: { th-lift th-lift-instances time ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "doclayout" = callPackage @@ -89424,15 +89505,15 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "fast-logger_3_0_4" = callPackage + "fast-logger_3_0_5" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time }: mkDerivation { pname = "fast-logger"; - version = "3.0.4"; - sha256 = "1a6h7mn34lw732ajlyc6bf7cybw2khs1cr4gj9dg2dd571q00rx1"; + version = "3.0.5"; + sha256 = "1mbnah6n8lig494523czcd95dfn01f438qai9pf20wpa2gdbz4x6"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -95678,15 +95759,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "free_5_1_6" = callPackage + "free_5_1_7" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, indexed-traversable, mtl, profunctors, semigroupoids , template-haskell, th-abstraction, transformers, transformers-base }: mkDerivation { pname = "free"; - version = "5.1.6"; - sha256 = "017cyz0d89560m3a2g2gpf8imzdzzlrd1rv0m6s2lvj41i2dhzfc"; + version = "5.1.7"; + sha256 = "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -97738,6 +97819,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Handle exceptions thrown in IO with fused-effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fused-effects-lens" = callPackage @@ -99608,6 +99691,8 @@ self: { pname = "generic-deriving"; version = "1.14"; sha256 = "00nbnxxkxyjfzj3zf6sxh3im24qv485w4jb1gj36c2wn4gjdbayh"; + revision = "1"; + editedCabalFile = "0g17hk01sxv5lmrlnmwqhkk73y3dy3xhy7l9myyg5qnw7hm7iin9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -99817,6 +99902,8 @@ self: { ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-optics-lite" = callPackage @@ -103919,6 +104006,8 @@ self: { libraryPkgconfigDepends = [ gmodule ]; description = "GModule bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {gmodule = null;}; "gi-gobject" = callPackage @@ -104922,6 +105011,8 @@ self: { libraryPkgconfigDepends = [ vips ]; description = "libvips GObject bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) vips;}; "gi-vte" = callPackage @@ -105386,25 +105477,25 @@ self: { , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq , directory, disk-free-space, dlist, edit-distance, exceptions , fdo-notify, feed, filepath, filepath-bytestring, free, git - , git-lfs, gnupg, hinotify, hslogger, http-client - , http-client-restricted, http-client-tls, http-conduit, http-types - , IfElse, lsof, magic, memory, microlens, monad-control - , monad-logger, mountpoints, mtl, network, network-bsd - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unliftio-core, unordered-containers, utf8-string - , uuid, vector, wai, wai-extra, warp, warp-tls, wget, which, yesod - , yesod-core, yesod-form, yesod-static + , git-lfs, gnupg, hinotify, http-client, http-client-restricted + , http-client-tls, http-conduit, http-types, IfElse, lsof, magic + , memory, microlens, monad-control, monad-logger, mountpoints, mtl + , network, network-bsd, network-info, network-multicast + , network-uri, old-locale, openssh, optparse-applicative + , path-pieces, perl, persistent, persistent-sqlite + , persistent-template, process, QuickCheck, random, regex-tdfa + , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare + , socks, split, stm, stm-chans, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun, template-haskell, text, time + , torrent, transformers, unix, unix-compat, unliftio-core + , unordered-containers, utf8-string, uuid, vector, wai, wai-extra + , warp, warp-tls, wget, which, yesod, yesod-core, yesod-form + , yesod-static }: mkDerivation { pname = "git-annex"; - version = "8.20210330"; - sha256 = "07dhxlmnj48drgndcplafc7xhby0w3rks68fz9wsppxan929240p"; + version = "8.20210428"; + sha256 = "0xpvhpnl600874sa392wjfd2yd9s6ps2cq2qfkzyxxf90p9fcwg8"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -105414,8 +105505,8 @@ self: { isExecutable = true; setupHaskellDepends = [ async base bytestring Cabal data-default directory exceptions - filepath filepath-bytestring hslogger IfElse process split - transformers unix-compat utf8-string + filepath filepath-bytestring IfElse process split time transformers + unix-compat utf8-string ]; executableHaskellDepends = [ aeson async attoparsec aws base blaze-builder bloomfilter byteable @@ -105423,17 +105514,17 @@ self: { connection containers crypto-api cryptonite data-default DAV dbus deepseq directory disk-free-space dlist edit-distance exceptions fdo-notify feed filepath filepath-bytestring free git-lfs hinotify - hslogger http-client http-client-restricted http-client-tls - http-conduit http-types IfElse magic memory microlens monad-control - monad-logger mountpoints mtl network network-bsd network-info - network-multicast network-uri old-locale optparse-applicative - path-pieces persistent persistent-sqlite persistent-template - process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare socks split stm stm-chans tagsoup tasty - tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time - torrent transformers unix unix-compat unliftio-core - unordered-containers utf8-string uuid vector wai wai-extra warp - warp-tls yesod yesod-core yesod-form yesod-static + http-client http-client-restricted http-client-tls http-conduit + http-types IfElse magic memory microlens monad-control monad-logger + mountpoints mtl network network-bsd network-info network-multicast + network-uri old-locale optparse-applicative path-pieces persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare + socks split stm stm-chans tagsoup tasty tasty-hunit + tasty-quickcheck tasty-rerun template-haskell text time torrent + transformers unix unix-compat unliftio-core unordered-containers + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -118601,6 +118692,28 @@ self: { broken = true; }) {}; + "hasbolt_0_1_4_5" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.4.5"; + sha256 = "185qh24n6j3b5awwmm92hxravb3sq40l5q8vyng74296mjc65nkw"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -118609,8 +118722,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.6"; - sha256 = "0il6752lvq0li29aipc66syc7kd9h57439akshlpqpd25b536zd9"; + version = "0.0.1.7"; + sha256 = "1dnia4da5g9c8ckiap4wsacv6lccr69ai24i3n6mywdykhy159f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126452,6 +126565,8 @@ self: { pname = "heidi"; version = "0.1.0"; sha256 = "1l4am8pqk3xrmjmjv48jia60d2vydpj2wy0iyxqiidnc7b8p5j8m"; + revision = "1"; + editedCabalFile = "0fbx6hkxdbrhh30j2bs3zrxknrlr6z29r7srxnpsgd4n0rkdajar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129173,8 +129288,8 @@ self: { }: mkDerivation { pname = "hierarchical-env"; - version = "0.1.0.0"; - sha256 = "0syx9i9z9j75wbqsrwl8nqhr025df6vmgb4p767sdb7dncpqkph9"; + version = "0.2.0.0"; + sha256 = "1hslf8wppwbs9r40kfvxwnw6vxwa4fm2fjdfmxn0grpbpwz1qvf5"; libraryHaskellDepends = [ base method microlens microlens-mtl microlens-th rio template-haskell th-abstraction @@ -130122,6 +130237,8 @@ self: { sha256 = "18hwc5x902k2dsk8895sr8nil4445b9lazzdzbjzpllx4smf0lvz"; libraryHaskellDepends = [ aeson base bytestring servant ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hipsql-client" = callPackage @@ -130144,6 +130261,8 @@ self: { http-types mtl servant-client servant-client-core ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hipsql-monad" = callPackage @@ -130175,6 +130294,8 @@ self: { servant-server warp ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hircules" = callPackage @@ -142290,6 +142411,8 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http2-client-exe" = callPackage @@ -142309,6 +142432,8 @@ self: { ]; description = "A command-line http2 client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http2-client-grpc" = callPackage @@ -146006,7 +146131,8 @@ self: { ]; description = "A fast JSON document store with push notification support"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ rkrzr ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "icfpc2020-galaxy" = callPackage @@ -151622,6 +151748,8 @@ self: { testHaskellDepends = [ base generic-lens QuickCheck ]; description = "Automatically derivable Has instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "itanium-abi" = callPackage @@ -156925,8 +157053,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "6"; - editedCabalFile = "0acc224njxf8y7r381pnzxx6z3lvshs5mwfafkcrn36nb0wfplng"; + revision = "7"; + editedCabalFile = "1xfhm486mgkf744nbx94aw0b1lraj1yv29c57rbx1c2b84v2z8k2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -159380,6 +159508,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "language-c-quote_0_13" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.13"; + sha256 = "02axz6498sg2rf24qds39n9gysc4lm3v354h2qyhrhadlfq8sf6d"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc test-framework + test-framework-hunit + ]; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-c99" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { @@ -170770,6 +170923,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "mainland-pretty_0_7_1" = callPackage + ({ mkDerivation, base, containers, srcloc, text, transformers }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.7.1"; + sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; + libraryHaskellDepends = [ + base containers srcloc text transformers + ]; + description = "Pretty printing designed for printing source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -191642,6 +191809,8 @@ self: { ]; description = "om-doh"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "om-elm" = callPackage @@ -199325,15 +199494,20 @@ self: { "pdf-toolbox-content" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , containers, io-streams, pdf-toolbox-core, text + , containers, hspec, io-streams, pdf-toolbox-core, scientific, text + , vector }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.0.5.1"; - sha256 = "1244r2ij46gs10zxc3mlf2693nnb1jpyminqkpzh71hp5qilw40w"; + version = "0.1.1"; + sha256 = "0bdcakhmazxim5npqkb13lh0b65p1xqv2a05c61zv0g64n1d6k5f"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers io-streams - pdf-toolbox-core text + pdf-toolbox-core scientific text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers hspec io-streams + pdf-toolbox-core ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; @@ -199342,16 +199516,25 @@ self: { }) {}; "pdf-toolbox-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, errors - , io-streams, scientific, transformers, zlib-bindings + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , cipher-aes, cipher-rc4, containers, crypto-api, cryptohash + , hashable, hspec, io-streams, scientific, unordered-containers + , vector }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.0.4.1"; - sha256 = "10d9fchmiwdbkbdxqmn5spim4pywc1qm9q9c0dhmsssryng99qyc"; + version = "0.1.1"; + sha256 = "1d5bk7qbcgz99xa61xi17z0hgr3w2by3d5mr2vgd0hpcdi5ygskz"; + revision = "1"; + editedCabalFile = "1h5nh360zaql29lw3mcykip7bvnnjjcxmpaaz3s842a227m9wflz"; libraryHaskellDepends = [ - attoparsec base bytestring containers errors io-streams scientific - transformers zlib-bindings + attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 + containers crypto-api cryptohash hashable io-streams scientific + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hspec io-streams unordered-containers + vector ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; @@ -199360,18 +199543,21 @@ self: { }) {}; "pdf-toolbox-document" = callPackage - ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 - , containers, crypto-api, cryptohash, io-streams - , pdf-toolbox-content, pdf-toolbox-core, text, transformers + ({ mkDerivation, base, bytestring, containers, directory, hspec + , io-streams, pdf-toolbox-content, pdf-toolbox-core, text + , unordered-containers, vector }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.0.7.1"; - sha256 = "1qghjsaya0wnl3vil8gv6a3crd94mmvl3y73k2cwzhc5madkfz9z"; + version = "0.1.2"; + sha256 = "172vxsv541hsdkk08rsr21rwdrcxwmf4pwjmgsq2rjwj4ba4723y"; libraryHaskellDepends = [ - base bytestring cipher-aes cipher-rc4 containers crypto-api - cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text - transformers + base bytestring containers io-streams pdf-toolbox-content + pdf-toolbox-core text unordered-containers vector + ]; + testHaskellDepends = [ + base directory hspec io-streams pdf-toolbox-core + unordered-containers ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; @@ -200203,6 +200389,8 @@ self: { ]; description = "Periodic task system haskell client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "periodic-client-exe" = callPackage @@ -200227,6 +200415,8 @@ self: { ]; description = "Periodic task system haskell client executables"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "periodic-common" = callPackage @@ -200243,6 +200433,8 @@ self: { ]; description = "Periodic task system common"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "periodic-polynomials" = callPackage @@ -202109,12 +202301,21 @@ self: { }) {}; "phonetic-languages-phonetics-basics" = callPackage - ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: + ({ mkDerivation, base, foldable-ix, lists-flines, mmsyn2-array + , mmsyn5 + }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.3.4.0"; - sha256 = "1x50ah7mhqgl39f1yvf0khq1ih2w4l0jdbpfdc2v1k9cp0jh8jh4"; - libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; + version = "0.5.1.0"; + sha256 = "1pqc16llr1ar7z6lfbniinxx7q09qpamajmbl3d9njhk4pwdl6b8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldable-ix lists-flines mmsyn2-array mmsyn5 + ]; + executableHaskellDepends = [ + base foldable-ix lists-flines mmsyn2-array mmsyn5 + ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; }) {}; @@ -206114,8 +206315,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.1.0"; - sha256 = "1gr7nyzz1wwl7c22q21c8y8r94b8sp0r5kma20w3avg6p0l53bm3"; + version = "0.4.2.0"; + sha256 = "0rsmdp7p0asmaf13wf5ky0ngrmnqdfbi67y4a0vcwqvknqmlys2y"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -206191,6 +206392,8 @@ self: { ]; description = "Extra Input and Output functions for polysemy.."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-fs" = callPackage @@ -206221,6 +206424,8 @@ self: { ]; description = "Run a KVStore as a filesystem in polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-http" = callPackage @@ -206268,6 +206473,8 @@ self: { ]; description = "Run a KVStore as a single json file in polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-log" = callPackage @@ -206538,6 +206745,8 @@ self: { libraryHaskellDepends = [ base polysemy polysemy-extra vinyl ]; description = "Functions for mapping vinyl records in polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-webserver" = callPackage @@ -206583,6 +206792,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polyseq" = callPackage @@ -220073,6 +220284,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "ref-fd_0_5" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "ref-fd"; + version = "0.5"; + sha256 = "1r34xyyx0fyl1fc64n1hhk0m2s1l808kjb18dmj8w0y91w4ms6qj"; + libraryHaskellDepends = [ base stm transformers ]; + description = "A type class for monads with references using functional dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ref-mtl" = callPackage ({ mkDerivation, base, mtl, stm, transformers }: mkDerivation { @@ -220097,6 +220320,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "ref-tf_0_5" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "ref-tf"; + version = "0.5"; + sha256 = "06lf3267b68syiqcwvgw8a7yi0ki3khnh4i9s8z7zjrjnj6h9r4v"; + libraryHaskellDepends = [ base stm transformers ]; + description = "A type class for monads with references using type families"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "refact" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -222853,6 +223088,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reorder expressions in a syntax tree according to operator fixities"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reorderable" = callPackage @@ -223416,15 +223653,18 @@ self: { }) {}; "reprinter" = callPackage - ({ mkDerivation, base, mtl, syb, syz, text, transformers, uniplate + ({ mkDerivation, base, bytestring, hspec, hspec-discover, mtl, syb + , syz, text, transformers }: mkDerivation { pname = "reprinter"; - version = "0.2.0.0"; - sha256 = "1b3hdz7qq9qk7pbx0ny4ziagjm9hi9wfi9rl0aq0b8p70zzyjiq1"; + version = "0.3.0.0"; + sha256 = "04rzgk0q5q75z52x3qyq8ddhyb6krnz1ixhmmvzpcfaq39p00cgh"; libraryHaskellDepends = [ - base mtl syb syz text transformers uniplate + base bytestring mtl syb syz text transformers ]; + testHaskellDepends = [ base hspec mtl text ]; + testToolDepends = [ hspec-discover ]; description = "Scrap Your Reprinter"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -228999,6 +229239,76 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_1_0_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lens, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.0.5"; + sha256 = "1np5c81jbv2k6sszrg7wwf2ymbnpn2pak8fji1phk79sdr04qmfh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sandwich-quickcheck" = callPackage + ({ mkDerivation, base, free, monad-control, QuickCheck + , safe-exceptions, sandwich, string-interpolate, time + }: + mkDerivation { + pname = "sandwich-quickcheck"; + version = "0.1.0.4"; + sha256 = "0sljlpnhv5wpda1w9nh5da2psmg9snias8k9dr62y9khymn3aya7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base free monad-control QuickCheck safe-exceptions sandwich + string-interpolate time + ]; + executableHaskellDepends = [ + base free monad-control QuickCheck safe-exceptions sandwich + string-interpolate time + ]; + testHaskellDepends = [ + base free monad-control QuickCheck safe-exceptions sandwich + string-interpolate time + ]; + description = "Sandwich integration with QuickCheck"; + license = lib.licenses.bsd3; + }) {}; + "sandwich-slack" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich @@ -229029,6 +229339,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-slack_0_1_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens + , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich + , stm, string-interpolate, text, time, vector, wreq + }: + mkDerivation { + pname = "sandwich-slack"; + version = "0.1.0.4"; + sha256 = "1l296q3lxafj3gd7pr6n6qrvcb4zdkncsj2z6ra6q0qfw465jaqk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + executableHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + description = "Sandwich integration with Slack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-webdriver" = callPackage ({ mkDerivation, aeson, base, containers, convertible, data-default , directory, exceptions, filepath, http-client, http-client-tls @@ -229761,6 +230102,8 @@ self: { testHaskellDepends = [ attoparsec base bytestring hspec scanner ]; description = "Inject attoparsec parser with backtracking into non-backtracking scanner"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "scat" = callPackage @@ -233650,6 +233993,8 @@ self: { ]; description = "Generate benchmark files from a Servant API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -246596,6 +246941,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "srcloc_0_6" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "srcloc"; + version = "0.6"; + sha256 = "1vcp9vgfi5rscy09l4qaq0pp426b6qcdpzs6kpbzg0k5x81kcsbb"; + libraryHaskellDepends = [ base ]; + description = "Data types for managing source code locations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "srec" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -247070,8 +247427,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.2"; - sha256 = "0q64g4frvcmj308x27mibi89m6rwjf5v47ql4yy6cnf9arjzqf9f"; + version = "0.2.1"; + sha256 = "07azc2phnljxwxskxlipmx52vjyavxn54q87k1bakapla469fdr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -251764,6 +252121,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structs_0_1_6" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "structs"; + version = "0.1.6"; + sha256 = "0wzbhsvix46aans0hdm11pvsigk1lxpdaha2sxslx0ip1xsdg0gk"; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell th-abstraction + ]; + testHaskellDepends = [ + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -261175,6 +261552,8 @@ self: { pname = "th-abstraction"; version = "0.4.2.0"; sha256 = "0h0wl442a82llpjsxv45i7grgyanlzjj7k28mhnvbi2zlb6v41pa"; + revision = "1"; + editedCabalFile = "1yc17r29vkwi4qzbrxy1d3gra87hk3ghy1jzfmrl2q8zjc0v59vb"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -261554,6 +261933,8 @@ self: { pname = "th-lift"; version = "0.8.2"; sha256 = "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s"; + revision = "1"; + editedCabalFile = "1l8fsxbxfsgcy6qxlgn6qxwhiqwwmmaj2vb1gbrjyb905gb3lpwm"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -275501,6 +275882,23 @@ self: { broken = true; }) {}; + "variadic" = callPackage + ({ mkDerivation, base, containers, criterion, hspec + , hspec-expectations-lifted, mmorph, mtl, process + }: + mkDerivation { + pname = "variadic"; + version = "0.0.0.0"; + sha256 = "1wlf8bxxmal6zmjhdw6ghvcdxi2lvlhs2vn7c7sn0jb88im0i18s"; + libraryHaskellDepends = [ base mmorph mtl ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-lifted mmorph mtl process + ]; + benchmarkHaskellDepends = [ base criterion mmorph mtl ]; + description = "Abstractions for working with variadic functions"; + license = lib.licenses.bsd3; + }) {}; + "variation" = callPackage ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids }: @@ -276152,6 +276550,8 @@ self: { ]; description = "A binding to the fftw library for one-dimensional vectors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -277650,6 +278050,30 @@ self: { broken = true; }) {}; + "vp-tree" = callPackage + ({ mkDerivation, base, boxes, bytestring, conduit, containers + , deepseq, depq, hspec, mtl, mwc-probability, primitive, psqueues + , QuickCheck, sampling, serialise, transformers, vector + , vector-algorithms, weigh + }: + mkDerivation { + pname = "vp-tree"; + version = "0.1.0.1"; + sha256 = "1hzzz5ld397ig0lskr09sdz2cdd4nkk6pckhb9r04vzmqczpiarp"; + libraryHaskellDepends = [ + base boxes containers deepseq depq mtl mwc-probability primitive + psqueues sampling serialise transformers vector vector-algorithms + ]; + testHaskellDepends = [ + base hspec mwc-probability primitive QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit containers deepseq vector weigh + ]; + description = "Vantage Point Trees"; + license = lib.licenses.bsd3; + }) {}; + "vpq" = callPackage ({ mkDerivation, base, primitive, smallcheck, tasty , tasty-smallcheck, util, vector @@ -279750,6 +280174,8 @@ self: { ]; description = "Simple Redis backed wai-session backend"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-session-tokyocabinet" = callPackage @@ -280142,6 +280568,8 @@ self: { ]; description = "A minimal gRPC server on top of Warp"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "warp-static" = callPackage @@ -282572,6 +283000,25 @@ self: { license = lib.licenses.isc; }) {}; + "witch_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "witch"; + version = "0.2.1.0"; + sha256 = "0zvq9axjmqksk4fqq42qgbj4whx27p4m40cgvdqmq4vpj4csvswl"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text + ]; + testHaskellDepends = [ + base bytestring containers hspec QuickCheck text + ]; + description = "Convert values from one type into another"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { From 2b61d9ea01dd69eeb5f113b906e24d0cb2252367 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 20:05:57 +0200 Subject: [PATCH 407/476] nixos/zigbee2mqtt: create migration path from config to settings --- nixos/modules/services/misc/zigbee2mqtt.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index 1f721910c4c..189e620127d 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -7,10 +7,16 @@ let format = pkgs.formats.yaml { }; configFile = format.generate "zigbee2mqtt.yaml" cfg.settings; + in { meta.maintainers = with maintainers; [ sweber ]; + imports = [ + # Remove warning before the 21.11 release + (mkRenamedOptionModule [ "services" "zigbee2mqtt" "config" ] [ "services" "zigbee2mqtt" "settings" ]) + ]; + options.services.zigbee2mqtt = { enable = mkEnableOption "enable zigbee2mqtt service"; From 62de527dc32563e65556669037f5ce81943091bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Apr 2021 20:40:04 +0200 Subject: [PATCH 408/476] nixos/zigbee2mqtt: start maintaing the module --- nixos/modules/services/misc/zigbee2mqtt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/misc/zigbee2mqtt.nix index 189e620127d..4458da1346b 100644 --- a/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/nixos/modules/services/misc/zigbee2mqtt.nix @@ -10,7 +10,7 @@ let in { - meta.maintainers = with maintainers; [ sweber ]; + meta.maintainers = with maintainers; [ sweber hexa ]; imports = [ # Remove warning before the 21.11 release From 8a3ef679253778c39dc2e487d8afe35a9fe7f8ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 11:44:04 -0700 Subject: [PATCH 409/476] kcov: 36 -> 38 (#121160) --- pkgs/development/tools/analysis/kcov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 4b294bf8ada..f0efbc294ef 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kcov"; - version = "36"; + version = "38"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3"; + sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; From 37656dc20816c27df282605ee8d2adff2563d0f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2021 20:45:03 +0200 Subject: [PATCH 410/476] git-annex: update sha256 hash for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22e7caf3d4..3965d4cfce8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "13n62v3cdkx23fywdccczcr8vsf0vmjbimmgin766bf428jlhh6h"; + sha256 = "1wig8nw2rxgq86y88m1f1qf93z5yckidf1cs33ribmhqa1hs300p"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 248a57d61a68fe08d9bbaa639ae3c6ea3a1bc57c Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Fri, 30 Apr 2021 18:55:31 +0000 Subject: [PATCH 411/476] nixos/adguardhome: init (#120568) --- nixos/modules/module-list.nix | 1 + .../services/networking/adguardhome.nix | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 nixos/modules/services/networking/adguardhome.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index daa96e64f59..dd6fa483281 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -632,6 +632,7 @@ ./services/network-filesystems/xtreemfs.nix ./services/network-filesystems/ceph.nix ./services/networking/3proxy.nix + ./services/networking/adguardhome.nix ./services/networking/amuled.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix new file mode 100644 index 00000000000..4388ef2b7e5 --- /dev/null +++ b/nixos/modules/services/networking/adguardhome.nix @@ -0,0 +1,78 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.adguardhome; + + args = concatStringsSep " " ([ + "--no-check-update" + "--pidfile /run/AdGuardHome/AdGuardHome.pid" + "--work-dir /var/lib/AdGuardHome/" + "--config /var/lib/AdGuardHome/AdGuardHome.yaml" + "--host ${cfg.host}" + "--port ${toString cfg.port}" + ] ++ cfg.extraArgs); + +in +{ + options.services.adguardhome = with types; { + enable = mkEnableOption "AdGuard Home network-wide ad blocker"; + + host = mkOption { + default = "0.0.0.0"; + type = str; + description = '' + Host address to bind HTTP server to. + ''; + }; + + port = mkOption { + default = 3000; + type = port; + description = '' + Port to serve HTTP pages on. + ''; + }; + + openFirewall = mkOption { + default = false; + type = bool; + description = '' + Open ports in the firewall for the AdGuard Home web interface. Does not + open the port needed to access the DNS resolver. + ''; + }; + + extraArgs = mkOption { + default = [ ]; + type = listOf str; + description = '' + Extra command line parameters to be passed to the adguardhome binary. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.adguardhome = { + description = "AdGuard Home: Network-level blocker"; + after = [ "syslog.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + StartLimitIntervalSec = 5; + StartLimitBurst = 10; + }; + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + Restart = "always"; + RestartSec = 10; + RuntimeDirectory = "AdGuardHome"; + StateDirectory = "AdGuardHome"; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + }; +} From b522e483b9b2e2d2867620bda4c79728f05db57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 30 Apr 2021 21:26:26 +0200 Subject: [PATCH 412/476] kcov: add metadata and passthru.tests (#121308) --- .../tools/analysis/kcov/default.nix | 104 +++++++++++++----- 1 file changed, 75 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index f0efbc294ef..a708c88ee9e 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,38 +1,84 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, zlib +, curl +, elfutils +, python3 +, libiberty +, libopcodes +, runCommand +, gcc +, rustc +}: -stdenv.mkDerivation rec { - pname = "kcov"; - version = "38"; +let + self = + stdenv.mkDerivation rec { + pname = "kcov"; + version = "38"; - src = fetchFromGitHub { - owner = "SimonKagstrom"; - repo = "kcov"; - rev = "v${version}"; - sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38="; - }; + src = fetchFromGitHub { + owner = "SimonKagstrom"; + repo = "kcov"; + rev = "v${version}"; + sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38="; + }; - preConfigure = "patchShebangs src/bin-to-c-source.py"; - nativeBuildInputs = [ cmake pkg-config python3 ]; + preConfigure = "patchShebangs src/bin-to-c-source.py"; + nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ curl zlib elfutils libiberty libopcodes ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes ]; - strictDeps = true; + strictDeps = true; - meta = with lib; { - description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; + passthru.tests = { + works-on-c = runCommand "works-on-c" {} '' + set -ex + cat - > a.c < a.rs < Date: Fri, 30 Apr 2021 19:37:43 +0000 Subject: [PATCH 413/476] macchina: 0.6.9 -> 0.7.2 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index d975e02d5ac..42a83f91df6 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "0.6.9"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y23gpYDnYoiTJcNyWKslVenPTXcCrOvxq+0N9PjQN3g="; + sha256 = "sha256-ICiU0emo5lEs6996TwkauuBWb2+Yy6lL+/x7zQgO470="; }; - cargoSha256 = "sha256-jfLj8kLBG6AeeYo421JCl1bMqWwOGiwQgv7AEomtFcY="; + cargoSha256 = "sha256-OfOh0YXeLT/kBuR9SOV7pHa8Z4b6+JvtVwqqwd1hCJY="; nativeBuildInputs = [ installShellFiles ]; From 33f9d30558ef7635cd0aeb983edfde7c8c090639 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 30 Apr 2021 14:43:41 -0500 Subject: [PATCH 414/476] rclone: 1.55.0 -> 1.55.1 (#121297) --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 83cc029c089..0a74d19dfdb 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.55.0"; + version = "1.55.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "01pvcns3n735s848wc11q40pkkv646gn3cxkma866k44a9c2wirl"; + sha256 = "1fyi12qz2igcf9rqsp9gmcgfnmgy4g04s2b03b95ml6klbf73cns"; }; - vendorSha256 = "05f9nx5sa35q2szfkmnkhvqli8jlqja8ghiwyxk7cvgjl7fgd6zk"; + vendorSha256 = "199z3j62xw9h8yviyv4jfls29y2ri9511hcyp5ix8ahgk6ypz8vw"; subPackages = [ "." ]; From 9465ce4e10ab833546afd7c521bb0bb98c1d775e Mon Sep 17 00:00:00 2001 From: Glowpelt Date: Thu, 29 Apr 2021 19:24:45 -0600 Subject: [PATCH 415/476] rtl88xxau-aircrack: fc0194 -> c0ce81 Linux Kernel 5.8 or about there broke the previous version of this driver. --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index c37c9502d2d..3371a2263df 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "rtl88xxau-aircrack-${kernel.version}-${version}"; - rev = "fc0194c1d90453bf4943089ca237159ef19a7374"; + rev = "c0ce81745eb3471a639f0efd4d556975153c666e"; version = "${builtins.substring 0 6 rev}"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "0hf7mrvxaskc6qcjar5w81y9xc7s2rlsxp34achyqly2hjg7fgmy"; + sha256 = "131cwwg3czq0i1xray20j71n836g93ac064nvf8wi13c2wr36ppc"; }; buildInputs = kernel.moduleBuildDependencies; From d25741e70740256cb180c32eee99a968640b5b67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 19:49:55 +0000 Subject: [PATCH 416/476] logcheck: 1.3.22 -> 1.3.23 --- pkgs/tools/system/logcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 6fd66b40e15..4c36e529ae9 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.22"; + version = "1.3.23"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4="; + sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk="; }; prePatch = '' From b6b5fe550d41b4b1c84b50d0cd4d799b10563905 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2021 22:01:26 +0200 Subject: [PATCH 417/476] all-cabal-hashes: update to Hackage at 2021-04-30T19:36:25Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 429470f2bf3..d8599c50b1d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/1aad60ed9679a7597f3fc3515a0fe26fdb896e55.tar.gz"; - sha256 = "0a7lm1ki8rz7m13x4zxlr1nkd93227xgmxbhvsmrj9fa4nc5bvyy"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz"; + sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2"; } From 6d365578bfbac27e1e52422aa7a22e68fb447938 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 12:01:46 -0300 Subject: [PATCH 418/476] aegisub: ffmpeg_3 -> ffmpeg And refactor. --- pkgs/applications/video/aegisub/default.nix | 96 +++++++++++---------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index d39b5e179a6..e953b96638f 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -3,22 +3,22 @@ , stdenv , fetchurl , fetchpatch -, libX11 -, wxGTK -, libiconv +, boost +, ffmpeg +, ffms +, fftw , fontconfig , freetype -, libGLU -, libGL -, libass -, fftw -, ffms -, ffmpeg_3 -, pkg-config -, zlib , icu -, boost , intltool +, libGL +, libGLU +, libX11 +, libass +, libiconv +, pkg-config +, wxGTK +, zlib , spellcheckSupport ? true , hunspell ? null @@ -46,71 +46,75 @@ assert alsaSupport -> (alsaLib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); -with lib; -stdenv.mkDerivation - rec { +let + inherit (lib) optional; +in +stdenv.mkDerivation rec { pname = "aegisub"; version = "3.2.2"; src = fetchurl { url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz"; - sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; + hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU="; }; patches = [ # Compatibility with ICU 59 (fetchpatch { url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch"; - sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7"; + sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8="; }) # Compatbility with Boost 1.69 (fetchpatch { url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch"; - sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf"; + sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk="; }) # Compatbility with make 4.3 (fetchpatch { url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch"; - sha256 = "1s9cc5rikrqb9ivjbag4b8yxcyjsmmmw744394d5xq8xi4k12vxc"; + sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk="; }) ]; nativeBuildInputs = [ - pkg-config intltool + pkg-config ]; - - buildInputs = with lib; [ - libX11 - wxGTK + buildInputs = [ + boost + ffmpeg + ffms + fftw fontconfig freetype - libGLU - libGL - libass - fftw - ffms - ffmpeg_3 - zlib icu - boost + libGL + libGLU + libX11 + libass libiconv + wxGTK + zlib ] - ++ optional spellcheckSupport hunspell - ++ optional automationSupport lua - ++ optional openalSupport openal - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport libpulseaudio - ++ optional portaudioSupport portaudio - ; + ++ optional alsaSupport alsaLib + ++ optional automationSupport lua + ++ optional openalSupport openal + ++ optional portaudioSupport portaudio + ++ optional pulseaudioSupport libpulseaudio + ++ optional spellcheckSupport hunspell + ; enableParallelBuilding = true; - hardeningDisable = [ "bindnow" "relro" ]; + hardeningDisable = [ + "bindnow" + "relro" + ]; - # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + # compat with icu61+ + # https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; # this is fixed upstream though not yet in an officially released version, @@ -119,7 +123,8 @@ stdenv.mkDerivation postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; - meta = { + meta = with lib; { + homepage = "https://github.com/Aegisub/Aegisub"; description = "An advanced subtitle editor"; longDescription = '' Aegisub is a free, cross-platform open source tool for creating and @@ -127,12 +132,11 @@ stdenv.mkDerivation audio, and features many powerful tools for styling them, including a built-in real-time video preview. ''; - homepage = "http://www.aegisub.org/"; - # The Aegisub sources are itself BSD/ISC, - # but they are linked against GPL'd softwares - # - so the resulting program will be GPL + # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd + # softwares - so the resulting program will be GPL license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } +# TODO [ AndersonTorres ]: update to fork release From 27525f6c4d2d7851657243f59441b5e7b7855e46 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 26 Apr 2021 21:06:14 -0300 Subject: [PATCH 419/476] kid3: ffmpeg_3 -> ffmpeg And refactor. --- pkgs/applications/audio/kid3/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index abfc9e7fe1e..7f8015e7143 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -6,7 +6,7 @@ , cmake , docbook_xml_dtd_45 , docbook_xsl -, ffmpeg_3 +, ffmpeg , flac , id3lib , libogg @@ -31,21 +31,22 @@ stdenv.mkDerivation rec { version = "3.8.6"; src = fetchurl { - url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ce+MWCJzAnN+u+07f0dvn0jnbqiUlS2RbcM9nAj5bgg="; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-R4gAWlCw8RezhYbw1XDo+wdp797IbLoM3wqHwr+ul6k="; }; nativeBuildInputs = [ cmake + docbook_xml_dtd_45 + docbook_xsl pkg-config + python3 wrapQtAppsHook ]; buildInputs = [ automoc4 chromaprint - docbook_xml_dtd_45 - docbook_xsl - ffmpeg_3 + ffmpeg flac id3lib libogg @@ -53,7 +54,6 @@ stdenv.mkDerivation rec { libxslt mp4v2 phonon - python3 qtbase qtmultimedia qtquickcontrols @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://kid3.kde.org/"; description = "A simple and powerful audio tag editor"; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, @@ -101,7 +102,6 @@ stdenv.mkDerivation rec { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; - homepage = "http://kid3.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From 41c71047c0b10ae62553b91f272a2e8531d18062 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 26 Apr 2021 21:13:14 -0300 Subject: [PATCH 420/476] mgba: ffmpeg_3 -> ffmpeg And refactor. --- pkgs/misc/emulators/mgba/default.nix | 65 ++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index be097c31185..fa25609dcdb 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config -, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick -, qtbase, qtmultimedia, qttools, minizip }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, epoxy +, ffmpeg +, imagemagick +, libedit +, libelf +, libzip +, makeDesktopItem +, minizip +, pkg-config +, qtbase +, qtmultimedia +, qttools +, wrapQtAppsHook +}: let desktopItem = makeDesktopItem { @@ -21,14 +37,26 @@ in stdenv.mkDerivation rec { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; + hash = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; }; - nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ]; - + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ - epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick - qtbase qtmultimedia qttools minizip + SDL2 + epoxy + ffmpeg + imagemagick + libedit + libelf + libzip + minizip + qtbase + qtmultimedia + qttools ]; postInstall = '' @@ -38,21 +66,19 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; - longDescription = '' mGBA is a new Game Boy Advance emulator written in C. - The project started in April 2013 with the goal of being fast - enough to run on lower end hardware than other emulators - support, without sacrificing accuracy or portability. Even in - the initial version, games generally play without problems. It - is loosely based on the previous GBA.js emulator, although very - little of GBA.js can still be seen in mGBA. + The project started in April 2013 with the goal of being fast enough to + run on lower end hardware than other emulators support, without + sacrificing accuracy or portability. Even in the initial version, games + generally play without problems. It is loosely based on the previous + GBA.js emulator, although very little of GBA.js can still be seen in mGBA. - Other goals include accurate enough emulation to provide a - development environment for homebrew software, a good workflow - for tool-assist runners, and a modern feature set for emulators - that older emulators may not support. + Other goals include accurate enough emulation to provide a development + environment for homebrew software, a good workflow for tool-assist + runners, and a modern feature set for emulators that older emulators may + not support. ''; license = licenses.mpl20; @@ -60,3 +86,4 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO [ AndersonTorres ]: use desktopItem functions From 5495d6d2b2a4508bcaf65f7f3470d82d38bf8031 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 26 Apr 2021 21:14:04 -0300 Subject: [PATCH 421/476] ppsspp: ffmpeg_3 -> ffmpeg And refactor. --- pkgs/misc/emulators/ppsspp/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index a50bc3eb3ec..4f5b4f7d69b 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,11 +1,11 @@ -{ SDL2 -, cmake +{ mkDerivation , fetchFromGitHub -, ffmpeg_3 +, SDL2 +, cmake +, ffmpeg , glew , lib , libzip -, mkDerivation , pkg-config , python3 , qtbase @@ -23,7 +23,7 @@ mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx"; + sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; postPatch = '' @@ -35,7 +35,7 @@ mkDerivation rec { buildInputs = [ SDL2 - ffmpeg_3 + ffmpeg glew libzip qtbase @@ -45,23 +45,25 @@ mkDerivation rec { ]; cmakeFlags = [ + "-DHEADLESS=OFF" "-DOpenGL_GL_PREFERENCE=GLVND" "-DUSE_SYSTEM_FFMPEG=ON" "-DUSE_SYSTEM_LIBZIP=ON" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSING_QT_UI=ON" - "-DHEADLESS=OFF" ]; installPhase = '' + runHook preInstall mkdir -p $out/share/ppsspp install -Dm555 PPSSPPQt $out/bin/ppsspp mv assets $out/share/ppsspp + runHook postInstall ''; meta = with lib; { - description = "A HLE Playstation Portable emulator, written in C++"; homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; From 5eefe24c94d451b93b75a2ea89232737777e7d9e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:58:55 -0300 Subject: [PATCH 422/476] wxSVG: ffmpeg_3 -> ffmpeg And refactor. --- pkgs/development/libraries/wxSVG/default.nix | 45 ++++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 5e7f7b71fbe..f83f7e40897 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,34 +1,43 @@ -{ lib, stdenv, fetchurl -, pkg-config, wxGTK -, ffmpeg_3, libexif -, cairo, pango }: +{ lib +, stdenv +, fetchurl +, cairo +, ffmpeg +, libexif +, pango +, pkg-config +, wxGTK +}: stdenv.mkDerivation rec { - pname = "wxSVG"; - srcName = "wxsvg-${version}"; version = "1.5.22"; src = fetchurl { - url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0agmmwg0zlsw1idygvqjpj1nk41akzlbdha0hsdk1k8ckz6niq8d"; + url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2"; + hash = "sha256-DeFozZ8MzTCbhkDBtuifKpBpg7wS7+dbDFzTDx6v9Sk="; }; - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; - - buildInputs = [ cairo pango ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + cairo + ffmpeg + libexif + pango + wxGTK + ]; meta = with lib; { + homepage = "http://wxsvg.sourceforge.net/"; description = "A SVG manipulation library built with wxWidgets"; longDescription = '' - wxSVG is C++ library to create, manipulate and render - Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. + wxSVG is C++ library to create, manipulate and render Scalable Vector + Graphics (SVG) files with the wxWidgets toolkit. ''; - homepage = "http://wxsvg.sourceforge.net/"; - license = with licenses; gpl2; + license = with licenses; gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + platforms = wxGTK.meta.platforms; }; } From b13d36b973d52157555e7c0be17e023819ddd600 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 10:48:39 -0300 Subject: [PATCH 423/476] xineLib -> xine-lib Rename it to a more intuitive name, and create a corresponding alias. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eadd95870ca..85ce57e9b31 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -849,6 +849,7 @@ mapAliases ({ xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPackages; # added 2018-04-25 kodiPlugins = kodiPackages; # added 2021-03-09; + xineLib = xine-lib; # added 2021-04-27 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80373d50963..980cf6585d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18074,7 +18074,7 @@ in xed = callPackage ../development/libraries/xed { }; - xineLib = callPackage ../development/libraries/xine-lib { }; + xine-lib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; From 8518bfeae1c3e0d0b5512fd39c5f74c95ea9ee56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:05:43 -0300 Subject: [PATCH 424/476] xineUI -> xine-ui Rename it to a more intuitive name, and create a corresponding alias. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85ce57e9b31..ae9ead3eb66 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -850,6 +850,7 @@ mapAliases ({ xbmcPlugins = kodiPackages; # added 2018-04-25 kodiPlugins = kodiPackages; # added 2021-03-09; xineLib = xine-lib; # added 2021-04-27 + xineUI = xine-ui; # added 2021-04-27 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 980cf6585d3..d54ae4a179f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27138,7 +27138,7 @@ in xfractint = callPackage ../applications/graphics/xfractint {}; - xineUI = callPackage ../applications/video/xine-ui { }; + xine-ui = callPackage ../applications/video/xine-ui { }; xlsxgrep = callPackage ../applications/search/xlsxgrep { }; From f223a67c651a366d382b00a8392010ce92dbd5e8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 30 Apr 2021 17:50:49 -0300 Subject: [PATCH 425/476] xine-lib: ffmpeg_3 -> ffmpeg And refactor. --- .../libraries/xine-lib/default.nix | 79 +++++++++++++++---- 1 file changed, 65 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 97fb83e4e2a..d84023bf9e9 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,7 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, xorg, alsaLib, libGLU, libGL, aalib -, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 -, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager -, libmpcdec, ncurses +{ lib +, stdenv +, fetchurl +, fetchpatch +, aalib +, alsaLib +, ffmpeg +, flac +, libGL +, libGLU +, libcaca +, libcdio +, libmng +, libmpcdec +, libpulseaudio +, libtheora +, libv4l +, libvorbis +, perl +, pkg-config +, speex +, vcdimager +, xorg +, zlib }: stdenv.mkDerivation rec { @@ -10,27 +30,58 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz"; - sha256 = "01bhq27g5zbgy6y36hl7lajz1nngf68vs4fplxgh98fx20fv4lgg"; + sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU="; }; - nativeBuildInputs = [ pkg-config perl ]; - + nativeBuildInputs = [ + pkg-config + perl + ]; buildInputs = [ - xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac - libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ncurses + aalib + alsaLib + ffmpeg + flac + libGL + libGLU + libcaca + libcdio + libmng + libmpcdec + libpulseaudio + libtheora + libv4l + libvorbis + perl + speex + vcdimager + zlib + ] ++ (with xorg; [ + libX11 + libXext + libXinerama + libXv + libxcb + ]); + + patches = [ + # splitting path plugin + (fetchpatch { + name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch"; + url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/"; + sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls="; + }) ]; NIX_LDFLAGS = "-lxcb-shm"; - propagatedBuildInputs = [zlib]; - enableParallelBuilding = true; meta = with lib; { - homepage = "http://xine.sourceforge.net/home"; + homepage = "http://www.xinehq.de/"; description = "A high-performance, portable and reusable multimedia playback engine"; - platforms = platforms.linux; license = with licenses; [ gpl2Plus lgpl2Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } From bc5a164ccfe9e1353e8d93639b299e7c386cb82e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:23:49 -0300 Subject: [PATCH 426/476] xine-ui: xineLib -> xine-lib And refactor. --- pkgs/applications/video/xine-ui/default.nix | 61 +++++++++++++++------ 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 651597b3a48..0a206befaf1 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,34 +1,63 @@ -{lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl -, lirc, shared-mime-info, libjpeg }: +{ lib +, stdenv +, fetchurl +, curl +, libjpeg +, libpng +, lirc +, ncurses +, pkg-config +, readline +, shared-mime-info +, xine-lib +, xorg +}: stdenv.mkDerivation rec { - name = "xine-ui-0.99.12"; + pname = "xine-ui"; + version = "0.99.12"; src = fetchurl { - url = "mirror://sourceforge/xine/${name}.tar.xz"; + url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz"; sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; }; - nativeBuildInputs = [ pkg-config shared-mime-info ]; + nativeBuildInputs = [ + pkg-config + shared-mime-info + ]; + buildInputs = [ + curl + libjpeg + libpng + lirc + ncurses + readline + xine-lib + ] ++ (with xorg; [ + libXext + libXft + libXi + libXinerama + libXtst + libXv + libXxf86vm + xlibsWrapper + xorgproto + ]); - buildInputs = - [ xineLib libpng readline ncurses curl lirc libjpeg - xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto - xorg.libXinerama xorg.libXi xorg.libXft - ]; - - patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; + postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c"; configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; -#NIX_LDFLAGS = "-lXext -lgcc_s"; meta = with lib; { - homepage = "http://www.xine-project.org/"; - description = "Xlib-based interface to Xine, a video player"; + homepage = "http://xinehq.de/"; + description = "Xlib-based frontend for Xine video player"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; - license = licenses.gpl2; }; } From 06dadfa1a1f7fa08f50b2a9f4c67f8eb4cb7da84 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:25:03 -0300 Subject: [PATCH 427/476] xineliboutput: xineLib -> xine-lib --- pkgs/applications/video/vdr/xineliboutput/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix index 950cb253c12..7660b4eae3d 100644 --- a/pkgs/applications/video/vdr/xineliboutput/default.nix +++ b/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, vdr , libav, libcap, libvdpau -, xineLib, libjpeg, libextractor, libglvnd, libGLU +, xine-lib, libjpeg, libextractor, libglvnd, libGLU , libX11, libXext, libXrender, libXrandr , makeWrapper }: let @@ -34,7 +34,7 @@ postFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xineLib ]}" + --prefix XINE_PLUGIN_PATH ":" "${makeXinePluginPath [ "$out" xine-lib ]}" done ''; @@ -53,10 +53,10 @@ libXrender libX11 vdr - xineLib + xine-lib ]; - passthru.requiredXinePlugins = [ xineLib self ]; + passthru.requiredXinePlugins = [ xine-lib self ]; meta = with lib;{ homepage = "https://sourceforge.net/projects/xineliboutput/"; From e44606ff470b29af631f33bdd4a5b63abf34bd1c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:45:13 -0300 Subject: [PATCH 428/476] dvdstyler: xineUI -> xine-ui --- pkgs/applications/video/dvdstyler/default.nix | 135 ++++++++++-------- 1 file changed, 79 insertions(+), 56 deletions(-) diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 6366a222722..83c38b933dd 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -1,84 +1,107 @@ -{ lib, stdenv, fetchurl, pkg-config -, flex, bison, gettext -, xineUI, wxSVG +{ lib +, stdenv +, fetchurl +, bison +, cdrtools +, docbook5 +, dvdauthor +, dvdplusrwtools +, flex , fontconfig -, xmlto, docbook5, zip -, cdrtools, dvdauthor, dvdplusrwtools +, gettext +, makeWrapper +, pkg-config +, wxSVG +, xine-ui +, xmlto +, zip + , dvdisasterSupport ? true, dvdisaster ? null , thumbnailSupport ? true, libgnomeui ? null , udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null -, makeWrapper }: - -with lib; -stdenv.mkDerivation rec { +}: +let + inherit (lib) optionals makeBinPath; +in stdenv.mkDerivation rec { pname = "dvdstyler"; - srcName = "DVDStyler-${version}"; version = "3.1.2"; src = fetchurl { - url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; + url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4"; }; - nativeBuildInputs = - [ pkg-config ]; - - packagesToBinPath = - [ cdrtools dvdauthor dvdplusrwtools ]; - - buildInputs = - [ flex bison gettext xineUI - wxSVG fontconfig xmlto - docbook5 zip makeWrapper ] - ++ packagesToBinPath + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + bison + cdrtools + docbook5 + dvdauthor + dvdplusrwtools + flex + fontconfig + gettext + makeWrapper + wxSVG + xine-ui + xmlto + zip + ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] ++ optionals dbusSupport [ dbus ] ++ optionals thumbnailSupport [ libgnomeui ]; - binPath = makeBinPath packagesToBinPath; - postInstall = '' - wrapProgram $out/bin/dvdstyler \ - --prefix PATH ":" "${binPath}" - ''; + postInstall = let + binPath = makeBinPath [ + cdrtools + dvdauthor + dvdplusrwtools + ]; in + '' + wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" + ''; meta = with lib; { + homepage = "https://www.dvdstyler.org/"; description = "A DVD authoring software"; longDescription = '' - DVDStyler is a cross-platform free DVD authoring application for the - creation of professional-looking DVDs. It allows not only burning of video - files on DVD that can be played practically on any standalone DVD player, - but also creation of individually designed DVD menus. It is Open Source - Software and is completely free. + DVDStyler is a cross-platform free DVD authoring application for the + creation of professional-looking DVDs. It allows not only burning of video + files on DVD that can be played practically on any standalone DVD player, + but also creation of individually designed DVD menus. It is Open Source + Software and is completely free. - Some of its features include: - - create and burn DVD video with interactive menus - - design your own DVD menu or select one from the list of ready to use menu - templates - - create photo slideshow - - add multiple subtitle and audio tracks - - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats - - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and - video formats - - support of multi-core processor - - use MPEG and VOB files without reencoding - - put files with different audio/video format on one DVD (support of - titleset) - - user-friendly interface with support of drag & drop - - flexible menu creation on the basis of scalable vector graphic - - import of image file for background - - place buttons, text, images and other graphic objects anywhere on the menu - screen - - change the font/color and other parameters of buttons and graphic objects - - scale any button or graphic object - - copy any menu object or whole menu - - customize navigation using DVD scripting + Some of its features include: + + - create and burn DVD video with interactive menus + - design your own DVD menu or select one from the list of ready to use menu + templates + - create photo slideshow + - add multiple subtitle and audio tracks + - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats + - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and + video formats + - support of multi-core processor + - use MPEG and VOB files without reencoding + - put files with different audio/video format on one DVD (support of + titleset) + - user-friendly interface with support of drag & drop + - flexible menu creation on the basis of scalable vector graphic + - import of image file for background + - place buttons, text, images and other graphic objects anywhere on the menu + screen + - change the font/color and other parameters of buttons and graphic objects + - scale any button or graphic object + - copy any menu object or whole menu + - customize navigation using DVD scripting ''; - homepage = "http://www.dvdstyler.org/"; - license = with licenses; gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; }; From df26e9a55dc22931bbad3ff81df03597059a1e35 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:46:16 -0300 Subject: [PATCH 429/476] eaglemode: xineLib -> xine-lib --- pkgs/applications/misc/eaglemode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index d411ce7ae81..65a74c4aca4 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config, -librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: +librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xine-lib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { pname = "eaglemode"; @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff - librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ]; + librsvg glib gtk2 libXxf86vm libXext poppler xine-lib ghostscript makeWrapper ]; # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. - # I use 'yes y' to skip a build error linking with xineLib, + # I use 'yes y' to skip a build error linking with xine-lib, # because xine stopped exporting "_x_vo_new_port" # https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' From 72dacfd325b2e5bb7ec042403459e6458e8fa63b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Apr 2021 11:47:06 -0300 Subject: [PATCH 430/476] quodlibet: xineLib -> xine-lib --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 2110a0deb24..738bf161cd5 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, - xineBackend ? false, xineLib, + xineBackend ? false, xine-lib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, webkitgtk ? null, keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] - ++ (if xineBackend then [ xineLib ] else with gst_all_1; + ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] From 307c0e2a3be2df853ea1d6b413553d56b5bc35ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:00:12 +0000 Subject: [PATCH 431/476] maddy: 0.4.3 -> 0.4.4 --- pkgs/servers/maddy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index ac3c075717c..1a84cb98732 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "1mi607hl4c9y9xxv5lywh9fvpybprlrgqa7617km9rssbgk4x1v7"; + sha256 = "sha256-IhVEb6tjfbWqhQdw1UYxy4I8my2L+eSOCd/BEz0qis0="; }; - vendorSha256 = "16laf864789yiakvqs6dy3sgnnp2hcdbyzif492wcijqlir2swv7"; + vendorSha256 = "sha256-FrKWlZ3pQB+oo+rfHA8AgGRAr7YRUcb064bZGTDSKkk="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; From 640253ce2e7e9803908149a0ef2ffe574095930c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 30 Apr 2021 23:22:00 +0200 Subject: [PATCH 432/476] nix-output-monitor: 1.0.3.0 -> 1.0.3.1 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 46020233ff1..a9c83305df3 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.0"; + version = "1.0.3.1"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1gidg03cwz8ss370bgz4a2g9ldj1lap5ws7dmfg6vigpx8mxigpb"; + sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92"; rev = "v${version}"; }; isLibrary = true; From 490fa1e891fde1aa41474c4c6e29369d9da63097 Mon Sep 17 00:00:00 2001 From: V Date: Fri, 30 Apr 2021 20:05:26 +0200 Subject: [PATCH 433/476] steamPackages.steam-runtime: 0.20201203.1 -> 0.20210317.0 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 70c6abe8db4..b501df598ef 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20201203.1"; + version = "0.20210317.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-hOHfMi0x3K82XM3m/JmGYbVk5RvuHG+m275eAC0MoQc="; + sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw"; name = "scout-runtime-${version}.tar.gz"; }; From eae41465ad65893723249e72b1af854c599bac45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:43:19 +0000 Subject: [PATCH 434/476] lldpd: 1.0.8 -> 1.0.10 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index f34b43f3c32..f2641235a19 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.8"; + version = "1.0.10"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-mNIA524w9iYsSkSTFIwYQIJ4mDKRRqV6NPjw+SjKPe8="; + sha256 = "sha256-RFstdgN+8+vQPUDh/B8p7wgQL6o6Cf6Ea5Unl8i8dyI="; }; configureFlags = [ From 7cc0cf9077122f47fb6d90fd6a412b714618193b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 May 2021 00:19:30 +0200 Subject: [PATCH 435/476] logcheck: update license to gpl2Plus --- pkgs/tools/system/logcheck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 4c36e529ae9..0f17b07d848 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = "https://salsa.debian.org/debian/logcheck"; - license = licenses.gpl2; + license = licenses.gpl2plus; maintainers = [ maintainers.bluescreen303 ]; }; } From cd5f229e4f1da480b876946938147a025de104a2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 May 2021 09:06:50 +1000 Subject: [PATCH 436/476] logcheck: fix license --- pkgs/tools/system/logcheck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 0f17b07d848..dea241e11ac 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = "https://salsa.debian.org/debian/logcheck"; - license = licenses.gpl2plus; + license = licenses.gpl2Plus; maintainers = [ maintainers.bluescreen303 ]; }; } From bd722f1105462dab55246d179711e917b72477d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 30 Apr 2021 20:58:58 -0300 Subject: [PATCH 437/476] haunt: enable tests and verify that the binary works --- pkgs/applications/misc/haunt/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/applications/misc/haunt/default.nix index 124e441a5af..59940392525 100644 --- a/pkgs/applications/misc/haunt/default.nix +++ b/pkgs/applications/misc/haunt/default.nix @@ -27,12 +27,21 @@ stdenv.mkDerivation rec { guile-reader ]; + doCheck = true; + postInstall = '' wrapProgram $out/bin/haunt \ --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \ --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/haunt --version + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://dthompson.us/projects/haunt.html"; description = "Guile-based static site generator"; @@ -53,7 +62,7 @@ stdenv.mkDerivation rec { to do things that aren't provided out-of-the-box. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres AluisioASG ]; platforms = guile.meta.platforms; }; } From 855b2b96bbcc004ca9a016ccb7e89a5ba87af510 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 1 May 2021 08:45:54 +0900 Subject: [PATCH 438/476] broot: 1.3.0 -> 1.3.1 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index b89dbb2b907..a5b62e32521 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.3.0"; + version = "1.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2FF/oB341PPGfSlXpLEs4mswjVk+3ty/jNsVJKu+fhs="; + sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk="; }; - cargoHash = "sha256-+UT9cz8OPA1jpFv7HafabxJ3NmLl57K1ODydfcV1FUM"; + cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE="; nativeBuildInputs = [ makeWrapper From bd64a6221f18a24c79b879c0441f4420f0f2d47e Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 1 May 2021 09:18:44 +0900 Subject: [PATCH 439/476] broot: remove unused argument --- pkgs/tools/misc/broot/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index a5b62e32521..0fa7841074a 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -4,7 +4,6 @@ , fetchCrate , installShellFiles , makeWrapper -, coreutils , libiconv , zlib , Security From 2e0ddf4c669fd40d0002c8ade5f70e5a07bc89a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 01:40:41 +0000 Subject: [PATCH 440/476] buildkit: 0.8.2 -> 0.8.3 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 806eb7c5b0e..f6eb7aef1ed 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.8.2"; + version = "0.8.3"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-aPVroqpR4ynfHhjJ6jJX6y5cdgmoUny3A8GBhnooOeo="; + sha256 = "sha256-dHtGxugTtxHcfZHMIHinlcH05ss7zT/+Ll1WboAhw9o="; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; From a5c7cd5779954d345035ef152e99a82bd7691d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Fri, 30 Apr 2021 21:09:05 -0300 Subject: [PATCH 441/476] haunt: fix Guile load paths Guile's version is part of the path and the installed files won't be found if we don't include it. Also, we can rely on the paths of build inputs being added to $GUILE_LOAD_PATH and $GUILE_LOAD_COMPILED_PATH by Guile's setup hook. --- pkgs/applications/misc/haunt/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/applications/misc/haunt/default.nix index 59940392525..87656d730b2 100644 --- a/pkgs/applications/misc/haunt/default.nix +++ b/pkgs/applications/misc/haunt/default.nix @@ -29,11 +29,15 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - wrapProgram $out/bin/haunt \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" - ''; + postInstall = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + wrapProgram $out/bin/haunt \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" + ''; doInstallCheck = true; installCheckPhase = '' From 36a44c4e8d07bee733ea1e9fe336854164ba13f4 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 30 Dec 2020 00:12:25 -0500 Subject: [PATCH 442/476] credhub-cli: fix build under go1.15 I've sent this upstream at https://github.com/cloudfoundry-incubator/credhub-cli/pull/107 But this should fix the build so it doesn't require go1.14 --- pkgs/tools/admin/credhub-cli/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 55af1679d7a..0c71850f849 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "credhub-cli"; @@ -11,6 +11,14 @@ buildGoModule rec { sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2"; }; + patches = [ + # Fix test with Go 1.15 + (fetchpatch { + url = "https://github.com/cloudfoundry-incubator/credhub-cli/commit/4bd1accd513dc5e163e155c4b428878ca0bcedbc.patch"; + sha256 = "180n3q3d19aw02q7xsn7dxck18jgndz5garj2mb056cwa7mmhw0j"; + }) + ]; + # these tests require network access that we're not going to give them postPatch = '' rm commands/api_test.go diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd038c72939..5169f977a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2196,9 +2196,7 @@ in cppclean = callPackage ../development/tools/cppclean {}; - credhub-cli = callPackage ../tools/admin/credhub-cli { - buildGoModule = buildGo114Module; - }; + credhub-cli = callPackage ../tools/admin/credhub-cli {}; crex = callPackage ../tools/misc/crex { }; From bef4bda8dd1655ec76849059c5dbd7c5de6eaebe Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 1 Jul 2020 12:01:48 -0400 Subject: [PATCH 443/476] sd-image: Add option to control sd image expansion on boot. This is supeer useful to allow the normal sd-image code to be used by someone who wants to setup multiple partitions with a sd-image. Currently I'm manually copying the sd-image file and modifying it instead. --- nixos/modules/installer/sd-card/sd-image.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index b811ae07eb0..45c8c67169b 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -126,6 +126,13 @@ in ''; }; + expandOnBoot = mkOption { + type = types.bool; + default = true; + description = '' + Whether to configure the sd image to expand it's partition on boot. + ''; + }; }; config = { @@ -215,7 +222,7 @@ in ''; }) {}; - boot.postBootCommands = '' + boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot '' # On the first boot do some maintenance tasks if [ -f /nix-path-registration ]; then set -euo pipefail From 87c3b7e767b18492fa8b3641b9c5d14dd2f38a8c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 02:19:42 +0000 Subject: [PATCH 444/476] amazonImage: make statically sized again For reasons we haven't been able to work out, the aarch64 EC2 image now regularly exceeds the output image size on hydra.nixos.org. As a workaround, set this back to being statically sized again. The other images do seem to build - it's just a case of the EC2 image now being too large (occasionally non-determinstically). --- nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 653744986d1..677aff4421e 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -41,7 +41,7 @@ in { sizeMB = mkOption { type = with types; either (enum [ "auto" ]) int; - default = "auto"; + default = if config.ec2.hvm then 2048 else 8192; example = 8192; description = "The size in MB of the image"; }; From 733d682cc3ed32c4b6325b8acffefa32a58ddb70 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 02:28:31 +0000 Subject: [PATCH 445/476] nixos/release: add amazonImageAutomaticSize This allows us to continue to have the automatically sized image attempt to build on Hydra, which should give us a good indication of when we've got this fixed. --- nixos/release.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index 87382f42f50..746e4c9dc69 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -224,6 +224,25 @@ in rec { ); + # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test + # automatic sizing without blocking the channel. + amazonImageAutomaticSize = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/ec2/amazon-image.nix + ({ ... }: { amazonImage.sizeMB = "auto"; }) + ]; + }).config.system.build.amazonImage) + + ); + + # Ensure that all packages used by the minimal NixOS config end up in the channel. dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { From 168f7a1dcf06b9d5c2fd6aa79359a97f84996f8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 18:35:21 +0000 Subject: [PATCH 446/476] malcontent: 0.10.0 -> 0.10.1 --- pkgs/development/libraries/malcontent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 641f3b87c3f..82635ae66d6 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.0"; + version = "0.10.1"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "1b6rgf7h9gj2kw1b7ba0mvhsb89riwf9p4pviqjfzd1i5nmbmnyx"; + sha256 = "sha256-GgY+E+1gzmiAAALzdKu1CjN3xPeVMhbmNLqJNB1zHaU="; }; patches = [ From e1a8c80e92b2424b9aed0f423ffd8741673a9bc7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 1 May 2021 00:45:20 -0300 Subject: [PATCH 447/476] river: refactor --- .../window-managers/river/default.nix | 73 +++++++++++++++---- 1 file changed, 57 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 9b40d34b6f2..d6869b4786f 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv ,fetchFromGitHub -, zig, wayland, pkg-config, scdoc -, xwayland, wayland-protocols, wlroots -, libxkbcommon, pixman, udev, libevdev, libX11, libGL +{ lib +, stdenv +, fetchFromGitHub +, libGL +, libX11 +, libevdev +, libxkbcommon +, pixman +, pkg-config +, scdoc +, udev +, wayland +, wayland-protocols +, wlroots +, xwayland +, zig }: stdenv.mkDerivation rec { @@ -12,33 +24,62 @@ stdenv.mkDerivation rec { owner = "ifreund"; repo = pname; rev = "0c8e718d95a6a621b9cba0caa9158915e567b076"; - sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk"; + sha256 = "sha256-c3lzsA2oml7DlfYA5mipHafF3Y3mqY1eJR6e2H8DUMo="; fetchSubmodules = true; }; - buildInputs = [ xwayland wayland-protocols wlroots pixman - libxkbcommon pixman udev libevdev libX11 libGL + nativeBuildInputs = [ + pkg-config + scdoc + wayland-protocols + zig + ]; + buildInputs = [ + libGL + libX11 + libevdev + libxkbcommon + pixman + pixman + udev + wayland + wlroots + xwayland ]; - preBuild = '' + dontConfigure = true; + + buildPhase = '' + runHook preBuild export HOME=$TMPDIR + zig build -Dman-pages -Drelease-safe -Dxwayland --prefix $out + runHook postBuild ''; + installPhase = '' - zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install + runHook preInstall + zig build -Dman-pages -Drelease-safe -Dxwayland --prefix $out install + runHook postInstall ''; - nativeBuildInputs = [ zig wayland scdoc pkg-config ]; - - installFlags = [ "DESTDIR=$(out)" ]; - meta = with lib; { + homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; longDescription = '' - river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm. + river is a dynamic tiling wayland compositor that takes inspiration from + dwm and bspwm. + + Its design goals are: + - Simplicity and minimalism, river should not overstep the bounds of a + window manager. + - Window management based on a stack of views and tags. + - Dynamic layouts generated by external, user-written executables. + (A default rivertile layout generator is provided.) + - Scriptable configuration and control through a custom wayland protocol + and separate riverctl binary implementing it. ''; - homepage = "https://github.com/ifreund/river"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ branwright1 AndersonTorres ]; platforms = platforms.linux; - maintainers = with maintainers; [ branwright1 ]; }; } From fcc8230147ae36f183b27e32230e61ac532cc030 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 30 Apr 2021 17:30:27 +0200 Subject: [PATCH 448/476] bombono: update ffmpeg, fix iso generation --- pkgs/applications/video/bombono/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 8d6df2c4904..a6633904c20 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -7,7 +7,8 @@ , dvdauthor , dvdplusrwtools , enca -, ffmpeg_3 +, cdrkit +, ffmpeg , gettext , gtk2 , gtkmm2 @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { dvdauthor dvdplusrwtools enca - ffmpeg_3 + ffmpeg gtk2 gtkmm2 libdvdread @@ -71,6 +72,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + # fix iso authoring + install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py + + wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg dvdauthor cdrkit ]} + ''; + meta = with lib; { description = "a DVD authoring program for personal computers"; homepage = "https://www.bombono.org/"; From 388659919a6f64e5dfb8d95701ff802b77f4156c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 27 Apr 2021 19:44:38 -0300 Subject: [PATCH 449/476] cargo-limit: 0.0.7 -> 0.0.8 Signed-off-by: Otavio Salvador --- pkgs/development/tools/rust/cargo-limit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 3ebe5ef1304..7d63b7adcea 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-8HsYhWYeRhCPTxVnU8hOJKLXvza8i9KvKTLL6yLo0+c="; + sha256 = "sha256-OHBxQcXhZkJ1F6xLc7/sPpJhJzuJXb91IUjAtyC3XP8="; }; - cargoSha256 = "sha256-8uA4oFExrzDMeMV5MacbtE0Awdfx+jUUkrKd7ushOHo="; + cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; passthru = { updateScript = nix-update-script { From 3b07746b0a362092f90248948270ddbae7a2fb2d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 27 Apr 2021 20:07:51 -0300 Subject: [PATCH 450/476] shellhub-agent: 0.6.0 -> 0.6.4 Signed-off-by: Otavio Salvador --- .../networking/shellhub-agent/default.nix | 11 +- .../shellhub-agent/fix-go-mod-deps.patch | 128 ++++++++++++++++++ 2 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index fa129baabc1..54eb1216b09 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,23 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.6.0"; + version = "0.6.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "0vdasz3qph73xb9y831bnr1hpcw0669n9zckqn95v1bsjc936313"; + sha256 = "12g9067knppkci2acc4w9xcismgw2w1zd0f1swbzdnx8bxl3vg9i"; }; + patches = [ + # Fix missing multierr package on go.mod + ./fix-go-mod-deps.patch + ]; + modRoot = "./agent"; - vendorSha256 = "059772rd1l7zyf2vlqjm35hg8ibmjc1p6cfazqd47n8mqqlqkilw"; + vendorSha256 = "0z5qvgmmrwwvhpmhjxdvgdfsd60a24q9ld68ggnkv36qln0gw7p4"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch b/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch new file mode 100644 index 00000000000..7e99eccb04d --- /dev/null +++ b/pkgs/applications/networking/shellhub-agent/fix-go-mod-deps.patch @@ -0,0 +1,128 @@ +diff --git a/agent/go.mod b/agent/go.mod +index c075083..b79726e 100644 +--- a/agent/go.mod ++++ b/agent/go.mod +@@ -28,6 +28,7 @@ require ( + github.com/pkg/errors v0.9.1 + github.com/shellhub-io/shellhub v0.5.2 + github.com/sirupsen/logrus v1.8.1 ++ go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect + golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 +diff --git a/agent/go.sum b/agent/go.sum +index e65c9ad..0f9afcd 100644 +--- a/agent/go.sum ++++ b/agent/go.sum +@@ -62,7 +62,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw + github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= + github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= + github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= + github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= + github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +@@ -73,7 +72,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= + github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= + github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= + github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +-github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= + github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= + github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= + github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +@@ -87,9 +85,7 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv + github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= + github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= + github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= + github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= + github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +@@ -113,7 +109,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= + github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= + github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= + github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= + github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= + github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +@@ -124,15 +119,18 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 + github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= ++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= + github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= + github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= + github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= + github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= + github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= ++go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= ++go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= ++go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= ++go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= + golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +@@ -148,7 +146,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +@@ -169,17 +166,13 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= + golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= + golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +@@ -197,14 +190,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY + golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= + google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= + google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= + google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= + google.golang.org/genproto v0.0.0-20210224155714-063164c882e6 h1:bXUwz2WkXXrXgiLxww3vWmoSHLOGv4ipdPdTvKymcKw= +@@ -223,7 +214,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi + google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= + google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= + google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +-google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= + google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= + google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= + google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +@@ -233,7 +223,6 @@ gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXa + gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= + gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M= + gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= +-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= + gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From f3e288316790c92df0eb43510fe8420bd3900836 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 1 May 2021 06:03:42 +0000 Subject: [PATCH 451/476] feedbackd: Add udev rules to output --- pkgs/applications/misc/feedbackd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 34119c2006d..1cf2fee3710 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { json-glib ]; + postInstall = '' + mkdir -p $out/lib/udev/rules.d + sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules + ''; + meta = with lib; { description = "A daemon to provide haptic (and later more) feedback on events"; homepage = "https://source.puri.sm/Librem5/feedbackd"; From 3086335f04b5bf7875508f84af6080b51c413065 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 1 May 2021 06:04:49 +0000 Subject: [PATCH 452/476] nixos/feedbackd: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/feedbackd.nix | 32 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 nixos/modules/programs/feedbackd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index daa96e64f59..dc56301c197 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -130,6 +130,7 @@ ./programs/droidcam.nix ./programs/environment.nix ./programs/evince.nix + ./programs/feedbackd.nix ./programs/file-roller.nix ./programs/firejail.nix ./programs/fish.nix diff --git a/nixos/modules/programs/feedbackd.nix b/nixos/modules/programs/feedbackd.nix new file mode 100644 index 00000000000..bb14489a6f4 --- /dev/null +++ b/nixos/modules/programs/feedbackd.nix @@ -0,0 +1,32 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.programs.feedbackd; +in { + options = { + programs.feedbackd = { + enable = mkEnableOption '' + Whether to enable the feedbackd D-BUS service and udev rules. + + Your user needs to be in the `feedbackd` group to trigger effects. + ''; + package = mkOption { + description = '' + Which feedbackd package to use. + ''; + type = types.package; + default = pkgs.feedbackd; + }; + }; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + services.dbus.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + + users.groups.feedbackd = {}; + }; +} From 31a32eeed3f11fca7475cd5f9746081033856132 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 30 Apr 2021 01:02:31 +0000 Subject: [PATCH 453/476] nixos/phosh: init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Blaž Hrastnik Co-authored-by: Jan Tojnar Co-authored-by: Jordi Masip --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/phosh.nix | 167 +++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 nixos/modules/programs/phosh.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dc56301c197..b9f4df20a81 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -164,6 +164,7 @@ ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix + ./programs/phosh.nix ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix new file mode 100644 index 00000000000..f6faf7990dd --- /dev/null +++ b/nixos/modules/programs/phosh.nix @@ -0,0 +1,167 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.phosh; + + # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop + oskItem = pkgs.makeDesktopItem { + name = "sm.puri.OSK0"; + type = "Application"; + desktopName = "On-screen keyboard"; + exec = "${pkgs.squeekboard}/bin/squeekboard"; + categories = "GNOME;Core;"; + extraEntries = '' + OnlyShowIn=GNOME; + NoDisplay=true + X-GNOME-Autostart-Phase=Panel + X-GNOME-Provides=inputmethod + X-GNOME-Autostart-Notify=true + X-GNOME-AutoRestart=true + ''; + }; + + phocConfigType = types.submodule { + options = { + xwayland = mkOption { + description = '' + Whether to enable XWayland support. + + To start XWayland immediately, use `immediate`. + ''; + type = types.enum [ "true" "false" "immediate" ]; + default = "false"; + }; + cursorTheme = mkOption { + description = '' + Cursor theme to use in Phosh. + ''; + type = types.str; + default = "default"; + }; + outputs = mkOption { + description = '' + Output configurations. + ''; + type = types.attrsOf phocOutputType; + default = { + DSI-1 = { + scale = 2; + }; + }; + }; + }; + }; + + phocOutputType = types.submodule { + options = { + modeline = mkOption { + description = '' + One or more modelines. + ''; + type = types.either types.str (types.listOf types.str); + default = []; + example = [ + "87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync" + "65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync" + ]; + }; + mode = mkOption { + description = '' + Default video mode. + ''; + type = types.nullOr types.str; + default = null; + example = "768x1024"; + }; + scale = mkOption { + description = '' + Display scaling factor. + ''; + type = types.nullOr types.ints.unsigned; + default = null; + example = 2; + }; + rotate = mkOption { + description = '' + Screen transformation. + ''; + type = types.enum [ + "90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null + ]; + default = null; + }; + }; + }; + + optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}"; + + renderPhocOutput = name: output: let + modelines = if builtins.isList output.modeline + then output.modeline + else [ output.modeline ]; + renderModeline = l: "modeline = ${l}"; + in '' + [output:${name}] + ${concatStringsSep "\n" (map renderModeline modelines)} + ${optionalKV "mode" output.mode} + ${optionalKV "scale" output.scale} + ${optionalKV "rotate" output.rotate} + ''; + + renderPhocConfig = phoc: let + outputs = mapAttrsToList renderPhocOutput phoc.outputs; + in '' + [core] + xwayland = ${phoc.xwayland} + ${concatStringsSep "\n" outputs} + [cursor] + theme = ${phoc.cursorTheme} + ''; +in { + options = { + programs.phosh = { + enable = mkEnableOption '' + Whether to enable, Phosh, related packages and default configurations. + ''; + phocConfig = mkOption { + description = '' + Configurations for the Phoc compositor. + ''; + type = types.oneOf [ types.lines types.path phocConfigType ]; + default = {}; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.phoc + pkgs.phosh + pkgs.squeekboard + oskItem + ]; + + programs.feedbackd.enable = true; + + # https://source.puri.sm/Librem5/phosh/-/issues/303 + security.pam.services.phosh = { + text = '' + auth requisite pam_nologin.so + auth required pam_succeed_if.so user != root quiet_success + auth required pam_securetty.so + auth requisite pam_nologin.so + ''; + }; + + services.gnome3.core-shell.enable = true; + services.gnome3.core-os-services.enable = true; + services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; + + environment.etc."phosh/phoc.ini".source = + if builtins.isPath cfg.phocConfig then cfg.phocConfig + else if builtins.isString cfg.phocConfig then pkgs.writeText "phoc.ini" cfg.phocConfig + else pkgs.writeText "phoc.ini" (renderPhocConfig cfg.phocConfig); + }; +} From f722f8d518a6b5048219eacbd2e4bf26bb48c300 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 1 May 2021 09:46:26 +0200 Subject: [PATCH 454/476] postgresql_jdbc: 42.2.5 -> 42.2.20 Fixes CVE-2020-13692. --- pkgs/development/java-modules/postgresql_jdbc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index e7968cf80c0..524273e080f 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "postgresql-jdbc"; - version = "42.2.5"; + version = "42.2.20"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; + sha256 = "0kjilsrz9shymfki48kg1q84la1870ixlh2lnfw347x8mqw2k2vh"; inherit version; }; phases = [ "installPhase" ]; installPhase = '' + runHook preInstall install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + runHook postInstall ''; meta = with lib; { From 2ec00820e6ae1079f4facc362a03a3a2a16c2712 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 08:30:14 +0000 Subject: [PATCH 455/476] cgal_5: 5.2 -> 5.2.1 --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 7ff9ac43343..bd8edc14a8b 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1+ov1fu79MXoW0D8odInMZPFMYg69st//PoMW42oXpA="; + sha256 = "sha256-sJyeehgt84rLX8ZBYIbFgHLG2aJDDHEj5GeVnQhjiOQ="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From ada3e19b7a20424381a75e109ced34e59054e1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 May 2021 11:01:38 +0200 Subject: [PATCH 456/476] prs: 0.2.10 -> 0.2.11 (#121314) https://gitlab.com/timvisee/prs/-/blob/v0.2.11/CHANGELOG.md#0211-2021-04-30 --- pkgs/tools/security/prs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 42332e40cc3..6d97958ec78 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-czGyBdy4emw7bUV6Nn+k+fJm+JqR6o0TEEUuIbEsml4="; + sha256 = "sha256-jBHe3ZeB+GS+Ds8c6ySwoyyJfqoCWKSgIObg+z1TNmU="; }; - cargoSha256 = "sha256-jnBYuk7uvnbvT2OQ35DJk6WIUSqJiZCvsmpSIxw9X1U="; + cargoSha256 = "sha256-dhQuzzML817cDIsYuZElHZfq55AdZ20xeXTNm1nJPqk="; postPatch = '' # The GPGME backend is recommended From c49a518f9f9b175a8689f48e253fa4bc0c1fb401 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 1 May 2021 00:22:19 +0000 Subject: [PATCH 457/476] qemu: 5.2.0 -> 6.0.0; adopt; broaden platforms Tested building qemu_kvm, qemu_full, and qemu_test on x86_64-linux. Also tested booting a VM generated with nixos-rebuild build-vm. I wasn't able to test building pkgsMusl.qemu_kvm, because of many build failures in dependencies. --- .../virtualization/qemu/default.nix | 130 +----------------- 1 file changed, 6 insertions(+), 124 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c3484a3312c..0c7cbd853a2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation rec { - version = "5.2.0"; + version = "6.0.0"; pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b"; + sha256 = "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ] @@ -84,126 +84,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch ./9p-ignore-noatime.patch - (fetchpatch { - name = "CVE-2020-27821.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/memory-clamp-cached-translation-if-points-to-MMIO-region-CVE-2020-27821.patch"; - sha256 = "0sj0kr0g6jalygr5mb9i17fgr491jzaxvk3dvala0268940s01x9"; - }) - (fetchpatch { - name = "CVE-2021-20221.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/arm_gic-fix-interrupt-ID-in-GICD_SGIR-CVE-2021-20221.patch"; - sha256 = "1iyvcw87hzlc57fg5l87vddqmch8iw2yghk0s125hk5shn1bygjq"; - }) - (fetchpatch { - name = "CVE-2021-20181.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/9pfs-Fully-restart-unreclaim-loop-CVE-2021-20181.patch"; - sha256 = "149ifiazj6rn4d4mv2c7lcayq744fijsv5abxlb8bhbkj99wd64f"; - }) - (fetchpatch { - name = "CVE-2020-35517.part-1.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-extract-lo_do_open-from-lo_open.patch"; - sha256 = "0j4waaz6q54by4a7vd5m8s2n8y0an9hqf0ndycxsy03g4ksm669d"; - }) - (fetchpatch { - name = "CVE-2020-35517.part-2.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-optionally-return-inode-pointer-from-lo_do_lookup.patch"; - sha256 = "08bag890r6dx2rhnq58gyvsxvzwqgvn83pjlg95b5ic0z6gyjnsg"; - }) - (fetchpatch { - name = "CVE-2020-35517.part-3.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-prevent-opening-of-special-files-CVE-2020-35517.patch"; - sha256 = "0ziy6638zbkn037l29ywirvgymbqq66l5rngg8iwyky67acilv94"; - }) - (fetchpatch { - name = "CVE-2021-20263.part-1.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-save-error-code-early-at-the-failure-callsite.patch"; - sha256 = "15rwb15yjpclrqaxkhx76npr8zlfm9mj4jb19czg093is2cn4rys"; - }) - (fetchpatch { - name = "CVE-2021-20263.part-2.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-drop-remapped-security.capability-xattr-as-needed-CVE-2021-20263.patch"; - sha256 = "06ylz80ilg30wlskd4dsjx677fp5qr8cranwlakvjhr88b630xw0"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-1.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-introduce.patch"; - sha256 = "0hcpf00vqpg9rc0wl8cry905w04614843aqifybyv15wbv190gpz"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-2.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-cadence_gem.patch"; - sha256 = "12mjnrvs6p4g5frzqb08k4h86hphdqlka91fcma2a3m4ap98nrxy"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-3.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-dp8393x.patch"; - sha256 = "02z6q0578fj55phjlg2larrsx3psch2ixzy470yf57jl3jq1dy6k"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-4.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-e1000.patch"; - sha256 = "0zzbiz8i9js524mcdi739c7hrsmn82gnafrygi0xrd5sqf1hp08z"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-5.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-lan9118.patch"; - sha256 = "1f44v5znd9s7l7wgc71nbg8jw1bjqiga4wkz7d7cpnkv3l7b9kjj"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-6.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-msf2.patch"; - sha256 = "04n1rzn6gfxdalp34903ysdhlvxqkfndnqayjj3iv1k27i5pcidn"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-7.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-pcnet.patch"; - sha256 = "1p9ls6f8r6hxprj8ha6278fydcxj3av29p1hvszxmabazml2g7l2"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-8.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-rtl8139.patch"; - sha256 = "0lms1zn49kpwblkp54widjjy7fwyhdh1x832l1jvds79l2nm6i04"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-9.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-sungem.patch"; - sha256 = "1mkzyrgsp9ml9yqzjxdfqnwjr7n0fd8vxby4yp4ksrskyni8y0p4"; - }) - (fetchpatch { - name = "CVE-2021-3416.part-10.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-tx_pkt-iov.patch"; - sha256 = "1pwqq8yw06y3p6hah3dgjhsqzk802wbn7zyajla1zwdfpic63jss"; - }) - (fetchpatch { - name = "CVE-2021-3409.part-1.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/dont-transfer-any-data-when-command-time-out.patch"; - sha256 = "0wf1yhb9mqpfgh9rv0hff0v1sw3zl2vsfgjrby4r8jvxdfjrxj8s"; - }) - (fetchpatch { - name = "CVE-2021-3409.part-2.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/dont-write-to-SDHC_SYSAD-register-when-transfer-is-in-progress.patch"; - sha256 = "1dd405dsdc7fbp68yf6f32js1azsv3n595c6nbxh28kfh9lspx4v"; - }) - (fetchpatch { - name = "CVE-2021-3409.part-3.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/correctly-set-the-controller-status-for-ADMA.patch"; - sha256 = "08jk51pfrbn1zfymahgllrzivajh2v2qx0868rv9zmgi0jldbky6"; - }) - (fetchpatch { - name = "CVE-2021-3409.part-4.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/limit-block-size-only-when-SDHC_BLKSIZE-register-is-writable.patch"; - sha256 = "1valfhw3l83br1cny6n4kmrv0f416hl625mggayqfz4prsknyhh7"; - }) - (fetchpatch { - name = "CVE-2021-3409.part-5.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/reset-the-data-pointer-of-s-fifo_buffer-when-a-different-block-size-is-programmed.patch"; - sha256 = "01p5qrr00rh3mlwrp3qq56h7yhqv0w7pw2cw035nxw3mnap03v31"; - }) - (fetchpatch { - name = "CVE-2021-3392.patch"; - url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/mptsas-remove-unused-MPTSASState.pending-CVE-2021-3392.patch"; - sha256 = "0n7dn2p102c21mf3ncqrnks0wl5kas6yspafbn8jd03ignjgc4hd"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { @@ -234,6 +114,8 @@ stdenv.mkDerivation rec { patchShebangs . # avoid conflicts with libc++ include for mv VERSION QEMU_VERSION + substituteInPlace configure \ + --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ --replace "'VERSION'" "'QEMU_VERSION'" '' + optionalString stdenv.hostPlatform.isMusl '' @@ -304,7 +186,7 @@ stdenv.mkDerivation rec { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ eelco qyliss ]; + platforms = platforms.unix; }; } From 2bf2252d6a61f55a1ba5375968b8b3788ede0c93 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 12:51:46 +0000 Subject: [PATCH 458/476] libsForQt5.libopenshot: tidy up nixpkgs-hammering comments * Remove now-unused dependency from arguments * Move swig to nativeBuildInputs * Add comment to fetchpatch --- pkgs/applications/video/openshot-qt/libopenshot.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index d635d6052cf..246c3d5cab8 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -2,7 +2,7 @@ , pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3, jsoncpp -, unittest-cpp, cppzmq, zeromq +, cppzmq, zeromq , qtbase, qtmultimedia , llvmPackages }: @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build with GCC 10. (fetchpatch { name = "fix-build-with-gcc-10.patch"; url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; @@ -33,10 +34,10 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkg-config cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen swig ]; buildInputs = - [ imagemagick ffmpeg swig python3 jsoncpp + [ imagemagick ffmpeg python3 jsoncpp cppzmq zeromq qtbase qtmultimedia ] ++ optional stdenv.isDarwin llvmPackages.openmp ; From 3b18aacd1f8b434294bcd74581615f91db0b6ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 14:03:04 +0000 Subject: [PATCH 459/476] facter: 3.14.16 -> 3.14.17 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 906ca618e46..d1d18809a5b 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.16"; + version = "3.14.17"; src = fetchFromGitHub { - sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE="; + sha256 = "sha256-RvsUt1DyN8Xr+Xtz84mbKlDwxLewgK6qklYVdQHu6q0="; rev = version; repo = pname; owner = "puppetlabs"; From d77daaf10b6a5cd8b756646974ba3da93fc3ce5f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <56614642+Kranzes@users.noreply.github.com> Date: Sat, 1 May 2021 18:22:14 +0300 Subject: [PATCH 460/476] virt-manager: 3.1.0 -> 3.2.0 (#120279) Co-authored-by: Sandro --- pkgs/applications/virtualization/virt-manager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 11ddaff8d3b..922d6fa9ff1 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, glib, libosinfo, gnome3 +, gsettings-desktop-schemas, libosinfo, gnome3 , gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip @@ -11,11 +11,11 @@ with lib; python3Packages.buildPythonApplication rec { pname = "virt-manager"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "0al34lxlywqnj98hdm72a38zk8ns91wkqgrc3h1mhv1kikd8pjfc"; + url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz"; + sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"; }; nativeBuildInputs = [ From 8c70a1a989bb9f4bdce93cd6ab632d00fa6c15a1 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Sat, 1 May 2021 17:29:00 +0200 Subject: [PATCH 461/476] lib: fix documented type of fixedWidthString (#121396) --- lib/strings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/strings.nix b/lib/strings.nix index 0f23b6b9d41..2e502588bf8 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -606,7 +606,7 @@ rec { This function will fail if the input string is longer than the requested length. - Type: fixedWidthString :: int -> string -> string + Type: fixedWidthString :: int -> string -> string -> string Example: fixedWidthString 5 "0" (toString 15) From ddf04685068c605ecaf4d080957932aa09db21cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 May 2021 16:11:05 +0200 Subject: [PATCH 462/476] google-drive-ocamlfuse: 0.7.22 -> 0.7.26 --- .../networking/google-drive-ocamlfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 72ff8bd8b4b..29ae860cdad 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.22"; + version = "0.7.26"; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "027j1r2iy8vnbqs8bv893f0909yk5312ki5p3zh2pdz6s865h750"; + sha256 = "sha256-8s3DnpdYIVyJj5rtsof3WpLvX9wCrWU47dp4D6c986s="; }; buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 ]; From d05202ea7c026640c18c9d058aa24a0469e7930d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 1 May 2021 18:47:29 +0200 Subject: [PATCH 463/476] Revert "firefox-esr: use latest Rust" This reverts commit 903e23ad362ed19e95eaf7765af719db551dfbbe. It caused segfaults when playing media: https://github.com/NixOS/nixpkgs/issues/121408 --- .../networking/browsers/firefox/common.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0b79da754f8..24195e578bd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , hunspell, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib, pciutils -, autoconf213, which, gnused, rustPackages +, autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , debugBuild ? false @@ -90,13 +90,19 @@ let then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" else "/bin"; - inherit (rustPackages) rustc cargo; + # 78 ESR won't build with rustc 1.47 + inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + rustc cargo; # Darwin's stdenv provides the default llvmPackages version, match that since # clang LTO on Darwin is broken so the stdenv is not being changed. + # Target the LLVM version that rustc -Vv reports it is built with for LTO. + # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11 llvmPackages = if stdenv.isDarwin then buildPackages.llvmPackages - else buildPackages.llvmPackages_11; + else if lib.versionAtLeast rustc.llvm.version "11" + then buildPackages.llvmPackages_11 + else buildPackages.llvmPackages_10; # When LTO for Darwin is fixed, the following will need updating as lld # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. From 64042dc2c6c075fa4b537729afa7ed84e1e6e35e Mon Sep 17 00:00:00 2001 From: Riey Date: Sun, 2 May 2021 01:58:06 +0900 Subject: [PATCH 464/476] kime: 2.5.2 -> 2.5.3 --- 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 35ed99b5a42..33df3f53e67 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.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "10zd4yrqxzxf4nj3b5bsblcmlbqssxqq9pac0misa1g61jdbszj8"; + sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "1bimi7020m7v287bh7via7zm9m7y13d13kqpd772xmpdbwrj8nrl"; + sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk"; }; # Replace autostart path From 291fd0ee7ee672ce68dcc3397c877ce5960a3d98 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 17:40:21 +0000 Subject: [PATCH 465/476] doppler: 3.24.1 -> 3.24.3 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 5a8e80d6cd0..0f2dee26ffc 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.24.1"; + version = "3.24.3"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ZWYyi/Fv18dA8MeKzcFHHm62RF1NfPyveWIE8aI4UxU="; + sha256 = "sha256-G7oyyvrn+19N0C0V5MBwls+dQNzHh+DJmMTmsln8rC4="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; From b63002b223e3bbb7be97563e857539ea1d562956 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 2 May 2021 01:42:47 +0800 Subject: [PATCH 466/476] papirus-icon-theme: 20210401 -> 20210501 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ff18baf75f4..bd9ab1bb77b 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210401"; + version = "20210501"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo="; + sha256 = "sha256-3KH0oLeCev7WuoIOh4KBTiHTn2/aQlVrW5dpO+LSRT4="; }; nativeBuildInputs = [ From af688cc00e301cfe90a905a6a7e2c32b34988b22 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 May 2021 13:49:59 +0200 Subject: [PATCH 467/476] python3.pkgs.cloudsmith-api: init at 0.54.15 --- .../python-modules/cloudsmith-api/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/cloudsmith-api/default.nix diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix new file mode 100644 index 00000000000..57316ae9d6c --- /dev/null +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, certifi +, six +, dateutil +, urllib3 +}: + +buildPythonPackage rec { + pname = "cloudsmith-api"; + version = "0.54.15"; + + format = "wheel"; + + src = fetchPypi { + pname = "cloudsmith_api"; + inherit format version; + sha256 = "X72xReosUnUlj69Gq+i+izhaKZuakM9mUrRHZI5L9h0="; + }; + + propagatedBuildInputs = [ + certifi + six + dateutil + urllib3 + ]; + + # Wheels have no tests + doCheck = false; + + pythonImportsCheck = [ + "cloudsmith_api" + ]; + + meta = with lib; { + description = "Cloudsmith API Client"; + homepage = "https://github.com/cloudsmith-io/cloudsmith-api"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec7afc633ea..e59e8da3440 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1405,6 +1405,8 @@ in { cloudscraper = callPackage ../development/python-modules/cloudscraper { }; + cloudsmith-api = callPackage ../development/python-modules/cloudsmith-api { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cma = callPackage ../development/python-modules/cma { }; From 0d55d38b4148a4f40b7d00361c87e368e1ca1dbf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 May 2021 14:00:57 +0200 Subject: [PATCH 468/476] python3.pkgs.click-spinner: init at 0.1.10 --- .../python-modules/click-spinner/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/click-spinner/default.nix diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix new file mode 100644 index 00000000000..e0d862ab131 --- /dev/null +++ b/pkgs/development/python-modules/click-spinner/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "click-spinner"; + version = "0.1.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; + }; + + checkInputs = [ + click + six + pytestCheckHook + ]; + + meta = with lib; { + description = "Add support for showwing that command line app is active to Click"; + homepage = "https://github.com/click-contrib/click-spinner"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e59e8da3440..2978ea4db17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1371,6 +1371,8 @@ in { click-plugins = callPackage ../development/python-modules/click-plugins { }; + click-spinner = callPackage ../development/python-modules/click-spinner { }; + click-repl = callPackage ../development/python-modules/click-repl { }; click-threading = callPackage ../development/python-modules/click-threading { }; From d26d7713819ae913b575a45defd094fb7ee8e30a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 May 2021 14:08:20 +0200 Subject: [PATCH 469/476] python3.pkgs.click-configfile: init at 0.2.3 --- .../click-configfile/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/click-configfile/default.nix diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix new file mode 100644 index 00000000000..0d87aa890d2 --- /dev/null +++ b/pkgs/development/python-modules/click-configfile/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "click-configfile"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; + }; + + propagatedBuildInputs = [ + click + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_configfile__with_unbound_section" + "test_matches_section__with_bad_arg" + ]; + + meta = with lib; { + description = "Add support for commands that use configuration files to Click"; + homepage = "https://github.com/click-contrib/click-configfile"; + license = licenses.bsd3; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2978ea4db17..163fdf72b82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1359,6 +1359,8 @@ in { click-completion = callPackage ../development/python-modules/click-completion { }; + click-configfile = callPackage ../development/python-modules/click-configfile { }; + click-datetime = callPackage ../development/python-modules/click-datetime { }; click-default-group = callPackage ../development/python-modules/click-default-group { }; From 1818ef1785936f7f7df9a7489c80dcfac9856e7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 May 2021 14:09:39 +0200 Subject: [PATCH 470/476] cloudsmith-cli: init at 0.26.0 --- .../tools/cloudsmith-cli/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/cloudsmith-cli/default.nix diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix new file mode 100644 index 00000000000..8de2bc1aeed --- /dev/null +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -0,0 +1,43 @@ +{ python3 +, lib +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cloudsmith-cli"; + version = "0.26.0"; + + format = "wheel"; + + src = python3.pkgs.fetchPypi { + pname = "cloudsmith_cli"; + inherit format version; + sha256 = "c2W5+z+X4oRZxlNhB6for4mN4NeBX9MtEtmXhU5sz4A="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + click-configfile + click-didyoumean + click-spinner + cloudsmith-api + colorama + future + requests + requests_toolbelt + semver + simplejson + six + setuptools # needs pkg_resources + ]; + + # Wheels have no tests + doCheck = false; + + meta = { + homepage = "https://help.cloudsmith.io/docs/cli/"; + description = "Cloudsmith Command Line Interface"; + maintainers = with lib.maintainers; [ jtojnar ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4d6273180..a649cb50409 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1260,6 +1260,8 @@ in cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { }; + codeql = callPackage ../development/tools/analysis/codeql { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; From 049efb917104b2476b4aaf13fa1a5b7444621baf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 1 May 2021 11:35:07 +0000 Subject: [PATCH 471/476] xen: fix build with GCC 10 Fixes: https://github.com/NixOS/nixpkgs/issues/108479 --- pkgs/applications/virtualization/xen/4.10.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index bc9003e128a..765baa0a3b4 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -160,6 +160,9 @@ callPackage (import ./generic.nix (rec { "-Wno-error=address-of-packed-member" "-Wno-error=format-overflow" "-Wno-error=absolute-value" + # Fix build with GCC 10 + "-Wno-error=enum-conversion" + "-Wno-error=zero-length-bounds" ]; postPatch = '' From c02b4629530fbf61398720fdadd6f746df9bd36d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 18:09:53 +0000 Subject: [PATCH 472/476] charliecloud: remove unused python3Packages argument --- pkgs/applications/virtualization/charliecloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 23677dddd7f..f6d7ce3d619 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: +{ lib, stdenv, fetchFromGitHub, python3, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { From 039101ad945b1b3b90a3e6a592f6200770518a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 1 May 2021 11:40:48 +0200 Subject: [PATCH 473/476] libtorch-bin: 1.8.0 -> 1.8.1 Changelog: https://github.com/pytorch/pytorch/releases/tag/v1.8.1 --- pkgs/development/libraries/science/math/libtorch/bin.nix | 2 +- .../libraries/science/math/libtorch/binary-hashes.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 481836a4e11..87b5835aa9e 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -18,7 +18,7 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.8.0"; + version = "1.8.1"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 208e0b7adab..ec4522a7559 100644 --- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,14 @@ version: { x86_64-darwin-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - hash = "sha256-V1lbztMB09wyWjdiJrwVwJ00DT8Kihy/TC2cKmdBLIE="; + hash = "sha256-FYgnd5zlycjCYnP5bZcjpMdGYXrRERwhFFBYo/SJgzs="; }; x86_64-linux-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc="; + hash = "sha256-xneCcVrY25Whgbs/kPbwdS1Lc0e6RxsDRpA5lHTZigc="; }; x86_64-linux-cuda = { url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; - hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00="; + hash = "sha256-VW+TW00nD49GBztCyxHE4dTyy81aN/kfYE3hKQOIm50="; }; } From 303977634c10e495cdb4855ffe00fc02ac9801c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 1 May 2021 11:41:47 +0200 Subject: [PATCH 474/476] libtorch-bin: fix false CUDA dependency in passthru test The passthru test used the CUDA toolkit for the CUDA stub unconditionally, also requiring the cudatoolkit derivation when cudaSupport = false. --- .../libraries/science/math/libtorch/test/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix index 60f9b5ad884..eaea649d434 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -42,8 +42,9 @@ in stdenv.mkDerivation { touch $out ''; - checkPhase = '' + checkPhase = lib.optionalString cudaSupport '' LD_LIBRARY_PATH=${cudaStub}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \ - ./test + '' + '' + ./test ''; } From 4226837368068600e6afd11b5cbc6d586c7b5fa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 May 2021 12:16:29 +0200 Subject: [PATCH 475/476] python3Packages.python-language-server: disable when python>=3.9 The package is not supported on anything newer than 3.8 yet. --- .../python-modules/python-language-server/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index b776a784c8e..daab437c979 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 , backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. @@ -22,6 +22,8 @@ in buildPythonPackage rec { pname = "python-language-server"; version = "0.36.2"; + # https://github.com/palantir/python-language-server/issues/896#issuecomment-752790868 + disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "palantir"; From 510fc9cd8f97f6c7fc04f0346089a87b1000f71f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 May 2021 18:52:56 +0000 Subject: [PATCH 476/476] jetbrains: update jetbrains.clion: 2021.1 -> 2021.1.1 jetbrains.datagrip: 2021.1 -> 2021.1.1 jetbrains.goland: 2021.1 -> 2021.1.1 jetbrains.idea-community: 2021.1 -> 2021.1.1 jetbrains.idea-ultimate: 2021.1 -> 2021.1.1 jetbrains.phpstorm: 2021.1 -> 2021.1.2 jetbrains.pycharm-community: 2021.1 -> 2021.1.1 jetbrains.pycharm-professional: 2021.1 -> 2021.1.1 jetbrains.rider: 2021.1.1 -> 2021.1.2 jetbrains.ruby-mine: 2021.1 -> 2021.1.1 jetbrains.webstorm: 2021.1 -> 2021.1.1 --- .../editors/jetbrains/default.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 16d7bf7dd16..32159e3ebd2 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1qq2k14pf2qy93y1xchlv08vvx99zcml8bdcx3h6jnjz6d7gz0px"; /* updated by script */ + sha256 = "0xzlkf3gq6fcb0q9mcj8k39880l8h21pb1lz0xl2dqj8cfwpws9h"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "11am11lkrhgfianr1apkkl4mn8gcsf6p1vz47y7lz4rfm05ac4gj"; /* updated by script */ + sha256 = "0smg0qbk3mnm2543w0nlvnyvbwmprf0p3z2spwrmcmfagv50crrx"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1hxid7k5b26hiwwdxbvhi1fzhlrvm1xsd5gb0vj0g5zw658y2lzz"; /* updated by script */ + sha256 = "02fyrq4px9w34amincgjgm6maxpxn445j5h4nfbskx7z428ynx25"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1d7m39rzdgh2fyx50rpifqfsdmvfpi04hjp52pl76m35gyb5hsvs"; /* updated by script */ + sha256 = "1say19p7kgx4b2ccs9bv61phllzhl8gmrd1fp1a5cnagya7vl1c5"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "062kaph42xs5hc01sbmry4cm7nkyjks43qr5m7pbj5a2bgd7zzgx"; /* updated by script */ + sha256 = "19zi4njz79z8gi458kz1m0sia79y3rhbayix4rmh93mwfc0npkii"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "052m7mqa1s548my0gda9y2mysi2ijq27c9b3bskrwqsf1pm5ry63"; /* updated by script */ + sha256 = "02s75fqd9hfh302zha4jw6qynpgm9nkrlq7s78nk3fc3d3hw8v5y"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1iiglh7s2zm37kj6hzlzxb1jnzh2p0j1f2zzhg3nqyrrakfbyq3h"; /* updated by script */ + sha256 = "04bs9sz872b0h1zzax23irvj6q5wxnzp6fl4f177j94kh4116cqh"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1n3b4mdygzal7w88gwka5wh5jp09bh2zmm4n5rz9s7hr2srz71mz"; /* updated by script */ + sha256 = "0wc9j7nilakmm7scf7a71zb3k9vixgih05ni3n3pp4iznvwb3nxg"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -359,12 +359,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "00kdbsjw9hmq7x94pjscslv0b412g8l0jbvyi7jiyay8xc6wiaaj"; /* updated by script */ + sha256 = "1a28pi18j0cb2wxhw1vnfg9gqsgf2kyfg0hl4xgqp50gzv7i3aam"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -372,12 +372,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "12mkb51x1w5wbx436pfnfzcad10qd53y43n0p4l2zg9yx985gm7v"; /* updated by script */ + sha256 = "05sfjf5523idsl7byc7400r4xqv1d65gpmkh5x0lbgf1k3bx2wlm"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -385,12 +385,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.1"; /* updated by script */ + version = "2021.1.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "15i521qj2b0y1viqr0xx815ckpq359j6nars4xxq8xvy7cg729yc"; /* updated by script */ + sha256 = "1hici40qsxj2fw29g68i6hr1vhr0h7xrlhkialy74ah53wi7myz1"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE";