Merge pull request #241152 from figsoda/version

treewide: replace "${version}" with version
2023-07-02 22:51:37 +02:00
parent 8d98293ee5 707ad3dfe4
commit e50d2c990f
58 changed files with 60 additions and 67 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    owner = "DamienCassou";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "1405v0bh2m8ip9c23l95i8iq2gfrpanc6f4dz17nysdcff2ay2p3";
  };

@@ -1,8 +1,6 @@
 { lib
-, stdenv
 , buildGoModule
 , fetchFromGitHub
-, fetchpatch
 }:

 buildGoModule rec {
@@ -12,7 +10,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "getAlby";
    repo = "lndhub.go";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU=";
  };

@@ -1,4 +1,4 @@
-{ mkDerivation, haskellPackages, fetchFromGitHub, lib, writeText }:
+{ mkDerivation, haskellPackages, fetchFromGitHub, lib }:

 let
  # deadd-notification-center.service
@@ -22,7 +22,7 @@ in mkDerivation rec {
  src = fetchFromGitHub {
    owner = "phuhl";
    repo = "linux_notification_center";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg=";
  };

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  src = fetchFromSourcehut {
    owner = "~raphi";
    repo = "somebar";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
  };

@@ -7,7 +7,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "doitintl";
    repo = "kube-no-trouble";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U=";
  };

@@ -7,7 +7,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "tenox7";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
  };

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    owner = "ANGSD";
    repo = "angsd";
    sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
-    rev = "${version}";
+    rev = version;
  };

  buildInputs = [ htslib zlib bzip2 xz curl openssl ];
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "rcedgar";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
  };

@@ -9,7 +9,7 @@ ocamlPackages.buildDunePackage rec {
  src = fetchFromGitHub {
    owner = "groupoid";
    repo = "anders";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
  };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "endaaman";
    repo = "${pname}";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s=";
  };

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    owner = "mattbas";
    repo = "${pname}";
-    rev = "${version}";
+    rev = version;
    sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw=";
    fetchSubmodules = true;
  };
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "mhogomchungu";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg=";
  };

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "dimtpap";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-gcOH8gJuP03MxhJbgl941yTtm2XIHmqHWVwkRCVATkQ=";
  };

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A=";
  };

@@ -10,7 +10,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "arduino";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8=";
  };

@@ -1,11 +1,9 @@
 { fetchFromGitHub
-, gcc
 , lib
 , libnl
 , libpcap
 , pkg-config
 , stdenv
-, writeShellScriptBin
 }:
 stdenv.mkDerivation rec {
  pname = "nmrpflash";
@@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ libnl libpcap ];

  PREFIX = "${placeholder "out"}";
-  STANDALONE_VERSION = "${version}";
+  STANDALONE_VERSION = version;

  preInstall = ''
    mkdir -p $out/bin
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "google";
    repo = "leveldb";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI=";
  };

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    domain = "gitlab.freedesktop.org";
    owner = "libdecor";
    repo = "libdecor";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ=";
  };

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "frankosterfeld";
    repo = "qtkeychain";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw=";
  };

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "rafa-dot-el";
    repo = "talib";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw=";
  };

@@ -213,7 +213,7 @@ let lispPackages = rec {
    src = pkgs.fetchFromGitHub {
      owner = "atlas-engineer";
      repo = "nyxt";
-      rev = "${version}";
+      rev = version;
      sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
    };

@@ -8,7 +8,7 @@ buildDunePackage rec {
    domain = "gitlab.inria.fr";
    owner = "fpottier";
    repo = "fix";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ=";
  };

@@ -8,7 +8,7 @@ buildDunePackage rec {
  src = fetchFromGitLab {
    owner = "nomadic-labs";
    repo = "json-data-encoding";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-ticulOKiFNQIZNFOQE9UQOw/wqRfygQwLVIc4kkmwg4=";
  };

@@ -11,7 +11,7 @@ buildDunePackage rec {
  src = fetchFromGitLab {
    owner = "nomadic-labs";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd";
  };

@@ -19,7 +19,6 @@ let param = {
  };
 }."${version}"; in

-let v = version; in
 buildDunePackage rec {
  pname = "odoc-parser";
  inherit version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "jxwolstenholme";
    repo = "btsmarthub_devicelist";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M=";
  };

@@ -10,7 +10,7 @@ buildPythonPackage rec {

  # flatbuffers needs VERSION environment variable for setting the correct
  # version, otherwise it uses the current date.
-  VERSION = "${version}";
+  VERSION = version;

  pythonImportsCheck = [ "flatbuffers" ];

@@ -12,7 +12,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "getsenic";
    repo = "gatt-python";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A=";
  };

@@ -12,7 +12,7 @@ buildPythonPackage rec {
  datasrc = fetchFromGitHub {
    owner = "hadiasghari";
    repo = "pyasn";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0";
  };

@@ -22,7 +22,7 @@ buildPythonPackage rec {
    hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc=";
  };

-  SETUPTOOLS_SCM_PRETEND_VERSION="${version}";
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;

  nativeBuildInputs = [
    setuptoolsBuildHook
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {

  env = {
    RUSTFLAGS = "-C strip=symbols";
-    ROME_VERSION = "${version}";
+    ROME_VERSION = version;
  };

  buildInputs =
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "deadlinks";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
  };

@@ -7,7 +7,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "pb-";
    repo = "gotypist";
-    rev = "${version}";
+    rev = version;
    sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11";
  };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "berarma";
    repo = "new-lg4ff";
-    rev = "${version}";
+    rev = version;
    sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY=";
  };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "voutilad";
    repo = "virtio_vmmci";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g=";
  };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "voutilad";
    repo = "vmm_clock";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo=";
  };

