From b8c6de64ab9f64574bf21aac1084f519551416f3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:42:39 -0300 Subject: [PATCH 01/17] docker-init: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/by-name/do/docker-init/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix index 46b951515d91..279f533da8ab 100644 --- a/pkgs/by-name/do/docker-init/package.nix +++ b/pkgs/by-name/do/docker-init/package.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "docker-init"; - version = "v1.4.0"; + version = "1.4.0"; + tag = "175267"; src = fetchurl { From fc024b25c5f0f617aabee11e62cb35359545ec5f Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:45:41 -0300 Subject: [PATCH 02/17] influxdb2: remove "v" prefix from version in libflux The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/servers/nosql/influxdb2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 7fcb072926f6..c90a77f4af36 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -32,7 +32,7 @@ let flux = rustPlatform.buildRustPackage { pname = "libflux"; - version = "v${libflux_version}"; + version = libflux_version; src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; From c70b85d5e045c065ce0de0e603f3e4a8623ff859 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:47:21 -0300 Subject: [PATCH 03/17] lora: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guidelines --- pkgs/by-name/lo/lora/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index a062c11e04d0..fa2389de0f91 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "lora"; - version = "v3.005"; + version = "3.005"; src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - rev = version; + rev = "v${version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; From 41d706f5e2289c2465e9b4d4a3f4ef69ccfe1d88 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:48:06 -0300 Subject: [PATCH 04/17] lora: use `tag` in fetchFromGitHub --- pkgs/by-name/lo/lora/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index fa2389de0f91..63bd4b81fa05 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; From abc4b21161a6841d75efbcd65c4573d4023a1f31 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:49:27 -0300 Subject: [PATCH 05/17] lora: use `finalAttrs` instead of `rec` --- pkgs/by-name/lo/lora/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index 63bd4b81fa05..711760bf474d 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lora"; version = "3.005"; src = fetchFromGitHub { owner = "cyrealtype"; repo = "lora"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s="; }; @@ -37,4 +37,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ofalvai ]; }; -} +}) From 4346407a05d2c0b30b1be73edadf722f6a73c652 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:50:35 -0300 Subject: [PATCH 06/17] lora: remove `with lib` from meta --- pkgs/by-name/lo/lora/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index 711760bf474d..590d32405d66 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -30,11 +30,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Lora is a well-balanced contemporary serif with roots in calligraphy"; homepage = "https://github.com/cyrealtype/lora"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ ofalvai ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ofalvai ]; }; }) From 6600f70b44e003aa93a6e25f53a72a3df141e253 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:53:04 -0300 Subject: [PATCH 07/17] phpExtensions.uuid: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/development/php-packages/uuid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/uuid/default.nix b/pkgs/development/php-packages/uuid/default.nix index f3efc0e8792c..0d54c7d07f6f 100644 --- a/pkgs/development/php-packages/uuid/default.nix +++ b/pkgs/development/php-packages/uuid/default.nix @@ -6,7 +6,7 @@ }: let - version = "v1.2.1"; + version = "1.2.1"; in buildPecl { inherit version; @@ -15,7 +15,7 @@ buildPecl { src = fetchFromGitHub { owner = "php"; repo = "pecl-networking-uuid"; - tag = version; + tag = "v${version}"; hash = "sha256-C4SoSKkCTQOLKM1h47vbBgiHTG+ChocDB9tzhWfKUsw="; }; @@ -26,7 +26,7 @@ buildPecl { env.PHP_UUID_DIR = libuuid; meta = { - changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/${version}"; + changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/v${version}"; description = "A wrapper around Universally Unique IDentifier library (libuuid)."; license = lib.licenses.php301; homepage = "https://github.com/php/pecl-networking-uuid"; From ce3377bf570dd1691e98950c80fba38b5d7df4a7 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:03:51 -0300 Subject: [PATCH 08/17] msgraph-cli: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/by-name/ms/msgraph-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix index e874a2706c7b..b2e3711a189e 100644 --- a/pkgs/by-name/ms/msgraph-cli/package.nix +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -7,12 +7,12 @@ }: buildDotnetModule rec { pname = "msgraph-cli"; - version = "v1.9.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-cli"; - rev = version; + tag = "v${version}"; hash = "sha256-bpdxzVlQWQLNYTZHN25S6qa3NKHhDc+xV6NvzSNMVnQ="; }; From f4b56e7f60bcca958f330a3963281c1d21157fa1 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:05:59 -0300 Subject: [PATCH 09/17] pythonPackages.falconpy: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/development/python-modules/falconpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index 3b44df20b090..161ec4a7730e 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "falconpy"; - version = "v1.4.6"; + version = "1.4.6"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; - tag = version; + tag = "v${version}"; hash = "sha256-boebQI//NenEqctQbEdxiXKU3/07C6jVzWVHecmJjPk="; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "The CrowdStrike Falcon SDK for Python"; homepage = "https://github.com/CrowdStrike/falconpy"; - changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/${version}"; + changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/v${version}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ levigross ]; }; From 9b40045dfbd3bad7acc85c4bbfb65aa63dc8b387 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:08:42 -0300 Subject: [PATCH 10/17] hullcaster: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/hu/hullcaster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index 268556d544bb..1fe9c515b884 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec { pname = "hullcaster"; - version = "v0.1.2"; + version = "0.1.2"; src = fetchFromGitHub { owner = "gilcu3"; repo = "hullcaster"; - rev = version; + tag = "v${version}"; hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc="; }; From 9cb6a2b262f296304eced767a35f2edbf25d87ef Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:11:14 -0300 Subject: [PATCH 11/17] git-together: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/gi/git-together/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 2ecb8afd8129..8b56b68280a0 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -10,12 +10,12 @@ rustPlatform.buildRustPackage rec { pname = "git-together"; - version = "v0.1.0-alpha.26"; + version = "0.1.0-alpha.26"; src = fetchFromGitHub { owner = "kejadlen"; repo = "git-together"; - rev = version; + tag = "v${version}"; hash = "sha256-2HgOaqlX0mmmvRlALHm90NAdIhby/jWUJO63bQFqc+4="; }; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM="; meta = with lib; { - changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}"; + changelog = "https://github.com/kejadlen/git-together/releases/tag/v${version}"; description = "Better commit attribution while pairing without messing with your git workflow"; homepage = "https://github.com/kejadlen/git-together"; license = licenses.mit; From a84b1a09e2d448ed5b068f39273b422552883cac Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:13:07 -0300 Subject: [PATCH 12/17] ncps: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/nc/ncps/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index b66c1d3ae1f2..be29560ce1a9 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -8,17 +8,17 @@ let finalAttrs = { pname = "ncps"; - version = "v0.1.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; - rev = finalAttrs.version; + tag = "v${finalAttrs.version}"; hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA"; }; ldflags = [ - "-X github.com/kalbasit/ncps/cmd.Version=${finalAttrs.version}" + "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}" ]; subPackages = [ "." ]; From c24c2a6e043b812ccd0a459a1fb00ee5cd786c1b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:14:53 -0300 Subject: [PATCH 13/17] gede: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/development/tools/misc/gede/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index dbe1c51b7b1c..f56769a9220b 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -13,12 +13,12 @@ mkDerivation rec { pname = "gede"; - version = "v2.22.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "jhn98032"; repo = "gede"; - rev = version; + tag = "v${version}"; hash = "sha256-6YSrqLDuV4G/uvtYy4vzbwqrMFftMvZdp3kr3R436rs="; }; From 6e37a9a488f4eb2fe3cda635877b82d90b4fa467 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:16:26 -0300 Subject: [PATCH 14/17] vmctl: remove "v" prefix from version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/vm/vmctl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vm/vmctl/package.nix b/pkgs/by-name/vm/vmctl/package.nix index 910ecd5f9d6d..fd6f7a145da6 100644 --- a/pkgs/by-name/vm/vmctl/package.nix +++ b/pkgs/by-name/vm/vmctl/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { pname = "vmctl"; - version = "v0.99-unstable-2024-05-14"; + version = "0.99-unstable-2024-05-14"; src = fetchFromGitHub { owner = "SamsungDS"; From c4ea434f1bc038dce4764841f2bce65b23bf9e26 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:18:50 -0300 Subject: [PATCH 15/17] criterion: remove "v" prefix from version of test derivation The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/by-name/cr/criterion/tests/001-version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/criterion/tests/001-version.nix b/pkgs/by-name/cr/criterion/tests/001-version.nix index 25a98b5a0c30..e9cf7278a370 100644 --- a/pkgs/by-name/cr/criterion/tests/001-version.nix +++ b/pkgs/by-name/cr/criterion/tests/001-version.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { name = "version-tester"; - version = "v${criterion.version}"; + inherit (criterion) version; src = ./test_dummy.c; dontUnpack = true; From 9a9523f75e046db42e33a730d2c90cf17144d83a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 18:31:51 -0300 Subject: [PATCH 16/17] gnomeExtensions.pano: remove "v" prefix in version The version string must start with a digit per nixpkgs versioning guideline. --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b3f1929c3cef..9b3ca5cd3c5a 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -144,9 +144,9 @@ super: lib.trivial.pipe super [ })) (patchExtension "pano@elhan.io" (final: prev: { - version = "v23-alpha3"; + version = "23-alpha3"; src = fetchzip { - url = "https://github.com/oae/gnome-shell-pano/releases/download/${final.version}/pano@elhan.io.zip"; + url = "https://github.com/oae/gnome-shell-pano/releases/download/v${final.version}/pano@elhan.io.zip"; hash = "sha256-LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc="; stripRoot = false; }; From df198feb81c109cbafe36fc9cf20f7dc71187cc3 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 19:49:47 -0300 Subject: [PATCH 17/17] influxdb: remove "v" prefix in version in libflux The version string must start with a digit per nixpkgs versioning guidelines. --- pkgs/servers/nosql/influxdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index d60d167e4d9f..a6f053467a5b 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -16,11 +16,11 @@ let # This is copied from influxdb2 with the required flux version flux = rustPlatform.buildRustPackage rec { pname = "libflux"; - version = "v${libflux_version}"; + version = libflux_version; src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; - rev = "v${libflux_version}"; + tag = "v${libflux_version}"; hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [