Commit 2de96293126f

Vincent Demeester <vincent@sbr.pm>
2020-09-16 17:37:48
pkgs: update go hashes…
Something changed with 20.09... Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 37636d2
Changed files (11)
pkgs
ape
default.nix
athens
default.nix
govanityurl
default.nix
krew
default.nix
nr
default.nix
operator-sdk
default.nix
prm
default.nix
rmapi
default.nix
tkn
default.nix
default.nix
tools
bus
default.nix
pkgs/ape/default.nix
@@ -10,8 +10,7 @@ buildGoModule rec {
     url = "https://git.sr.ht/~vdemeester/ape";
     sha256 = "0f2rfmpqy66ris4gqh58dr9qvz8fmskldh41kpniy5vr0jxqf3av";
   };
-  vendorSha256 = "1zanxsbxhm0dpk2q94fp2rx2x1i8r3j28piz86k3k4vvqnykyvj1";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "1frjpg21jm543idja5yj96bl5wda1vpr1cp4vds2pwxnkg267d2w";
 
   meta = {
     description = "a git mirror *upstream* updater ";
pkgs/athens/default.nix
@@ -14,8 +14,7 @@ buildGoModule rec {
     repo = "athens";
     sha256 = "10l96v2ayz3bp7kzr3a2lwyb95hc3dymlvcanl4629dy087ap6zj";
   };
-  vendorSha256 = "1xgyna4hwwxjpwcd4k4npkzjlmzzhkba4f46vgcn3qzv0xysvpdx";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "1sjahs7a06vsnzfbwgzh6wdqwlcgpq5w4zkhf711ws4njipkmq1r";
 
   meta = {
     description = "a Go module datastore and proxy";
pkgs/govanityurl/default.nix
@@ -10,6 +10,5 @@ buildGoModule rec {
     rev = "v${version}";
     sha256 = "05cj3760z3b7z6schp85hfmirfzwkgnx6big0b8j6d8wn9nls1zc";
   };
-  vendorSha256 = "0s99bp9g1rfgrxmh9i94p2h8p68q93fk2799ifxd76r88f0f0hcn";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "0sqa1gajwb9gha1rq7aia1klny4pgxf526qmkhabg0g6zb3d5vm9";
 }
pkgs/krew/default.nix
@@ -13,8 +13,7 @@ buildGoModule rec {
     repo = "krew";
     sha256 = "0n10kpr2v9jzkz4lxrf1vf9x5zql73r5q1f1llwvjw6mb3xyn6ij";
   };
-  vendorSha256 = "01sgzi6cfdx2p1mbfbcxh8vivrj79qmzsflah9n6j5favn8sqsl3";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "01jy73g087bng5xhbwd7pigsd44jl7pdfwf7ff43m9jsziknd39i";
 
   meta = {
     description = "The package manager for 'kubectl plugins. ";
pkgs/nr/default.nix
@@ -10,8 +10,7 @@ buildGoModule rec {
     url = "https://git.sr.ht/~vdemeester/nr";
     sha256 = "0b8y5wsy8f0r9aspn1045nrpkph9kbh6754m2kkyx4i9zjhgnqjp";
   };
-  vendorSha256 = "17cz2gahs1j9vd9nqg36q2q04xq24gd2pyvivxkjhqgmq2fcpl17";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "05bp90qc7w9c9484vy7j1ry1sq4cvmpm94p8vidgfxs2shfv9s9n";
 
   meta = {
     description = "a nix run alias generator";
pkgs/operator-sdk/default.nix
@@ -8,64 +8,56 @@ rec {
     , vendorSha256
     }:
 
-    buildGoModule rec {
-      inherit vendorSha256;
-      pname = "operator-sdk";
-      name = "${pname}-${version}";
-      rev = "v${version}";
+      buildGoModule rec {
+        inherit vendorSha256;
+        pname = "operator-sdk";
+        name = "${pname}-${version}";
+        rev = "v${version}";
 
-      builtInputs = [ "git" ];
+        builtInputs = [ "git" ];
 
-      goPackagePath = "github.com/operator-framework/operator-sdk";
-      subPackages = [ "cmd/operator-sdk" ];
-      buildFlagsArray = let t = "${goPackagePath}/version"; in
-        ''
-          -ldflags=
-            -X ${t}.GitVersion=${version}
-            -X ${t}.KubernetesVersion=v1.17.2
+        goPackagePath = "github.com/operator-framework/operator-sdk";
+        subPackages = [ "cmd/operator-sdk" ];
+        buildFlagsArray = let
+          t = "${goPackagePath}/version";
+        in
+          ''
+            -ldflags=
+              -X ${t}.GitVersion=${version}
+              -X ${t}.KubernetesVersion=v1.17.2
+          '';
+
+        src = fetchFromGitHub {
+          inherit rev;
+          owner = "operator-framework";
+          repo = "operator-sdk";
+          sha256 = "${sha256}";
+        };
+        modSha256 = "${vendorSha256}";
+
+        postInstall = ''
+          # completions
+          mkdir -p $out/share/bash-completion/completions/
+          $out/bin/operator-sdk completion bash > $out/share/bash-completion/completions/operator-sdk
+          mkdir -p $out/share/zsh/site-functions/
+          $out/bin/operator-sdk completion zsh > $out/share/zsh/site-functions/_operator-sdk
         '';
 
-      src = fetchFromGitHub {
-        inherit rev;
-        owner = "operator-framework";
-        repo = "operator-sdk";
-        sha256 = "${sha256}";
+        meta = {
+          description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding";
+          homepage = https://github.com/operator-framework/operator-sdk;
+          license = lib.licenses.asl20;
+        };
       };
-      modSha256 = "${vendorSha256}";
 
-      postInstall = ''
-        # completions
-        mkdir -p $out/share/bash-completion/completions/
-        $out/bin/operator-sdk completion bash > $out/share/bash-completion/completions/operator-sdk
-        mkdir -p $out/share/zsh/site-functions/
-        $out/bin/operator-sdk completion zsh > $out/share/zsh/site-functions/_operator-sdk
-      '';
-
-      meta = {
-        description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding";
-        homepage = https://github.com/operator-framework/operator-sdk;
-        license = lib.licenses.asl20;
-      };
-    };
-
-  operator-sdk_0_16 = makeOverridable operatorSdkGen {
-    version = "0.16.0";
-    sha256 = "1qdvnfxz81ij1y7qdk5xjq0nd3dqgbdjq0gmramxmkkz892cdaf3";
-    vendorSha256 = "11nz0fdxpsc9ifszprgp1l70myhadh90hcs94cilrpqwlci0i8c5";
-  };
-  operator-sdk_0_17 = makeOverridable operatorSdkGen {
-    version = "0.17.0";
-    sha256 = "11mirwgmmhfccv1knxvf2pv51pisngw5lb8vpcbzi5v2lm192aqk";
-    vendorSha256 = "0mspbnw41c6r3p7kaafza1v10zi4jv0vrnzxwpyh7pkmx150xgvd";
-  };
   operator-sdk_0_18 = makeOverridable operatorSdkGen {
     version = "0.18.0";
     sha256 = "1jbi5v1kcni740znjxm6hbpjx3a1zlkgnbnpsqbiljfi6k7spn6p";
-    vendorSha256 = "19icxp39kvgh7v8sa190ym8i9ffyxgccf6mvqn48hdhq5sr95wm2";
+    vendorSha256 = "08n6r0d7gqiysyl348l698blr7y9cxdmcadbmymzcya0fmczp0mv";
   };
   operator-sdk_0_19 = makeOverridable operatorSdkGen {
     version = "0.19.0";
     sha256 = "0prwdsxm8sldzdn7r9k1yw2q4asz90n25g4zcfaq23vs6fkxch9b";
-    vendorSha256 = "1pz1k23a7jrisflx03jfp5a6xcw7x6pjkp9b6bma9y9w4jaklyqw";
+    vendorSha256 = "0k6xrd1ahic89l821qvh3rr8k203ab6fmj7v4flkv889xaajjxb0";
   };
 }
pkgs/prm/default.nix
@@ -5,8 +5,7 @@ buildGoModule rec {
   version = "3.4.0";
   rev = "v${version}";
 
-  goPackagePath = "github.com/ldez/prm";
-
+  goPackagePath = "github.com/ldez/prm/v3";
   buildFlagsArray = let t = "${goPackagePath}/meta"; in
     ''
       -ldflags=
@@ -20,8 +19,7 @@ buildGoModule rec {
     repo = "prm";
     sha256 = "1vpii7046rq13ahjkbk7rmbqskk6x1mcsrzqx91nii7nzl32wdap";
   };
-  vendorSha256 = "1lsi02d0vm0z308brbxpwaywwa6jlpynh332fsfs6w4da448vmx9";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "0hiz514xklhk4c5c7lmx02l04dynnlmjy6mjwx3f7ynxiyk3scgz";
 
   meta = {
     description = "Pull Request Manager for Maintainers";
pkgs/rmapi/default.nix
@@ -13,8 +13,7 @@ buildGoModule rec {
     repo = "rmapi";
     sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45";
   };
-  vendorSha256 = "0w2qiafs5gkgv00yz16bx8yis6gnpxbgqliwrhj5k6z8yy9s7b17";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is";
 
   meta = {
     description = "Go app that allows you to access your reMarkable tablet files through the Cloud API";
pkgs/tkn/default.nix
@@ -2,7 +2,7 @@
 
 with lib;
 rec {
-  tknGen = { version, sha256, modSha }:
+  tknGen = { version, sha256 }:
     buildGoModule rec {
       pname = "tkn";
       name = "${pname}-${version}";
@@ -13,18 +13,17 @@ rec {
         let
           t = "${goPackagePath}/pkg/cmd/version";
         in
-        ''
-          -ldflags=
-            -X ${t}.clientVersion=${version}
-        '';
+          ''
+            -ldflags=
+              -X ${t}.clientVersion=${version}
+          '';
       src = fetchFromGitHub {
         owner = "tektoncd";
         repo = "cli";
         rev = "v${version}";
         sha256 = "${sha256}";
       };
-      modSha256 = "${modSha}";
-      vendorSha256 = "${modSha}";
+      vendorSha256 = null;
 
       postInstall = ''
         # manpages
@@ -51,21 +50,9 @@ rec {
   tkn_0_12 = makeOverridable tknGen {
     version = "0.12.0";
     sha256 = "08mw8g31f4v2n55hsb5106r5ng9lklx66xfx0v580m7fbrdb83gs";
-    modSha = "1475423l1hgx51zxd5k78j05198bblf6cmqjma4wnpwl4z2qcq57";
   };
   tkn_0_11 = makeOverridable tknGen {
     version = "0.11.0";
     sha256 = "19svynznk7bshjm9hd0zxzdn5j09fl7n7jws2hf8qm1y0ynbydmb";
-    modSha = "0cs8lh3n84qxwybd9jf2wx3pj8drpj2bl9p31p5v4bs9k26m2jw4";
-  };
-  tkn_0_10 = makeOverridable tknGen {
-    version = "0.10.0";
-    sha256 = "1jdhd11g7kvq2c0cda888gvdpqhzi8srf4si2v951madr7dai2cl";
-    modSha = "1cdhs794habhhv1242ffv3lpkddx6rk2wjiyknf3lq6q47xlzz24";
-  };
-  tkn_0_9 = makeOverridable tknGen {
-    version = "0.9.0";
-    sha256 = "1x4fk10dwrv3sm8gli7z248jzjjvs8j49rqs7s6gqby8pck5ihq7";
-    modSha = "160174vw34v9w53azkzslcskzhsk1dflccfbvl1l38xm624fj4lw";
   };
 }
pkgs/default.nix
@@ -1,5 +1,5 @@
 { sources ? import ../nix
-, pkgs ? sources.pkgs { }
+, pkgs ? sources.pkgs {}
 }:
 let
   emacs27 = (pkgs.emacs.override { srcRepo = true; }).overrideAttrs (
@@ -32,44 +32,44 @@ let
 in
 rec {
   # pre nur-packages import
-  scripts = pkgs.callPackage ./scripts { };
-  tmux-tpm = pkgs.callPackage ./tmux-tpm { };
-  vrsync = pkgs.callPackage ./vrsync { };
-  vde-thinkpad = pkgs.callPackage ./vde-thinkpad { };
-  bus = pkgs.callPackage ../tools/bus { };
+  scripts = pkgs.callPackage ./scripts {};
+  tmux-tpm = pkgs.callPackage ./tmux-tpm {};
+  vrsync = pkgs.callPackage ./vrsync {};
+  vde-thinkpad = pkgs.callPackage ./vde-thinkpad {};
+  bus = pkgs.callPackage ../tools/bus {};
 
   # Mine
-  ape = pkgs.callPackage ./ape { };
-  fhs-std = pkgs.callPackage ./fhs/std.nix { };
-  nr = pkgs.callPackage ./nr { };
-  ram = pkgs.callPackage ./ram { };
-  sec = pkgs.callPackage ./sec { };
-  systemd-email = pkgs.callPackage ./systemd-email { };
-  yak = pkgs.callPackage ./yak { };
+  ape = pkgs.callPackage ./ape {};
+  fhs-std = pkgs.callPackage ./fhs/std.nix {};
+  nr = pkgs.callPackage ./nr {};
+  ram = pkgs.callPackage ./ram {};
+  #sec = pkgs.callPackage ./sec { };
+  systemd-email = pkgs.callPackage ./systemd-email {};
+  yak = pkgs.callPackage ./yak {};
 
   # emacs
   emacs = emacs27.override { inherit (pkgs) imagemagick; withXwidgets = true; };
 
   # Maybe upstream
-  athens = pkgs.callPackage ./athens { };
-  envbox = pkgs.callPackage ./envbox { };
-  esc = pkgs.callPackage ./esc { };
-  gogo-protobuf = pkgs.callPackage ./gogo-protobuf { };
-  gorun = pkgs.callPackage ./gorun { };
-  govanityurl = pkgs.callPackage ./govanityurl { };
-  ko = pkgs.callPackage ./ko { };
-  kss = pkgs.callPackage ./kss { };
-  batzconverter = pkgs.callPackage ./batzconverter { };
-  kubernix = pkgs.callPackage ./kubernix { };
-  krew = pkgs.callPackage ./krew { };
-  prm = pkgs.callPackage ./prm { };
-  protobuild = pkgs.callPackage ./protobuild { };
-  rmapi = pkgs.callPackage ./rmapi { };
-  toolbox = pkgs.callPackage ./toolbox { };
-  yaspell = pkgs.callPackage ./yaspell { };
+  athens = pkgs.callPackage ./athens {};
+  envbox = pkgs.callPackage ./envbox {};
+  esc = pkgs.callPackage ./esc {};
+  #gogo-protobuf = pkgs.callPackage ./gogo-protobuf {};
+  gorun = pkgs.callPackage ./gorun {};
+  govanityurl = pkgs.callPackage ./govanityurl {};
+  ko = pkgs.callPackage ./ko {};
+  kss = pkgs.callPackage ./kss {};
+  batzconverter = pkgs.callPackage ./batzconverter {};
+  kubernix = pkgs.callPackage ./kubernix {};
+  krew = pkgs.callPackage ./krew {};
+  prm = pkgs.callPackage ./prm {};
+  #protobuild = pkgs.callPackage ./protobuild { };
+  rmapi = pkgs.callPackage ./rmapi {};
+  toolbox = pkgs.callPackage ./toolbox {};
+  yaspell = pkgs.callPackage ./yaspell {};
 
   # OpenShift
-  inherit (pkgs.callPackage ./oc { })
+  inherit (pkgs.callPackage ./oc {})
     oc_4_1
     oc_4_2
     oc_4_3
@@ -77,7 +77,7 @@ rec {
     oc_4_5
     ;
   oc = oc_4_5;
-  inherit (pkgs.callPackage ./openshift-install { })
+  inherit (pkgs.callPackage ./openshift-install {})
     openshift-install_4_3
     openshift-install_4_4
     openshift-install_4_5
@@ -94,31 +94,27 @@ rec {
   crc = crc_1_10;
 
   # Operator SDK
-  inherit (pkgs.callPackage ./operator-sdk { })
-    operator-sdk_0_16
-    operator-sdk_0_17
+  inherit (pkgs.callPackage ./operator-sdk {})
     operator-sdk_0_18
     operator-sdk_0_19
     ;
   operator-sdk = operator-sdk_0_19;
 
   # Tekton
-  inherit (pkgs.callPackage ./tkn { })
-    tkn_0_9
-    tkn_0_10
+  inherit (pkgs.callPackage ./tkn {})
     tkn_0_11
     tkn_0_12
     ;
   tkn = tkn_0_12;
 
   # Upstream
-  buildkit = pkgs.callPackage ./buildkit { };
-  inherit (pkgs.callPackage ./containerd { })
+  buildkit = pkgs.callPackage ./buildkit {};
+  inherit (pkgs.callPackage ./containerd {})
     containerd_1_2
     containerd_1_3
     containerd_1_4
     ;
   containerd = containerd_1_3;
 
-  gnome-shell-extension-shell = pkgs.callPackage ./gnome/extensions/shell { };
+  gnome-shell-extension-shell = pkgs.callPackage ./gnome/extensions/shell {};
 }
tools/bus/default.nix
@@ -4,6 +4,5 @@ buildGoModule rec {
   name = "bus";
   src = ./.;
 
-  vendorSha256 = "1633qy8a24pacr337v20ws12p3wgr2kf7q2mymar90qrq301wfnx";
-  modSha256 = "${vendorSha256}";
+  vendorSha256 = "05iqr46pm05jxfcss23cxdqng1wpnqp46v5vyw8f65sq0vsfv4xh";
 }