gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2022-10-16 06:06:50 +00:00
committed by GitHub
parent ec95041d85 e648107a22
commit aef671963d
24 changed files with 102 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/configuration/kubernetes.chapter.md
-8
View File
@@ -43,14 +43,6 @@ Note: Assigning either role will also default both
and [](#opt-services.kubernetes.easyCerts)
to true. This sets up flannel as CNI and activates automatic PKI bootstrapping.
As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled
ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP
ports have been disabled by default. While opening insecure ports is
still possible, it is recommended not to bind these to other interfaces
than loopback. To re-enable the insecure port on the apiserver, see options:
[](#opt-services.kubernetes.apiserver.insecurePort) and
[](#opt-services.kubernetes.apiserver.insecureBindAddress)
::: {.note}
As of NixOS 19.03, it is mandatory to configure:
[](#opt-services.kubernetes.masterAddress).
nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml
-11
View File
@@ -47,17 +47,6 @@ services.kubernetes.roles = [ "master" "node" ];
<xref linkend="opt-services.kubernetes.easyCerts" /> to true. This
sets up flannel as CNI and activates automatic PKI bootstrapping.
</para>
<para>
As of kubernetes 1.10.X it has been deprecated to open
non-tls-enabled ports on kubernetes components. Thus, from NixOS
19.03 all plain HTTP ports have been disabled by default. While
opening insecure ports is still possible, it is recommended not to
bind these to other interfaces than loopback. To re-enable the
insecure port on the apiserver, see options:
<xref linkend="opt-services.kubernetes.apiserver.insecurePort" />
and
<xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress" />
</para>
<note>
<para>
As of NixOS 19.03, it is mandatory to configure:
nixos/modules/services/cluster/kubernetes/apiserver.nix
+2 -15
View File
@@ -18,7 +18,8 @@ in
imports = [
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecureBindAddress" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecurePort" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
@@ -164,18 +165,6 @@ in
type = listOf str;
};
insecureBindAddress = mkOption {
description = lib.mdDoc "The IP address on which to serve the --insecure-port.";
default = "127.0.0.1";
type = str;
};
insecurePort = mkOption {
description = lib.mdDoc "Kubernetes apiserver insecure listening port. (0 = disabled)";
default = 0;
type = int;
};
kubeletClientCaFile = mkOption {
description = lib.mdDoc "Path to a cert file for connecting to kubelet.";
default = top.caFile;
@@ -376,8 +365,6 @@ in
"--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \
${optionalString (cfg.proxyClientKeyFile != null)
"--proxy-client-key-file=${cfg.proxyClientKeyFile}"} \
--insecure-bind-address=${cfg.insecureBindAddress} \
--insecure-port=${toString cfg.insecurePort} \
${optionalString (cfg.runtimeConfig != "")
"--runtime-config=${cfg.runtimeConfig}"} \
--secure-port=${toString cfg.securePort} \
nixos/modules/services/cluster/kubernetes/controller-manager.nix
+1 -8
View File
@@ -10,7 +10,7 @@ in
{
imports = [
(mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])
(mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])
(mkRemovedOptionModule [ "services" "kubernetes" "controllerManager" "insecurePort" ] "")
];
###### interface
@@ -50,12 +50,6 @@ in
type = listOf str;
};
insecurePort = mkOption {
description = lib.mdDoc "Kubernetes controller manager insecure listening port.";
default = 0;
type = int;
};
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
leaderElect = mkOption {
@@ -133,7 +127,6 @@ in
--leader-elect=${boolToString cfg.leaderElect} \
${optionalString (cfg.rootCaFile!=null)
"--root-ca-file=${cfg.rootCaFile}"} \
--port=${toString cfg.insecurePort} \
--secure-port=${toString cfg.securePort} \
${optionalString (cfg.serviceAccountKeyFile!=null)
"--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \
nixos/modules/services/cluster/kubernetes/flannel.nix
-1
View File
@@ -26,7 +26,6 @@ in
};
services.kubernetes.kubelet = {
networkPlugin = mkDefault "cni";
cni.config = mkDefault [{
name = "mynet";
type = "flannel";
nixos/modules/services/cluster/kubernetes/kubelet.nix
+1 -9
View File
@@ -62,6 +62,7 @@ in
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")
];
###### interface
@@ -189,12 +190,6 @@ in
default = {};
};
networkPlugin = mkOption {
description = lib.mdDoc "Network plugin to use by Kubernetes.";
type = nullOr (enum ["cni" "kubenet"]);
default = "kubenet";
};
nodeIp = mkOption {
description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node.";
default = null;
@@ -315,7 +310,6 @@ in
"--cluster-dns=${cfg.clusterDns}"} \
${optionalString (cfg.clusterDomain != "")
"--cluster-domain=${cfg.clusterDomain}"} \
--cni-conf-dir=${cniConfig} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
--hairpin-mode=hairpin-veth \
@@ -323,8 +317,6 @@ in
--healthz-port=${toString cfg.healthz.port} \
--hostname-override=${cfg.hostname} \
--kubeconfig=${kubeconfig} \
${optionalString (cfg.networkPlugin != null)
"--network-plugin=${cfg.networkPlugin}"} \
${optionalString (cfg.nodeIp != null)
"--node-ip=${cfg.nodeIp}"} \
--pod-infra-container-image=pause \
nixos/tests/kubernetes/base.nix
+1 -1
View File
@@ -43,7 +43,7 @@ let
trustedInterfaces = ["mynet"];
extraCommands = concatMapStrings (node: ''
iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
iptables -A INPUT -s ${node.networking.primaryIPAddress} -j ACCEPT
'') (attrValues nodes);
};
};
pkgs/applications/graphics/hydrus/default.nix
+3 -2
View File
@@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "502";
version = "502a";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI=";
sha256 = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw=";
};
nativeBuildInputs = [
@@ -30,6 +30,7 @@ python3Packages.buildPythonPackage rec {
cbor2
chardet
cloudscraper
dateutil
html5lib
lxml
lz4
pkgs/applications/networking/cluster/kubernetes/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.23.13";
version = "1.25.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "sha256-Te31+geLT2hzyDfSGkCoXS0pXC1gbIJmpfC0DNDecAI=";
sha256 = "sha256-UDulyX1PXyAe4cqtekOY1nmQnmMqVLFuHnCswFfE6v0=";
};
vendorSha256 = null;
pkgs/applications/networking/cluster/terraform-providers/providers.json
+17 -17
View File
@@ -48,13 +48,13 @@
"version": "2.4.2"
},
"alicloud": {
"hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=",
"hash": "sha256-k5WZpqZvoL4R1kQ0CBWK8JLkWCvfpkl1b849ZbJsPxw=",
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.187.0",
"rev": "v1.188.0",
"vendorHash": null,
"version": "1.187.0"
"version": "1.188.0"
},
"ansible": {
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
@@ -515,13 +515,13 @@
"version": "5.1.5"
},
"hetznerdns": {
"hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=",
"hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
"owner": "timohirt",
"provider-source-address": "registry.terraform.io/timohirt/hetznerdns",
"repo": "terraform-provider-hetznerdns",
"rev": "v2.1.0",
"rev": "v2.2.0",
"vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=",
"version": "2.1.0"
"version": "2.2.0"
},
"htpasswd": {
"hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=",
@@ -543,13 +543,13 @@
"version": "3.1.0"
},
"huaweicloud": {
"hash": "sha256-Hr60bx3fGpfSxQAwGckhmZ80Iw/bPKLNDXeVXV1GTdo=",
"hash": "sha256-QBRnlBR+gPMy9gtM2P93Lot4GDW94z7B4BgYs+lT5IQ=",
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.41.0",
"rev": "v1.41.1",
"vendorHash": null,
"version": "1.41.0"
"version": "1.41.1"
},
"huaweicloudstack": {
"hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=",
@@ -741,13 +741,13 @@
"version": "3.3.0"
},
"minio": {
"hash": "sha256-57wks4TYv7+kUPEhlj8V/X1fQ0/J/kbsuFQFlPxXwns=",
"hash": "sha256-9EpVDRX5rPJ1TIlC+gI79AC442cBzWq76ebFLKPbwmc=",
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.6.0",
"vendorHash": "sha256-0pWW7CDVwVombuKqAwzmkJmLpB1RCuV2SEoQnWppA1M=",
"version": "1.6.0"
"rev": "v1.7.0",
"vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=",
"version": "1.7.0"
},
"mongodbatlas": {
"hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
@@ -1093,13 +1093,13 @@
"version": "1.4.0"
},
"statuscake": {
"hash": "sha256-wpDe+mtFh96qIbtfg+uilklvFNftQxqF9DOuudKLMm0=",
"hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=",
"owner": "StatusCakeDev",
"provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake",
"repo": "terraform-provider-statuscake",
"rev": "v2.0.4",
"vendorHash": "sha256-FxTGEeJkElMovd6VGUEGss0gjorZPSPc+whqeHe4s2Y=",
"version": "2.0.4"
"rev": "v2.0.5",
"vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=",
"version": "2.0.5"
},
"sumologic": {
"hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=",
pkgs/development/libraries/clanlib/default.nix
-2
View File
@@ -9,7 +9,6 @@
, file
, freetype
, fontconfig
, xlibsWrapper
, alsa-lib
, libXrender
}:
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
xorg.xorgproto
freetype
fontconfig
xlibsWrapper
alsa-lib
libXrender
];
pkgs/development/libraries/uhttpmock/default.nix
+35 -17
View File
@@ -1,33 +1,51 @@
{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }:
{ stdenv
, lib
, fetchFromGitLab
, meson
, ninja
, pkg-config
, gobject-introspection
, vala
, gtk-doc
, docbook-xsl-nons
, glib
, libsoup
}:
stdenv.mkDerivation rec {
version="0.5.0";
pname = "uhttpmock";
version = "0.5.5";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pwithnall";
repo = "uhttpmock";
owner = "uhttpmock";
rev = version;
sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4";
sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts=";
};
nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ];
buildInputs = [ glib libsoup ];
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
vala
gtk-doc
docbook-xsl-nons
];
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
# while cross
# /build/source/tmp-introspect3xf43lf3/.libs/Uhm-0.0: error while loading shared libraries: libuhttpmock-0.0.so.0: cannot open shared object file: No such file or directory
preBuild = ''
mkdir -p ${placeholder "out"}/lib
ln -s $PWD/libuhttpmock/.libs/libuhttpmock-0.0.so.0 ${placeholder "out"}/lib/libuhttpmock-0.0.so.0
'';
buildInputs = [
glib
libsoup
];
meta = with lib; {
description = "Project for mocking web service APIs which use HTTP or HTTPS";
homepage = "https://gitlab.com/groups/uhttpmock/";
license = licenses.lgpl21;
homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
platforms = platforms.linux;
};
}
pkgs/development/python-modules/gcal-sync/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gcal-sync";
version = "0.11.0";
version = "1.0.0";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
hash = "sha256-7eaAgGVPzBc2A57VAlLZvz+SYl8G7hv2iCDAOh8Gmoc=";
hash = "sha256-zBWYhCzQDpjlEP1CzimcXpEaNbMCbZTWWyWC+JNZENU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/globus-sdk/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.12.0";
version = "3.13.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-p5GsJRoOG1vV3+efHDUFdIkfXe75HvjI3h5mveFak/M=";
hash = "sha256-d8c/kMfDMz5Z9O7OtAz2hAXQHqTlJ8oKcL9Yk+6MsA4=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-pubsub/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.13.9";
version = "2.13.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5hD6Pi55OviEF0szcDu6j6ME4gOcr+8dBdBW4ohJzIE=";
hash = "sha256-PnRqGpfJa9xj/FSZUp7XJi8UZPbejIuuYjjBIgCRmsA=";
};
propagatedBuildInputs = [
pkgs/development/tools/build-managers/muon/default.nix
+15 -14
View File
@@ -17,16 +17,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "muon"
+ lib.optionalString embedSamurai "-embedded-samurai";
version = "unstable-2022-09-24";
version = "0.1.0";
src = fetchFromSourcehut {
name = "muon-src";
owner = "~lattis";
repo = "muon";
rev = "f385c82a6104ea3341ca34756e2812d700bc43d8";
hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0=";
rev = finalAttrs.version;
hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o=";
};
outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
nativeBuildInputs = [
pkgconf
samurai
@@ -50,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
# URLs manually extracted from subprojects directory
meson-docs-wrap = fetchurl {
name = "meson-docs-wrap";
url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz";
hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg=";
url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz";
hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q=";
};
samurai-wrap = fetchurl {
@@ -79,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: {
'';
buildPhase = let
featureFlag = feature: flag:
muonFeatureFlag = feature: flag:
"-D${feature}=${if flag then "enabled" else "disabled"}";
conditionFlag = condition: flag:
muonConditionFlag = condition: flag:
"-D${condition}=${lib.boolToString flag}";
cmdlineForMuon = lib.concatStringsSep " " [
(conditionFlag "static" stdenv.targetPlatform.isStatic)
(featureFlag "docs" buildDocs)
(featureFlag "samurai" embedSamurai)
(muonConditionFlag "static" stdenv.targetPlatform.isStatic)
(muonFeatureFlag "docs" buildDocs)
(muonFeatureFlag "samurai" embedSamurai)
];
cmdlineForSamu = "-j$NIX_BUILD_CORES";
in ''
@@ -132,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
};
})
# TODO LIST:
# 1. setup hook
# 2. multiple outputs
# 3. automate sources acquisition (especially wraps)
# 4. tests
# 1. automate sources acquisition (especially wraps)
# 2. setup hook
# 3. tests
pkgs/games/gogdl/default.nix
+3 -3
View File
@@ -8,14 +8,14 @@
buildPythonApplication rec {
pname = "gogdl";
version = "0.3";
version = "0.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "heroic-gogdl";
rev = "v${version}";
sha256 = "sha256-lVNvmdUK7rjSNVdhDuSxyfuEw2FeZt0rVf9pdtsfgqE=";
rev = "refs/tags/v${version}";
sha256 = "sha256-4hWuGd0Alzd/ZqtN4zG2aid6C9lnT3Ihrrsjfg9PEYA=";
};
disabled = pythonOlder "3.8";
pkgs/misc/arm-trusted-firmware/default.nix
+4
View File
@@ -53,6 +53,10 @@ let
makeFlags = [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
# binutils 2.39 regression
# `warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions`
# See also: https://developer.trustedfirmware.org/T996
"LDFLAGS=-no-warn-rwx-segments"
] ++ (lib.optional (platform != null) "PLAT=${platform}")
++ extraMakeFlags;
pkgs/misc/uboot/default.nix
+2 -2
View File
@@ -23,10 +23,10 @@
}:
let
defaultVersion = "2022.07";
defaultVersion = "2022.10";
defaultSrc = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
hash = "sha256-krCOtJwk2hTBrb9wpxro83zFPutCMOhZrYtnM9E9z14=";
hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg=";
};
buildUBoot = lib.makeOverridable ({
version ? null
pkgs/os-specific/linux/conky/default.nix
+2 -3
View File
@@ -15,7 +15,7 @@
, docbook_xsl ? null , docbook_xml_dtd_44 ? null
, ncursesSupport ? true , ncurses ? null
, x11Support ? true , xlibsWrapper ? null
, x11Support ? true , freetype, xorg
, xdamageSupport ? x11Support, libXdamage ? null
, doubleBufferSupport ? x11Support
, imlib2Support ? x11Support, imlib2 ? null
@@ -43,7 +43,6 @@ assert docsSupport -> docbook2x != null && libxslt != null
assert ncursesSupport -> ncurses != null;
assert x11Support -> xlibsWrapper != null;
assert xdamageSupport -> x11Support && libXdamage != null;
assert imlib2Support -> x11Support && imlib2 != null;
assert luaSupport -> lua != null;
@@ -95,7 +94,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper
++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ]
++ optional xdamageSupport libXdamage
++ optional imlib2Support imlib2
++ optional luaSupport lua
pkgs/tools/admin/aliyun-cli/default.nix
+3 -3
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.128";
version = "3.0.131";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aliyun";
repo = pname;
fetchSubmodules = true;
sha256 = "sha256-FKynQXvxWU4adGzLTKkRpGCej1So8XbeqqGYu0RM4Rw=";
sha256 = "sha256-YE4+/pzUPk8wte+3ITFfhb9tn5RvaGCteAnirouITSo=";
};
vendorSha256 = "sha256-p1QRYXPetuC8jkPRx54jIKBN5WHgrw4/TZ2RUK2kzDU=";
vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo=";
subPackages = [ "main" ];
pkgs/tools/networking/checkip/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "checkip";
version = "0.40.4";
version = "0.41.0";
src = fetchFromGitHub {
owner = "jreisinger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KGRcHtrmgUN7yi6SmJuckFOUec0Bhgz0iL6AUgdCWVw=";
sha256 = "sha256-n8dKt18Ak+H+6NKMamUaeuaPKylOxFWrLAjMg5iqEdk=";
};
vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";
pkgs/tools/security/cariddi/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cariddi";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "edoardottt";
repo = pname;
rev = "v${version}";
sha256 = "sha256-e6mB1Z/PqxD3TbcfoPpWUrgDebcD+nadiTtx3reGqvk=";
sha256 = "sha256-OW6AdT2sF85WrICHiYMBLRT1lUQSgNNsXvCCs4xQceE=";
};
vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio=";
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -29493,7 +29493,7 @@ with pkgs;
kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes { buildGoModule = buildGo119Module; };
kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { };
kubectl-convert = kubectl.convert;