From ceebdcfc2ca2d37872c46f224503a36f4d25daa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 19 May 2022 15:15:08 +0200 Subject: [PATCH 01/69] lib/types: allow custom `submoduleWith` descriptions Currently the only way to set the description for a submodule type is to use `freeformType`. This is not ideal as it requires setting a freeform type, and evaluates the submodule config unnecessarily. Instead, add a `description` argument to `submoduleWith`. --- lib/types.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 91b040d24553..f53bb132ff5e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -568,6 +568,7 @@ rec { { modules , specialArgs ? {} , shorthandOnlyDefinesConfig ? false + , description ? null # Internal variable to avoid `_key` collisions regardless # of `extendModules`. Wired through by `evalModules`. @@ -616,10 +617,14 @@ rec { freeformType = base._module.freeformType; - in - mkOptionType rec { name = "submodule"; - description = freeformType.description or name; + + in + mkOptionType { + inherit name; + description = + if description != null then description + else freeformType.description or name; check = x: isAttrs x || isFunction x || path.check x; merge = loc: defs: (base.extendModules { @@ -645,9 +650,7 @@ rec { functor = defaultFunctor name // { type = types.submoduleWith; payload = { - modules = modules; - specialArgs = specialArgs; - shorthandOnlyDefinesConfig = shorthandOnlyDefinesConfig; + inherit modules specialArgs shorthandOnlyDefinesConfig description; }; binOp = lhs: rhs: { modules = lhs.modules ++ rhs.modules; @@ -664,6 +667,14 @@ rec { else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig then lhs.shorthandOnlyDefinesConfig else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values"; + description = + if lhs.description == null + then rhs.description + else if rhs.description == null + then lhs.description + else if lhs.description == rhs.description + then lhs.description + else throw "A submoduleWith option is declared multiple times with conflicting descriptions"; }; }; }; From 9440e44a33cc06a4fa33392a56f86c7f7ea1f077 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 19:54:57 +0100 Subject: [PATCH 02/69] industrializer: 0.2.6 -> 0.2.7 Main change is the fix for -fno-common toolchains. Without the update build fails on upstream gcc-10 as: ld: jack.o:src/jack.h:26: multiple definition of `driver_jack'; main.o:src/jack.h:26: first defined here --- pkgs/applications/audio/industrializer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index f894c856c751..97862104a057 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { pname = "industrializer"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2"; - sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; + url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.xz"; + sha256 = "0k688k2wppam351by7cp9m7an09yligzd89padr8viqy63gkdk6v"; }; nativeBuildInputs = [ pkg-config autoconf automake ]; From 22f3d4e4dbc415c880dabca13fcc11d45e8d53ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Fri, 13 May 2022 16:46:01 +0900 Subject: [PATCH 03/69] nixos: move matrix services into their category --- nixos/modules/module-list.nix | 14 +++++++------- .../appservice-discord.nix} | 0 .../appservice-irc.nix} | 0 .../matrix-conduit.nix => matrix/conduit.nix} | 0 .../modules/services/{misc => matrix}/dendrite.nix | 0 .../services/{misc => matrix}/mautrix-facebook.nix | 0 .../services/{misc => matrix}/mautrix-telegram.nix | 0 ...pse-log_config.yaml => synapse-log_config.yaml} | 0 .../matrix/{matrix-synapse.nix => synapse.nix} | 4 ++-- .../matrix/{matrix-synapse.xml => synapse.xml} | 0 nixos/tests/all-tests.nix | 8 ++++---- .../appservice-irc.nix} | 2 +- .../{matrix-conduit.nix => matrix/conduit.nix} | 2 +- nixos/tests/{ => matrix}/dendrite.nix | 2 +- .../{matrix-synapse.nix => matrix/synapse.nix} | 4 ++-- 15 files changed, 18 insertions(+), 18 deletions(-) rename nixos/modules/services/{misc/matrix-appservice-discord.nix => matrix/appservice-discord.nix} (100%) rename nixos/modules/services/{misc/matrix-appservice-irc.nix => matrix/appservice-irc.nix} (100%) rename nixos/modules/services/{misc/matrix-conduit.nix => matrix/conduit.nix} (100%) rename nixos/modules/services/{misc => matrix}/dendrite.nix (100%) rename nixos/modules/services/{misc => matrix}/mautrix-facebook.nix (100%) rename nixos/modules/services/{misc => matrix}/mautrix-telegram.nix (100%) rename nixos/modules/services/matrix/{matrix-synapse-log_config.yaml => synapse-log_config.yaml} (100%) rename nixos/modules/services/matrix/{matrix-synapse.nix => synapse.nix} (99%) rename nixos/modules/services/matrix/{matrix-synapse.xml => synapse.xml} (100%) rename nixos/tests/{matrix-appservice-irc.nix => matrix/appservice-irc.nix} (99%) rename nixos/tests/{matrix-conduit.nix => matrix/conduit.nix} (98%) rename nixos/tests/{ => matrix}/dendrite.nix (99%) rename nixos/tests/{matrix-synapse.nix => matrix/synapse.nix} (98%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d59d7bfe40d9..ab1ea759f48a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -515,9 +515,15 @@ ./services/mail/roundcube.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix - ./services/matrix/matrix-synapse.nix + ./services/matrix/appservice-discord.nix + ./services/matrix/appservice-irc.nix + ./services/matrix/conduit.nix + ./services/matrix/dendrite.nix + ./services/matrix/mautrix-facebook.nix + ./services/matrix/mautrix-telegram.nix ./services/matrix/mjolnir.nix ./services/matrix/pantalaimon.nix + ./services/matrix/synapse.nix ./services/misc/ananicy.nix ./services/misc/airsonic.nix ./services/misc/ankisyncd.nix @@ -536,7 +542,6 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix - ./services/misc/dendrite.nix ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/duckling.nix @@ -579,11 +584,6 @@ ./services/misc/libreddit.nix ./services/misc/lifecycled.nix ./services/misc/mame.nix - ./services/misc/matrix-appservice-discord.nix - ./services/misc/matrix-appservice-irc.nix - ./services/misc/matrix-conduit.nix - ./services/misc/mautrix-facebook.nix - ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix ./services/misc/mediatomb.nix ./services/misc/metabase.nix diff --git a/nixos/modules/services/misc/matrix-appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix similarity index 100% rename from nixos/modules/services/misc/matrix-appservice-discord.nix rename to nixos/modules/services/matrix/appservice-discord.nix diff --git a/nixos/modules/services/misc/matrix-appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix similarity index 100% rename from nixos/modules/services/misc/matrix-appservice-irc.nix rename to nixos/modules/services/matrix/appservice-irc.nix diff --git a/nixos/modules/services/misc/matrix-conduit.nix b/nixos/modules/services/matrix/conduit.nix similarity index 100% rename from nixos/modules/services/misc/matrix-conduit.nix rename to nixos/modules/services/matrix/conduit.nix diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix similarity index 100% rename from nixos/modules/services/misc/dendrite.nix rename to nixos/modules/services/matrix/dendrite.nix diff --git a/nixos/modules/services/misc/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix similarity index 100% rename from nixos/modules/services/misc/mautrix-facebook.nix rename to nixos/modules/services/matrix/mautrix-facebook.nix diff --git a/nixos/modules/services/misc/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix similarity index 100% rename from nixos/modules/services/misc/mautrix-telegram.nix rename to nixos/modules/services/matrix/mautrix-telegram.nix diff --git a/nixos/modules/services/matrix/matrix-synapse-log_config.yaml b/nixos/modules/services/matrix/synapse-log_config.yaml similarity index 100% rename from nixos/modules/services/matrix/matrix-synapse-log_config.yaml rename to nixos/modules/services/matrix/synapse-log_config.yaml diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/synapse.nix similarity index 99% rename from nixos/modules/services/matrix/matrix-synapse.nix rename to nixos/modules/services/matrix/synapse.nix index 87a977f8e1ef..b3108484fae1 100644 --- a/nixos/modules/services/matrix/matrix-synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -285,7 +285,7 @@ in { log_config = mkOption { type = types.path; - default = ./matrix-synapse-log_config.yaml; + default = ./synapse-log_config.yaml; description = '' The file that holds the logging configuration. ''; @@ -767,7 +767,7 @@ in { meta = { buildDocsInSandbox = false; - doc = ./matrix-synapse.xml; + doc = ./synapse.xml; maintainers = teams.matrix.members; }; diff --git a/nixos/modules/services/matrix/matrix-synapse.xml b/nixos/modules/services/matrix/synapse.xml similarity index 100% rename from nixos/modules/services/matrix/matrix-synapse.xml rename to nixos/modules/services/matrix/synapse.xml diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5ef2a8a82804..79f9d03ef4e0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -126,7 +126,7 @@ let croc = handleTest ./croc.nix {}; cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; - dendrite = handleTest ./dendrite.nix {}; + dendrite = handleTest ./matrix/dendrite.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; @@ -315,9 +315,9 @@ let mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {}; matomo = handleTest ./matomo.nix {}; - matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; - matrix-conduit = handleTest ./matrix-conduit.nix {}; - matrix-synapse = handleTest ./matrix-synapse.nix {}; + matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; + matrix-conduit = handleTest ./matrix/conduit.nix {}; + matrix-synapse = handleTest ./matrix/synapse.nix {}; mattermost = handleTest ./mattermost.nix {}; mediatomb = handleTest ./mediatomb.nix {}; mediawiki = handleTest ./mediawiki.nix {}; diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix similarity index 99% rename from nixos/tests/matrix-appservice-irc.nix rename to nixos/tests/matrix/appservice-irc.nix index 70d458523986..7dd44da8305e 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; in diff --git a/nixos/tests/matrix-conduit.nix b/nixos/tests/matrix/conduit.nix similarity index 98% rename from nixos/tests/matrix-conduit.nix rename to nixos/tests/matrix/conduit.nix index d159fbaa4800..780837f962fa 100644 --- a/nixos/tests/matrix-conduit.nix +++ b/nixos/tests/matrix/conduit.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let name = "conduit"; in diff --git a/nixos/tests/dendrite.nix b/nixos/tests/matrix/dendrite.nix similarity index 99% rename from nixos/tests/dendrite.nix rename to nixos/tests/matrix/dendrite.nix index 1ff415433b47..82e71d912130 100644 --- a/nixos/tests/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix/synapse.nix similarity index 98% rename from nixos/tests/matrix-synapse.nix rename to nixos/tests/matrix/synapse.nix index 1ff1e47b2840..756a8d5de49a 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... } : let +import ../make-test-python.nix ({ pkgs, ... } : let runWithOpenSSL = file: cmd: pkgs.runCommand file { @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let ''; - mailerCerts = import ./common/acme/server/snakeoil-certs.nix; + mailerCerts = import ../common/acme/server/snakeoil-certs.nix; mailerDomain = mailerCerts.domain; registrationSharedSecret = "unsecure123"; testUser = "alice"; From 955d1a6dde9862822fbb0f2d6be9bfa51fdbc689 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 6 Jun 2022 18:06:38 +0300 Subject: [PATCH 04/69] pipewire: create home directory for the pipewire user when running systemwide wireplumber wants to store state there --- nixos/modules/services/desktops/pipewire/pipewire.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 6459b22519db..07b5dd12ffc5 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -251,6 +251,8 @@ in { ] ++ lib.optional config.security.rtkit.enable "rtkit"; description = "Pipewire system service user"; isSystemUser = true; + home = "/var/lib/pipewire"; + createHome = true; }; groups.pipewire.gid = config.ids.gids.pipewire; }; From c2cee3f76e7aa6fcac9e6e8af24201b7edbb00be Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 May 2022 21:05:50 +0200 Subject: [PATCH 05/69] php.extensions.apcu_bc: Deinit due to broken in all attributes after php74 deprecation --- .../php-packages/apcu_bc/default.nix | 24 ------------------- pkgs/top-level/php-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/php-packages/apcu_bc/default.nix diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix deleted file mode 100644 index e487a075dbde..000000000000 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ buildPecl, lib, pcre2, php }: - -buildPecl { - pname = "apcu_bc"; - - version = "1.0.5"; - sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; - - peclDeps = [ php.extensions.apcu ]; - - buildInputs = [ pcre2 ]; - - postInstall = '' - mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so - ''; - - meta = with lib; { - description = "APCu Backwards Compatibility Module"; - license = licenses.php301; - homepage = "https://pecl.php.net/package/apcu_bc"; - maintainers = teams.php.members; - broken = versionAtLeast php.version "8"; - }; -} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3637a7a4bcf1..e28817ac17cd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -196,8 +196,6 @@ lib.makeScope pkgs.newScope (self: with self; { apcu = callPackage ../development/php-packages/apcu { }; - apcu_bc = callPackage ../development/php-packages/apcu_bc { }; - ast = callPackage ../development/php-packages/ast { }; blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; From 00fa9e195eb2d747447f89b8bde3a24a54e647b7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 24 May 2022 21:06:42 +0200 Subject: [PATCH 06/69] php.extensions.php_excel: Deinit due to broken in all attributes after php74 deprecation --- .../php-packages/php_excel/default.nix | 30 ------------------- pkgs/top-level/php-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/php-packages/php_excel/default.nix diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix deleted file mode 100644 index 0930926a06e0..000000000000 --- a/pkgs/development/php-packages/php_excel/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildPecl, fetchurl, lib, libxl, php }: -let - pname = "php_excel"; - phpVersion = "php7"; - version = "1.0.2"; -in -buildPecl { - inherit pname version; - - src = fetchurl { - url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; - sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; - }; - - buildInputs = [ libxl ]; - - configureFlags = [ - "--with-excel" - "--with-libxl-incdir=${libxl}/include_c" - "--with-libxl-libdir=${libxl}/lib" - ]; - - meta = with lib; { - description = "PHP Extension interface to the Excel writing/reading library"; - license = licenses.php301; - homepage = "https://github.com/iliaal/php_excel"; - maintainers = lib.teams.php.members; - broken = lib.versionAtLeast php.version "8.0"; - }; -} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e28817ac17cd..91e6da336ba8 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -258,8 +258,6 @@ lib.makeScope pkgs.newScope (self: with self; { pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; - php_excel = callPackage ../development/php-packages/php_excel { }; - pinba = callPackage ../development/php-packages/pinba { }; protobuf = callPackage ../development/php-packages/protobuf { }; From d6ec38508d1f0c1b6318b3788c45f86aac75e860 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:27:05 +0200 Subject: [PATCH 07/69] unit: Drop PHP 7.4 support --- pkgs/servers/http/unit/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 4db762ec40d4..43617f405760 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, nixosTests, which , pcre2 , withPython3 ? true, python3, ncurses -, withPHP74 ? false, php74 , withPHP80 ? true, php80 , withPerl532 ? false, perl532 , withPerl534 ? true, perl534 @@ -24,7 +23,6 @@ let fpmSupport = false; }; - php74-unit = php74.override phpConfig; php80-unit = php80.override phpConfig; in stdenv.mkDerivation rec { @@ -42,7 +40,6 @@ in stdenv.mkDerivation rec { buildInputs = [ pcre2.dev ] ++ optionals withPython3 [ python3 ncurses ] - ++ optional withPHP74 php74-unit ++ optional withPHP80 php80-unit ++ optional withPerl532 perl532 ++ optional withPerl534 perl534 @@ -60,12 +57,10 @@ in stdenv.mkDerivation rec { ++ optional withDebug "--debug"; # Optionally add the PHP derivations used so they can be addressed in the configs - usedPhp74 = optionals withPHP74 php74-unit; usedPhp80 = optionals withPHP80 php80-unit; postConfigure = '' ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"} ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} From 4580a63bc4385e48f27a9e85923b20a4c8ec5a1f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:31:45 +0200 Subject: [PATCH 08/69] nixos/grocy: Upgrade to PHP 8.0 --- nixos/modules/services/web-apps/grocy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index be2de638dd96..a77fddf1f2f4 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -115,9 +115,9 @@ in { user = "grocy"; group = "nginx"; - # PHP 7.4 is the only version which is supported/tested by upstream: - # https://github.com/grocy/grocy/blob/v3.0.0/README.md#how-to-install - phpPackage = pkgs.php74; + # PHP 8.0 is the only version which is supported/tested by upstream: + # https://github.com/grocy/grocy/blob/v3.3.0/README.md#how-to-install + phpPackage = pkgs.php80; inherit (cfg.phpfpm) settings; From c53c34ee72fa0f1e216c0251572d9cbf2511378b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:34:42 +0200 Subject: [PATCH 09/69] nixos/postfixadmin: Upgrade to PHP 8.1 --- nixos/modules/services/mail/postfixadmin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index a0846ad52902..8adae3c1a013 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -177,7 +177,7 @@ in services.phpfpm.pools.postfixadmin = { user = user; - phpPackage = pkgs.php74; + phpPackage = pkgs.php81; phpOptions = '' error_log = 'stderr' log_errors = on From f822b894c5ac8a7acc049c7fa41c047ba4a530f7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:36:38 +0200 Subject: [PATCH 10/69] nixos/dokuwiki: Upgrade to PHP 8.1 They seem to run tests against 8.1 since this commit: https://github.com/splitbrain/dokuwiki/commit/7aee97ee813f0e08e339a6f29e554d52bc4ef9d3 --- nixos/modules/services/web-apps/dokuwiki.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 1f8ca742db95..d8fc978774e4 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -293,9 +293,7 @@ in inherit user; group = webserver.group; - # Not yet compatible with php 8 https://www.dokuwiki.org/requirements - # https://github.com/splitbrain/dokuwiki/issues/3545 - phpPackage = pkgs.php74; + phpPackage = pkgs.php81; phpEnv = { DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}"; DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}"; From a69ba21a2973b17df7986a7b1bd5a376591edc35 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:46:58 +0200 Subject: [PATCH 11/69] nixos/invoiceplan: Upgrade to PHP 8.1 They seem to be working to get PHP 8.1 support: https://github.com/InvoicePlane/InvoicePlane/issues/798 --- nixos/modules/services/web-apps/invoiceplane.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index 095eec36dec3..527e248f65b0 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -236,7 +236,7 @@ in }; services.phpfpm = { - phpPackage = pkgs.php74; + phpPackage = pkgs.php81; pools = mapAttrs' (hostName: cfg: ( nameValuePair "invoiceplane-${hostName}" { inherit user; @@ -302,4 +302,3 @@ in ]); } - From d0862b0ed9e20bbfad4af5c4d323ce4732e8c113 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:47:56 +0200 Subject: [PATCH 12/69] nixos/nextcloud: Upgrade to PHP 8.0 --- nixos/modules/services/web-apps/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index dd2f2479f4e9..e0aaafd46333 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -157,7 +157,7 @@ in { }; phpPackage = mkOption { type = types.package; - relatedPackages = [ "php74" "php80" "php81" ]; + relatedPackages = [ "php80" "php81" ]; defaultText = "pkgs.php"; description = '' PHP package to use for Nextcloud. @@ -632,7 +632,7 @@ in { services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; services.nextcloud.phpPackage = - if versionOlder cfg.package.version "21" then pkgs.php74 + if versionOlder cfg.package.version "24" then pkgs.php80 # FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed: # # https://github.com/nextcloud/twofactor_totp/issues/1192 From d7f000b98be30912436356834aa2995e0d6846d2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:49:11 +0200 Subject: [PATCH 13/69] nixos/moodle: Upgrade to PHP 8.1 --- nixos/modules/services/web-apps/moodle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 19f3e754691e..55e5ac9281e7 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -56,7 +56,7 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - phpExt = pkgs.php74.withExtensions + phpExt = pkgs.php81.withExtensions ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]); in { From da19e4ae97416618259bf7e5a3d5e0b96f01db1c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:51:06 +0200 Subject: [PATCH 14/69] nixos/snipe-it: Upgrade to PHP 8.1 They state that they support PHP 8.1: https://snipe-it.readme.io/docs/requirements --- nixos/modules/services/web-apps/snipe-it.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index f14171d02f35..842e0715c025 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -344,7 +344,7 @@ in { services.phpfpm.pools.snipe-it = { inherit user group; - phpPackage = pkgs.php74; + phpPackage = pkgs.php81; phpOptions = '' post_max_size = ${cfg.maxUploadSize} upload_max_filesize = ${cfg.maxUploadSize} From 8c28c83800c50f82c2d11bd30a452cef4af507fe Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:53:56 +0200 Subject: [PATCH 15/69] arcanist: Upgrade to PHP 8.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73693bab099b..8dbc8ebf60ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1782,7 +1782,7 @@ with pkgs; }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; - arcanist = callPackage ../development/tools/misc/arcanist { php = php74; }; + arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; arduino = arduino-core.override { withGui = true; }; From fa4acb76598f665895c6a32d2f61645b44c7d893 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:54:21 +0200 Subject: [PATCH 16/69] engelsystem: Upgrade to PHP 8.1 --- pkgs/servers/web-apps/engelsystem/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index d154b1cee11c..eee76b1bf594 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -2,7 +2,7 @@ let phpExt = php.withExtensions - ({ enabled, all }: with all; [ json filter mysqlnd mysqli pdo pdo_mysql ]); + ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); in stdenv.mkDerivation rec { pname = "engelsystem"; version = "3.1.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dbc8ebf60ef..ed09a26b7191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21713,7 +21713,7 @@ with pkgs; dspam = callPackage ../servers/mail/dspam { }; - engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; + engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; envoy = callPackage ../servers/http/envoy { jdk = openjdk11_headless; From 506bcd905ee582b78629e91d463612acb61698e7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:54:40 +0200 Subject: [PATCH 17/69] lsp-plugins: Upgrade to PHP 8.1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed09a26b7191..8ba232b05b92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27891,7 +27891,7 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; }; + lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; }; ltex-ls = callPackage ../tools/text/ltex-ls { }; From 42b3cedbb5b880e035258b86b2565a9341d4413b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:56:23 +0200 Subject: [PATCH 18/69] php.extensions.oci8: Drop 2.2.0 for older PHP packages --- pkgs/development/php-packages/oci8/default.nix | 6 +++++- pkgs/top-level/php-packages.nix | 8 +------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index eb65b5a27cda..2657a67d38ba 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, version, sha256, oracle-instantclient }: +{ buildPecl, lib, oracle-instantclient }: +let + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; +in buildPecl { pname = "oci8"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 91e6da336ba8..a1079243f246 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -224,13 +224,7 @@ lib.makeScope pkgs.newScope (self: with self; { mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = callPackage ../development/php-packages/oci8 ({ - version = "2.2.0"; - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - } // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") { - version = "3.0.1"; - sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; - }); + oci8 = callPackage ../development/php-packages/oci8 { }; openswoole = callPackage ../development/php-packages/openswoole { }; From 5d409065a48faaf0e2c9d1c43b8ac2b3ebfbe014 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 18:57:48 +0200 Subject: [PATCH 19/69] nixos/uwsgi: Drop optionalstring based on PHP version --- pkgs/servers/uwsgi/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index e8bfed1ab89b..d24c482a8895 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -97,9 +97,7 @@ stdenv.mkDerivation rec { substituteInPlace "$f" \ --replace pkg-config "$PKG_CONFIG" done - ${lib.optionalString (lib.versionAtLeast php.version "8") '' - sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py - ''} + sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py ''; configurePhase = '' From 1cd3f3f1fe531c897d9508ef1cc6eb337d2a7314 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 19:03:59 +0200 Subject: [PATCH 20/69] php: Drop declarations of internalDeps for json --- pkgs/development/php-packages/couchbase/default.nix | 1 - pkgs/development/php-packages/ds/default.nix | 2 -- pkgs/development/php-packages/redis/default.nix | 2 -- 3 files changed, 5 deletions(-) diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 84f307204319..d87985ab1217 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -16,7 +16,6 @@ buildPecl { configureFlags = [ "--with-couchbase" ]; buildInputs = [ libcouchbase zlib ]; - internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; patches = [ (substituteAll { diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix index c6417fd5513a..2552a5bee3b6 100644 --- a/pkgs/development/php-packages/ds/default.nix +++ b/pkgs/development/php-packages/ds/default.nix @@ -8,8 +8,6 @@ buildPecl { buildInputs = [ pcre2 ]; - internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; - meta = with lib; { description = "An extension providing efficient data structures for PHP"; license = licenses.mit; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index e4b16dd991a7..b54d85b73ecb 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -8,8 +8,6 @@ buildPecl { internalDeps = with php.extensions; [ session - ] ++ lib.optionals (lib.versionOlder php.version "8.0") [ - json ]; meta = with lib; { From 125ad85c09bbf4d612f6a01eda3ed9c9b6f7faed Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 19:04:55 +0200 Subject: [PATCH 21/69] php: Drop broken declarations for old versions --- pkgs/development/php-packages/grumphp/default.nix | 1 - pkgs/development/php-packages/phpmd/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index e9b88d8155e2..eb74c5ad0419 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -22,7 +22,6 @@ mkDerivation rec { ''; meta = with lib; { - broken = versionOlder php.version "8.0"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; license = licenses.mit; diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 228fd25ea553..575d4ec7b460 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -29,6 +29,5 @@ mkDerivation { license = licenses.bsd3; homepage = "https://phpmd.org/"; maintainers = teams.php.members; - broken = versionOlder php.version "7.4"; }; } From 9ec41c8875c00d230f2461f3dce1d16e24070015 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 19:05:55 +0200 Subject: [PATCH 22/69] php: Drop special cases for versions below 8.0 --- pkgs/top-level/php-packages.nix | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a1079243f246..41c507a1aed6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -335,13 +335,6 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}" ]; - patches = lib.optionals (lib.versionOlder php.version "8.0") [ - # Header path defaults to FHS location, preventing the configure script from detecting errno support. - (fetchpatch { - url = "https://github.com/fossar/nix-phps/raw/263861a8c9bdafd7abe44db6db4ef0179643680c/pkgs/iconv-header-path.patch"; - sha256 = "7GHnEUu+hcsQ4h3itDwk6p46ZKfib9JZ2XpWlXrdn6E="; - }) - ]; doCheck = false; } { @@ -355,7 +348,6 @@ lib.makeScope pkgs.newScope (self: with self; { name = "intl"; buildInputs = [ icu64 ]; } - { name = "json"; enable = lib.versionOlder php.version "8.0"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; @@ -371,9 +363,7 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "mbstring"; - buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ - pcre2 - ]; + buildInputs = [ oniguruma pcre2 ]; doCheck = false; } { @@ -406,11 +396,9 @@ lib.makeScope pkgs.newScope (self: with self; { '') ]; } - # oci8 (7.4, 7.3, 7.2) - # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind.dev ]; zendExtension = true; @@ -433,14 +421,12 @@ lib.makeScope pkgs.newScope (self: with self; { enable = (!stdenv.isDarwin); doCheck = false; } - # pdo_firebird (7.4, 7.3, 7.2) { name = "pdo_mysql"; internalDeps = with php.extensions; [ pdo mysqlnd ]; configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ]; doCheck = false; } - # pdo_oci (7.4, 7.3, 7.2) { name = "pdo_odbc"; internalDeps = [ php.extensions.pdo ]; @@ -490,7 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; { ''; doCheck = false; } - { name = "session"; doCheck = lib.versionOlder php.version "8.0"; } + { name = "session"; doCheck = false; } { name = "shmop"; } { name = "simplexml"; @@ -548,15 +534,6 @@ lib.makeScope pkgs.newScope (self: with self; { "--enable-xmlreader" ]; } - { - name = "xmlrpc"; - buildInputs = [ libxml2 libiconv ]; - # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc - enable = lib.versionOlder php.version "8.0"; - configureFlags = [ - "--with-xmlrpc" - ]; - } { name = "xmlwriter"; buildInputs = [ libxml2 ]; @@ -567,7 +544,7 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "xsl"; buildInputs = [ libxslt libxml2 ]; - doCheck = lib.versionOlder php.version "8.0"; + doCheck = false; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } From e91811bbe107b7dad31075254344a3ec57cfa4de Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 25 May 2022 19:06:58 +0200 Subject: [PATCH 23/69] php74: Drop PHP 7.4 and add aliases throwing an error --- doc/languages-frameworks/php.section.md | 4 +- .../from_md/release-notes/rl-2211.section.xml | 6 +++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/tests/all-tests.nix | 1 - pkgs/development/interpreters/php/7.4.nix | 52 ------------------- pkgs/top-level/aliases.nix | 4 ++ pkgs/top-level/all-packages.nix | 7 --- 7 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/interpreters/php/7.4.nix diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 5977363323f1..8600e49d4570 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -9,7 +9,7 @@ wide variety of extensions and libraries available. The different versions of PHP that nixpkgs provides are located under attributes named based on major and minor version number; e.g., -`php74` is PHP 7.4. +`php81` is PHP 8.1. Only versions of PHP that are supported by upstream for the entirety of a given NixOS release will be included in that release of @@ -23,7 +23,7 @@ NixOS - not necessarily the latest major release from upstream. All available PHP attributes are wrappers around their respective binary PHP package and provide commonly used extensions this way. The real PHP 7.4 package, i.e. the unwrapped one, is available as -`php74.unwrapped`; see the next section for more details. +`php81.unwrapped`; see the next section for more details. Interactive tools built on PHP are put in `php.packages`; composer is for example available at `php.packages.composer`. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5c29f98b28df..5219c1329e36 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -108,6 +108,12 @@ (with foo; isPower && is32bit && isBigEndian). + + + PHP 7.4 is no longer supported due to upstream not supporting + this version for the entire lifecycle of the 22.11 release. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 624bde2c83d7..0f04eff7c045 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -45,6 +45,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. +- PHP 7.4 is no longer supported due to upstream not supporting this + version for the entire lifecycle of the 22.11 release. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1064d62da930..6d2525732da0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -422,7 +422,6 @@ in { pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; - php74 = handleTest ./php { php = pkgs.php74; }; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; pict-rs = handleTest ./pict-rs.nix {}; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix deleted file mode 100644 index 823002978785..000000000000 --- a/pkgs/development/interpreters/php/7.4.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ callPackage, lib, stdenv, ... }@_args: - -let - base = callPackage ./generic.nix (_args // { - version = "7.4.29"; - sha256 = "sha256-fd5YoCsiXCUTDG4q4su6clS7A0D3/hcpFHgXbYZvlII="; - }); - -in -base.withExtensions ({ all, ... }: with all; ([ - bcmath - calendar - curl - ctype - dom - exif - fileinfo - filter - ftp - gd - gettext - gmp - iconv - intl - json - ldap - mbstring - mysqli - mysqlnd - opcache - openssl - pcntl - pdo - pdo_mysql - pdo_odbc - pdo_pgsql - pdo_sqlite - pgsql - posix - readline - session - simplexml - sockets - soap - sodium - sqlite3 - tokenizer - xmlreader - xmlwriter - zip - zlib -] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1fc44abf1ab8..30702ade0fbf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1011,6 +1011,10 @@ mapAliases ({ phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 # Obsolete PHP version aliases + php74 = throw "php74 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2022-05-24 + php74Packages = php74; # Added 2022-05-24 + php74Extensions = php74; # Added 2022-05-24 + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03 php73Packages = php73; # Added 2021-06-03 php73Extensions = php73; # Added 2021-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ba232b05b92..d3bfe0189536 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14409,13 +14409,6 @@ with pkgs; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; - # Import PHP74 interpreter, extensions and packages - php74 = callPackage ../development/interpreters/php/7.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - }; - php74Extensions = recurseIntoAttrs php74.extensions; - php74Packages = recurseIntoAttrs php74.packages; - picoc = callPackage ../development/interpreters/picoc {}; From b7b4b839bbcf62332a3a8aaec81d66cc1afa6060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jun 2022 18:23:00 +0000 Subject: [PATCH 24/69] python310Packages.pulumi-aws: 5.3.0 -> 5.7.2 --- pkgs/development/python-modules/pulumi-aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 69a4ea692072..ce48389e9867 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pulumi-aws"; # version is independant of pulumi's. - version = "5.3.0"; + version = "5.7.2"; disabled = isPy27; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; - rev = "v${version}"; - sha256 = "sha256-LrWiNYJeQQvXJDOxklRO86VSiaadvkOepQVPhh2BBkk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; }; propagatedBuildInputs = [ From 6400298c786d57018a6e1d75abb26ff00861f5c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jun 2022 23:11:11 +0200 Subject: [PATCH 25/69] python310Packages.pywizlight: 0.5.13 -> 0.5.14 --- pkgs/development/python-modules/pywizlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 707a82054cba..0fcbf396d36a 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.13"; + version = "0.5.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UePrG49Q2tJq3f2QaW4BjbWHHif6cTFGdiO/DZfpMFA="; + sha256 = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ="; }; propagatedBuildInputs = [ From 3abb144ebf3b2e18c8ef8a80ca7265628054d241 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 00:52:16 +0000 Subject: [PATCH 26/69] python310Packages.sunpy: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 78c5665d102f..b9fc0a652439 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-01eGYls8eE2e3vzDYXz5D1xQs7pxpmHt89aBKCvVdLg="; + hash = "sha256-TKOJcEg5A3zjuJbH/tugoX7A7vxSwcE20jJ5QuvWTu8="; }; nativeBuildInputs = [ From 056e7bc946cf931bc6d69cebb84b0b4b284744af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 01:32:02 +0000 Subject: [PATCH 27/69] clojure: 1.11.1.1113 -> 1.11.1.1119 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 55adb7481d59..b309dd8b7db1 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1113"; + version = "1.11.1.1119"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-DJVKVqBx8zueA5+KuQX4NypaYBoNFKMuDM8jDqdgaiI="; + sha256 = "sha256-DPFLExCMWheI5IIa8aNz/ZggftJpxgOUIOYZZKBdvIc="; }; nativeBuildInputs = [ From 96188399399fda479dd75a6263283385f4e035ff Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 7 Jun 2022 23:45:44 -0300 Subject: [PATCH 28/69] gnome-todo: use SRI hash format --- pkgs/desktops/gnome/apps/gnome-todo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 95ec0699db73..e9331c08993c 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667 (fetchpatch { url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655"; - sha256 = "sha256:0ihixyq72yhx6njij7bldsqb80x3y217yh6livknlf5r1wr3hakn"; + sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY="; extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) From 8f3e98cf282fa02879a7d10cb9f8ebe0b5ed8deb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 7 Jun 2022 23:46:19 -0300 Subject: [PATCH 29/69] bugdom: use SRI hash format --- pkgs/games/bugdom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index fd8935594696..d1cadd04be05 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256:1371inw11rzfrxmc3v4gv5axp56bxjbcr0mhqm4x839401bfq5mf"; + sha256 = "sha256-rhbsVgAkDdRJxbCCzJbsy5TbVdmP7MFqz+7nELiN4Yw="; fetchSubmodules = true; }; From 254a82389d1e6ec2bb4b25673f361d6bd57bdfc0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:28:36 -0300 Subject: [PATCH 30/69] openorienteering-mapper: use SRI hash format --- .../gis/openorienteering-mapper/default.nix | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ee2a1511261..b73fb71f698f 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,45 +1,33 @@ -{ lib, stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch -, substituteAll -, gdal +, clipper , cmake +, cups +, doxygen +, gdal , ninja , proj -, clipper -, zlib -, qttools +, qtimageformats , qtlocation , qtsensors +, qttools , qttranslations -, doxygen -, cups -, qtimageformats +, substituteAll +, zlib }: mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = "0.9.5"; - buildInputs = [ - gdal - qtlocation - qtimageformats - qtsensors - clipper - zlib - proj - cups - ]; - - nativeBuildInputs = [ cmake doxygen ninja qttools ]; - src = fetchFromGitHub { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5"; + hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE="; }; patches = [ @@ -55,6 +43,24 @@ mkDerivation rec { }) ]; + nativeBuildInputs = [ + cmake + doxygen + ninja + qttools + ]; + + buildInputs = [ + clipper + cups + gdal + proj + qtimageformats + qtlocation + qtsensors + zlib + ]; + cmakeFlags = [ # Building the manual and bundling licenses fails # See https://github.com/NixOS/nixpkgs/issues/85306 @@ -81,15 +87,12 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; - description = '' - OpenOrienteering Mapper is an orienteering mapmaking program - and provides a free alternative to the existing proprietary solution. - ''; homepage = "https://www.openorienteering.org/apps/mapper/"; + description = "An orienteering mapmaking program"; changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mpickering sikmir ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin; }; } From 0965a514043a76f4495ae564a9a669f5db4ccf08 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:29:07 -0300 Subject: [PATCH 31/69] udig: use SRI hash format --- pkgs/applications/gis/udig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index e4abddbcde00..b939cf05e754 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -6,11 +6,11 @@ let srcs = { x86_64-linux = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; - sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa"; + hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4="; }; x86_64-darwin = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; - sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692"; + hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; }; }; src = srcs.${stdenv.hostPlatform.system}; From bdbfd5cead25a9bacdd956a41a2df666626124ce Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:29:24 -0300 Subject: [PATCH 32/69] whitebox-tools: use SRI hash format --- .../gis/whitebox-tools/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c60523e3e996..fc4648eb9dce 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: + rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; version = "2.0.0"; @@ -7,20 +13,22 @@ rustPlatform.buildRustPackage rec { owner = "jblindsay"; repo = "whitebox-tools"; rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8"; - sha256 = "0mngw99aj60bf02y3piimxc1z1zbw1dhwyixndxh3b3m9xqhk51h"; + hash = "sha256-MJQJcU91rAF7sz16Dlvg64cfWK8x3uEFcAsYqVLiz1Y="; }; - cargoPatches = [./update-cargo-lock.patch]; + cargoSha256 = "sha256-+IFLv/mIgqyDKNC5aZgQeW6Ymu6+desOD8dDvEdwsSM="; + + cargoPatches = [ + ./update-cargo-lock.patch + ]; buildInputs = lib.optional stdenv.isDarwin Security; - cargoSha256 = "08xif13vqhy71w7fnxdyxsd9hvkr22c6kffh521sr0l8z6zlp0gq"; - doCheck = false; meta = with lib; { - description = "An advanced geospatial data analysis platform"; homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; + description = "An advanced geospatial data analysis platform"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; }; From 2922710cb57981ac90f09d66791c6637bbb0e1e7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:29:45 -0300 Subject: [PATCH 33/69] otto-matic: use SRI hash format --- pkgs/games/otto-matic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 5dd7f98e4569..2257b50e0c8d 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256:1yd4clks7kr2hn69c4q1ykc92sw6axbspambm03viapr834bjz3q"; + sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk="; fetchSubmodules = true; }; From 233e380f3b09efc4fb67d80898a59e494c1b6baa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:30:15 -0300 Subject: [PATCH 34/69] tworld2: use SRI hash format --- pkgs/games/tworld2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/games/tworld2/default.nix b/pkgs/games/tworld2/default.nix index 1db1dcf5f065..158d494fb32d 100644 --- a/pkgs/games/tworld2/default.nix +++ b/pkgs/games/tworld2/default.nix @@ -1,8 +1,8 @@ { stdenv , lib , fetchurl -, qt4 , SDL +, qt4 }: stdenv.mkDerivation rec { @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://tw2.bitbusters.club/downloads/tworld-${version}-src.tar.gz"; - sha256 = "sha256:1y55v2shk2xxcds7bdwdjaq9lka31sgdp2469zqnvldchwbvcb2i"; + hash = "sha256-USy2F4es0W3xT4aI254OQ02asJKNt3V0Y72LCbXYpfg="; }; - buildInputs = [ qt4 SDL ]; + buildInputs = [ SDL qt4 ]; + enableParallelBuilding = true; postConfigure = '' @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge"; homepage = "https://tw2.bitbusters.club/"; + description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = with maintainers; [ drperceptron ]; + platforms = platforms.linux; }; } From 1404529e1dfc07bf4bc163fe9d131ffffa65e858 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:08:53 -0300 Subject: [PATCH 35/69] fairymax: use SRI hash format --- pkgs/games/fairymax/default.nix | 38 +++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 49a91e7a64d4..b493f4dcfa27 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -1,39 +1,49 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchurl +}: + stdenv.mkDerivation rec { pname = "fairymax"; version = "4.8"; + src = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c"; - sha256 = "01vxhpa4z0613mkgkzmsln293wxmyp5kdzil93cd1ik51q4gwjca"; + hash = "sha256-ikn+CA5lxtDYSDT+Nsv1tfORhKW6/vlmHcGAT9SFfQc="; }; + ini = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax.ini"; - sha256 = "1zwx70g3gspbqx1zf9gm1may8jrli9idalvskxbdg33qgjys47cn"; + hash = "sha256-lh2ivXx4jNdWn3pT1WKKNEvkVQ31JfdDx+vqNx44nf8="; }; + unpackPhase = '' cp ${src} fairymax.c cp ${ini} fmax.ini ''; + buildPhase = '' - $CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + cc *.c -Wno-return-type \ + -o fairymax \ + -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' ''; + installPhase = '' mkdir -p "$out"/{bin,share/fairymax} cp fairymax "$out/bin" cp fmax.ini "$out/share/fairymax" ''; - meta = { + + meta = with lib; { + homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; description = "A small chess engine supporting fairy pieces"; longDescription = '' - A version of micro-Max that reads the piece description - from a file fmax.ini, so that arbitrary fairy pieces can be - implemented. This version (4.8J) supports up to 15 piece types, - and board sizes up to 12x8. A Linux port exists in the - format of a debian package. + A version of micro-Max that reads the piece description from a file + fmax.ini, so that arbitrary fairy pieces can be implemented. This version + (4.8J) supports up to 15 piece types, and board sizes up to 12x8. ''; - license = lib.licenses.free ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.all; - homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; + license = licenses.free; + maintainers = [ maintainers.raskin ]; + platforms = platforms.all; }; } From 0036078a21f199a0a17e4a0e66928986fd52cf26 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:09:18 -0300 Subject: [PATCH 36/69] gshogi: use SRI hash format --- pkgs/games/gshogi/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index c3479f6758af..4b674ac129df 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -1,8 +1,12 @@ -{ lib, buildPythonApplication, fetchFromGitHub -, gtk3, gobject-introspection -, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, python3 +, wrapGAppsHook +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gshogi"; version = "0.5.1"; @@ -10,7 +14,7 @@ buildPythonApplication rec { owner = "johncheetham"; repo = "gshogi"; rev = "v${version}"; - sha256 = "06vgndfgwyfi50wg3cw92zspc9z0k7xn2pp6qsjih0l5yih8iwqh"; + hash = "sha256-EPOIYPSFAhilxuZeYfuZ4Cd29ReJs/E4KNF5/lyzbxs="; }; doCheck = false; # no tests available @@ -22,15 +26,15 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; meta = with lib; { - description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; homepage = "http://johncheetham.com/projects/gshogi/"; - license = licenses.gpl3; + description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ciil ]; }; From e28fc76d2cdb785ef46c8fe0344bb5a814ad83d0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:09:34 -0300 Subject: [PATCH 37/69] julius: use SRI hash format --- pkgs/games/julius/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 84970d110550..df1ff2bd1a06 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_mixer +, cmake +, libpng +}: stdenv.mkDerivation rec { pname = "julius"; @@ -8,18 +15,18 @@ stdenv.mkDerivation rec { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; + hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_mixer libpng ]; meta = with lib; { - description = "An open source re-implementation of Caesar III"; homepage = "https://github.com/bvschaik/julius"; + description = "An open source re-implementation of Caesar III"; license = licenses.agpl3; + maintainers = with maintainers; [ Thra11 ]; platforms = platforms.all; broken = stdenv.isDarwin; - maintainers = with maintainers; [ Thra11 ]; }; } From d2ebaafd9081c26a5da581898e562b348ecf4a95 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:09:52 -0300 Subject: [PATCH 38/69] koules: use SRI hash format --- pkgs/games/koules/default.nix | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/games/koules/default.nix b/pkgs/games/koules/default.nix index e2c7c55cbb70..360415dc2e1d 100644 --- a/pkgs/games/koules/default.nix +++ b/pkgs/games/koules/default.nix @@ -2,29 +2,28 @@ , lib , fetchurl , fetchzip -, makeDesktopItem , copyDesktopItems -, imake , gccmakedep +, imake +, installShellFiles , libX11 , libXext -, installShellFiles +, makeDesktopItem }: let debian-extras = fetchzip { url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz"; - sha256 = "0bq1rr6vxqmx2k0dhyrqnwwfiw4h2ycbj576v66vwr0jaq5plil3"; + hash = "sha256-g0Z6C1YSZL6N2eYUuZgXkPDoOLc4e9jAFL3ivk3OAS8="; }; in - stdenv.mkDerivation rec { pname = "koules"; version = "1.4"; src = fetchurl { url = "https://www.ucw.cz/~hubicka/koules/packages/${pname}${version}-src.tar.gz"; - sha256 = "06x2wkpns14kii9fxmxbmj5lma371qj00hgl7fc5kggfmzz96vy3"; + hash = "sha256-w2+T/q/uvVmYO/RBACQOZ6hKi6yr1+5SjJMEbe/kohs="; }; nativeBuildInputs = [ imake gccmakedep installShellFiles copyDesktopItems ]; @@ -57,20 +56,22 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItems = [ (makeDesktopItem { - desktopName = "Koules"; - name = "koules"; - exec = "xkoules"; - icon = "koules"; - comment = "Push your enemies away, but stay away from obstacles"; - categories = [ "Game" "ArcadeGame" ]; - }) ]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Koules"; + name = "koules"; + exec = "xkoules"; + icon = "koules"; + comment = "Push your enemies away, but stay away from obstacles"; + categories = [ "Game" "ArcadeGame" ]; + }) + ]; meta = with lib; { - description = "Fast arcade game based on the fundamental law of body attraction"; homepage = "https://www.ucw.cz/~hubicka/koules/English/"; + description = "Fast arcade game based on the fundamental law of body attraction"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = [ maintainers.iblech ]; + platforms = platforms.linux; }; } From 8e41788cba33409cf2e1113b14cc7b19f97f5adf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:10:09 -0300 Subject: [PATCH 39/69] leela-zero: use SRI hash format --- pkgs/games/leela-zero/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 13b423832e67..e7b6c7934188 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost -, opencl-headers, ocl-icd, qtbase , zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, opencl-headers +, ocl-icd +, qtbase +, zlib +}: stdenv.mkDerivation rec { pname = "leela-zero"; @@ -9,7 +17,7 @@ stdenv.mkDerivation rec { owner = "gcp"; repo = "leela-zero"; rev = "v${version}"; - sha256 = "1k04ld1ysabxb8ivci3ji5by9vb3yvnflkf2fscs1x0bp7d6j101"; + sha256 = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; fetchSubmodules = true; }; @@ -21,9 +29,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; - homepage = "https://github.com/gcp/leela-zero"; - license = licenses.gpl3; + homepage = "https://github.com/gcp/leela-zero"; + license = licenses.gpl3Plus; maintainers = [ maintainers.averelld maintainers.omnipotententity ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 5b6c9db8109797eece80a590890107e8aa744b21 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:10:47 -0300 Subject: [PATCH 40/69] performous: use SRI hash format --- pkgs/games/performous/default.nix | 53 +++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index c4af373cdcdd..10ce4dd06fcd 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,32 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext -, glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, ffmpeg, portaudio, libepoxy +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, boost +, cmake +, ffmpeg +, gettext +, glew +, glibmm +, libepoxy +, librsvg +, libxmlxx +, pango +, pkg-config +, portaudio }: stdenv.mkDerivation rec { pname = "performous"; version = "1.1"; - meta = with lib; { - description = "Karaoke, band and dancing game"; - homepage = "http://performous.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - src = fetchFromGitHub { owner = "performous"; repo = "performous"; rev = version; - sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x"; + hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI="; }; patches = [ ./performous-cmake.patch ]; - nativeBuildInputs = [ cmake pkg-config gettext ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + ]; buildInputs = [ - glibmm libxmlxx pango librsvg - SDL2 glew boost ffmpeg portaudio libepoxy + SDL2 + boost + ffmpeg + glew + glibmm + libepoxy + librsvg + libxmlxx + pango + portaudio ]; + + meta = with lib; { + homepage = "http://performous.org/"; + description = "Karaoke, band and dancing game"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; } From 494ef5a68c632cc24f68c78ce9dd2e51945a62cb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:10:59 -0300 Subject: [PATCH 41/69] vectoroids: use SRI hash format --- pkgs/games/vectoroids/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 765f21465805..82c157104439 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -1,14 +1,25 @@ -{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_image +, SDL_mixer +}: stdenv.mkDerivation rec { pname = "vectoroids"; version = "1.1.0"; + src = fetchurl { url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-${version}.tar.gz"; sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d"; }; - buildInputs = [ SDL SDL_image SDL_mixer]; + buildInputs = [ + SDL + SDL_image + SDL_mixer + ]; preConfigure = '' sed -i s,/usr/local,$out, Makefile From 95390a3e1334421e67e44343ab33caf70b6ee7af Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:11:14 -0300 Subject: [PATCH 42/69] zandronum/sqlite.nix: use SRI hash format --- pkgs/games/zandronum/sqlite.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index e38dedbb7f73..c7687f89589d 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation { pname = "sqlite-zandronum"; @@ -6,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"; - sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp"; + hash = "sha256-N1dhJGOXbn0IxenwrzAhYT/CS7z+HFEZfWd2uezprFw="; }; buildPhase = '' From ce51fe80f8e91b1dec219d21f3184cfad30087cc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:11:33 -0300 Subject: [PATCH 43/69] zdoom: use SRI hash format --- pkgs/games/zdoom/zdbsp.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e688b908e126..d18eb144292f 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchzip, cmake, zlib }: +{ lib +, stdenv +, fetchzip +, cmake +, zlib +}: stdenv.mkDerivation rec { pname = "zdbsp"; @@ -6,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; - sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d"; + sha256 = "sha256-DTj0jMNurvwRwMbo0L4+IeNlbfIwUbqcG1LKd68C08g="; stripRoot = false; }; @@ -23,8 +28,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "ZDoom's internal node builder for DOOM maps"; homepage = "https://zdoom.org/wiki/ZDBSP"; + description = "ZDoom's internal node builder for DOOM maps"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus siraben ]; platforms = platforms.unix; From 3b224dccc3306043d1f7ee4dc1229a95e464d665 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:11:47 -0300 Subject: [PATCH 44/69] zoom: use SRI hash format --- pkgs/games/zoom/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 02cfc28ebeef..e281caee72a2 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: +{ lib +, stdenv +, fetchurl +, perl +, expat +, xlibsWrapper +, freetype +}: # !!! assert freetype == xorg.freetype @@ -8,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${version}.tar.gz"; - sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; + hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w="; }; buildInputs = [ perl expat xlibsWrapper freetype ]; @@ -16,6 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; meta = with lib; { + homepage = "https://www.logicalshift.co.uk/unix/zoom/"; description = "Player for Z-Code, TADS and HUGO stories or games"; longDescription = '' Zoom is a player for Z-Code, TADS and HUGO stories or games. These are From 2275593fe8a3c577ddf79c46207cfefa7a0f5133 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 9 Jun 2022 23:10:23 -0300 Subject: [PATCH 45/69] openttd/nml.nix: use SRI hash format --- pkgs/games/openttd/nml.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index bb44d9eee0b6..2f7405725ab9 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -1,6 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ stdenv +, lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; version = "0.6.1"; @@ -8,15 +12,18 @@ python3Packages.buildPythonApplication rec { owner = "OpenTTD"; repo = "nml"; rev = version; - sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2"; + hash = "sha256-AmJrPyzPMe2F8geJhhRpO8aj467n1wqldC9iuzElFnw="; }; - propagatedBuildInputs = with python3Packages; [ply pillow]; + propagatedBuildInputs = with python3.pkgs; [ + pillow + ply + ]; meta = with lib; { + homepage = "http://openttdcoop.org/"; description = "Compiler for OpenTTD NML files"; - homepage = "http://openttdcoop.org/"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ ToxicFrog ]; }; } From 3f953478bee6771a8ce5c86540b1fda451df1808 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 8 Jun 2022 22:30:32 -0300 Subject: [PATCH 46/69] unvanquished: use SRI hash format --- pkgs/games/unvanquished/default.nix | 75 +++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 14 deletions(-) diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 191d8c218070..574c639ad125 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,8 +1,34 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem -, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5 -, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg -, libvorbis, libjpeg, libwebp, libpng -, cacert, aria2 # to download assets +{ lib +, stdenv +, fetchzip +, fetchFromGitHub +, SDL2 +, buildFHSUserEnv +, cmake +, copyDesktopItems +, curl +, freetype +, gcc +, geoip +, glew +, gmp +, libGL +, libjpeg +, libogg +, libopus +, libpng +, libvorbis +, libwebp +, lua5 +, makeDesktopItem +, ncurses +, nettle +, openal +, opusfile +, zlib +# to download assets +, aria2 +, cacert }: let @@ -14,18 +40,21 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1fiqn9f6nsh4cfjy7gfsv950hphwi9ca0ddgsjvn77g7yc0arp6c"; + sha256 = "sha256-zNysAPPnnWO31K81oFiKHF4IStraveOlYwRqa1yyOLo="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { # DISCLAIMER: this is selected binary crap from the NaCl SDK name = "unvanquished-binary-deps"; version = binary-deps-version; + src = fetchzip { url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p"; + sha256 = "sha256-N/zkUhPFnU15QSe4NGmVLmhU7UslYrzz9ZUWuLbydyE="; }; + dontPatchELF = true; + preFixup = '' # We are not using the autoPatchelfHook, because it would make # nacl_bootstrap_helper unable to load nacl_loader: @@ -38,7 +67,12 @@ let fi done ''; - preCheck = "pnacl/bin/clang -v"; # check it links correctly + + preCheck = '' + # check it links correctly + pnacl/bin/clang -v + ''; + installPhase = '' runHook preInstall @@ -51,15 +85,18 @@ let libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation { name = "libstdcpp-preload-for-unvanquished-nacl"; + + propagatedBuildInputs = [ gcc.cc.lib ]; + buildCommand = '' mkdir $out/etc -p echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload ''; - propagatedBuildInputs = [ gcc.cc.lib ]; }; fhsEnv = buildFHSUserEnv { name = "unvanquished-fhs-wrapper"; + targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ]; }; @@ -81,10 +118,14 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256:084jdisb48xyk9agjifn0nlnsdnjgg32si8zd1khsywd0kffplzx"; + outputHash = "sha256-/dPr3ASNew1naB9FLcZ70jZtqQXWRflUmr4jsnRskiA="; outputHashMode = "recursive"; + nativeBuildInputs = [ aria2 cacert ]; - buildCommand = "bash $src/download-paks --cache=$(pwd) --version=${version} $out"; + + buildCommand = '' + bash $src/download-paks --cache=$(pwd) --version=${version} $out + ''; }; # this really is the daemon game engine, the game itself is in the assets @@ -98,7 +139,12 @@ in stdenv.mkDerivation rec { chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ ''; - nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ]; + nativeBuildInputs = [ + cmake + unvanquished-binary-deps + copyDesktopItems + ]; + buildInputs = [ gmp libGL @@ -168,17 +214,18 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + meta = { - platforms = [ "x86_64-linux" ]; homepage = "https://unvanquished.net/"; downloadPage = "https://unvanquished.net/download/"; description = "A fast paced, first person strategy game"; - maintainers = with lib.maintainers; [ afontain ]; # don't replace the following lib.licenses.zlib with just "zlib", # or you would end up with the package instead license = with lib.licenses; [ mit gpl3Plus lib.licenses.zlib bsd3 # engine cc-by-sa-25 cc-by-sa-30 cc-by-30 cc-by-sa-40 cc0 # assets ]; + maintainers = with lib.maintainers; [ afontain ]; + platforms = [ "x86_64-linux" ]; }; } From a7b8b68ba96dbcead84b6a630c79ef01bf9f0586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Jun 2022 03:08:36 +0000 Subject: [PATCH 47/69] python310Packages.twitchapi: 2.5.4 -> 2.5.5 https://github.com/Teekeks/pyTwitchAPI/releases/tag/v2.5.5 --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 5d46ea9e0445..97cb99e2066f 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.4"; + version = "2.5.5"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-uNXET3V3r3f6c72IF3DEdXfQlrgkn2w5f4ksKBOsihg="; + hash = "sha256-NOLuooJNGpuHnKa9eAEEDzKJnXdJ6/Yx2/9KZqY9SDk="; }; propagatedBuildInputs = [ From 1de09605f2e0fc36f8c65fc49449138ffa7b6fd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 03:55:57 +0000 Subject: [PATCH 48/69] python310Packages.peaqevcore: 0.3.4 -> 0.3.14 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 519084e073e9..b1af47e6b580 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.3.4"; + version = "0.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s2OPHA3uBoWFnEz51itif3icErYkXhayvQ3+0b6jyjE="; + hash = "sha256-cIm4ADZSVbE+Hb23AjKs6vADnIQNFPJjFj3Ex7INnwo="; }; postPatch = '' From 63eead4a4fa5f3bc65323dd79628d2b2e9cd74ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 04:01:02 +0000 Subject: [PATCH 49/69] python310Packages.pynetgear: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/pynetgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index d5ac236feb6d..6c5d7b7c50cd 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.10.4"; + version = "0.10.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-+Tv7i3iUr8HySTHPR4iNO6ycUnpNazKJkp3mXSflu54="; + sha256 = "sha256-eYcMS8gxJO5JXvgIcZEEei5THb+gDdmoad+/Vokis/Q="; }; propagatedBuildInputs = [ From 22e8068097cf022d8f2d212d3f8b2a7ebfb6c035 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Jun 2022 12:19:52 +0800 Subject: [PATCH 50/69] pantheon.elementary-videos: 2.8.3 -> 2.8.4 --- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index d4c03a076579..9059338da479 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -7,7 +7,6 @@ , ninja , vala , python3 -, desktop-file-utils , gtk3 , granite , libgee @@ -20,17 +19,16 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE="; + sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw="; }; nativeBuildInputs = [ - desktop-file-utils meson ninja pkg-config From 6667e3670fcbdc5f4c8a5b29601f48035f922e67 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Jun 2022 12:23:02 +0800 Subject: [PATCH 51/69] pantheon.elementary-notifications: 6.0.1 -> 6.0.2 --- .../pantheon/services/elementary-notifications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 4cea8b0894d2..afde58c5f509 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg="; + sha256 = "sha256-kM//T3P8gMGnCMDJ1caQQGgD6HBOQo0wp2wZGMUUPuU="; }; nativeBuildInputs = [ From 4b4376cded662b1430e5afad7ee03e4e3fe2cf07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 05:04:18 +0000 Subject: [PATCH 52/69] python310Packages.trimesh: 3.12.5 -> 3.12.6 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index edade9f1fbb1..cc7a3d386ee8 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.5"; + version = "3.12.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CTWxN7boesxRFxMy+k1BOejuvoSFg/JDYYCC0Aud+Es="; + sha256 = "sha256-p7YE1qVhjizVNuJLXZF0lw28WbzvnOwfguvMr0b8ifc="; }; propagatedBuildInputs = [ numpy ]; From a824be79d863add368b73d7d444745f9913f1076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 06:35:10 +0000 Subject: [PATCH 53/69] python310Packages.types-freezegun: 1.1.9 -> 1.1.10 --- pkgs/development/python-modules/types-freezegun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index d34bac65a92d..ebca11ad4776 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.9"; + version = "1.1.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-bwUQjUaLrsrfmZhzvTfleyXOs1010/g+enQvJdb+iw4="; + hash = "sha256-yzotLu6VDqy6rAZzq1BJmCM2XOuMZVursVRKQURkCew="; }; # Module doesn't have tests From a5f36314c769d8df0321b3b84d642d15c9bbcaf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 06:46:30 +0000 Subject: [PATCH 54/69] python310Packages.transformers: 4.19.2 -> 4.19.3 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index dcc89161d4ea..ae3009e3fba5 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.19.2"; + version = "4.19.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9r/1vW7Rhv9+Swxdzu5PTnlQlT8ofJeZamHf5X4ql8w="; + hash = "sha256-kXgxIjU5L4YYCqHGvhqjX4YZ3VKNLYIxIKqT1Nmv/GU="; }; propagatedBuildInputs = [ From 0aa9eac9c95310dc627e0d763475fb1e16d4b3d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jun 2022 07:04:08 +0000 Subject: [PATCH 55/69] python310Packages.svg-path: 6.0 -> 6.1 --- pkgs/development/python-modules/svg-path/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index b5b154763221..4e135a03cf79 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "svg.path"; - version = "6.0"; + version = "6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X78HaJFzywl3aA4Sl58wHQu2r1NVyjlsww0+ESx5TdU="; + hash = "sha256-i0Rx37c2GwibZstC2pZBWO0A6aXKEVuKaaxPXcJHSj8="; }; checkInputs = [ From e6a8399cafcadd3f44e59db8487d9ee44190e727 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jun 2022 09:50:11 +0200 Subject: [PATCH 56/69] python310Packages.bc-python-hcl2: 0.3.42 -> 0.3.43 --- pkgs/development/python-modules/bc-python-hcl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index a3dee2254621..21e2914ecf61 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.42"; + version = "0.3.43"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-s4O2xoNafYHFBToxkKzgJ5NjQH4M5D7PcpsmiAZqR/8="; + hash = "sha256-rUmvhmqvVtblmqzbYJcHUdFSw2PsPGbZFPJRi3Xtjv0="; }; # Nose is required during build process, so can not use `checkInputs`. From 310422912295630de7f752bc7c12af3c9905ab03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jun 2022 09:59:02 +0200 Subject: [PATCH 57/69] checkov: 2.0.1206 -> 2.0.1209 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 280354ebf516..ec5074402758 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1206"; + version = "2.0.1209"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-5pnT9JcE1BY4kgqycfNLm3PiTqZdw2V9ksz2E+jfFkY="; + hash = "sha256-q2TwkmP16SvhMJkBcvYMfjbXP6GKZpzEQh7H9N+H20U="; }; nativeBuildInputs = with py.pkgs; [ From ab4e0fc110eb4850da9eb410d0d81920641b7456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jun 2022 10:14:57 +0200 Subject: [PATCH 58/69] python310Packages.pulumi-aws: use sourceRoot --- .../python-modules/pulumi-aws/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index ce48389e9867..170a24ff70fb 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -1,40 +1,43 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch -, pulumi , parver +, pulumi +, pythonOlder , semver -, isPy27 }: buildPythonPackage rec { pname = "pulumi-aws"; - # version is independant of pulumi's. + # Version is independant of pulumi's. version = "5.7.2"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - sha256 = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; + hash = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; }; + sourceRoot = "${src.name}/sdk/python"; + propagatedBuildInputs = [ - pulumi parver + pulumi semver ]; - postPatch = '' - cd sdk/python - ''; - - # checks require cloud resources + # Checks require cloud resources doCheck = false; - pythonImportsCheck = ["pulumi_aws"]; + + pythonImportsCheck = [ + "pulumi_aws" + ]; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; From 6130c92db65606145f7d7f869f08f59f37af5edf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Jun 2022 09:18:09 +0100 Subject: [PATCH 59/69] retroarchBare: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10 or llvm-11. Otherwise build fails as: duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o --- pkgs/applications/emulators/retroarch/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index e9aa7d80d57f..0a078f68c7a3 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -126,7 +126,12 @@ stdenv.mkDerivation rec { # Workaround for the following error affecting newer versions of Clang: # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang [ "-Wno-undef-prefix" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ] + # Workaround build failure on -fno-common toolchains: + # duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o + # TODO: drop when upstream gets a fix for it: + # https://github.com/libretro/RetroArch/issues/14025 + ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; meta = with lib; { homepage = "https://libretro.com"; From 134b8fc0d49a2fd1e3f5aeb8f207a02ae38438fe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 10:19:26 +0000 Subject: [PATCH 60/69] mmc-utils: update homepage and src URL These are also used by Debian. --- pkgs/os-specific/linux/mmc-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 7430182e5d2e..ae13cc299eb1 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2021-05-11"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; + url = "git://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git"; rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc"; sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Configure MMC storage devices from userspace"; - homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/"; + homepage = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; From 0bbe51030e6e891c012ed251053c038cff27eeb6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 10:20:54 +0000 Subject: [PATCH 61/69] mmc-utils: fetchgit -> fetchzip There's no need to download the full git history when a tarball is available. --- pkgs/os-specific/linux/mmc-utils/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index ae13cc299eb1..24249f9111d6 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,12 +1,11 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation { pname = "mmc-utils"; version = "2021-05-11"; - src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git"; - rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc.tar.gz"; sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5"; }; From dc08e07e7c40f3fe6b704ed58fcc178a5a92602e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 11:17:59 +0000 Subject: [PATCH 62/69] mmc-utils: 2021-05-11 -> unstable-2022-04-26 I did this with unstableGitUpdater, which should help this package stay up to date in future. --- pkgs/os-specific/linux/mmc-utils/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 24249f9111d6..76927f79158b 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, unstableGitUpdater }: stdenv.mkDerivation { pname = "mmc-utils"; - version = "2021-05-11"; + version = "unstable-2022-04-26"; - src = fetchzip { - url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc.tar.gz"; - sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5"; + src = fetchzip rec { + url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; + passthru.rev = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802"; + sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -17,6 +18,10 @@ stdenv.mkDerivation { cp man/mmc.1 $out/share/man/man1/ ''; + passthru.updateScript = unstableGitUpdater { + url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git"; + }; + meta = with lib; { description = "Configure MMC storage devices from userspace"; homepage = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/"; From 77d0ed11f6e13f08837972cac7833ff20680801e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 11:19:44 +0000 Subject: [PATCH 63/69] mmc-utils: don't manually run make It's better to let this be handled by stdenv. --- pkgs/os-specific/linux/mmc-utils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 76927f79158b..304b10879d5e 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -10,10 +10,9 @@ stdenv.mkDerivation { sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc="; }; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; - installPhase = '' - make install prefix=$out + postInstall = '' mkdir -p $out/share/man/man1 cp man/mmc.1 $out/share/man/man1/ ''; From 0d5048765fa2f9a266f6e743b3a6e0769783dd79 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 11:20:04 +0000 Subject: [PATCH 64/69] mmc-utils: enable parallel building Build tested at -j4. --- pkgs/os-specific/linux/mmc-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 304b10879d5e..ee0091b0113d 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { cp man/mmc.1 $out/share/man/man1/ ''; + enableParallelBuilding = true; + passthru.updateScript = unstableGitUpdater { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git"; }; From 18ad5579c4fd3dbb4dbc864a5d11ab8eeffbd6a5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Jun 2022 11:20:16 +0000 Subject: [PATCH 65/69] mmc-utils: clarify license --- pkgs/os-specific/linux/mmc-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index ee0091b0113d..7f9c72ad870d 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Configure MMC storage devices from userspace"; homepage = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; From 9632bc06aeadd1265d454f8f7068775ed2ab46a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 10 Jun 2022 11:03:02 +0200 Subject: [PATCH 66/69] buildkite-test-collector-rust: init at version `0.1.0` (#176118) --- .../buildkite-test-collector-rust/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix new file mode 100644 index 000000000000..14b35cb1573c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "buildkite-test-collector-rust"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "test-collector-rust"; + rev = "v${version}"; + sha256 = "sha256-rY/+AwxO0+xcnRj0A8TRhCUJQ0ecosybI6It1mDOdQM="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoSha256 = "sha256-+3OwifInUAEn3IRbebg+eXEcHDNLkN169tNAUr7L8os="; + + meta = with lib; { + description = "Rust adapter for Buildkite Test Analytics"; + homepage = "https://buildkite.com/test-analytics"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ jfroche ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a329b9106c..1ab652f0b961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15087,6 +15087,10 @@ with pkgs; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; + buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bump = callPackage ../development/tools/github/bump { }; libbpf = callPackage ../os-specific/linux/libbpf { }; From 73238a4242568596f5cb89fa845c094a19e81bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 10 Jun 2022 11:13:45 +0200 Subject: [PATCH 67/69] buildkite-test-collector-rust: fix vendor sha --- .../buildkite-test-collector-rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 14b35cb1573c..7f1e6c55f5fa 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoSha256 = "sha256-+3OwifInUAEn3IRbebg+eXEcHDNLkN169tNAUr7L8os="; + cargoSha256 = "sha256-qfJ0ROi0S0mmPl6kKrW3dp3VLjYqK+sBVj+iKDNTjyM="; meta = with lib; { description = "Rust adapter for Buildkite Test Analytics"; From d9b980c98e218658d365482265fe4ac8fcacf130 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 10 Jun 2022 12:20:50 +0300 Subject: [PATCH 68/69] linux: enable vc4 HDMI-CEC by default (#176762) --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 20532d75e764..d8084bbfcccf 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -289,6 +289,9 @@ let # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = whenAtLeast "4.16" yes; DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module; + } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + # enable HDMI-CEC on RPi boards + DRM_VC4_HDMI_CEC = whenAtLeast "4.14" yes; }; sound = { From 33d84e02ee99fbb5254ad0daadfdc5ddad1d4241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 10 Jun 2022 08:34:39 -0300 Subject: [PATCH 69/69] xdgmenumaker: 1.5 -> 1.6 (#176568) * xdgmenumaker: format nix expression * xdgmenumaker: add update script * xdgmenumaker: fix license * xdgmenumaker: avoid double wrapping * xdgmenumaker: 1.5 -> 1.6 --- .../misc/xdgmenumaker/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 00ae2df100e3..357fa7f59648 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -1,20 +1,32 @@ -{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchFromGitHub +, atk +, gdk-pixbuf +, gobject-introspection +, pango +, python3Packages +, txt2tags +, wrapGAppsHook +, gitUpdater +}: python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif"; + sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; }; format = "other"; strictDeps = false; + dontWrapGApps = true; + nativeBuildInputs = [ gobject-introspection txt2tags @@ -22,26 +34,30 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - glib + atk + gdk-pixbuf + pango ]; pythonPath = with python3Packages; [ - pyxdg pygobject3 + pyxdg ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - installFlags = [ - "DESTDIR=" - ]; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru.updateScript = gitUpdater {inherit pname version; }; meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; homepage = "https://github.com/gapan/xdgmenumaker"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; maintainers = [ maintainers.romildo ];