From 6bbbc295539fc583e516e597c237ae22614e0b9c Mon Sep 17 00:00:00 2001 From: Potato Hatsue Date: Tue, 25 Jul 2023 13:24:34 +0800 Subject: [PATCH 01/72] wakapi: 2.7.0 -> 2.8.1 --- pkgs/tools/misc/wakapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 6ca253707786..95ffa8e8e4b1 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-1EMSrHx6Tx58voz5veyNZg1gnubuGyg2K4dg2QdzmMw="; + sha256 = "sha256-5EUXhKv4cLDaHr6Q2mel3YbVPAYRJd1JtHyWn7kQy8Y="; }; - vendorHash = "sha256-0wHXULDKyXYBTGxfSQXT/5NidPtSnx7ujb8vyczmE38="; + vendorHash = "sha256-rwQeIHJAtnRm5nPQCvgoBabVeyLZyrY3yglCW9+NGwM="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; From fdd31f980ea4bf56d1bbe321d55cd46d9d27f189 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:54:32 -0400 Subject: [PATCH 02/72] pkgs/tools/admin: remove dead code with the help of deadnix & nil --- pkgs/tools/admin/awscli/default.nix | 4 ++-- pkgs/tools/admin/azure-cli/default.nix | 2 +- pkgs/tools/admin/azure-cli/python-packages.nix | 2 +- pkgs/tools/admin/credhub-cli/default.nix | 2 +- pkgs/tools/admin/cw/default.nix | 2 +- pkgs/tools/admin/gixy/default.nix | 4 ++-- pkgs/tools/admin/google-cloud-sdk/components.nix | 8 +++----- pkgs/tools/admin/google-cloud-sdk/default.nix | 2 +- pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix | 2 +- pkgs/tools/admin/kics/default.nix | 3 +-- pkgs/tools/admin/meshcentral/default.nix | 2 +- pkgs/tools/admin/ossutil/default.nix | 2 +- pkgs/tools/admin/syft/default.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 1 - 14 files changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index ac119e7d1c31..dc5b34184ad0 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -8,7 +8,7 @@ let py = python3.override { packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + pyyaml = super.pyyaml.overridePythonAttrs rec { version = "5.4.1"; src = fetchFromGitHub { owner = "yaml"; @@ -21,7 +21,7 @@ let PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all runHook postCheck ''; - }); + }; }; self = py; }; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index fcfc16f7e820..786620088a1d 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -14,7 +14,7 @@ let # put packages that needs to be overridden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version python3 fetchPypi; + inherit stdenv src version python3 fetchPypi; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 3fbd9e8f1acb..303e0ffacc37 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, fetchPypi, lib, src, version }: +{ stdenv, python3, fetchPypi, src, version }: let buildAzureCliPackage = with py.pkgs; buildPythonPackage; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index f87723cc3100..c2849d6afd4c 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/tools/admin/cw/default.nix index 413fad40dcc3..1a1941369419 100644 --- a/pkgs/tools/admin/cw/default.nix +++ b/pkgs/tools/admin/cw/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cw"; diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index bd216050b200..e8d400d7f66d 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -3,7 +3,7 @@ let python = python3.override { packageOverrides = self: super: { - pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + pyparsing = super.pyparsing.overridePythonAttrs rec { version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; @@ -14,7 +14,7 @@ let nativeBuildInputs = [ super.setuptools ]; - }); + }; }; }; in diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index f4e5bca7307f..2b25d65a7f27 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,12 +1,10 @@ -{ stdenv -, lib -, google-cloud-sdk +{ lib +, stdenv , system , snapshotPath , autoPatchelfHook , python3 , libxcrypt-legacy -, ... }: let @@ -143,7 +141,7 @@ let { url = src; inherit sha256; - }) ; + }); dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 9401523e3456..f354dde039c8 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index 1260f9673a2b..c71f23c978bb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -1,4 +1,4 @@ -{ lib, google-cloud-sdk, callPackage, runCommand, components }: +{ lib, google-cloud-sdk, runCommand, components }: comps_: diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index b06c2fde645a..e5b4733332c2 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub -, lib , testers , kics }: diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 62e0d302486a..5d511368ef10 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }: +{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }: yarn2nix-moretea.mkYarnPackage { version = "1.1.6"; diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix index 478c7d46c81b..be5f8f914026 100644 --- a/pkgs/tools/admin/ossutil/default.nix +++ b/pkgs/tools/admin/ossutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { version = "1.7.16"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0f2fa51e3742..1f03755ef91d 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "syft"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index a405f10671cf..d1a0d8cf416f 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , xorg , xkeyboard_config , zlib From b035cabadfa9801a2a5e00dbd00ae5dc486a8354 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 10:08:41 -0400 Subject: [PATCH 03/72] pkgs/tools/filesystems: remove dead code with the help of deadnix & nil --- pkgs/tools/filesystems/bees/default.nix | 4 ++-- pkgs/tools/filesystems/ceph/default.nix | 8 ++++---- pkgs/tools/filesystems/davfs2/default.nix | 1 - pkgs/tools/filesystems/dduper/default.nix | 4 ++-- pkgs/tools/filesystems/dupe-krill/default.nix | 2 +- pkgs/tools/filesystems/dwarfs/default.nix | 1 - pkgs/tools/filesystems/garage/default.nix | 2 +- pkgs/tools/filesystems/gocryptfs/default.nix | 1 - pkgs/tools/filesystems/lizardfs/default.nix | 1 - pkgs/tools/filesystems/mkspiffs/presets.nix | 4 ++-- pkgs/tools/filesystems/netatalk/default.nix | 3 --- pkgs/tools/filesystems/nilfs-utils/default.nix | 2 +- pkgs/tools/filesystems/sdat2img/default.nix | 2 +- pkgs/tools/filesystems/squashfs/default.nix | 1 - pkgs/tools/filesystems/ubidump/default.nix | 2 +- pkgs/tools/filesystems/wipefreespace/default.nix | 1 - .../filesystems/zpool-auto-expand-partitions/default.nix | 5 ++--- 17 files changed, 17 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 5710d80c2cc7..fd1166e1a301 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -75,8 +75,8 @@ in substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'').overrideAttrs (old: { +'').overrideAttrs { passthru.tests = { smoke-test = nixosTests.bees; }; -}) +} diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 2437fd358a7d..1b0c9c98633a 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -107,7 +107,7 @@ let optZfs = shouldUsePkg zfs; # Downgrade rocksdb, 7.10 breaks ceph - rocksdb' = rocksdb.overrideAttrs (oldAttrs: { + rocksdb' = rocksdb.overrideAttrs { version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; @@ -115,7 +115,7 @@ let rev = "refs/tags/v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; - }); + }; hasRadosgw = optExpat != null && optCurl != null && optLibedit != null; @@ -165,7 +165,7 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.46"; src = fetchPypi { pname = "SQLAlchemy"; @@ -176,7 +176,7 @@ let "test/aaa_profiling" "test/ext/mypy" ]; - }); + }; }; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 1efef2d9b53c..3d3c1b54db82 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , neon , procps diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index 9c38852e4e90..efdb9f3dc1d6 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: let - btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; @@ -9,7 +9,7 @@ let sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; - }); + }; py3 = python3.withPackages (ps: with ps; [ prettytable numpy diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix index b28aaadca906..d825c1b0fb09 100644 --- a/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/pkgs/tools/filesystems/dupe-krill/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "dupe-krill"; diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 1ffe03601dfe..cd774395c2c1 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -9,7 +9,6 @@ , double-conversion , fmt_8 , fuse3 -, gflags , glog , gtest , jemalloc diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 4eb488b2d025..ef4a46868cad 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, testers, Security, garage, nixosTests }: +, cacert, Security, garage, nixosTests }: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 23446ce998d9..a1f424915f30 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , fuse diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index aa2260cb374d..7f7a9f54fd82 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , python3 diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix index c0b74d9cf1b7..d4008b2fa3c3 100644 --- a/pkgs/tools/filesystems/mkspiffs/presets.nix +++ b/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -4,10 +4,10 @@ lib.mapAttrs ( name: { CPPFLAGS }: - mkspiffs.overrideAttrs (drv: { + mkspiffs.overrideAttrs { inherit CPPFLAGS; BUILD_CONFIG_NAME = "-${name}"; - }) + } ) { arduino-esp8266.CPPFLAGS = [ "-DSPIFFS_USE_MAGIC_LENGTH=0" diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index a4e1b6d62c4d..d4ef2154d81d 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,16 +1,13 @@ { lib , stdenv , fetchurl -, fetchpatch , acl , autoreconfHook , avahi , db -, ed , libevent , libgcrypt , libiconv -, libtirpc , openssl , pam , perl diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index fbb1532f3e6d..5f3b5e534ca3 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libuuid, libselinux , e2fsprogs }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/tools/filesystems/sdat2img/default.nix index 44e884201d4a..4176eabad401 100644 --- a/pkgs/tools/filesystems/sdat2img/default.nix +++ b/pkgs/tools/filesystems/sdat2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "sdat2img"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index c52b83ceb1a2..ae658330b280 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , help2man , lz4 , lzo diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 5e325591e6ee..623cef884476 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix index 885d64f7c41f..03adc070c0ef 100644 --- a/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -1,5 +1,4 @@ { stdenv -, pkgs , lib , fetchurl , e2fsprogs diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index afafbca58baf..601baabd87ee 100644 --- a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -1,8 +1,7 @@ -{ rustPlatform +{ lib +, rustPlatform , cloud-utils , fetchFromGitHub -, lib -, llvmPackages , pkg-config , util-linux , zfs From 3ef3b08083b865d67c3c9692add60e98134b12d0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:05 -0400 Subject: [PATCH 04/72] pkgs/tools/audio: remove dead code --- pkgs/tools/audio/botamusique/default.nix | 1 - pkgs/tools/audio/isrcsubmit/default.nix | 2 +- pkgs/tools/audio/kaldi/default.nix | 3 +-- pkgs/tools/audio/midimonster/default.nix | 6 ++---- pkgs/tools/audio/mpd-notification/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 5eaaa9c873e3..02460f61d93b 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3Packages , ffmpeg , makeWrapper diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix index fa01756f8982..f135cccbc6cd 100644 --- a/pkgs/tools/audio/isrcsubmit/default.nix +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "isrcsubmit"; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 777a7535a10c..7ea5cf622b57 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -7,7 +7,6 @@ , cmake , pkg-config , fetchFromGitHub -, git , python3 , Accelerate , _experimental-update-script-combinators @@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateOpenfst ]; - }; + }; meta = with lib; { description = "Speech Recognition Toolkit"; diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index 841704427c2b..ec55367474f5 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, zlib , fetchFromGitHub , gnumake , gcc @@ -15,7 +13,7 @@ , libevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "midimonster"; version = "0.6.0"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { owner = "cbdevnet"; rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; -}; + }; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index 66f6d1880a61..03b632ae7e0e 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, systemd , file , iniparser , ffmpeg @@ -33,9 +32,9 @@ stdenv.mkDerivation rec { ffmpeg libmpdclient discount - ]; + ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace systemd/mpd-notification.service --replace /usr $out - ''; + substituteInPlace systemd/mpd-notification.service --replace /usr $out + ''; - meta = with lib; { + meta = with lib; { description = "Notifications for mpd"; homepage = "https://github.com/eworm-de/mpd-notification"; license = licenses.gpl3Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba142c1e461a..a2d7b6e7391a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9212,7 +9212,7 @@ with pkgs; ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; From d454e416fd9ac69f575198b4865838749db98546 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:31 -0400 Subject: [PATCH 05/72] pkgs/tools/bluetooth: remove dead code --- pkgs/tools/bluetooth/blueberry/default.nix | 1 - pkgs/tools/bluetooth/blueman/default.nix | 2 +- pkgs/tools/bluetooth/bluetuith/default.nix | 2 +- pkgs/tools/bluetooth/nrfconnect/default.nix | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index ac64242fe646..63845045c06b 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -5,7 +5,6 @@ , cinnamon , gnome , gobject-introspection -, intltool , libnotify , pavucontrol , python3Packages diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 5b887222c513..cc4f15d1bea8 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 +, obex_data_server, xdg-utils, dnsmasq, dhcp, iproute2 , gnome, librsvg, wrapGAppsHook, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 7a86be1fa1d8..7904e8d5b5d0 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bluetuith"; diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/tools/bluetooth/nrfconnect/default.nix index 8a89f5fc840f..07dc7303a06e 100644 --- a/pkgs/tools/bluetooth/nrfconnect/default.nix +++ b/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , appimageTools }: From d80e7644338d1002d7a3787d18046a903c530c19 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:51 -0400 Subject: [PATCH 06/72] ventoy: remove dead code --- pkgs/tools/cd-dvd/ventoy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index bc29040d89d4..1983018788ea 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/pkgs/tools/cd-dvd/ventoy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoPatchelfHook , bash , copyDesktopItems From 0f00e2f1cf73d8638c816e064da10732f8162627 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 10:00:01 -0400 Subject: [PATCH 07/72] pkgs/tools/compression: remove dead code --- pkgs/tools/compression/zopfli/default.nix | 2 +- pkgs/tools/compression/zstd/default.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 753368b70b97..2c844cffc21b 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "zopfli"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 3a51bdce190b..791dda4f11ef 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file -, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling From 6149d319158f38ef4d541b36ce26a5231ae7b98b Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 10 Jul 2023 23:15:00 +0200 Subject: [PATCH 08/72] chicken: enable cross-compilation This allows the cross compilation of chicken in, at least, the following ways: ```sh nix-build -A pkgsCross.aarch64-multiplatform.chicken ``` and ```sh nix-build -A pkgsCross.raspberryPi.chicken ``` Building with clang on x86_64-linux has also been repaired. Additionally, instead of reimplementing a version tester in the `installCheckPhase`, this test has been pulled out into its own tester attribute. While two broken tests needed to be disabled, the functionality of static building is not broken. Only the tests themselves seem not to be able to handle the specification of absolute compiler paths. --- .../compilers/chicken/5/chicken.nix | 47 ++++++++++--------- .../compilers/chicken/5/eggDerivation.nix | 8 ++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index b1fdde8d8668..ed74dfd48239 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null, testers }: let platform = with stdenv; @@ -8,30 +8,41 @@ let else if isSunOS then "solaris" else "linux"; # Should be a sane default in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chicken"; version = "5.3.0"; binaryVersion = 11; src = fetchurl { - url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; }; + # Disable two broken tests: "static link" and "linking tests" + postPatch = '' + sed -i tests/runtests.sh -e "/static link/,+4 { s/^/# / }" + sed -i tests/runtests.sh -e "/linking tests/,+11 { s/^/# / }" + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + # -fno-strict-overflow is not a supported argument in clang + hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; makeFlags = [ - "PLATFORM=${platform}" "PREFIX=$(out)" - ] ++ (lib.optionals stdenv.isDarwin [ - "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "PLATFORM=${platform}" + "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" + "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" + ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "HOSTSYSTEM=${stdenv.hostPlatform.config}" ]); nativeBuildInputs = [ @@ -44,24 +55,16 @@ stdenv.mkDerivation rec { bootstrap-chicken ]; - postInstall = '' - for f in $out/bin/* - do - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - done - ''; - doCheck = !stdenv.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ - -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" + -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/chicken -version - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "csi -version"; + }; meta = { homepage = "https://call-cc.org/"; @@ -77,4 +80,4 @@ stdenv.mkDerivation rec { Windows, and many Unix flavours. ''; }; -} +}) diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index a85a98d46cb6..2d2462355928 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,14 +17,16 @@ in (stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ chicken makeWrapper ]; buildInputs = [ chicken ]; + strictDeps = true; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; buildPhase = '' runHook preBuild - chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -no-install -host ${lib.escapeShellArgs chickenInstallFlags} runHook postBuild ''; @@ -33,7 +35,7 @@ in export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -host ${lib.escapeShellArgs chickenInstallFlags} for f in $out/bin/* do From 59fbf3ee74d68484782d5c1a7d93a66ff09e07b5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 16:32:44 -0400 Subject: [PATCH 09/72] pkgs/tools/typesetting: remove dead code --- pkgs/tools/typesetting/lowdown/default.nix | 3 +-- pkgs/tools/typesetting/satysfi/default.nix | 6 +++--- pkgs/tools/typesetting/tex/mftrace/default.nix | 1 - pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e4c904fffbc6..3a108d7c8ed0 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, enableShared ? !(stdenv.hostPlatform.isStatic) +, enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests , nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = let - inherit (stdenv.hostPlatform.extensions) sharedLibrary; soVersion = "3"; in diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 16fe6c579c0a..8b341298f311 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages +{ lib, fetchFromGitHub, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { + camlpdf = ocamlPackages.camlpdf.overrideAttrs { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }); + }; otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/tools/typesetting/tex/mftrace/default.nix index 9f061630e224..4b8a0350c8b1 100644 --- a/pkgs/tools/typesetting/tex/mftrace/default.nix +++ b/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , autoreconfHook -, buildEnv , python3 , fontforge , potrace diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix index fe08d6823396..4fd32aadf8ce 100644 --- a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix +++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "pgf-umlcd"; version = "unstable-2020-05-28"; @@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -}) +} From 9a6b05a7aae835dc3ca2c911dbb486c35e3a1b74 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 16:33:07 -0400 Subject: [PATCH 10/72] wtwitch: remove dead code --- pkgs/tools/video/wtwitch/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index e03deea51fc2..9b2a9a7be031 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -10,12 +10,10 @@ , makeWrapper , mplayer , mpv -, ncurses , procps , scdoc , stdenv , streamlink -, sudo , vlc }: From 98fd1b11157793664c53dc546ed7838c12e13582 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 16:33:22 -0400 Subject: [PATCH 11/72] pkgs/tools/virtualization: remove dead code --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- pkgs/tools/virtualization/google-compute-engine/default.nix | 1 - pkgs/tools/virtualization/google-guest-agent/default.nix | 2 +- pkgs/tools/virtualization/google-guest-configs/default.nix | 2 +- pkgs/tools/virtualization/google-guest-oslogin/default.nix | 5 ++--- pkgs/tools/virtualization/ovftool/default.nix | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index f9828abe629c..696b0b822e51 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -18,7 +18,7 @@ let cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + pyyaml = super.pyyaml.overridePythonAttrs rec { version = "5.4.1"; checkPhase = '' runHook preCheck @@ -30,7 +30,7 @@ let inherit version; hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; }; - }); + }; }; }; in diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544aea2..c980a45bbef2 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index f531b5ca84ac..f34a56f5d143 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper +{ buildGoModule, fetchFromGitHub, lib, coreutils, makeWrapper , google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps }: diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/tools/virtualization/google-guest-configs/default.nix index dd3c01c6229a..73dd3c93d255 100644 --- a/pkgs/tools/virtualization/google-guest-configs/default.nix +++ b/pkgs/tools/virtualization/google-guest-configs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll +{ stdenv, lib, fetchFromGitHub, makeWrapper , ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 68ca58fb64ff..84e6a865dcd6 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -1,6 +1,5 @@ -{ stdenv -, lib -, bashInteractive +{ lib +, stdenv , curl , fetchFromGitHub , json_c diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index bbd80391c7ae..5f501647783e 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} -, requireFile, autoPatchelfHook, makeWrapper, unzip +, autoPatchelfHook, makeWrapper, unzip , glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib }: From 4bf0d5dfa2bcb151c1583997b3ad54a28de7fc59 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 16:33:37 -0400 Subject: [PATCH 12/72] pkgs/tools/wayland: remove dead code --- pkgs/tools/wayland/gtklock/default.nix | 1 - pkgs/tools/wayland/mpvpaper/default.nix | 1 - pkgs/tools/wayland/swww/default.nix | 2 +- pkgs/tools/wayland/waynergy/default.nix | 1 - pkgs/tools/wayland/wayout/default.nix | 3 +-- pkgs/tools/wayland/wlay/default.nix | 4 ++-- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 8a57fd581037..3d74344a4e76 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkgs , pam , scdoc , gtk3 diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index 3f98e8ef8c21..51edcc0ea3a2 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , meson -, cmake , ninja , wlroots , wayland diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 2bd2dbcf7e38..3555af7c0424 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; version = "0.8.1"; diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index dd2e6502bc8c..646ed3698504 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -10,7 +10,6 @@ , wayland-protocols , wl-clipboard , libxkbcommon -, cmake , libressl }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix index 041c3dfe8cce..ca3a3f419116 100644 --- a/pkgs/tools/wayland/wayout/default.nix +++ b/pkgs/tools/wayland/wayout/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromSourcehut , rustPlatform +, fetchFromSourcehut }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/wayland/wlay/default.nix b/pkgs/tools/wayland/wlay/default.nix index a766a49d25d9..3a80e0627e37 100644 --- a/pkgs/tools/wayland/wlay/default.nix +++ b/pkgs/tools/wayland/wlay/default.nix @@ -15,7 +15,7 @@ , wayland-scanner }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "wlay"; version = "unstable-2022-01-26"; @@ -54,4 +54,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -}) +} From 18389c81357500e1f7ed9cc3a106a167810c1db2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 16:36:03 -0400 Subject: [PATCH 13/72] sunpaper: remove dead code --- pkgs/tools/X11/sunpaper/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/tools/X11/sunpaper/default.nix index 9f760bb4a93f..116b0225ab0f 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/tools/X11/sunpaper/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , sunwait , wallutils -, rPackages }: stdenvNoCC.mkDerivation rec { @@ -27,7 +26,7 @@ stdenvNoCC.mkDerivation rec { --replace "sunwait" "${sunwait}/bin/sunwait" \ --replace "setwallpaper" "${wallutils}/bin/setwallpaper" \ --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" - ''; + ''; installPhase = '' mkdir -p "$out/bin" "$out/share/sunpaper/images" From 7c1602303e2b667c0487939d97c0f16be0547cb7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Jul 2023 04:20:00 +0000 Subject: [PATCH 14/72] git-lfs: 3.3.0 -> 3.4.0 Diff: https://github.com/git-lfs/git-lfs/compare/v3.3.0...v3.4.0 Changelog: https://github.com/git-lfs/git-lfs/raw/v3.4.0/CHANGELOG.md --- pkgs/applications/version-management/git-lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 4285c5be8a38..a45f184881d4 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw="; + hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI="; }; - vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw="; + vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; nativeBuildInputs = [ asciidoctor installShellFiles ]; From c5355d2bfe7bfd270f813b167243626941718ad0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Jul 2023 12:51:54 +0800 Subject: [PATCH 15/72] xfce.xfce4-volumed-pulse: 0.2.3 -> 0.2.4 https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/compare/xfce4-volumed-pulse-0.2.3...xfce4-volumed-pulse-0.2.4 --- .../xfce/applications/xfce4-volumed-pulse/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 3820cae101a8..9f1373d7d926 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -3,15 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; - version = "0.2.3"; + version = "0.2.4"; - sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; - - # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 - postPatch = '' - substituteInPlace configure.ac.in \ - --replace "2.16" "2.26" - ''; + sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y="; buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; From 0e195385d6b1f740ecb544ee044bd4ed8c41efa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 07:22:28 +0000 Subject: [PATCH 16/72] python310Packages.jsonmerge: 1.9.0 -> 1.9.2 --- pkgs/development/python-modules/jsonmerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 6dfa6914f426..6d2c8b10108c 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.9.0"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; + hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; propagatedBuildInputs = [ jsonschema ]; From 70779762306b6bb42eb1c434504aa13fb24fdde1 Mon Sep 17 00:00:00 2001 From: Piet de Vries Date: Wed, 26 Jul 2023 09:58:33 +0200 Subject: [PATCH 17/72] azuredatastudio: 1.35.1 -> 1.44.1 --- pkgs/applications/misc/azuredatastudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 0261f983ac79..7e366d19d54c 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.35.1"; + version = "1.44.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ="; + sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath From 44d3d0d545549d0f5c6084b58610037d7dfb5d2e Mon Sep 17 00:00:00 2001 From: Jan Votava Date: Wed, 26 Jul 2023 17:27:32 +0700 Subject: [PATCH 18/72] timoni: 0.10.0 -> 0.11.0 --- pkgs/applications/networking/cluster/timoni/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 1ce1420ce3dd..573e2cd78e4a 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-D49jpwldmtS7/+++4avqAGOhILaHmlUvnfjoV45KVc4="; + hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o="; }; - vendorHash = "sha256-QWNYBHxcKyAexnD6bHfJIDSOEST2J/09YKC/kDsXKHU="; + vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; From e381388f5eab6f2b9d36fa3fdaa52f38a423c04f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 10:59:18 +0000 Subject: [PATCH 19/72] morgen: 2.7.4 -> 2.7.5 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 30cc891d0999..559474b7417a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; + sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; }; nativeBuildInputs = [ From d721d226918a20edcfae482260d5424444d567c9 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 26 Jul 2023 19:15:38 +0200 Subject: [PATCH 20/72] iina: add meta.sourceProvenance This package is not built from source, so mark it as such. --- pkgs/applications/video/iina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix index 20089630c87c..b1a6e5169227 100644 --- a/pkgs/applications/video/iina/default.nix +++ b/pkgs/applications/video/iina/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "The modern media player for macOS"; platforms = platforms.darwin; license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ arkivm stepbrobd ]; }; } From 54be506f973f9eb57ae932c716ccf3f15a5bf285 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 26 Jul 2023 19:02:01 +0200 Subject: [PATCH 21/72] iina: 1.3.2 -> 1.3.3 https://github.com/iina/iina/releases/tag/v1.3.3 --- pkgs/applications/video/iina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix index b1a6e5169227..8e317102b365 100644 --- a/pkgs/applications/video/iina/default.nix +++ b/pkgs/applications/video/iina/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - hash = "sha256-rF5yv2QHWVUUsyf/u78jWRn4C629GBJgB/i8YnaKHBk="; + hash = "sha256-Sz9sS+07t32+KcEr9tXQlZKEr7Ace1mjX9caOicIiZE="; }; nativeBuildInputs = [ undmg ]; From 38e7c1eea2c3a0bddb8392df8a1da0d84dc398e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 18:27:18 +0000 Subject: [PATCH 22/72] tar2ext4: 0.9.8 -> 0.10.0 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 4ac3d777bc54..b41d5b2c6994 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog="; + sha256 = "sha256-+GhYeQ27uwg9JOv1qbf1+UbMd+vPXJ05nsXZD9OakzI="; }; sourceRoot = "source/cmd/tar2ext4"; From 208db71739c1ec3cb7bde13eadc8ea57634a1ca4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 19:01:01 +0000 Subject: [PATCH 23/72] python310Packages.weconnect-mqtt: 0.42.3 -> 0.45.1 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0bd4bec4d516..0111a43b06ce 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.3"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w="; + hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; }; postPatch = '' From 44bf861c6bc3fa754d115106bc81e9dc08415a83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:18 +0200 Subject: [PATCH 24/72] python311Packages.archinfo: 9.2.60 -> 9.2.61 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.60...v9.2.61 --- 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 be715ade28f7..504fb66a491f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w2dauzM7niQSbgLgSMXN5X2aU1Xj+9G/8Mah4CDMWGw="; + hash = "sha256-ZTS+Z0PWcA/jhBx37SVZOZ+NjPyG2VaRYMmBg0BeCDI="; }; nativeBuildInputs = [ From 6f69d24c9f657a1a189cfb5d6cf497d5da412dcb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:21 +0200 Subject: [PATCH 25/72] python311Packages.ailment: 9.2.60 -> 9.2.61 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.60...v9.2.61 --- 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 6e0f136e0e1c..21325a944226 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gai+o8XVcOj/HidvlictpnbHLUcGrNR+BLkCuEK8b7c="; + hash = "sha256-QIYJ0Xp1MwCHN1LcpGXF+ZjzFV7dRP6faQy1nwBiMFM="; }; nativeBuildInputs = [ From e715a981b5266e9d0e64a2c434c64b8a56a20a29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:30 +0200 Subject: [PATCH 26/72] python311Packages.pyvex: 9.2.60 -> 9.2.61 --- 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 9b1d8424fafe..26af176ec470 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gDkt+6fuQ3kHfjgy3VqYGZNM9mGyJdbkt6QzNpVHzYQ="; + hash = "sha256-UbaaudnwsIXs/IsiZyCamnWjLndwrn244ZdbvZa7P0I="; }; nativeBuildInputs = [ From 13226bc7f89784e677bab571c19243d3d1cb7583 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:33 +0200 Subject: [PATCH 27/72] python311Packages.claripy: 9.2.60 -> 9.2.61 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.60...v9.2.61 --- 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 37e38c47ad58..e0b6126482c5 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UpNnvHlsZkDltIDJAl8m1wx79MByRpBjUneiTW0PZr8="; + hash = "sha256-ibxXVHVskDF0DcOWccNKQpWu2V50ZSLCoZHRo+XEZTM="; }; nativeBuildInputs = [ From 0b4e09d65edd406a57fce072741175f1dbb5ed22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:36 +0200 Subject: [PATCH 28/72] python311Packages.cle: 9.2.60 -> 9.2.61 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.60...v9.2.61 --- 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 d02cf1d1e370..3435e20b65ed 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.60"; + version = "9.2.61"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CpJiRcaZGM7AOzO1HqCmzWJAFhS2fHmSOJsRLs3VPFc="; + hash = "sha256-iAKHNVAtUdm+ZTk5nXejI7WdEV9sTjLnfZ4B6Wxzk18="; }; nativeBuildInputs = [ From b263d359cdd79244151ad43a8e2231a1fa3563d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:02:42 +0200 Subject: [PATCH 29/72] python311Packages.angr: 9.2.60 -> 9.2.61 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.60...v9.2.61 --- 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 bfaecc909577..16e34408e856 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.60"; + version = "9.2.61"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+LeJDSYtAdWyYu2wDm+r7nr1H+CKGxQI9CnmY/8lc/w="; + hash = "sha256-8nGiGDohzxiFNyvMls9EeUxcV7iFIBS2YhaE6Hep0KU="; }; propagatedBuildInputs = [ From 52a20d5ec49c9c5911e2664a7c0b1f283d80f4d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:23:01 +0200 Subject: [PATCH 30/72] python311Packages.kasa-crypt: 0.2.1 -> 0.3.0 Diff: https://github.com/bdraco/kasa-crypt/compare/refs/tags/v0.2.1...v0.3.0 Changelog: https://github.com/bdraco/kasa-crypt/blob/0.3.0/CHANGELOG.md --- pkgs/development/python-modules/kasa-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index a761c9785932..d7445a30d1be 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ="; + hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y="; }; postPatch = '' From 9c7aa11bdd241f6c19fb437002a0968f5e583a30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jul 2023 21:24:40 +0200 Subject: [PATCH 31/72] python311Packages.kasa-crypt: update changelog entry --- pkgs/development/python-modules/kasa-crypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index d7445a30d1be..a9b15b4390d1 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast kasa crypt"; homepage = "https://github.com/bdraco/kasa-crypt"; - changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From c15aaf8a16edf5f334fe38d81226543704af710d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 20:39:13 +0000 Subject: [PATCH 32/72] python310Packages.azure-mgmt-kusto: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/azure-mgmt-kusto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index b4321d50dba3..5195c0102db4 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; + hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c="; extension = "zip"; }; From 941c77f4b91e8b1339a192b1b09bea07981a9013 Mon Sep 17 00:00:00 2001 From: Anatolii Smolianinov Date: Thu, 27 Jul 2023 00:36:39 +0200 Subject: [PATCH 33/72] wasm-tools: 1.0.37 -> 1.0.38 --- pkgs/tools/misc/wasm-tools/Cargo.lock | 162 ++++++++++--------------- pkgs/tools/misc/wasm-tools/default.nix | 4 +- 2 files changed, 65 insertions(+), 101 deletions(-) diff --git a/pkgs/tools/misc/wasm-tools/Cargo.lock b/pkgs/tools/misc/wasm-tools/Cargo.lock index ff19090b8a7b..53d0877bac82 100644 --- a/pkgs/tools/misc/wasm-tools/Cargo.lock +++ b/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -235,9 +235,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.16" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -246,9 +246,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.16" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -580,9 +580,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" @@ -643,12 +643,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fixedbitset" @@ -855,17 +852,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" version = "0.4.9" @@ -954,12 +940,6 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.3" @@ -1025,9 +1005,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1174,9 +1154,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1297,26 +1277,12 @@ checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" dependencies = [ "bitflags 1.3.2", "errno 0.2.8", - "io-lifetimes 0.7.5", + "io-lifetimes", "libc", "linux-raw-sys 0.0.46", "windows-sys 0.42.0", ] -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.4" @@ -1370,9 +1336,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -1389,9 +1355,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", @@ -1400,9 +1366,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -1411,9 +1377,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.24" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5f51e3fdb5b9cdd1577e1cb7a733474191b1aca6a72c2e50913241632c1180" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ "indexmap 2.0.0", "itoa", @@ -1475,9 +1441,9 @@ checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" [[package]] name = "syn" -version = "2.0.26" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1492,15 +1458,14 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", - "rustix 0.37.23", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -1524,18 +1489,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", @@ -1726,10 +1691,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-compose" -version = "0.3.1" +version = "0.4.0" dependencies = [ "anyhow", - "clap 4.3.16", "glob", "heck", "indexmap 2.0.0", @@ -1740,7 +1704,7 @@ dependencies = [ "serde_yaml", "smallvec", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-component", @@ -1748,42 +1712,42 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.31.0" +version = "0.31.1" dependencies = [ "anyhow", "leb128", "tempfile", - "wasmparser 0.109.0", + "wasmparser 0.110.0", ] [[package]] name = "wasm-metadata" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", - "clap 4.3.16", + "clap 4.3.19", "indexmap 2.0.0", "serde", "serde_json", "spdx", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wasm-mutate" -version = "0.2.29" +version = "0.2.30" dependencies = [ "anyhow", - "clap 4.3.16", + "clap 4.3.19", "egg", "env_logger", "log", "rand", "thiserror", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] @@ -1794,37 +1758,37 @@ version = "0.1.0" dependencies = [ "anyhow", "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "env_logger", "itertools", "log", "num_cpus", "rand", "wasm-mutate", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", ] [[package]] name = "wasm-shrink" -version = "0.1.30" +version = "0.1.31" dependencies = [ "anyhow", "blake3", - "clap 4.3.16", + "clap 4.3.19", "env_logger", "log", "rand", "wasm-mutate", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-smith" -version = "0.12.12" +version = "0.12.13" dependencies = [ "arbitrary", "criterion", @@ -1835,19 +1799,19 @@ dependencies = [ "rand", "serde", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-tools" -version = "1.0.37" +version = "1.0.38" dependencies = [ "addr2line 0.20.0", "anyhow", "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "cpp_demangle 0.4.2", "diff", "env_logger", @@ -1868,7 +1832,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1885,7 +1849,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1904,7 +1868,7 @@ dependencies = [ "wasm-encoder", "wasm-mutate", "wasm-smith", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", "wast", @@ -1925,7 +1889,7 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.109.0" +version = "0.110.0" dependencies = [ "anyhow", "criterion", @@ -1940,13 +1904,13 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.61" +version = "0.2.62" dependencies = [ "anyhow", "diff", "rayon", "tempfile", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wast", "wat", ] @@ -2108,7 +2072,7 @@ dependencies = [ [[package]] name = "wast" -version = "62.0.0" +version = "62.0.1" dependencies = [ "anyhow", "leb128", @@ -2116,13 +2080,13 @@ dependencies = [ "rayon", "unicode-width", "wasm-encoder", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wat" -version = "1.0.68" +version = "1.0.69" dependencies = [ "wast", ] @@ -2336,7 +2300,7 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "wit-component" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "bitflags 2.3.3", @@ -2347,7 +2311,7 @@ dependencies = [ "pretty_assertions", "wasm-encoder", "wasm-metadata", - "wasmparser 0.109.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-parser", @@ -2355,7 +2319,7 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "env_logger", @@ -2384,10 +2348,10 @@ dependencies = [ [[package]] name = "wit-smith" -version = "0.1.7" +version = "0.1.8" dependencies = [ "arbitrary", - "clap 4.3.16", + "clap 4.3.19", "indexmap 2.0.0", "log", "semver", diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 24ed77fdd531..6572b7469f30 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.37"; + version = "1.0.38"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-3LswpSnXCRaDeoViEa/EnyB472g4TlLYc705rUmfN9M="; + hash = "sha256-SGNIGOpkREGu/bmojOh+TPlg75rKoa04u+BDiida6dI="; fetchSubmodules = true; }; From 4fe15d0abaf0861e6aeef8a130a380fabe01c2e9 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Thu, 27 Jul 2023 00:51:14 +0200 Subject: [PATCH 34/72] pgmodeler: 1.0.4 -> 1.0.5 --- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index fa6b1f86e03b..87847e32f6cc 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s="; + sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; From 578ac5435b71426d9961564c61084037e47efbe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 23:19:45 +0000 Subject: [PATCH 35/72] kubeconform: 0.6.2 -> 0.6.3 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 06624f2b29f4..76f81be00ea5 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo="; + sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw="; }; vendorHash = null; From 1e6e15e1657ce13243f47bf2312c2568936ee484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 23:41:50 +0000 Subject: [PATCH 36/72] python311Packages.azure-mgmt-cognitiveservices: 13.4.0 -> 13.5.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index b72ffdd4ea50..25dfe383e35d 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.4.0"; + version = "13.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; + hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; }; propagatedBuildInputs = [ From 1f65672cbaa8884a1361eef342a9a57a4b6c0a81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jul 2023 00:05:52 +0000 Subject: [PATCH 37/72] buf: 1.24.0 -> 1.25.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 82f67523389f..c066a9c55537 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-DMZYjtIuN8b03UOAEtz32+Cj2MaE46v2k0IHT7YiZfk="; + hash = "sha256-koYRJCO9G8McoFNe2P61y+q7T4gZ1MBNAy9jFC63kds="; }; - vendorHash = "sha256-uBM5r3cT0c4NUOfWaqkxRJ06p2GtOwvSOQfvP77ivTA="; + vendorHash = "sha256-2UA8rp2ZHTUnYialFXrIlH+RzfZHtdKn0dc+Dfps8ow="; patches = [ # Skip a test that requires networking to be available to work. From d4e1c00fa0ac4b6de089392fc836bcdb62844990 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jul 2023 00:16:58 +0000 Subject: [PATCH 38/72] minesweep-rs: 6.0.16 -> 6.0.19 --- pkgs/games/minesweep-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 8aa3ecdc5893..4d09d7715ac3 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.16"; + version = "6.0.19"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-jA4NqLZw+JREj0UlEMjcatb6PeBHpiNKrFenpe3HyBw="; + hash = "sha256-dFY+t6MVRdbp0z5mbnREd/t6v1D+7g/vD+K8mcJvn9E="; }; - cargoHash = "sha256-wvN7aa4LjvYIJZtUedAscD2x8EKpdtzc5b1YI9MTeLY="; + cargoHash = "sha256-mLRD5Z/ZzfT1BFFSyYmJkY98vMY/Elt3Gy0SboCpzec="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; From 31069d431aa35c2cdce9cfc6b6d7a4a90e0bc909 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 03:06:08 +0000 Subject: [PATCH 39/72] terraform-providers.buildkite: 0.20.0 -> 0.21.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 20d041f6b699..96e329c896fe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=", + "hash": "sha256-2nJXniJfOHuHaEEue0rugq5RRnThcFMh7MWYGE/AzmA=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.20.0", + "rev": "v0.21.2", "spdx": "MIT", - "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I=" + "vendorHash": "sha256-xxuF4LVDkFkHT42plP+Mv8GFdBrrZZVUm6vErjpho3I=" }, "checkly": { "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=", From 6c80c82cd42d0e754cffc27bbda0bde5ec987dd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 03:07:18 +0000 Subject: [PATCH 40/72] terraform-providers.equinix: 1.14.3 -> 1.14.4 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 96e329c896fe..3b66b9876ba7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -354,13 +354,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=", + "hash": "sha256-fTzo4vgUwq9k5BhlAEAjMbu3O+jGtIumvzT0xYox6fg=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.3", + "rev": "v1.14.4", "spdx": "MIT", - "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" + "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc=" }, "exoscale": { "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", From 6dccf0c4d737b67d9a06132f6418a6695aa61c58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 03:11:24 +0000 Subject: [PATCH 41/72] terraform-providers.rancher2: 3.0.2 -> 3.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3b66b9876ba7..875ba7c5abe4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -935,13 +935,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=", + "hash": "sha256-/BAaOZM9SZA0crEEB0+UlCzDo2d4RfNdDQe04pCTCdE=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.0.2", + "rev": "v3.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc=" + "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, "random": { "hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=", From 88c693d64e59e6ef50c24c49f26926c3f2d6ed9e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Jul 2023 04:20:00 +0000 Subject: [PATCH 42/72] terraform: 1.5.3 -> 1.5.4 Diff: https://github.com/hashicorp/terraform/compare/v1.5.3...v1.5.4 Changelog: https://github.com/hashicorp/terraform/blob/v1.5.4/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1aff80d275f2..fe653013cf4d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.3"; - hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo="; + version = "1.5.4"; + hash = "sha256-MvN4gSJcPORD0wj6ixc3gUXPISGvAKSJPA6bS/SmDOY="; vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; patches = [ ./provider-path-0_15.patch ]; passthru = { From f7395ccc561d9c8c41309b606c9cf7a81887a685 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jul 2023 00:26:26 +0000 Subject: [PATCH 43/72] k8sgpt: 0.3.9 -> 0.3.13 --- pkgs/applications/networking/cluster/k8sgpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 44c977ab9310..1cfa5865c3dc 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.9"; + version = "0.3.13"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-nTGAYsw4R4ANAV8V3QdNpwXKWxdcAfXfUOUJJTkBD4k="; + hash = "sha256-JXKM39tODHg5jRE5p0u5xETPFDZrQgFri3FrYJFVUZU="; }; - vendorHash = "sha256-XHhk9JG9U4bz67pcNohAZJULIjmSPYBybYi3z6aPwi4="; + vendorHash = "sha256-L8/GLhjCI93R9S1fE+wgXyPObIXRMkj5MF71iWAZVQk="; CGO_ENABLED = 0; From e604d3a8f32b9a62c495d2ce08ab93c912f78ace Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 26 Jul 2023 16:04:26 -0500 Subject: [PATCH 44/72] mold: passthru.updateScript = nix-update-script Signed-off-by: Austin Seipp --- pkgs/development/tools/mold/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index ac60a01a1ae9..75ab4c1a98bb 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -8,6 +8,7 @@ , zlib , testers , mold +, nix-update-script }: stdenv.mkDerivation rec { @@ -49,7 +50,10 @@ stdenv.mkDerivation rec { "-faligned-allocation" ]); - passthru.tests.version = testers.testVersion { package = mold; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = mold; }; + }; meta = with lib; { description = "A faster drop-in replacement for existing Unix linkers"; From 9882be680a74a57d7e7a1881102395277357a358 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 26 Jul 2023 21:05:35 +0000 Subject: [PATCH 45/72] mold: 1.11.0 -> 2.0.0, license is now MIT Signed-off-by: Austin Seipp --- pkgs/development/tools/mold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 75ab4c1a98bb..8a83d0566465 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.11.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dfdrXp05eJALTQnx2F3GxRWKMA+Icj0mRPcb72z7qMw="; + hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; - license = licenses.agpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; }; From a149d8852a514f67203c110b4de21e185bece30d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Jul 2023 19:13:05 -0300 Subject: [PATCH 46/72] bmake: remove fix-localtime-test.patch This file is not referenced anywhere in the expression. --- .../bmake/fix-localtime-test.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch b/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch deleted file mode 100644 index b377292cce28..000000000000 --- a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- bmake/unit-tests/Makefile.orig 2021-05-30 14:24:38.822484317 +0200 -+++ bmake/unit-tests/Makefile 2021-05-31 13:25:21.645751428 +0200 -@@ -455,7 +455,8 @@ - ENV.varmisc= FROM_ENV=env - ENV.varmisc+= FROM_ENV_BEFORE=env - ENV.varmisc+= FROM_ENV_AFTER=env --ENV.varmod-localtime+= TZ=Europe/Berlin -+# Set absolute path to tz file since musl doesn't support TZDIR -+ENV.varmod-localtime+= TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin - ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2 - - # Override make flags for some of the tests; default is -k. ---- bmake/unit-tests/varmod-localtime.mk.orig 2021-05-30 14:30:34.397986246 +0200 -+++ bmake/unit-tests/varmod-localtime.mk 2021-05-31 13:24:41.430906606 +0200 -@@ -3,7 +3,7 @@ - # Tests for the :localtime variable modifier, which formats a timestamp - # using strftime(3) in local time. - --.if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile -+.if ${TZ} != ":${TZDIR}/Europe/Berlin" # see unit-tests/Makefile - . error - .endif - From aef415998b66d93467f6f87c07df82044e4b46df Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Jul 2023 18:18:58 -0300 Subject: [PATCH 47/72] bmake: cosmetic rewrite - remove `with lib;` - put BROKEN_TESTS under env - reorder phases in execution order (because it's nice!) --- .../tools/build-managers/bmake/default.nix | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 7b6e8a5123a2..0e5c26276082 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -13,23 +13,10 @@ stdenv.mkDerivation (finalAttrs: { version = "20230414"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8="; }; - # Make tests work with musl - # * Disable deptgt-delete_on_error test (alpine does this too) - # * Disable shell-ksh test (ksh doesn't compile with musl) - # * Fix test failing due to different strerror(3) output for musl and glibc - postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - sed -i unit-tests/Makefile \ - -e '/deptgt-delete_on_error/d' \ - -e '/shell-ksh/d' - substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" - ''; - - nativeBuildInputs = [ getopt ]; - patches = [ # make bootstrap script aware of the prefix in /nix/store ./bootstrap-fix.patch @@ -51,6 +38,19 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # Make tests work with musl + # * Disable deptgt-delete_on_error test (alpine does this too) + # * Disable shell-ksh test (ksh doesn't compile with musl) + # * Fix test failing due to different strerror(3) output for musl and glibc + postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + sed -i unit-tests/Makefile \ + -e '/deptgt-delete_on_error/d' \ + -e '/shell-ksh/d' + substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" + ''; + + nativeBuildInputs = [ getopt ]; + # The generated makefile is a small wrapper for calling ./boot-strap with a # given op. On a case-insensitive filesystem this generated makefile clobbers # a distinct, shipped, Makefile and causes infinite recursion during tests @@ -59,17 +59,6 @@ stdenv.mkDerivation (finalAttrs: { "--without-makefile" ]; - # Disabled tests: - # opt-chdir: ofborg complains about it somehow - # opt-keep-going-indirect: not yet known - # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, - # implicit paths - BROKEN_TESTS = builtins.concatStringsSep " " [ - "opt-chdir" - "opt-keep-going-indirect" - "varmod-localtime" - ]; - buildPhase = '' runHook preBuild @@ -94,6 +83,17 @@ stdenv.mkDerivation (finalAttrs: { ksh ]; + # Disabled tests: + # opt-chdir: ofborg complains about it somehow + # opt-keep-going-indirect: not yet known + # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, + # implicit paths + env.BROKEN_TESTS = builtins.concatStringsSep " " [ + "opt-chdir" + "opt-keep-going-indirect" + "varmod-localtime" + ]; + checkPhase = '' runHook preCheck @@ -104,14 +104,14 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + passthru.tests.bmakeMusl = pkgsMusl.bmake; + + meta = { homepage = "http://www.crufty.net/help/sjg/bmake.html"; description = "Portable version of NetBSD 'make'"; - license = licenses.bsd3; - maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; + platforms = lib.platforms.unix; }; - - passthru.tests.bmakeMusl = pkgsMusl.bmake; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) From 14d3808d2bb64c8e2dbb8d21f7aedb995fa7268a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Jul 2023 18:39:44 -0300 Subject: [PATCH 48/72] bmake: refactor setup-hook.sh - shellcheck it - move function definitions to the top of file --- .../tools/build-managers/bmake/setup-hook.sh | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index f477a96d57ab..a36d024b111e 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2086,SC2154,SC2206 + addMakeFlags() { export prefix="$out" export MANDIR="${!outputMan}/share/man" @@ -6,48 +8,40 @@ addMakeFlags() { export STRIP_FLAG= } -preConfigureHooks+=(addMakeFlags) - bmakeBuildPhase() { runHook preBuild local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) echoCmd 'build flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray runHook postBuild } -if [ -z "${dontUseBmakeBuild-}" -a -z "${buildPhase-}" ]; then - buildPhase=bmakeBuildPhase -fi - bmakeCheckPhase() { runHook preCheck if [ -z "${checkTarget:-}" ]; then #TODO(@oxij): should flagsArray influence make -n? if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then - checkTarget=check + checkTarget="check" elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi if [ -z "${checkTarget:-}" ]; then echo "no test target found in bmake, doing nothing" else - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} @@ -56,17 +50,11 @@ bmakeCheckPhase() { echoCmd 'check flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - - unset flagsArray fi runHook postCheck } -if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then - checkPhase=bmakeCheckPhase -fi - bmakeInstallPhase() { runHook preInstall @@ -74,10 +62,9 @@ bmakeInstallPhase() { mkdir -p "$prefix" fi - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} @@ -86,15 +73,10 @@ bmakeInstallPhase() { echoCmd 'install flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray runHook postInstall } -if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then - installPhase=bmakeInstallPhase -fi - bmakeDistPhase() { runHook preDist @@ -103,7 +85,6 @@ bmakeDistPhase() { fi # Old bash empty array hack - # shellcheck disable=SC2086 local flagsArray=( $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} ) @@ -116,13 +97,26 @@ bmakeDistPhase() { # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - # shellcheck disable=SC2086 cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" fi runHook postDist } -if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then +preConfigureHooks+=(addMakeFlags) + +if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=bmakeBuildPhase +fi + +if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=bmakeCheckPhase +fi + +if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=bmakeInstallPhase +fi + +if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then distPhase=bmakeDistPhase fi From 741bedef5bd0d22d89503973a64cfa5ee93952d3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Jul 2023 19:12:31 -0300 Subject: [PATCH 49/72] bmake: 20230414 -> 20230711 --- .../tools/build-managers/bmake/default.nix | 16 +++----------- .../bmake/dont-test-while-installing.diff | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 0e5c26276082..ba717759f470 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20230414"; + version = "20230711"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8="; + hash = "sha256-CoFULAPxoObCe/UBXY+7xSY04RkIOOx9p2RYR9kzL+8="; }; patches = [ @@ -25,17 +25,7 @@ stdenv.mkDerivation (finalAttrs: { # Always enable ksh test since it checks in a impure location /bin/ksh ./unconditional-ksh-test.patch # decouple tests from build phase - (fetchpatch { - name = "separate-tests.patch"; - url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; - hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM="; - }) - # add a shebang to bmake's install(1) replacement - (fetchpatch { - name = "install-sh.patch"; - url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; - hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0="; - }) + ./dont-test-while-installing.diff ]; # Make tests work with musl diff --git a/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff b/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff new file mode 100644 index 000000000000..ab9399920c24 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff @@ -0,0 +1,21 @@ +diff -Naur bmake-old/boot-strap bmake-new/boot-strap +--- bmake-old/boot-strap 2023-06-27 18:02:19.000000000 -0300 ++++ bmake-new/boot-strap 2023-07-23 22:31:02.334720661 -0300 +@@ -413,9 +413,6 @@ + [ -s make-bootstrap.sh ] || op_configure + chmod 755 make-bootstrap.sh || exit 1 + ./make-bootstrap.sh || exit 1 +- case "$op" in +- build) op_test;; +- esac + } + + op_test() { +@@ -434,7 +431,6 @@ + } + + op_install() { +- op_test + case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in + ,$HOST_TARGET/bin,*/$HOST_TARGET) + INSTALL_PREFIX=`dirname $prefix` From f90ca5098723294cf99205e9fce3d20a983f08bb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 26 Jul 2023 00:34:37 -0300 Subject: [PATCH 50/72] bmake: mark as broken on Aarch64 --- pkgs/development/tools/build-managers/bmake/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index ba717759f470..f1ceb79dcdfa 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; platforms = lib.platforms.unix; + broken = stdenv.isAarch64; # failure on gnulib-tests }; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) From 6259a2386a478c13e24769d3279fe79ff466e020 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jul 2023 00:54:34 +0000 Subject: [PATCH 51/72] treesheets: unstable-2023-07-16 -> unstable-2023-07-22 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 8e44c1bd3b74..585da031afae 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-07-16"; + version = "unstable-2023-07-22"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "95709ed796bc1df558aa7ba3728b6eb9b6385fea"; - sha256 = "wNGVvIQkAburH37GumSZX09V++MVCNvXee5Gw7YQHtc="; + rev = "24a80b0468d9abf15207dcb962d9e14a544d53a3"; + sha256 = "D9bLsxQ/52ziIlm0A9/be8KmcqZ+xr8ZygCCG2mgGJw="; }; nativeBuildInputs = [ From 2ee8f165aa17e4f4c482b9aa1411e7d5b4594edb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jul 2023 01:14:54 +0000 Subject: [PATCH 52/72] automatic-timezoned: 1.0.110 -> 1.0.116 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 207aadf4dca9..6b48b6f642dc 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.110"; + version = "1.0.116"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TIa4yGj3imDrWJ6U8Qyv84bAihhuFbQizXghJuEIc88="; + sha256 = "sha256-BS44/bN76iD659j1ISMBBw0o2uwLasd7CDJMh8LDII4="; }; - cargoHash = "sha256-0ORDDwb2wXdJXoesfcY98EgONWjovT/bE96qFVxDRcM="; + cargoHash = "sha256-tscxMeSS0BGJT7HlMrDsd3zMZXE0nUtd5qSzsSE2o/s="; meta = with lib; { description = "Automatically update system timezone based on location"; From f6de9f42c68891d1cd70d16b19f4136c51a56e5a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 27 Jul 2023 10:07:47 +1000 Subject: [PATCH 53/72] wl-clipboard: 2.1.0 -> 2.2.0 --- pkgs/tools/wayland/wl-clipboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix index 923391b79956..18bd14870857 100644 --- a/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wl-clipboard"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - sha256 = "sha256-lqtLHLsSChWcYWsfFigj0Xveo9doAr7G31fRSaxm0Lw="; + sha256 = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; }; strictDeps = true; From 1b31fb062df1a5d3230239330f0fb213d0d0ba2a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 27 Jul 2023 10:59:08 +1000 Subject: [PATCH 54/72] `sha256` in `fetchFromGitHub` -> `hash` --- pkgs/tools/wayland/wl-clipboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix index 18bd14870857..141e2e11d025 100644 --- a/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - sha256 = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; + hash = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; }; strictDeps = true; From 2ffca30cded859fdbde6f1ae4685e29f92c20424 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Thu, 27 Jul 2023 01:42:35 +0000 Subject: [PATCH 55/72] Revert "python3: splice python within python3Packages.callPackage" --- pkgs/development/interpreters/python/hooks/default.nix | 8 ++++---- pkgs/development/interpreters/python/passthrufun.nix | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 338e15f02485..001e477b9185 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -1,9 +1,9 @@ -self: dontUse: with self; +self: super: with self; let - pythonInterpreter = python.pythonForBuild.interpreter; - pythonSitePackages = python.sitePackages; - pythonCheckInterpreter = python.interpreter; + pythonInterpreter = super.python.pythonForBuild.interpreter; + pythonSitePackages = super.python.sitePackages; + pythonCheckInterpreter = super.python.interpreter; setuppy = ../run_setup.py; in { makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args); diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index b73885b5e29e..aa63f354e085 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -47,13 +47,12 @@ selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; hooks = import ./hooks/default.nix; - keep = self: hooks self {}; + keep = lib.extends hooks pythonPackagesFun; extra = _: {}; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ([ - hooks pythonExtension ] ++ (optionalExtensions (!self.isPy3k) [ python2Extension @@ -65,7 +64,7 @@ otherSplices keep extra - (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun)) + (lib.extends (lib.composeExtensions aliases extensions) keep)) { overrides = packageOverrides; python = self; From baa5d1b7ff1f2a227c72343e03c5cae2f2f6f3fa Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 30 Jun 2023 09:45:21 +0200 Subject: [PATCH 56/72] sudo: 1.9.13p3 -> 1.9.14p3 --- pkgs/tools/security/sudo/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 8aaea88579f6..6cf8349b09af 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , buildPackages , coreutils , pam @@ -14,13 +15,22 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.13p3"; + version = "1.9.14p3"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-kjNKEruT4MBWsJ9T4lXMt9b2fGNQ4oE82Vk87sp4Vgs="; + hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I="; }; + patches = [ + # Extra bugfix not included in 1.9.14p3 to address a bug that impacts the + # NixOS test suite for sudo. + (fetchpatch { + url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch"; + hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE="; + }) + ]; + prePatch = '' # do not set sticky bit in nix store substituteInPlace src/Makefile.in --replace 04755 0755 From 82a3131335b69be431911d211488076634c297b8 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 24 Jul 2023 04:44:09 +0000 Subject: [PATCH 57/72] python3Packages.tpm2-pytss: fixup build This fixes the build that broke after the upgrade of tpm2-tss to 4.0.1 Signed-off-by: Arthur Gautier --- .../python-modules/tpm2-pytss/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index fe7df9d9efcf..3c18e7cbdc03 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , asn1crypto , cffi @@ -28,6 +29,19 @@ buildPythonPackage rec { hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; + patches = [ + # This patches the call to the C preprocessor not to include types + # pycparser does not handle. + # `hardeningDisable = [ "fortify" ]` would have the same effect but + # would also disable hardening from generated FFI objects. + # + # backport of https://github.com/tpm2-software/tpm2-pytss/pull/523 + (fetchpatch { + url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; + sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; + }) + ]; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module From 246e73daade1116c052413133bd56b2c89768a9f Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 16 Jul 2023 16:42:15 +0800 Subject: [PATCH 58/72] wayfire-plugins-extra: init at 0.7.5 --- .../window-managers/wayfire/plugins.nix | 1 + .../wayfire/wayfire-plugins-extra.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 830a918fcb7e..f03cf5255c8f 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -7,6 +7,7 @@ let callPackage = newScope self; wf-shell = callPackage ./wf-shell.nix { }; + wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; }; in self diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix new file mode 100644 index 000000000000..110fcfe75ff8 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayfire +, wf-config +, gtkmm3 +, gtk-layer-shell +, libxkbcommon +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayfire-plugins-extra"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = "wayfire-plugins-extra"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo="; + }; + + postPatch = '' + substituteInPlace metadata/meson.build \ + --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + wf-config + libxkbcommon + xcbutilwm + gtkmm3 + gtk-layer-shell + ]; + + mesonFlags = [ "--sysconfdir /etc" ]; + + meta = { + homepage = "https://github.com/WayfireWM/wayfire-plugins-extra"; + description = "Additional plugins for Wayfire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b95d1dd96bb..95b9812ded36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36005,7 +36005,7 @@ with pkgs; wapiti = callPackage ../tools/security/wapiti { }; - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); + wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell plugins.wayfire-plugins-extra ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( (callPackage ../applications/window-managers/wayfire/applications.nix { }). From 8974e68bef967c8a8fa11c758e904bc7642aa48a Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 16 Jul 2023 23:04:25 +0800 Subject: [PATCH 59/72] wayfire: refactor 1 --- .../window-managers/wayfire/applications.nix | 20 ------- .../window-managers/wayfire/plugins.nix | 20 +++---- .../window-managers/wayfire/wrapper.nix | 59 ++++++++----------- pkgs/top-level/all-packages.nix | 22 ++++--- 4 files changed, 45 insertions(+), 76 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/applications.nix diff --git a/pkgs/applications/window-managers/wayfire/applications.nix b/pkgs/applications/window-managers/wayfire/applications.nix deleted file mode 100644 index a77d3f8bf5d8..000000000000 --- a/pkgs/applications/window-managers/wayfire/applications.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, newScope, wayfirePlugins }: - -lib.makeExtensible (self: with self; { - inherit wayfirePlugins; - - callPackage = newScope self; - - wayfire = callPackage ./. { }; - - wcm = callPackage ./wcm.nix { - inherit (wayfirePlugins) wf-shell; - }; - - wrapWayfireApplication = callPackage ./wrapper.nix { }; - - withPlugins = selector: self // { - wayfire = wrapWayfireApplication wayfire selector; - wcm = wrapWayfireApplication wcm selector; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index f03cf5255c8f..111a8c87dd78 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -1,13 +1,11 @@ -{ newScope, wayfire }: +{ lib, pkgs }: -let - self = with self; { - inherit wayfire; - - callPackage = newScope self; - - wf-shell = callPackage ./wf-shell.nix { }; +lib.makeScope pkgs.newScope (self: + let + inherit (self) callPackage; + in { wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; - }; -in -self + wcm = callPackage ./wcm.nix { }; + wf-shell = callPackage ./wf-shell.nix { }; + } +) diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix index e972929237d4..35bb3ad15837 100644 --- a/pkgs/applications/window-managers/wayfire/wrapper.nix +++ b/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -1,39 +1,32 @@ -{ runCommand, lib, makeWrapper, wayfirePlugins }: +{ symlinkJoin, lib, makeWrapper, wayfire, plugins ? [ ] }: -let - inherit (lib) escapeShellArg makeBinPath; +symlinkJoin { + name = "wayfire-wrapped-${lib.getVersion wayfire}"; - xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell"; - - makePluginPath = lib.makeLibraryPath; - makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath; -in - -application: - -choosePlugins: - -let - plugins = choosePlugins wayfirePlugins; -in - -runCommand "${application.name}-wrapped" { nativeBuildInputs = [ makeWrapper ]; - passthru = application.passthru // { - unwrapped = application; + paths = [ + wayfire + ] ++ plugins; + + postBuild = '' + for binary in $out/bin/*; do + wrapProgram $binary \ + --prefix WAYFIRE_PLUGIN_PATH : $out/lib/wayfire \ + --prefix WAYFIRE_PLUGIN_XML_PATH : $out/share/wayfire/metadata + done + ''; + + preferLocalBuild = true; + + passthru = wayfire.passthru // { + unwrapped = wayfire; }; - inherit (application) meta; -} '' - mkdir -p $out/bin - for bin in ${application}/bin/* - do - makeWrapper "$bin" $out/bin/''${bin##*/} \ - --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \ - --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \ - --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)} - done - find ${application} -mindepth 1 -maxdepth 1 -not -name bin \ - -exec ln -s '{}' $out ';' -'' + meta = wayfire.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (wayfire.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b9812ded36..3b6bc48c0391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36005,22 +36005,20 @@ with pkgs; wapiti = callPackage ../tools/security/wapiti { }; - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell plugins.wayfire-plugins-extra ]); - inherit (wayfireApplications) wayfire wcm; - wayfireApplications-unwrapped = recurseIntoAttrs ( - (callPackage ../applications/window-managers/wayfire/applications.nix { }). - extend (_: _: { wlroots = wlroots_0_16; }) - ); - wayfirePlugins = recurseIntoAttrs ( - callPackage ../applications/window-managers/wayfire/plugins.nix { - inherit (wayfireApplications-unwrapped) wayfire; - } - ); - weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { + wlroots = wlroots_0_16; + }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; + wayfirePlugins = recurseIntoAttrs ( + callPackage ../applications/window-managers/wayfire/plugins.nix { } + ); + wayfire-with-plugins = callPackage ../applications/window-managers/wayfire/wrapper.nix { + plugins = with wayfirePlugins; [ wcm wf-shell ]; + }; + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv { }; From d9f707f79563673576f31c0195f5b85a5ce92067 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 16 Jul 2023 23:11:54 +0800 Subject: [PATCH 60/72] nixos/wayfire: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/wayland/wayfire.nix | 48 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 nixos/modules/programs/wayland/wayfire.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7acbb59dc2c..e4e5fa97608a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -264,6 +264,7 @@ ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix + ./programs/wayland/wayfire.nix ./programs/weylus.nix ./programs/wireshark.nix ./programs/xastir.nix diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix new file mode 100644 index 000000000000..d0b280e3940f --- /dev/null +++ b/nixos/modules/programs/wayland/wayfire.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.programs.wayfire; +in +{ + meta.maintainers = with lib.maintainers; [ rewine ]; + + options.programs.wayfire = { + enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots."); + + package = lib.mkPackageOptionMD pkgs "wayfire" { }; + + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = with pkgs.wayfirePlugins; [ wcm wf-shell ]; + defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]"; + example = lib.literalExpression '' + with pkgs.wayfirePlugins; [ + wcm + wf-shell + wayfire-plugins-extra + ]; + ''; + description = lib.mdDoc '' + Additional plugins to use with the wayfire window manager. + ''; + }; + }; + + config = let + finalPackage = pkgs.wayfire-with-plugins.override { + wayfire = cfg.package; + plugins = cfg.plugins; + }; + in + lib.mkIf cfg.enable { + environment.systemPackages = [ + finalPackage + ]; + + services.xserver.displayManager.sessionPackages = [ finalPackage ]; + + xdg.portal = { + enable = lib.mkDefault true; + wlr.enable = lib.mkDefault true; + }; + }; +} From c56fec9f9fb84c846ad0e06a732cec30ac5a4192 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Wed, 26 Jul 2023 18:06:25 -0500 Subject: [PATCH 61/72] hheretic: init at 0.2.3 --- pkgs/games/hheretic/default.nix | 56 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/games/hheretic/default.nix diff --git a/pkgs/games/hheretic/default.nix b/pkgs/games/hheretic/default.nix new file mode 100644 index 000000000000..73adca8928cd --- /dev/null +++ b/pkgs/games/hheretic/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hheretic"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hheretic"; + rev = "hheretic-${finalAttrs.version}"; + hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8="; + }; + + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 hheretic-gl -t $out/bin + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "hheretic-"; + }; + + meta = { + description = "Linux port of Raven Game's Heretic"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; + license = lib.licenses.gpl2Plus; + mainProgram = "hheretic-gl"; + maintainers = with lib.maintainers; [ moody ]; + inherit (SDL.meta) platforms; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eaaa1e01a72..5785981cb561 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38226,6 +38226,8 @@ with pkgs; hhexen = callPackage ../games/hhexen { }; + hheretic = callPackage ../games/hheretic { }; + wyvern = callPackage ../games/wyvern { }; hsetroot = callPackage ../tools/X11/hsetroot { }; From 38bfa587724e3490c47d11ee67ca5e264ecadc19 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Wed, 26 Jul 2023 18:38:38 -0500 Subject: [PATCH 62/72] hhexen: sdlmixer audio backend and various tidy --- pkgs/games/hhexen/default.nix | 53 ++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 4b978ab56511..075aae69978b 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -1,23 +1,56 @@ -{ lib, fetchurl, SDL, stdenv }: +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hhexen"; version = "1.6.3"; - src = fetchurl { - url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; - sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hhexen"; + rev = "hhexen-${finalAttrs.version}"; + hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI="; }; - buildInputs = [ SDL ]; + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + installPhase = '' + runHook preInstall + install -Dm755 hhexen-gl -t $out/bin + + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "hhexen-"; + }; + + meta = { description = "Linux port of Raven Game's Hexen"; homepage = "https://hhexen.sourceforge.net/hhexen.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ djanatyn ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; + inherit (SDL.meta) platforms; }; -} +}) From d54c57e93c7d5ba088db2e191c912ccffb137c66 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Jul 2023 06:42:48 +0200 Subject: [PATCH 63/72] =?UTF-8?q?coqPackages.coq-ext-lib:=200.11.7=20?= =?UTF-8?q?=E2=86=92=200.11.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8991787873ff..297beaf950e0 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "0.11.7"; } + { case = range "8.11" "8.17"; out = "0.11.8"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } @@ -13,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; From 93f79d3d95fcc3aeb4a03fbb8f3d38fb4372b6fa Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 27 Jul 2023 01:30:53 +0300 Subject: [PATCH 64/72] freetype: makeWrapper doesn't cross compile to windows Issue #120726 --- pkgs/development/libraries/freetype/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index ed847cb3ffea..850709660868 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] + nativeBuildInputs = [ pkg-config which ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ lib.optional (!stdenv.isLinux) gnumake; @@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" From afdc1c468cfb876c52ed03e5b436386a40988098 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:07:49 +0000 Subject: [PATCH 65/72] terraform-providers.cloudflare: 4.10.0 -> 4.11.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 875ba7c5abe4..097a1ba3df35 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-Zj8CC+Xiej+gz9V/9IeIGaWP2cjIg6jboXN5jrBCosM=", + "hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.10.0", + "rev": "v4.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hxD+0OrCdyYn/9nvz5fd/54YiaZyZMOfsIa7lqZhCHE=" + "vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE=" }, "cloudfoundry": { "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=", From e6443d683439db23cb56452b15dbbd22a6235170 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:10:30 +0000 Subject: [PATCH 66/72] terraform-providers.argocd: 5.6.0 -> 6.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 097a1ba3df35..4ec70d80da10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" }, "argocd": { - "hash": "sha256-S7Za9V18clq3Kb3pIQxUZpt8d51Dht76e+ypdAZB3VA=", + "hash": "sha256-pEcByit+xTBuJXCqhDOgHoc4lmCpbDptVocylcTqgz4=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.6.0", + "rev": "v6.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4gVJ5j2pdrtZYmatsO5N+IwVbNCJfqMlizDI7UhgiOU=" + "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "auth0": { "hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=", From e0d71ed2cf1a14f43e60e567dbf9149a280d4fe6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:11:13 +0000 Subject: [PATCH 67/72] terraform-providers.heroku: 5.2.4 -> 5.2.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4ec70d80da10..492e824a0952 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -510,11 +510,11 @@ "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, "heroku": { - "hash": "sha256-zxX7cro1hAtgABlDsKQHxJJH9BrOlJHKFFwL5gGrmU0=", + "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.2.4", + "rev": "v5.2.5", "spdx": null, "vendorHash": null }, From c987713d7c54710c2d535ca4af4e2cc6b31f896e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:12:59 +0000 Subject: [PATCH 68/72] terraform-providers.launchdarkly: 2.13.2 -> 2.13.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 492e824a0952..d59066ddc4b8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -655,11 +655,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=", + "hash": "sha256-I4d/REcXlyFX+LztvpkWjXjlWZD2JL//mewvgNdw2Rc=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.13.2", + "rev": "v2.13.3", "spdx": "MPL-2.0", "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA=" }, From fb383a1280d751cf00f6d0691b2703eabfb05501 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:13:46 +0000 Subject: [PATCH 69/72] terraform-providers.newrelic: 3.25.2 -> 3.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d59066ddc4b8..5e9b83166bb3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -772,13 +772,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=", + "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.25.2", + "rev": "v3.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c=" + "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, "nomad": { "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", From 09e8afd62b812cd8c317adab871f1a629aa5a5fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:18:09 +0000 Subject: [PATCH 70/72] terraform-providers.spotinst: 1.128.0 -> 1.129.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5e9b83166bb3..6dbda959c124 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1052,11 +1052,11 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-3NxeqlcodW6n7RbLferdGKMf2iXEEcMtmQgaMa/J4lU=", + "hash": "sha256-PxjZ6PBGLuV4x5ImSnYO4JuezNfgDXaCxrRUioDxdCg=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.128.0", + "rev": "v1.129.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4=" }, From b5616857af88e74749862555ac46fe429192cc8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 03:21:06 +0000 Subject: [PATCH 71/72] terraform-providers.oci: 5.5.0 -> 5.6.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6dbda959c124..79459bf1a7f9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -818,11 +818,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=", + "hash": "sha256-GH8y9NkoNydzEpwl6wxmHIpaq6IfRv8cOz/NidiT488=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", "vendorHash": null }, From 44928e3448b51d7379e4817c75ccb5f73afd6598 Mon Sep 17 00:00:00 2001 From: QJoly Date: Wed, 26 Jul 2023 19:04:17 +0200 Subject: [PATCH 72/72] nova: 3.6.4 -> 3.7.0 nova: 3.6.4 -> 3.7.0 --- pkgs/applications/networking/cluster/nova/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix index f77e8be55003..2686b79c4b7f 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; - rev = version; - hash = "sha256-6gTrBogMvM7X6PFthG+c8N9wXoNHwp0wHjGVKjiHJJY="; + rev = "v${version}"; + hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA="; }; - vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U="; + vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA="; ldflags = [ "-X main.version=${version}" "-s" "-w" ];