commit ffc9a65963af333340c7453d2666945a006cfe4d
parent 9a15949f1817aa612f0171bef3d215b84616d857
Author: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 28 Sep 2020 14:45:09 +0200
pkgs: nixpkgs-fmt pass
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
4 files changed, 76 insertions(+), 74 deletions(-)
diff --git a/pkgs/crc/default.nix b/pkgs/crc/default.nix
@@ -24,9 +24,10 @@ rec {
goPackagePath = "github.com/code-ready/crc";
subPackages = [ "cmd/crc" ];
- buildFlagsArray = let
- t = "${goPackagePath}/pkg/crc";
- in
+ buildFlagsArray =
+ let
+ t = "${goPackagePath}/pkg/crc";
+ in
''
-ldflags=
-X ${t}/version.crcVersion=${version}
diff --git a/pkgs/default.nix b/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 {};
+ 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 {};
+ 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 {};
+ 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 {};
+ 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 {};
+ 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,27 +94,27 @@ rec {
crc = crc_1_10;
# Operator SDK
- inherit (pkgs.callPackage ./operator-sdk {})
+ inherit (pkgs.callPackage ./operator-sdk { })
operator-sdk_0_18
operator-sdk_0_19
;
operator-sdk = operator-sdk_0_19;
# Tekton
- inherit (pkgs.callPackage ./tkn {})
+ 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 { };
}
diff --git a/pkgs/operator-sdk/default.nix b/pkgs/operator-sdk/default.nix
@@ -8,47 +8,48 @@ 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
+ 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
+ ''
+ -ldflags=
+ -X ${t}.GitVersion=${version}
+ -X ${t}.KubernetesVersion=v1.17.2
'';
- 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;
- };
+ 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
+ '';
+
+ 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_18 = makeOverridable operatorSdkGen {
version = "0.18.0";
diff --git a/pkgs/tkn/default.nix b/pkgs/tkn/default.nix
@@ -13,10 +13,10 @@ rec {
let
t = "${goPackagePath}/pkg/cmd/version";
in
- ''
- -ldflags=
- -X ${t}.clientVersion=${version}
- '';
+ ''
+ -ldflags=
+ -X ${t}.clientVersion=${version}
+ '';
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
