From c586e42763e0f093d16b4b655759cb340171ad42 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 4 Jun 2021 17:28:20 +0200 Subject: [PATCH 01/92] nixos/postgresqlBackup: Use PATH for readability --- nixos/modules/services/backup/postgresql-backup.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 9da2d522a68d..8857335a6e58 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -14,15 +14,17 @@ let requires = [ "postgresql.service" ]; + path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ]; + script = '' umask 0077 # ensure backup is only readable by postgres user if [ -e ${cfg.location}/${db}.sql.gz ]; then - ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz + mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz fi ${dumpCmd} | \ - ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz + gzip -c > ${cfg.location}/${db}.sql.gz ''; serviceConfig = { @@ -113,12 +115,12 @@ in { }) (mkIf (cfg.enable && cfg.backupAll) { systemd.services.postgresqlBackup = - postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall"; + postgresqlBackupService "all" "pg_dumpall"; }) (mkIf (cfg.enable && !cfg.backupAll) { systemd.services = listToAttrs (map (db: let - cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}"; + cmd = "pg_dump ${cfg.pgdumpOptions} ${db}"; in { name = "postgresqlBackup-${db}"; value = postgresqlBackupService db cmd; From 81c8189a841728a813bcde8604b80427fcf33522 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 4 Jun 2021 17:34:26 +0200 Subject: [PATCH 02/92] nixos/postgresqlBackup: Only replace backup when successful Previously, a failed backup would always overwrite ${db}.sql.gz, because the bash `>` redirect truncates the file; even if the backup was going to fail. On the next run, the ${db}.prev.sql.gz backup would be overwritten by the bad ${db}.sql.gz. Now, if the backup fails, the ${db}.in-progress.sql.gz is in an unknown state, but ${db}.sql.gz will not be written. On the next run, ${db}.prev.sql.gz (our only good backup) will not be overwritten because ${db}.sql.gz does not exist. --- .../services/backup/postgresql-backup.nix | 6 ++++- nixos/tests/postgresql.nix | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 8857335a6e58..f658eb756f7b 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -17,6 +17,8 @@ let path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ]; script = '' + set -e -o pipefail + umask 0077 # ensure backup is only readable by postgres user if [ -e ${cfg.location}/${db}.sql.gz ]; then @@ -24,7 +26,9 @@ let fi ${dumpCmd} | \ - gzip -c > ${cfg.location}/${db}.sql.gz + gzip -c > ${cfg.location}/${db}.in-progress.sql.gz + + mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz ''; serviceConfig = { diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 091e64294ac5..0369a0707190 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -73,8 +73,30 @@ let machine.succeed( "systemctl start ${backupService}.service", "zcat /var/backup/postgresql/${backupName}.sql.gz | grep 'ok'", + "ls -hal /var/backup/postgresql/ >/dev/console", "stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600", ) + with subtest("Backup service fails gracefully"): + # Sabotage the backup process + machine.succeed("rm /run/postgresql/.s.PGSQL.5432") + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "ls -hal /var/backup/postgresql/ >/dev/console", + "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep 'ok'", + "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", + ) + # In a previous version, the second run would overwrite prev.sql.gz, + # so we test a second run as well. + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", + "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep 'ok'", + ) + with subtest("Initdb works"): machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") From be03cf01f30d5319c7f1629a23265655711b9d07 Mon Sep 17 00:00:00 2001 From: roblabla Date: Wed, 23 Jun 2021 15:30:09 +0200 Subject: [PATCH 03/92] linux-kernel: Add dell drivers on 5.12+ --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 26bb9f82063b..355e653c8eae 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -844,6 +844,7 @@ let PREEMPT_VOLUNTARY = yes; X86_AMD_PLATFORM_DEVICE = yes; + X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support From eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 11:06:44 -0700 Subject: [PATCH 04/92] pipewire: 0.3.30 -> 0.3.31 --- nixos/modules/services/desktops/pipewire/jack.conf.json | 2 +- .../pipewire/0055-pipewire-media-session-path.patch | 7 ++----- .../pipewire/0090-pipewire-config-template-paths.patch | 8 ++++---- pkgs/development/libraries/pipewire/default.nix | 9 +++++++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json index a6bd34917851..e36e04fffcf2 100644 --- a/nixos/modules/services/desktops/pipewire/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/jack.conf.json @@ -7,7 +7,7 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", + "name": "libpipewire-module-rt", "args": {}, "flags": [ "ifexists", 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 be6683c3e7b7..8290aec5dfc4 100644 --- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt index 93b5e2a9..1b915ac3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -13,6 +13,9 @@ option('media-session', - description: 'Build and install pipewire-media-session', +@@ -200,3 +200,6 @@ option('media-session', type: 'feature', value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') - option('man', - description: 'Build manpages', - type: 'feature', + option('session-managers', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build index 1edebb2d..251270eb 100644 --- a/src/daemon/systemd/user/meson.build diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 966cb9579777..1f1a98780e9c 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644 # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ -- # @media_session_path@ -+ # +- # @session_manager_path@ ++ # #] # An array of rejected paths. @@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644 # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@media_session_path@" args = "" } -+ @comment@{ path = "" args = "" } +- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @comment@{ path = "" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8504d2669849..823ed69f066a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -14,6 +14,7 @@ , dbus , alsa-lib , libjack2 +, libusb1 , udev , libva , libsndfile @@ -43,10 +44,11 @@ let }; mesonEnable = b: if b then "enabled" else "disabled"; + mesonList = l: "[" + lib.concatStringsSep "," l + "]"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.30"; + version = "0.3.31"; outputs = [ "out" @@ -64,7 +66,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; + sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79"; }; patches = [ @@ -96,6 +98,7 @@ let dbus glib libjack2 + libusb1 libsndfile ncurses udev @@ -122,6 +125,7 @@ let "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=disabled" + "-Droc=disabled" "-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" @@ -133,6 +137,7 @@ let "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" + "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file From 878116272abc6fbc190269319b3c7835c1a6b993 Mon Sep 17 00:00:00 2001 From: j-brn Date: Mon, 28 Jun 2021 22:08:03 +0200 Subject: [PATCH 05/92] maintainers: add j-brn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a5c9fcbd7f1..945df62b5104 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4609,6 +4609,12 @@ githubId = 6874204; name = "Jason Carr"; }; + j-brn = { + email = "me@bricker.io"; + github = "j-brn"; + githubId = 40566146; + name = "Jonas Braun"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; From 6f609a1f125be88e0c590f1a33a61f68c67a5850 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 09:09:32 +0200 Subject: [PATCH 06/92] python3Packages.aiounittest: 1.3.1 -> 1.4.0 --- .../python-modules/aiounittest/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index eeb0ea0af577..088131824ad7 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -4,20 +4,25 @@ , nose , coverage , isPy27 +, wrapt }: buildPythonPackage rec { pname = "aiounittest"; - version = "1.3.1"; + version = "1.4.0"; disabled = isPy27; src = fetchFromGitHub { owner = "kwarunek"; repo = pname; rev = version; - sha256 = "0mlic2q49cb0vv62mixy4i4x8c91qb6jlji7khiamcxcg676nasl"; + sha256 = "sha256-GbGApY4pQoFpP3RTCLdjjTnJbdz9wEXXzZRRYXgtFEM="; }; + propagatedBuildInputs = [ + wrapt + ]; + checkInputs = [ nose coverage @@ -27,6 +32,8 @@ buildPythonPackage rec { nosetests ''; + pythonImportsCheck = [ "aiounittest" ]; + meta = with lib; { description = "Test asyncio code more easily"; homepage = "https://github.com/kwarunek/aiounittest"; From ef532a04436001249a7c24e13c628e970791dc7f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 11:07:38 -0700 Subject: [PATCH 07/92] nixos/pipewire: add bluez hardware database --- .../pipewire/bluez-hardware.conf.json | 197 ++++++++++++++++++ .../pipewire/pipewire-media-session.nix | 6 + .../libraries/pipewire/default.nix | 1 + 3 files changed, 204 insertions(+) create mode 100644 nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json new file mode 100644 index 000000000000..7c527b292158 --- /dev/null +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -0,0 +1,197 @@ +{ + "bluez5.features.device": [ + { + "name": "Air 1 Plus", + "no-features": [ + "hw-volume-mic" + ] + }, + { + "name": "AirPods", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "AirPods Pro", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "AXLOIE Goin", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "JBL Endurance RUN BT", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl", + "sbc-xq" + ] + }, + { + "name": "JBL LIVE650BTNC" + }, + { + "name": "Soundcore Life P2-L", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "Urbanista Stockholm Plus", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "address": "~^94:16:25:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^9c:64:8b:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a0:e9:db:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^0c:a6:94:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:14:02:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^44:5e:f3:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^d4:9c:28:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:18:6b:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^b8:ad:3e:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a0:e9:db:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:24:1c:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:11:b1:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a4:15:66:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:14:f1:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:26:7e:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^90:03:b7:", + "no-features": [ + "hw-volume" + ] + } + ], + "bluez5.features.adapter": [ + { + "bus-type": "usb", + "vendor-id": "usb:0bda" + }, + { + "bus-type": "usb", + "no-features": [ + "msbc-alt1-rtl" + ] + }, + { + "no-features": [ + "msbc-alt1-rtl" + ] + } + ], + "bluez5.features.kernel": [ + { + "sysname": "Linux", + "release": "~^[0-4]\\.", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.[1-7]\\.", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.(8|9|10)\\.", + "no-features": [ + "msbc-alt1" + ] + }, + { + "no-features": [] + } + ] +} diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 17a2d49bb1f3..41ab995e3292 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -15,6 +15,7 @@ let defaults = { alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json)); bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json)); + bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json)); media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json)); v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json)); }; @@ -22,6 +23,7 @@ let configs = { alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor; bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor; + bluez-hardware = defaults.bluez-hardware; media-session = recursiveUpdate defaults.media-session cfg.config.media-session; v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor; }; @@ -120,6 +122,10 @@ in { mkIf config.services.pipewire.pulse.enable { source = json.generate "bluez-monitor.conf" configs.bluez-monitor; }; + environment.etc."pipewire/media-session.d/bluez-hardware.conf" = + mkIf config.services.pipewire.pulse.enable { + source = json.generate "bluez-hardware.conf" configs.bluez-hardware; + }; environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 823ed69f066a..5f32216737ef 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -192,6 +192,7 @@ let 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/bluez-hardware.conf.json" "nix-support/etc/pipewire/media-session.d/media-session.conf.json" "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" ]; From 9fd7bb6a8b2a1d1929a58efc092d3490f92ae4c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jul 2021 23:22:49 +0200 Subject: [PATCH 08/92] python3Packages.python-jose: 3.2.0 -> 3.3.0 --- .../python-modules/python-jose/default.nix | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 15c6474cc388..5ba5d9c8ddc0 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,46 +1,50 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, future, six, ecdsa, rsa -, pycrypto, pytestcov, pytestrunner, cryptography +{ lib +, buildPythonPackage +, fetchFromGitHub +, ecdsa +, rsa +, pycrypto +, pyasn1 +, pycryptodome +, cryptography , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mpdavis"; - repo = "python-jose"; + repo = pname; rev = version; - sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY="; + sha256 = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; - checkInputs = [ + propagatedBuildInputs = [ + cryptography + ecdsa + pyasn1 pycrypto - pytestCheckHook - pytestcov - pytestrunner - cryptography # optional dependency, but needed in tests + pycryptodome + rsa ]; - # relax ecdsa deps - patchPhase = '' + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' substituteInPlace setup.py \ - --replace 'ecdsa<0.15' 'ecdsa' \ - --replace 'ecdsa <0.15' 'ecdsa' + --replace '"pytest-runner",' "" ''; - disabledTests = [ - # https://github.com/mpdavis/python-jose/issues/176 - "test_key_too_short" - ]; - - propagatedBuildInputs = [ future six ecdsa rsa ]; + pythonImportsCheck = [ "jose" ]; meta = with lib; { homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; - maintainers = [ maintainers.jhhuh ]; + maintainers = with maintainers; [ jhhuh ]; }; } From 3afcb021729935164aae7f28d2a70bdd91c01b6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jul 2021 23:45:18 +0200 Subject: [PATCH 09/92] python3Packages.bitarray: 2.1.3 -> 2.2.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 985c5429f7e8..d7e15d4c1e1b 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.1.3"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a24aff72a7f1b09571b5daf9dbfcffd98481be1fe085ae5ef662cf11452a97e0"; + sha256 = "sha256-xF7u+qYA9vL2hD/EaZhprl18HouPtY/zgFhM6bx6cII="; }; checkPhase = '' From cd7ca4552ac6f98abf1f3662560149154d9a8b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Tue, 6 Jul 2021 00:33:56 +0200 Subject: [PATCH 10/92] mariadb: replace galera_new_cluster in postPatch instead of postInstall This prevents build errors when building mariadb with systemd removed from buildInputs, in which case the galera_new_cluster file isn't copied to $out/bin. Also fixes a small bug where the URL in the script became invalid after replacing - now it correctly points to an article on the MariaDB website. --- pkgs/servers/sql/mariadb/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 64f603a4f071..b7205f93026d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -161,6 +161,11 @@ server = stdenv.mkDerivation (common // { patches = common.patches; + postPatch = '' + substituteInPlace scripts/galera_new_cluster.sh \ + --replace ":-mariadb" ":-mysql" + ''; + cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" "-DENABLED_LOCAL_INFILE=OFF" @@ -202,7 +207,6 @@ server = stdenv.mkDerivation (common // { mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security rm -r "$out"/OFF - sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; # perlPackages.DBDmysql is broken on darwin From d556c247bc6f4426caa9a58b3dbfc93dc6296551 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:46 -0700 Subject: [PATCH 11/92] python3Packages.azure-core: 1.15.0 -> 1.16.0 --- pkgs/development/python-modules/azure-core/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 6718ca1d5042..8dce5b8feb75 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp +, flask , mock , msrest , pytest @@ -14,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.15.0"; + version = "1.16.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f"; + sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; }; propagatedBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { checkInputs = [ aiodns aiohttp + flask mock msrest pytest @@ -51,6 +53,8 @@ buildPythonPackage rec { # wants network "tests/async_tests/test_streaming_async.py" "tests/test_streaming.py" + # testserver tests require being in a very specific working directory to make it work + "tests/testserver_tests/" ]; meta = with lib; { From cdc7c6c22ef3af96152b33b48c15aa448ca02309 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 12/92] python3Packages.azure-keyvault-administration: 4.0.0b1 -> 4.0.0 --- .../python-modules/azure-keyvault-administration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index e72dc036989b..788eaf70457d 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.0.0b1"; + version = "4.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; + sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb"; }; propagatedBuildInputs = [ From c6a1a9639bc1c38c987a4c08bb8f4fa1b8eff7a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 13/92] python3Packages.azure-keyvault-certificates: 4.2.1 -> 4.3.0 --- .../python-modules/azure-keyvault-certificates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 56ccb8b5fb0d..52b1305998ec 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c"; + sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87"; }; propagatedBuildInputs = [ From e1327cfc1cab2601f88d6b46ae03b3f59928118e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 14/92] python3Packages.azure-keyvault-keys: 4.3.1 -> 4.4.0 --- .../python-modules/azure-keyvault-keys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index bbdc06d52d4d..27f97854dd37 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.3.1"; + version = "4.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fbf67bca913ebf68b9075ee9d2e2b899dc3c7892cc40abfe1b08220a382f6ed9"; + sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0"; }; propagatedBuildInputs = [ From 56fb9ffdb2bad04b834da0ce4e2ce89ac7b59a30 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 15/92] python3Packages.azure-keyvault-secrets: 4.2.0 -> 4.3.0 --- .../python-modules/azure-keyvault-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 704d2951cc97..78f7f20e469e 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.2.0"; + version = "4.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f"; + sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276"; }; propagatedBuildInputs = [ From 1fa9b53797f476720ad7d2b966fb19dfc41f316e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 16/92] python3Packages.azure-mgmt-appconfiguration: 1.0.1 -> 2.0.0 --- .../python-modules/azure-mgmt-appconfiguration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 9fea2cf87d06..45147a94b2ab 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.1"; + version = "2.0.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; + sha256 = "97e990ec6a5a3acafc7fc1add8ff1a160ebb2052792931352fd7cf1d90f1f956"; extension = "zip"; }; From 57a258834424cbab0f7d3ebdc017c426dda1a275 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:50 -0700 Subject: [PATCH 17/92] python3Packages.azure-mgmt-containerservice: 15.1.0 -> 16.0.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 76d5c11cb6fd..e903e553b44a 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "15.1.0"; + version = "16.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9"; + sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; }; propagatedBuildInputs = [ From a53c4b8b31102711a414ae8773fe1e39cd761c32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:51 -0700 Subject: [PATCH 18/92] python3Packages.azure-mgmt-core: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/azure-mgmt-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index c824f3725a7e..fe64cabb2567 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312"; + sha256 = "3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40"; }; propagatedBuildInputs = [ From b47111056923b171fb1fa7c25a01a5312688e1cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:51 -0700 Subject: [PATCH 19/92] python3Packages.azure-mgmt-cosmosdb: 6.3.0 -> 6.4.0 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 1531a4e0758f..f546f2e23e0d 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d"; + sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; }; propagatedBuildInputs = [ From 41237a8c7fc01d121d42486452bd1385d6cdfdcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:51 -0700 Subject: [PATCH 20/92] python3Packages.azure-mgmt-netapp: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index ccb7c5592478..06f0ae30aff6 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "4.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605"; + sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42"; extension = "zip"; }; From 37262e24e2169f0390159cc8a5d56437c58c0dbf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:51 -0700 Subject: [PATCH 21/92] python3Packages.azure-mgmt-rdbms: 8.1.0 -> 9.0.0 --- pkgs/development/python-modules/azure-mgmt-rdbms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 56e531421634..75e77c594008 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19"; + sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829"; }; propagatedBuildInputs = [ From fd1de1a63a0c5264ab75a5f098be89cd986fa1c2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 5 Jul 2021 14:57:51 -0700 Subject: [PATCH 22/92] python3Packages.azure-mgmt-sql: 2.1.0 -> 3.0.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 83cffa0a295c..a9e41e32799e 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919"; + sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21"; }; propagatedBuildInputs = [ From 60b1a047b724e6e9bf4bd43a694b6687b5d8d603 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 30 Jun 2021 23:55:32 +0800 Subject: [PATCH 23/92] linuxPackages.evdi: 2021-04-01 -> 2021-06-11, fix 5.13 build --- pkgs/os-specific/linux/evdi/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index a8a0445e955d..5eb31e9422de 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,15 +2,28 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-20210401"; + version = "unstable-2021-06-11"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "b0b3d131b26df62664ca33775679eea7b70c47b1"; - sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y"; + rev = "65e12fca334f2f42396f4e8d16592d53cab34dd6"; + sha256 = "sha256-81IfdYKadKT7vRdkmxzfGo4KHa4UJ8uJ0K6djQCr22U="; }; + # Linux 5.13 support + # The patches break compilation for older kernels + patches = lib.optional (kernel.kernelAtLeast "5.13") [ + (fetchpatch { + url = "https://github.com/DisplayLink/evdi/commit/c5f5441d0a115d2cfc8125b8bafaa05b2edc7938.patch"; + sha256 = "sha256-tWYgBrRh3mXPebhUygOvJ07V87g9JU66hREriACfEVI="; + }) + (fetchpatch { + url = "https://github.com/DisplayLink/evdi/commit/5f04d2e2df4cfd21dc15d31f1152c6a66fa48a78.patch"; + sha256 = "sha256-690/eUiEVWvnT/YAVgKcLo86dgolF9giWRuPxXpL+eQ="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; @@ -31,8 +44,8 @@ stdenv.mkDerivation rec { description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ eyjhb ]; platforms = platforms.linux; - license = with licenses; [ lgpl21 gpl2 ]; + license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = versionOlder kernel.version "4.19" || stdenv.isAarch64; + broken = kernel.kernelOlder "4.19" || stdenv.isAarch64; }; } From 7498e1f46df041dddab924a2c0f7f1ef54e47c87 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 6 Jul 2021 04:20:00 +0000 Subject: [PATCH 24/92] zeek: 4.0.2 -> 4.0.3 https://github.com/zeek/zeek/releases/tag/v4.0.3 --- pkgs/applications/networking/ids/zeek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 7ee55c452990..979d765e9e6e 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "15gxxgg7nmfmswlbxhvcp6alq5k9wpvrm5cwyf1qfd7xsfli61sm"; + sha256 = "1nrkwaj0dilyzhfl6yma214vyakvpi97acyffdr7n4kdm4m6pvik"; }; nativeBuildInputs = [ cmake flex bison file ]; From 802f0213826579ea4230505c592aea3c279d5f30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 6 Jul 2021 11:21:56 +0200 Subject: [PATCH 25/92] aws-c-cal: 0.4.5 -> 0.5.11 --- pkgs/development/libraries/aws-c-cal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 3246c572962f..6f3df977efa8 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.4.5"; + version = "0.5.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6"; + sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc="; }; nativeBuildInputs = [ cmake ]; From e200a5999584ea3639c0f14398c268849c8d4de2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 11:33:13 +0000 Subject: [PATCH 26/92] canta-theme: 2020-05-17 -> 2021-07-06 --- pkgs/data/themes/canta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index 431522fa85e8..f0a2339b3e63 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "canta-theme"; - version = "2020-05-17"; + version = "2021-07-06"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0"; + sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8="; }; nativeBuildInputs = [ From f95399337fe69fc5dac5f02e212876f68ad467c0 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Tue, 6 Jul 2021 10:57:34 -0400 Subject: [PATCH 27/92] pulumi-bin: 3.5.1 -> 3.6.0 --- pkgs/tools/admin/pulumi/data.nix | 50 +++++++++++++++---------------- pkgs/tools/admin/pulumi/update.sh | 12 ++++---- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index e1a6d14914be..99627b930c25 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,20 +1,20 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.5.1"; + version = "3.6.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-linux-x64.tar.gz"; - sha256 = "1wdkwifn1p0m98dmn0g2kcwnllqilfwzkyyg2sg1pfdmk3da9bi3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-linux-x64.tar.gz"; + sha256 = "1phj65y1l6pllq5fyrxm7hrwg44jpzq1skq6dw7x6zrs8prnlj52"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-linux-amd64.tar.gz"; - sha256 = "14r2akgfrs512h9g6lx9scl0bph3qmw3j113shwg2nhqbmwvvh3z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-linux-amd64.tar.gz"; + sha256 = "12fj43pcs64s0i6h05q94abbxi0r1rlh8qgycmmydr8wajsn2a54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-linux-amd64.tar.gz"; - sha256 = "0w28ikwna057dbhsvidkd5sp2v0frih6n4an1cl3gx51yhqsxzap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-linux-amd64.tar.gz"; + sha256 = "0h0dpbdc9rcagw0wgz5l6jjc8wl1hj5ki5shi44jyf4hz7l0yl9y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; @@ -53,16 +53,16 @@ sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-linux-amd64.tar.gz"; - sha256 = "1jk3al4mnk6cblaf56yyx0anv3kp3vyr6fqglsinkzaayaswx63z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-linux-amd64.tar.gz"; + sha256 = "0al3578g7l9rvhkswlm56wpkybj6njj39a3g56in9882lhpqixsy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-linux-amd64.tar.gz"; - sha256 = "1dpd6m5w6fnxrspig4s2vcd4hxy720gcrdrxakn1mvz29k4s0zv3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-linux-amd64.tar.gz"; + sha256 = "1zi6r1g7l56ra506hxkj8p9wlkgbmry7ir48v8wwdsfvplryj4sf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0q1bi1a80jwgx52m9hy0vp67hdv3nbhd0gqxj3jaf5w4dnh48dca"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1lvb3vs2yp0ybz2xn2za5f0nfipiisrpzwzfn0wgl9arh17v0phc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; @@ -99,16 +99,16 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-darwin-x64.tar.gz"; - sha256 = "0q2617vg53ib65vlj09z78lqqg4dz5ymcjn9kablkm5a6s1sfh5s"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-darwin-x64.tar.gz"; + sha256 = "0yql94y78q0hfsxfsgvkxs7dv2lgrkv4ypm59qjr8l04krcknbmm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "0qhpzvfv67fn2n1x3h7znqiw7wxz526iw1a41q8v8jalkahfa2rb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "0zv4b7nyvz7h0h0jxndd7dxzf4risgqyl7f20cbbcsixxk90sz38"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-darwin-amd64.tar.gz"; @@ -135,8 +135,8 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-darwin-amd64.tar.gz"; - sha256 = "1y4pjx260dlh7yi0skd5n2ixlqzi6b9lp5h77qaq1b9h3n4xybfh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-darwin-amd64.tar.gz"; + sha256 = "1k7yxajx3157qdanw1y11053k74rwlcvh828xrpwkzqszmzizxp9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; @@ -147,16 +147,16 @@ sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-darwin-amd64.tar.gz"; - sha256 = "1ddkzwwr2vc0sp1q3r510rpjqj5dl1dn8ax938874jnflcbcwng6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "1fgh7q7sivip212q2zgvrgg3lwxrzasm9vpa858168fvjv67ylbc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "1x6fqa643n731cadb02288kc2z321gjjldkvi8wvjjy2dm0lfp72"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "0cl8wg5g78c147pqy5q52qq9bd7hw8zgvfmdafszwzwz6xh1051b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "13rq01ylrqp48n62cp640a4mdqbrqnibb0xaw9pcpddl3a3nnck0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "008jqnrl08g3gd38vg2yjwxdn288z75sbp3ghl2cbncfah2lwwja"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 98f382d12d20..efde5e7d6603 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,25 +3,25 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.5.1" +VERSION="3.6.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.8.0" + "aws=4.10.0" "cloudflare=3.2.0" "consul=3.2.0" "datadog=3.3.0" "digitalocean=4.4.1" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.9.0" + "gcp=5.11.0" "github=4.2.0" "gitlab=4.1.0" - "hcloud=1.0.1" - "kubernetes=3.4.0" - "linode=3.1.0" + "hcloud=1.1.0" + "kubernetes=3.5.0" + "linode=3.2.0" "mailgun=3.1.0" "mysql=3.0.0" "openstack=3.2.0" From 873fd459a39849869afe193d5e3059c8c5027933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 6 Jul 2021 22:46:54 +0700 Subject: [PATCH 28/92] flare: 1.11 -> 1.12rc1 --- pkgs/games/flare/default.nix | 2 +- pkgs/games/flare/engine.nix | 4 ++-- pkgs/games/flare/game.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 2058abebb55e..3ecade9b97e5 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,7 +1,7 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.11"; + name = "flare-1.12rc1"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 2b2738b41089..9104195febc9 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.11"; + version = "1.12rc1"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n"; + sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 6b7f15fd9ccb..7eae29f84d18 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.11"; + version = "1.12rc1"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l"; + sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc"; }; nativeBuildInputs = [ cmake ]; From 69d84ca21679fc7405d8139a4768a9b57eda75f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 15:57:16 +0000 Subject: [PATCH 29/92] jrsonnet: 0.4.0 -> 0.4.1 --- pkgs/development/compilers/jrsonnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 57d163706ba5..a8b4a76b7dea 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-+kvdbUw+lQ/BKJwcBzho1OWg/6y0YDRkLE+SAe8hLQQ="; + sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg="; }; postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet ''; - cargoSha256 = "sha256-0soXOxp4Kr1DdmVERl8/sqwltqYLDwkVJZHFnYeHs+c="; + cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys="; meta = { description = "Purely-functional configuration language that helps you define JSON data"; From 77a2f3889297a9d1fa12cf78ddd4ea5cc621b066 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Tue, 6 Jul 2021 19:33:31 +0300 Subject: [PATCH 30/92] terraform-providers.cloudflare: update source, 2.7.0 -> 2.23.0 --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03cceb4b868e..e738a6ad7753 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -175,11 +175,13 @@ "version": "0.1.0" }, "cloudflare": { - "owner": "terraform-providers", + "owner": "cloudflare", + "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v2.7.0", - "sha256": "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2", - "version": "2.7.0" + "rev": "v2.23.0", + "sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l", + "vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962", + "version": "2.23.0" }, "cloudinit": { "owner": "hashicorp", From ad8b9f8c60854dfa48e649b3afd7b57b24029a39 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Tue, 6 Jul 2021 13:34:21 -0400 Subject: [PATCH 31/92] looking-glass-obs: init --- .../video/obs-studio/plugins/default.nix | 1 + .../obs-studio/plugins/looking-glass-obs.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 477f0efa3e09..ef360487a6b1 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -6,4 +6,5 @@ obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {}; obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {}; wlrobs = callPackage ./wlrobs.nix {}; + looking-glass-obs = callPackage ./looking-glass-obs.nix {}; } diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix new file mode 100644 index 000000000000..1dbfef2a8649 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio +, looking-glass-client }: + +stdenv.mkDerivation { + pname = "looking-glass-obs"; + version = looking-glass-client.version; + + src = looking-glass-client.src; + + sourceRoot = "source/obs"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio libbfd SDL2 ]; + + NIX_CFLAGS_COMPILE = "-mavx"; + + installPhase = '' + mkdir -p $out/lib/obs-plugins/ + mv liblooking-glass-obs.so $out/lib/obs-plugins/ + ''; + + meta = with lib; { + description = "Plugin for OBS Studio for efficient capturing of looking-glass"; + homepage = "https://looking-glass.io/docs/stable/obs/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} From 06c4f46a1abf2ce528a34a947e1e6eb6657af537 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 5 Jul 2021 15:19:02 -0700 Subject: [PATCH 32/92] python3Packages.python3-saml: Add patch to fix tests due to expired responses --- .../python-modules/python3-saml/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index 00774cc40f88..af57357d11c9 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k, +{ lib, fetchpatch, fetchFromGitHub, buildPythonPackage, isPy3k, isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { @@ -13,14 +13,21 @@ buildPythonPackage rec { sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k"; }; + # Remove both patches on update patches = [ # Remove the dependency on defusedxml # # This patch is already merged upstream and does not introduce any # functionality changes. - (fetchurl { + (fetchpatch { url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch"; - sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy"; + sha256 = "sha256-KHyAoX3our3Rz2z4xo0lTBB1XOGuC3Pe+lUDCzK5WQI="; + }) + + # Update expiry dates for test response XMLs + (fetchpatch { + url = "https://github.com/onelogin/python3-saml/commit/05611bbf6d7d8313adb9c77ff88a9210333ccc38.patch"; + sha256 = "sha256-62TwgCXDFYsZIAeqAysJRziMvhUVhGzta/C2wS3v4HY="; }) ]; From 2327acd1d03770f55aa882345ae2a241263fd809 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Tue, 6 Jul 2021 20:11:41 +0200 Subject: [PATCH 33/92] ytmdl: patch bug Update pkgs/tools/misc/ytmdl/default.nix Co-authored-by: Pavol Rusnak Update pkgs/tools/misc/ytmdl/default.nix Co-authored-by: Pavol Rusnak --- pkgs/tools/misc/ytmdl/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 9fe917d49aa7..43f46bc05231 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , python3 +, fetchpatch , ffmpeg }: @@ -15,6 +16,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p"; }; + patches = [ + # Fixes https://github.com/deepjyoti30/ytmdl/issues/188 + # Only needed until the next major release after 2021.06.26 + (fetchpatch { + url = "https://github.com/deepjyoti30/ytmdl/commit/37ba821d9692249c1fa563505cf60bd11b8e209e.patch"; + includes = [ "bin/ytmdl" ]; + sha256 = "sha256-VqtthpUL0Oub3DK7tSvAnemOzPPTcLvXXeebZIGOgdc="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "bs4" "beautifulsoup4" From 77488646553eb062f27cad53345eeccbd8d7b4d1 Mon Sep 17 00:00:00 2001 From: j-brn Date: Mon, 28 Jun 2021 22:12:26 +0200 Subject: [PATCH 34/92] kvmfr: init at $looking-glass-client.version --- pkgs/os-specific/linux/kvmfr/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/linux/kvmfr/default.nix diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix new file mode 100644 index 000000000000..a7949c85c2ee --- /dev/null +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }: + +stdenv.mkDerivation rec { + pname = "kvmfr"; + version = looking-glass-client.version; + + src = looking-glass-client.src; + sourceRoot = "source/module"; + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KVER=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D kvmfr.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/" + ''; + + meta = with lib; { + description = "Optional kernel module for LookingGlass"; + longDescription = '' + This kernel module implements a basic interface to the IVSHMEM device for LookingGlass when using LookingGlass in VM->VM mode + Additionally, in VM->host mode, it can be used to generate a shared memory device on the host machine that supports dmabuf + ''; + homepage = "https://github.com/gnif/LookingGlass"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ j-brn ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2952e8a7c89..a0bba227ef03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20978,6 +20978,8 @@ in jool = callPackage ../os-specific/linux/jool { }; + kvmfr = callPackage ../os-specific/linux/kvmfr { }; + mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; From c31f5ba08351905c96f3b264e3ea2d49c7930437 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Tue, 6 Jul 2021 22:03:44 +0100 Subject: [PATCH 35/92] pianoteq.{stage-trial,standard-trial}: 7.3.0 -> 7.4.1 --- pkgs/applications/audio/pianoteq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 842c43fc55bb..9c258f69f664 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -162,20 +162,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.3.0"; + version = "7.4.1"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k"; + sha256 = "14mbaz6i1rxqayrjjkck9yx8iijkm4q1qz29ymkd7sz2gpk7fcpa"; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.3.0"; + version = "7.4.1"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d"; + sha256 = "01xh4n0h7dd3xqhm0bx0a62mqmfvxvmr5cm5r2g249c9wqg5i32a"; }; }; stage-6 = mkPianoteq rec { From 2e9dd407b89019a1d9eeaac3b2976c7ed0fcba69 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Tue, 6 Jul 2021 23:58:53 +0100 Subject: [PATCH 36/92] rr-unstable: 2020-10-04 -> 2021-07-06 It seems like the original reason for the rr-unstable package has gone stale, and there has been a proper release (5.4.0) since it was made. However, it has now been over 8 months since a release again, so I figured I would repurpose rr-unstable. I personally need the following unreleased commit to be able to use rr at all on an AMD Ryzen 5900X CPU: https://github.com/rr-debugger/rr/pull/2762/commits/854b51effa25c7be3d6687ac0d6ef8afe9b3e3bb --- pkgs/development/tools/analysis/rr/unstable.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/unstable.nix b/pkgs/development/tools/analysis/rr/unstable.nix index 82b644f76ae6..35098c1bcfc8 100644 --- a/pkgs/development/tools/analysis/rr/unstable.nix +++ b/pkgs/development/tools/analysis/rr/unstable.nix @@ -1,9 +1,8 @@ -# This is a temporary copy of the default.nix in this folder, with the version updated to the current tip of rr's master branch. -# This exists because rr has not had a release in a long time, but there have been a lot of improvements including UX. -# Some of the UX improvements help prevent foot shooting. -# Upstream has stated that it should be fine to use master. -# This file, and its attribute in all-packages, can be removed once rr makes a release. -# For further information, please see https://github.com/NixOS/nixpkgs/issues/99535 "Improve support for the rr debugger in nixos containers" +# This is a temporary copy of the default.nix in this folder, with the version +# updated to the current tip of rr's master branch. This exists because rr has +# not had a release in a long time. Upstream has stated that it should be fine +# to use master. This file, and its attribute in all-packages, can be removed +# once rr makes a release. { callPackage, fetchFromGitHub }: @@ -12,12 +11,12 @@ let in rr.overrideAttrs (old: { - version = "unstable-2020-10-04"; + version = "unstable-2021-07-06"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; - rev = "9ff375813a740a0a6ebcdfcebc58bd61ab68c667"; - sha256 = "0raifs6cg5ckpi2445inhy3hfhp4p89s1lkx9z17mcc2g1c1phf5"; + rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0"; + sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5"; }; }) From b9ff6b1f3371feb73dddaafd44e143f02d8a30ee Mon Sep 17 00:00:00 2001 From: Peter Woodman Date: Tue, 6 Jul 2021 18:45:33 -0400 Subject: [PATCH 37/92] google-cloud-sdk: add aarch64-darwin --- pkgs/tools/admin/google-cloud-sdk/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index e0c0f061ecb9..5bd9c95d3a5e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -24,6 +24,11 @@ let sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd"; }; + aarch64-darwin = { + url = "${baseUrl}/${name}-darwin-arm.tar.gz"; + sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk="; + }; + x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb"; @@ -109,6 +114,6 @@ in stdenv.mkDerivation rec { license = licenses.free; homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From 66aa4f2d4f6c3a9b025856a4aa688ed82ff9dd54 Mon Sep 17 00:00:00 2001 From: "\"Vanilla\"" <"neko@hydev.org"> Date: Wed, 7 Jul 2021 07:59:42 +0800 Subject: [PATCH 38/92] vimPlugins.doki-theme-vim: init at 2021-06-16 --- 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 fade7b84e079..6218cc05d0f1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1326,6 +1326,18 @@ final: prev: meta.homepage = "https://github.com/direnv/direnv.vim/"; }; + doki-theme-vim = buildVimPluginFrom2Nix { + pname = "doki-theme-vim"; + version = "2021-06-16"; + src = fetchFromGitHub { + owner = "doki-theme"; + repo = "doki-theme-vim"; + rev = "8a3a7b64d5509f87564d846faae5ef0b2b77d2a6"; + sha256 = "05s7fph5bm9gz2b0biqrpsvvh8ccfxh5csxya3rkja86ppz6wawr"; + }; + meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; + }; + DoxygenToolkit-vim = buildVimPluginFrom2Nix { pname = "DoxygenToolkit-vim"; version = "2010-11-06"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9513f29dbf1d..de93c6750e55 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -102,6 +102,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim +doki-theme/doki-theme-vim dominikduda/vim_current_word dpelle/vim-LanguageTool dracula/vim as dracula-vim From d8dc2f15ea4fa788c66d2b1210c7e002c3c67873 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jul 2021 02:04:06 +0200 Subject: [PATCH 39/92] python3Packages.pep8-naming: fix tests Was broken when bumping flake8 to a version newer than 3.9.0, because their tests "mock out things that are internal to Flake8". https://github.com/PyCQA/pep8-naming/issues/171 --- .../python-modules/pep8-naming/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 5f6ef894d8ff..a23cce431a09 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,6 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib +, fetchPypi +, fetchpatch +, buildPythonPackage +, flake8 , flake8-polyfill -, importlib-metadata +, python }: buildPythonPackage rec { @@ -12,10 +16,27 @@ buildPythonPackage rec { sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1"; }; + patches = [ + (fetchpatch { + # Fix tests by setting extended-default-ignore to an empty list + url = "https://github.com/PyCQA/pep8-naming/commit/6d62db81d7967e123e29673a4796fefec6f06d26.patch"; + sha256 = "1jpr2dga8sphksik3izyzq9hiszyki691mwnh2rjzd2vpgnv8cxf"; + }) + ]; + propagatedBuildInputs = [ + flake8 flake8-polyfill - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} run_tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pep8ext_naming" ]; meta = with lib; { From 7d8653652999ff29ed5e8f4d00ca7d5d1f14e9c3 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Wed, 7 Jul 2021 08:49:33 +0800 Subject: [PATCH 40/92] rtw89: init at 2021-07-03 (#129325) Co-authored-by: Sandro --- .../linux/firmware/rtw89-firmware/default.nix | 25 ++++++++++++ pkgs/os-specific/linux/rtw89/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 69 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix create mode 100644 pkgs/os-specific/linux/rtw89/default.nix diff --git a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix new file mode 100644 index 000000000000..8e71770df9ce --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix @@ -0,0 +1,25 @@ +{ stdenvNoCC, lib, linuxPackages }: + +stdenvNoCC.mkDerivation { + pname = "rtw89-firmware"; + inherit (linuxPackages.rtw89) version src; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/firmware/rtw89 + cp *.bin $out/lib/firmware/rtw89 + + runHook postInstall + ''; + + meta = with lib; { + description = "Driver for Realtek 8852AE, an 802.11ax device"; + homepage = "https://github.com/lwfinger/rtw89"; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ tvorog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix new file mode 100644 index 000000000000..86ca72c537cf --- /dev/null +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +let + modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw89"; +in +stdenv.mkDerivation { + pname = "rtw89"; + version = "unstable-2021-07-03"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtw89"; + rev = "cebafc6dc839e66c725b92c0fabf131bc908f607"; + sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af"; + }; + + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + + runHook postInstall + ''; + + meta = with lib; { + description = " Driver for Realtek 8852AE, an 802.11ax device"; + homepage = "https://github.com/lwfinger/rtw89"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ tvorog ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "5.4"; + priority = -1; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa17692f12f0..2e04bc25bb82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21004,6 +21004,8 @@ in rtw88 = callPackage ../os-specific/linux/rtw88 { }; rtlwifi_new = rtw88; + rtw89 = callPackage ../os-specific/linux/rtw89 { }; + openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; # Current stable release; don't backport release updates! @@ -21600,6 +21602,8 @@ in rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; + rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { }; + s3ql = callPackage ../tools/backup/s3ql { }; sass = callPackage ../development/tools/sass { }; From 176b8cce2360c107b9310d3aa8d4c13a1b745d0a Mon Sep 17 00:00:00 2001 From: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Date: Wed, 7 Jul 2021 03:08:35 +0200 Subject: [PATCH 41/92] fmt_8: init at 8.0.1 (#129378) --- pkgs/development/libraries/fmt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 474c990d5177..3fee016175bc 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -47,4 +47,9 @@ in version = "7.1.3"; sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; }; + + fmt_8 = generic { + version = "8.0.1"; + sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6e95914730e..be0b60596998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15058,7 +15058,7 @@ in flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_7; + inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8; fmt = fmt_7; From c4f09d8006817c64fcd1d72eda28637c6c1e35b3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 7 Jul 2021 11:44:57 +0900 Subject: [PATCH 42/92] oil: 0.8.11 -> 0.8.12 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 1f6c7b70dc71..4d66f0d401dc 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-GVV+532dPrXkQ3X2+wa4u6aCPBvQAIiypeoqzJqvk9Y="; + sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU="; }; postPatch = '' From ae5e4425a001705b83f7ac7577a273b1b7d7f814 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 04:14:49 +0000 Subject: [PATCH 43/92] esbuild: 0.12.12 -> 0.12.14 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 309845df80a8..8b37899ef675 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.12"; + version = "0.12.14"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-4Ooadv8r6GUBiayiv4WKVurUeRPIv6LPlMhieH4VL8o="; + sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From 6dfc26e6f67e87e32566f739f89d9eb85ce3a75f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 6 Jul 2021 16:57:30 +0200 Subject: [PATCH 44/92] gitea: 1.14.3 -> 1.14.4 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 96f3af51620b..258e81acedfc 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.3"; + version = "1.14.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-ieQxqZO84sYBcCzWYn40tRGLgSs2PpLlcNkI4vFq+wE="; + sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo="; }; unpackPhase = '' From 655dc5b67eadad07ac99e80ae9e323adacf7cf1c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 7 Jul 2021 13:10:50 +0900 Subject: [PATCH 45/92] purescript: 0.14.2 -> 0.14.3 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 568407c3614e..adf9dd13c71f 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.2"; + version = "0.14.3"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf"; + sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw"; + sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0"; }; From 91887fed8dd3e8450329280c4efc4682225d4c7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 7 Jul 2021 00:46:23 +0000 Subject: [PATCH 46/92] fish: 3.3.0 -> 3.3.1 --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 23edf2068175..c53a9ed0fe2d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,7 +144,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pCFeTKsqWxAbC4hDcgvaPH65jooU3KCVC47xfpQoL6o="; + sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; }; # Fix FHS paths in tests From a2cdd3f44a8a3170197f3d2deef91574d9918514 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 7 Jul 2021 00:05:44 -0700 Subject: [PATCH 47/92] roon-server: 1.8-795 -> 1.8-806 --- 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 a6592ee235c9..91371a085575 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-795"; + version = "1.8-806"; # 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/20210610060249/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-gC+UquDMyDpgCEYKPp2RRIkHD/4itJssl0hcSEQO5Rc="; + url = "https://web.archive.org/web/20210707070319/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-TRgsHR71wNz2MoH+RZrIaWEzQSAbo+q8ICKfmmCFy5Y="; }; buildInputs = [ From e55f56bb9e38f133dc6248c8cd90f0a56256119e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:19 +0200 Subject: [PATCH 48/92] python3Packages.archinfo: 9.0.8021 -> 9.0.8761 --- 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 96cbf539fd18..580b05b82ade 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.8021"; + version = "9.0.8761"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc="; + sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; }; checkInputs = [ From dc25b0bc075329464c9334f1a13a14c828000542 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:22 +0200 Subject: [PATCH 49/92] python3Packages.ailment: 9.0.8021 -> 9.0.8761 --- 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 388880cda0b3..961a6cff1960 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.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8="; + sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; }; propagatedBuildInputs = [ pyvex ]; From ed0d0e75a9fa6fb2b983d32d4bfab7ab2b1b566a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:25 +0200 Subject: [PATCH 50/92] python3Packages.pyvex: 9.0.8021 -> 9.0.8761 --- 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 b2696b101b42..b2f43db50cf9 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.8021"; + version = "9.0.8761"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo="; + sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; }; postPatch = lib.optionalString stdenv.isDarwin '' From c4b6ca48423060b338b796bdc03afa6c0dbf92d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:28 +0200 Subject: [PATCH 51/92] python3Packages.claripy: 9.0.8021 -> 9.0.8761 --- 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 03be293a5674..d8257f446d15 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.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs="; + sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; }; # Use upstream z3 implementation From c566add8cb3ead5f8ef5f3b5183917f3ea17672f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:30 +0200 Subject: [PATCH 52/92] python3Packages.cle: 9.0.8021 -> 9.0.8761 --- 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 bb99365e33fa..87091509fb0d 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.8021"; + version = "9.0.8761"; # 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-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM="; + sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; }; propagatedBuildInputs = [ From 7d43b982ddf75bdb40116e750563dea27424abd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:35 +0200 Subject: [PATCH 53/92] python3Packages.angr: 9.0.8021 -> 9.0.8761 --- 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 89cdc5c55f0b..092d3a53e941 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.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk="; + sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; }; propagatedBuildInputs = [ From 05f7b916ae1c6c1b7898999303e26c63e0047a8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 09:11:37 +0200 Subject: [PATCH 54/92] python3Packages.angrop: 9.0.8021 -> 9.0.8761 --- 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 09d1388c25ec..aa6f72eae54f 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44="; + sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; }; propagatedBuildInputs = [ From 90f9b704238409decdbfcddc015889d4bb6f386f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 7 Jul 2021 09:11:25 +0200 Subject: [PATCH 55/92] pdns-recursor: 4.5.2 -> 4.5.4 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 70e7e758bb94..da57282ae08f 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1101izvyknxqhzz987j3acsa221ymgrnmyciaz8v7jziai9ksa5i"; + sha256 = "0sl98ykk2bh0v2aw2hyak7wk9k3pbhvmfkb3i4a72jlsixm60p81"; }; nativeBuildInputs = [ pkg-config ]; From 64f20381dc92ba36cef6cd677f4ea2bdb8c19288 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 7 Jul 2021 13:54:00 +0800 Subject: [PATCH 56/92] xcolor: fix build --- pkgs/tools/graphics/xcolor/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index f19a80357f35..1e8f3fd78d72 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libX11, libXcursor, libxcb, python3 }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, libX11, libXcursor, libxcb, python3 }: rustPlatform.buildRustPackage rec { pname = "xcolor"; @@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rHqK05dN5lrvDNbRCWGghI7KJwWzNCuRDEThEeMzmio="; }; - cargoSha256 = "sha256-lHOT/P1Sh1b53EkPIQM3l9Tozdqh60qlUDdjthj32jM="; + cargoPatches = [ + # Update Cargo.lock, lexical_core doesn't build on Rust 1.52.1 + (fetchpatch { + url = "https://github.com/Soft/xcolor/commit/324d80a18a39a11f2f7141b226f492e2a862d2ce.patch"; + sha256 = "sha256-5VzXitpl/gMef40UQBh1EoHezXPyB08aflqp0mSMAVI="; + }) + ]; + + cargoSha256 = "sha256-yD4pX+dCJvbDecsdB8tNt1VsEcyAJxNrB5WsZUhPGII="; nativeBuildInputs = [ pkg-config python3 ]; From 1cfc10e797bedd4531da45b7543b860c09911c4a Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 7 Jul 2021 15:46:28 +0800 Subject: [PATCH 57/92] stevenblack-blocklist: 3.7.12 -> 3.7.13 --- pkgs/tools/networking/stevenblack-blocklist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index b8b045831088..ebbaaa73fce1 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.12"; + version = "3.7.13"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E="; + sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; meta = with lib; { description = "Unified hosts file with base extensions"; From 50a10986ec1dc3a11165c8e734ccfb03f0236b65 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 7 Jul 2021 16:23:04 +0800 Subject: [PATCH 58/92] mdbook: 0.4.9 -> 0.4.10 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index a8c5efb0a493..dd6265b5b348 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-wc3poiLnIHbbl0j2sWQkEbxccpohPnvjLPdNuKfsDSY="; + sha256 = "sha256-1Ddy/kb2Q7P+tzyEr3EC3qWm6MGSsDL3/vnPJLAm/J0="; }; - cargoSha256 = "sha256-2DNfacPp9IMke2j8WYxpGmMxityaFGyXrc0jOyqPl3c="; + cargoSha256 = "sha256-x2BwnvEwTqz378aDE7OHWuEwNEsUnRudLq7sUJjHRpA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 315e3cfc9aafb7e52b988db27f68d8f83b4d7e04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 10:30:01 +0200 Subject: [PATCH 59/92] python3Packages.dependency-injector: 4.32.2 -> 4.34.0 --- .../python-modules/dependency-injector/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 8958566070ed..d220bd51ac1c 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.32.2"; + version = "4.34.0"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg"; + sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0="; }; propagatedBuildInputs = [ @@ -42,6 +42,11 @@ buildPythonPackage rec { pyyaml ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "six>=1.7.0,<=1.15.0" "six" + ''; + disabledTestPaths = [ # There is no unique identifier to disable the one failing test "tests/unit/ext/test_aiohttp_py35.py" From e6fb1bb60e3d6f6f9916aa7d9d8bc7f17d3fcc9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 21:43:13 +0200 Subject: [PATCH 60/92] python3Packages.graphene: fix build --- pkgs/development/python-modules/graphene/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index be2cc808eb0d..c2776e20e2bb 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -25,9 +25,8 @@ buildPythonPackage rec { sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338="; }; - # Allow later aniso8601 releases - # https://github.com/graphql-python/graphene/pull/1331 patches = [ (fetchpatch { + # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331 url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch"; sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk="; }) ]; @@ -50,6 +49,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # TypeError: Failed: DID NOT RAISE Date: Tue, 6 Jul 2021 21:33:37 +0200 Subject: [PATCH 61/92] python3Packages.starlette: fix build --- pkgs/development/python-modules/starlette/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 694b678930b2..3079b60564f1 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -53,9 +53,13 @@ buildPythonPackage rec { typing-extensions ]; - # fails to import graphql, but integrated graphql support is about to - # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. - disabledTestPaths = [ "tests/test_graphql.py" ]; + disabledTestPaths = [ + # fails to import graphql, but integrated graphql support is about to + # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. + "tests/test_graphql.py" + # contextfunction was removed in Jinja 3.1 + "tests/test_templates.py" + ]; pythonImportsCheck = [ "starlette" ]; From b57c87ae7d20e57989064a28b7bb940ddd884242 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 7 Jul 2021 10:29:07 +0000 Subject: [PATCH 62/92] btcpayserver: 1.1.1 -> 1.1.2 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 7b6e3918da58..d942ac768a83 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY="; + sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; From cf2bee80eb2c370610232334da4ea008ad4221e8 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 7 Jul 2021 10:32:59 +0000 Subject: [PATCH 63/92] nbxplorer: 2.1.51 -> 2.1.52 --- .../blockchains/nbxplorer/default.nix | 4 ++-- pkgs/applications/blockchains/nbxplorer/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 7e279b226961..40deef62c2ce 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.51"; + version = "2.1.52"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg="; + sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index de75ad228d3a..b7b01b14bff5 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.31"; - sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; + version = "2.0.33"; + sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.22"; - sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n"; + version = "2.0.23"; + sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.76"; - sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79"; + version = "5.0.78"; + sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.77"; - sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + version = "5.0.81"; + sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) (fetchNuGet { name = "NETStandard.Library"; From 4c0834929cafb7478a5e82616d484578a80a3e41 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 7 Jul 2021 09:33:06 +0200 Subject: [PATCH 64/92] ocamlPackages.lwt-canceler: init at 0.2 --- .../ocaml-modules/lwt-canceler/default.nix | 27 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lwt-canceler/default.nix diff --git a/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/pkgs/development/ocaml-modules/lwt-canceler/default.nix new file mode 100644 index 000000000000..2e4d12082b75 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt-canceler/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitLab, buildDunePackage, lwt }: + +buildDunePackage rec { + pname = "lwt-canceler"; + version = "0.2"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "lwt-canceler"; + rev = "v${version}"; + sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1"; + }; + useDune2 = true; + + propagatedBuildInputs = [ + lwt + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/nomadic-labs/lwt-canceler"; + description = "Cancellation synchronization object"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e25108d04fe..1a7c42c8a543 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -612,6 +612,8 @@ let ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; + lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { }; + ocaml_lwt = lwt; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; From 1537d093614d98258becf48b9872a58c21bcfc91 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 7 Jul 2021 13:41:35 +0200 Subject: [PATCH 65/92] uutils-coreutils: fix darwin build (missing libiconv) --- pkgs/tools/misc/uutils-coreutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index b2d3883176c6..209a38cdcc10 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -5,6 +5,7 @@ , cargo , sphinx , Security +, libiconv , prefix ? "uutils-" , buildMulticallBinary ? true }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; makeFlags = [ "CARGO=${cargo}/bin/cargo" From c7ddc7e001b755d77c42899b87b5bc7d06831b58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 13:56:07 +0200 Subject: [PATCH 66/92] pinfo: 0.6.10 -> 0.6.13 --- pkgs/applications/misc/pinfo/default.nix | 45 +++++++++++++++++------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 8668807e81cc..b0fc64a1a5e9 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,24 +1,45 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }: +{ lib +, autoreconfHook +, fetchFromGitHub +, gettext +, ncurses +, readline +, stdenv +, texinfo +}: -stdenv.mkDerivation { - name = "pinfo-0.6.10"; +stdenv.mkDerivation rec { + pname = "pinfo"; + version = "0.6.13"; - src = fetchurl { - # homepage needed you to login to download the tarball - url = "https://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" - + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; - sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; + src = fetchFromGitHub { + owner = "baszoetekouw"; + repo = pname; + rev = "v${version}"; + sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gettext texinfo ncurses readline ]; + nativeBuildInputs = [ + autoreconfHook + ]; - configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; + buildInputs = [ + gettext + texinfo + ncurses + readline + ]; + + configureFlags = [ + "--with-curses=${ncurses.dev}" + "--with-readline=${readline.dev}" + ]; meta = with lib; { description = "A viewer for info files"; + homepage = "https://github.com/baszoetekouw/pinfo"; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ fab ]; }; } - From 8560dc854943ee35d420ccdc591adbc20d1b52f1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 7 Jul 2021 17:13:57 +0200 Subject: [PATCH 67/92] cypress: 7.5.0 -> 7.7.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 9563563bc427..0b61aa23086f 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.5.0"; + version = "7.7.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj"; + sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; }; passthru.updateScript = ./update.sh; From 17d2bc7eeb4640a9fc75607111d2688f677bf248 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Wed, 7 Jul 2021 12:04:57 -0400 Subject: [PATCH 68/92] katago: Corrected git commit hash to be the tagged version, not the old tagged version --- pkgs/games/katago/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 2457cd1cf961..fb08ef44710e 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -34,7 +34,7 @@ let in env.mkDerivation rec { pname = "katago"; version = "1.9.1"; - githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362"; + githash = "c3220a5a404af835792c476f3f24904e4b799444"; src = fetchFromGitHub { owner = "lightvector"; From ce35e2852d2b094314c6eec29843b3a5b33e7245 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:08:00 +0200 Subject: [PATCH 69/92] python3Packages.aqualogic: 2.6 -> 3.3 --- .../python-modules/aqualogic/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 9a23ebd82a9f..255248e8d924 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -1,33 +1,36 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , pyserial , pytestCheckHook +, websockets }: buildPythonPackage rec { pname = "aqualogic"; - version = "2.6"; + version = "3.3"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM="; + sha256 = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs="; }; - patches = [ - (fetchpatch { - name = "allow-iobase-objects.patch"; - url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch"; - sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg"; - }) + propagatedBuildInputs = [ + pyserial + websockets ]; - propagatedBuildInputs = [ pyserial ]; + checkInputs = [ + aiohttp + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + # With 3.3 the event loop is not terminated after the first test + # https://github.com/swilson/aqualogic/issues/9 + doCheck = false; pythonImportsCheck = [ "aqualogic" ]; From aea1a6c3cdea7b5886cfcf1e99f9ae085ad4d7a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 18:07:30 +0200 Subject: [PATCH 70/92] python3Packages.foolscap: 20.4.0 -> 21.7.0 --- .../python-modules/foolscap/default.nix | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index e0d38a5a1313..ea0c17d5524a 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -2,39 +2,48 @@ , buildPythonPackage , fetchPypi , mock -, twisted , pyopenssl +, pytestCheckHook , service-identity +, twisted }: buildPythonPackage rec { pname = "foolscap"; - version = "20.4.0"; + version = "21.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; + sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; }; - propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; + propagatedBuildInputs = [ + mock + twisted + pyopenssl + service-identity + ]; - checkPhase = '' - # Either uncomment this, or remove this custom check phase entirely, if - # you wish to do battle with the foolscap tests. ~ C. - # trial foolscap - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Not all dependencies are present + "src/foolscap/test/test_connection.py" + ]; + + pythonImportsCheck = [ "foolscap" ]; meta = with lib; { - homepage = "http://foolscap.lothar.com/"; - description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; + description = "RPC protocol for Python that follows the distributed object-capability model"; longDescription = '' - "Foolscap" is the name for the next-generation RPC protocol, - intended to replace Perspective Broker (part of Twisted). - Foolscap is a protocol to implement a distributed - object-capabilities model in Python. + "Foolscap" is the name for the next-generation RPC protocol, intended to + replace Perspective Broker (part of Twisted). Foolscap is a protocol to + implement a distributed object-capabilities model in Python. ''; - # See http://foolscap.lothar.com/trac/browser/LICENSE. + homepage = "https://github.com/warner/foolscap"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 652d498786800389ee3314f94e083b6828be90a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:30:03 +0200 Subject: [PATCH 71/92] python3Packages.hstspreload: 2021.6.28 -> 2021.7.5 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index e6a3837522e6..6833837b6968 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.6.28"; + version = "2021.7.5"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-SZGyn79R3+IwtoZ+khgFnl0WosRoCcKNk8efGxbOugc="; + sha256 = "sha256-/89K41MrTdF68+BVkfnv+0d+6rBHdRGKpN2Psfr2Wog="; }; # tests require network connection From a79e9212ec4d47ccb2014cadaa40578532e6868e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 7 Jul 2021 18:58:33 +0200 Subject: [PATCH 72/92] python3Packages.maestral: 1.4.5 -> 1.4.6 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index d974038e7b0a..50180f43b8ed 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.5"; + version = "1.4.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4="; + sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4="; }; propagatedBuildInputs = [ From d20231f714e6e50cfce3d1deb65afa154461ce33 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 7 Jul 2021 18:58:49 +0200 Subject: [PATCH 73/92] maestral-gui: 1.4.5 -> 1.4.6 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 53b439b9f715..18189f64a6d6 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.5"; + version = "1.4.6"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw="; + sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ="; }; propagatedBuildInputs = with python3.pkgs; [ From a7a7be8b94b57845b8af6bbf8829af384ce81fd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 07:26:37 +0000 Subject: [PATCH 74/92] k9s: 0.24.12 -> 0.24.13 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index b2788f8b0701..8da48f8485f4 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.12"; + version = "0.24.13"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs="; + sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28="; }; buildFlagsArray = '' From fc745d501da187e928cb8879b73deeeb3efaee2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:49:34 +0200 Subject: [PATCH 75/92] python3Packages.bitarray: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index d7e15d4c1e1b..28ae80020986 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xF7u+qYA9vL2hD/EaZhprl18HouPtY/zgFhM6bx6cII="; + sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0="; }; checkPhase = '' From 8d113676ca61528b4defde7bacc303c5e3ef7f73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 07:18:23 +0000 Subject: [PATCH 76/92] just: 0.9.6 -> 0.9.8 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8a8d4201451f..d7a2e7338592 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.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-FWJ7fSJysT5LVFio49nbN0T0b+zWwiV7NvEJlojbNKs="; + sha256 = "sha256-WT3r6qw/lCZy6hdfAJmoAgUqjSLPVT8fKX4DnqDnhOs="; }; - cargoSha256 = "sha256-/VmCuHPURQTyeIumMaWVrFu18ZgVR0klpc/bO1f1w4o="; + cargoSha256 = "sha256-0R/9VndP/Oh5/yP7NsBC25jiCSRVNEXhbVksElLXeEc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 8211a76d5b01b375c7382ac883f9796774480d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 06:41:26 +0000 Subject: [PATCH 77/92] humioctl: 0.28.4 -> 0.28.5 --- pkgs/applications/logging/humioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 591d1569bdd6..f73c38591f95 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.4"; - sha256 = "sha256-X2pc15InfCzVbZ2fmBdr+GKgOySIruA1yD61HcLO164="; + humioCtlVersion = "0.28.5"; + sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0="; vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; From 7b48f6295d4370159b0749a66718dce8474aa3f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 23:47:15 +0000 Subject: [PATCH 78/92] libcyaml: 1.1.0 -> 1.2.0 --- pkgs/development/libraries/libcyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index b316b6b63956..0fabdb49ca11 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"; + sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU="; }; buildInputs = [ libyaml ]; From 2b42d61cefabac24310fbe8eaa9e9be2e6b958c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 02:51:37 +0000 Subject: [PATCH 79/92] codeql: 2.5.6 -> 2.5.7 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a2396314387c..df3c42b4718f 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.6"; + version = "2.5.7"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w="; + sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc="; }; nativeBuildInputs = [ From f62e46d62976148e99335ca860402c1dbc226a2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Jul 2021 05:44:13 +0000 Subject: [PATCH 80/92] goreleaser: 0.172.1 -> 0.173.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 18c936befb4c..34195c2fffe0 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.172.1"; + version = "0.173.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc="; + sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo="; }; - vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU="; + vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; buildFlagsArray = [ "-ldflags=" From 97111e82cad9ea979aad656db44cc03ac278a02c Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Wed, 7 Jul 2021 17:40:59 +0200 Subject: [PATCH 81/92] python3Packages.pymetar: 1.2 -> 1.3 The original homepage URL is inaccessible, changed it to the GitHub page. --- pkgs/development/python-modules/pymetar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index ef5273936cf4..b4ff976c8eac 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.2"; + version = "1.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68"; + sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; }; checkPhase = '' @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A command-line tool to show the weather report by a given station ID"; - homepage = "http://www.schwarzvogel.de/software/pymetar.html"; + homepage = "https://github.com/klausman/pymetar"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; From addf2a6edf9a91464b5ab527b25dbdf18e36bcdd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:33:10 +0200 Subject: [PATCH 82/92] python3Packages.httmock: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/httmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index cbf6b95ccd36..8976afaf852e 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "httmock"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; + sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; checkInputs = [ requests ]; From ab7068523804ac953849b2d8de7a6b4ee178a28f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 16:40:06 +0200 Subject: [PATCH 83/92] python3Packages.httmock: enable tests --- .../python-modules/httmock/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 8976afaf852e..7928189c7cd1 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -1,7 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: buildPythonPackage rec { - pname = "httmock"; + pname = "httmock"; version = "1.4.0"; src = fetchFromGitHub { @@ -11,12 +16,19 @@ buildPythonPackage rec { sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; - checkInputs = [ requests ]; + checkInputs = [ + requests + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ "httmock" ]; meta = with lib; { description = "A mocking library for requests"; - homepage = "https://github.com/patrys/httmock"; - license = licenses.asl20; + homepage = "https://github.com/patrys/httmock"; + license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; } From b749ff4f51211db2bd0d9931aedaf110467c1fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 17:01:11 +0200 Subject: [PATCH 84/92] python3Packages.pg8000: 1.19.5 -> 1.20.0 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 5560e918ac4a..db18611f20aa 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.19.5"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3LmvucuHrMeTiK5jPEXPf4Bqq+O7XYzxVFcraZOT+Tc="; + sha256 = "sha256-SQ7CKpJgHwRUs+1MjU7N3DD2bA4/eD8OzFgQN3SajFU="; }; propagatedBuildInputs = [ From 1947733a32019fda3847d74061749c883d299786 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Wed, 7 Jul 2021 19:29:52 +0000 Subject: [PATCH 85/92] polkadot: 0.9.7 -> 0.9.8 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 8c549ee4e796..a1f0b17b2020 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc="; + sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8="; }; - cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw="; + cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6"; nativeBuildInputs = [ clang ]; From 82a2deced8e02f3875419272d1481910011c3872 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 7 Jul 2021 22:20:17 +0200 Subject: [PATCH 86/92] fcft: 2.4.1 -> 2.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes a “rare crash”: https://codeberg.org/dnkl/fcft/releases/tag/2.4.2 --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 9018a1bfa218..3634b4a2cab1 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.1"; + version = "2.4.2"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM="; + sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; From 5ec78c03ce0edc82d33f6a4e4f6c243ce8d96cb1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 06:49:37 +0300 Subject: [PATCH 87/92] change various expressions to use pname and version --- .../tools/literate-programming/funnelweb/default.nix | 5 +++-- .../tools/misc/editorconfig-core-c/default.nix | 7 +++---- pkgs/development/tools/misc/rolespec/default.nix | 7 ++----- pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix | 6 +++--- pkgs/tools/admin/sec/default.nix | 6 +++--- pkgs/tools/misc/lnav/default.nix | 8 +++----- pkgs/tools/misc/yank/default.nix | 8 +++----- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 53b7f208e812..56d53104a206 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,8 +1,9 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "funnelweb"; + version = "3.20"; - name = "funnelweb-${meta.version}"; src = fetchurl { url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index de5c1e070fdb..f48ba999d868 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { - name = "editorconfig-core-c-${meta.version}"; + pname = "editorconfig-core-c"; + version = "0.12.1"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-c.git"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; fetchSubmodules = true; - inherit name; }; buildInputs = [ pcre ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; - version = "0.12.1"; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index b26fbf75031d..7b084fae891e 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - - name = "rolespec-${meta.version}"; + pname = "rolespec"; + version = "20161104"; src = fetchFromGitHub { owner = "nickjj"; repo = "rolespec"; rev = "d9ee530cd709168882059776c482fc37f46cb743"; sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; - inherit name; }; nativeBuildInputs = [ makeWrapper ]; @@ -41,9 +40,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/nickjj/rolespec"; license = licenses.gpl3; - version = "20161104"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; - } diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 6eebfe64d5a7..d32968cc45c3 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -1,10 +1,11 @@ { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mfcl2700dncupswrapper-${meta.version}"; + pname = "mfcl2700dncupswrapper"; + version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; }; @@ -39,6 +40,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.linux; - version = "3.2.0-1"; }; } diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index fe3517c6196c..0afac976d09e 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,12 +1,13 @@ { fetchFromGitHub, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "sec-${meta.version}"; + pname = "sec"; + version = "2.8.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; - rev = meta.version; + rev = version; sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; @@ -27,6 +28,5 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.all; - version = "2.8.3"; }; } diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d9364ff23e4..373687fafdf1 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -2,15 +2,14 @@ , readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { - - name = "lnav-${meta.version}"; + pname = "lnav"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; - inherit name; }; buildInputs = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 19a4ba986ff2..dbbe14cf3864 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, xsel }: stdenv.mkDerivation rec { - - name = "yank-${meta.version}"; + pname = "yank"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; - inherit name; }; installFlags = [ "PREFIX=$(out)" ]; @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.2.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; From d8a87e89e7147cfa96c6ee37c0dc854555d75689 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 07:06:41 +0300 Subject: [PATCH 88/92] switch mercurial_4 and tortoisehg to pname --- .../version-management/mercurial/4.9.nix | 18 ++++++--------- .../version-management/tortoisehg/default.nix | 22 +++++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index 030a35212ec6..0a76f7df9704 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,21 +1,19 @@ { lib, stdenv, fetchurl, python2Packages, makeWrapper , guiSupport ? false, tk ? null , ApplicationServices -, mercurialSrc ? fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = "4.9.1"; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - } }: let inherit (python2Packages) docutils hg-git dulwich python; -in python2Packages.buildPythonApplication { +in python2Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "4.9.1"; - inherit (mercurialSrc.meta) name version; - src = mercurialSrc; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; + }; format = "other"; @@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication { ''; meta = { - inherit (mercurialSrc.meta) version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; @@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication { platforms = lib.platforms.unix; }; } - diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 17cde4c8a540..73d8f3aa5ec2 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,20 +1,18 @@ { lib, fetchurl, python3Packages , mercurial, qt5 }: -let - tortoisehgSrc = fetchurl rec { - meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.8"; - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; - sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; - }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; +python3Packages.buildPythonApplication rec { + pname = "tortoisehg"; + version = "5.8"; -in python3Packages.buildPythonApplication { - inherit (tortoisehgSrc.meta) name version; - src = tortoisehgSrc; + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; + }; + + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; propagatedBuildInputs = with python3Packages; [ tortoiseMercurial qscintilla-qt5 iniparse From 83e44f67b1a05c65fad8fc55a54268cc06ecf3f7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 7 Jul 2021 22:35:28 +0200 Subject: [PATCH 89/92] dwm: support cross-compilation by setting proper CC --- pkgs/applications/window-managers/dwm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 088581b67013..6235c93a2816 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { homepage = "https://dwm.suckless.org/"; description = "An extremely fast, small, and dynamic window manager for X"; From e93d6ab0ff3f9999c58cea3c6e4f3554c9b221ef Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 7 Jul 2021 23:21:12 +0200 Subject: [PATCH 90/92] mdbook: remove unused input --- pkgs/tools/text/mdbook/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index a8c5efb0a493..b43e8e52bad0 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook"; From aa359bdfde3d0d4eceb9161639be761edbeac086 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 8 Jul 2021 00:12:15 +0200 Subject: [PATCH 91/92] electrs: 0.8.9 -> 0.8.10 --- pkgs/applications/blockchains/electrs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix index af0346196a32..cf2f4d3d47eb 100644 --- a/pkgs/applications/blockchains/electrs.nix +++ b/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y"; + sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8"; + cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; From 5ae0e01511be6c37135361365a32ffc3a82beb1f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 7 Jul 2021 23:12:54 +0200 Subject: [PATCH 92/92] fcft: support cross-compilation --- pkgs/development/libraries/fcft/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 3634b4a2cab1..c413cf277c8b 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ] ++ lib.optional withHarfBuzz harfbuzz;