@@ -7,7 +7,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "czerwonk";
    repo = "junos_exporter";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-XYISwq6xcVKhXUK6j22pQ5eOfuKNH0uXOEK1MUzSq90=";
  };

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-bsc";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-oCHEWQjHG2JZdoisROukwRbpQq2cNAgC+1yOqsgx+As=";
  };

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-bts";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-RSWXWQn3DAPtThUbthyXrSFSQhHzKaH/m1f6/MCojzM=";
  };

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-ggsn";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-j7Szh6lDZY9ji9VAdE3D73R/WBPDo85nVB8hr4HzO7M=";
  };

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-hlr";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-lFIYoDaJbVcC0A0TukRO9KDTVx31WqPPz/Z3wACJBp0=";
  };

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-hnbgw";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-OWCAiU4mK57e5gm6QOovwmoFAaCG1d8ZYpkP4isIqvI=";
  };

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-hnodeb";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-Izivyw2HqRmrM68ehGqlIkJeuZ986d1WQ0yr6NWWTdA=";
  };

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-iuh";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs=";
  };

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-mgw";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-l7JBAigcqQdb1IIz2iuetK8EKVkevtei7hB98g4a79Y=";
  };

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-msc";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-CVyjSo+QFDLcow6XAcudhQ7LOnbCSHeYVTzTMh7KEwg=";
  };

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-pcu";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-wZLTDvqVxP0FXV0VQH5KuigwbgzBipwL5JkTDp5Mzrc=";
  };

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-sgsn";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-tjExV8XigPEZ5gOCEoWfjhtGJVa5Ja3GHnpSovradak=";
  };

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-sip-connector";
-    rev = "${version}";
+    rev = version;
    hash = "sha256-vsPtNeh6Yi5fQb+E90OF4/Hnjl9T5nMf9EMBhzpIA2I=";
  };

@@ -1,7 +1,6 @@
 { lib, beamPackages
 , fetchFromGitHub, fetchFromGitLab, fetchHex
 , file, cmake
-, libxcrypt-legacy
 , nixosTests, writeText
 , ...
 }:
@@ -20,7 +19,7 @@ beamPackages.mixRelease rec {

  mixNixDeps = import ./mix.nix {
    inherit beamPackages lib;
-    overrides = (final: prev: {
+    overrides = final: prev: {
      # mix2nix does not support git dependencies yet,
      # so we need to add them manually
      gettext = beamPackages.buildMix rec {
@@ -136,7 +135,7 @@ beamPackages.mixRelease rec {

        src = fetchHex {
          pkg = "${name}";
-          version = "${version}";
+          inherit version;
          sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z";
        };

@@ -160,7 +159,7 @@ beamPackages.mixRelease rec {
          cp ${cfgFile} config/config.exs
        '';
      };
-    });
+    };
  };

  passthru = {
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , rustPlatform
 , polaris-web
@@ -12,7 +11,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "agersant";
    repo = "polaris";
-    rev = "${version}";
+    rev = version;
    sha256 = "sp1KDTzKvcGtuqL37fFnVgcnkIsmj5ZQji72BeyiFQE=";

    # The polaris version upstream in Cargo.lock is "0.0.0".
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "agersant";
    repo = "polaris-web";
-    rev = "${version}";
+    rev = version;
    sha256 = "2XqU4sExF7Or7RxpOK2XU9APtBujfPhM/VkOLKVDvF4=";
  };

@@ -7,7 +7,7 @@ buildFishPlugin rec {
  src = fetchFromGitHub {
    owner = "meaningful-ooo";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w=";
  };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "Jeija";
    repo = "gtkterm";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-4Z+8fs4VEk2+Ci1X3oUuInylTdIbQ5AiPenFqnyNXvc=";
  };

@@ -7,7 +7,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "flosell";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-ovmWZpeHt1L8zNzG7+2BohteSjpYADMivi+AP0Vm8/E=";
  };

@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "araujobsd";
    repo = "ifwifi";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U=";
  };

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "gjedeer";
    repo = pname;
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8=";
  };

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "alex-courtis";
    repo = "way-displays";
-    rev = "${version}";
+    rev = version;
    sha256 = "sha256-rR181sxaddtn3yFtF1exSGPBU0Yp3VBRyucfuxyXI+Q=";
  };