From 1573dbdcd01293fd45fec86ea0f35008b5924d0d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 12:35:10 +0100 Subject: [PATCH] treewide: fix versions starting with 'v' --- pkgs/applications/audio/plujain-ramp/default.nix | 2 +- pkgs/applications/science/chemistry/d-seams/default.nix | 4 ++-- pkgs/development/libraries/ngt/default.nix | 2 +- pkgs/development/libraries/rang/default.nix | 8 ++++---- pkgs/development/python-modules/rstcheck/default.nix | 4 ++-- pkgs/development/tools/packet/default.nix | 4 ++-- pkgs/misc/screensavers/physlock/default.nix | 4 ++-- pkgs/tools/admin/pebble/default.nix | 9 ++++----- pkgs/tools/graphics/snapdragon-profiler/default.nix | 2 +- pkgs/tools/graphics/structure-synth/default.nix | 7 +++---- pkgs/tools/text/diffr/default.nix | 4 ++-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix index 56f4d6da050a..d8f5357efdbe 100644 --- a/pkgs/applications/audio/plujain-ramp/default.nix +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - version = "v1.1.3"; + version = "1.1.3"; pname = "plujain-ramp"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index f5e21db4b55a..74260bacabcc 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -2,13 +2,13 @@ , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { - version = "v1.0.1"; + version = "1.0.1"; pname = "d-SEAMS"; src = fetchFromGitHub { owner = "d-SEAMS"; repo = "seams-core"; - rev = "v1.0.1"; + rev = "v${version}"; sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a6..e42ee750cc09 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index 79ab52fc8351..050beef5ea30 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce747..606b2879908e 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "v3.3.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "myint"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; }; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 723e5d8bb2d1..173ff4770daf 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -3,12 +3,12 @@ buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; src = fetchgit { - rev = version; + rev = "v${version}"; url = "https://github.com/ebsarr/packet"; sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index d25a777e650b..b5e9ba8d2b6a 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { - version = "v13"; + version = "13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 1fb902a8c803..436e77ed5f16 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -4,17 +4,16 @@ , nixosTests }: -let - version = "v2.3.0"; +buildGoPackage rec { pname = "pebble"; -in buildGoPackage { - inherit pname version; + version = "2.3.0"; + goPackagePath = "github.com/letsencrypt/${pname}"; src = fetchFromGitHub { owner = "letsencrypt"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 298975ef18b6..b48c0a6d16a3 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "snapdragon-profiler"; - version = "v2021.2"; + version = "2021.2"; src = archive; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 5f6e655882ab..ab32657236ab 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: -stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "structure-synth"; - version = "v1.5"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index a77a5dc081e8..844a09f0d581 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -2,12 +2,12 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.4"; + version = "0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; };