Merge master into staging-next

authored by github-actions[bot] and committed by GitHub e648107a e9c5a28d

+102 -129
-8
nixos/doc/manual/configuration/kubernetes.chapter.md
··· 43 and [](#opt-services.kubernetes.easyCerts) 44 to true. This sets up flannel as CNI and activates automatic PKI bootstrapping. 45 46 - As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled 47 - ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP 48 - ports have been disabled by default. While opening insecure ports is 49 - still possible, it is recommended not to bind these to other interfaces 50 - than loopback. To re-enable the insecure port on the apiserver, see options: 51 - [](#opt-services.kubernetes.apiserver.insecurePort) and 52 - [](#opt-services.kubernetes.apiserver.insecureBindAddress) 53 - 54 ::: {.note} 55 As of NixOS 19.03, it is mandatory to configure: 56 [](#opt-services.kubernetes.masterAddress).
··· 43 and [](#opt-services.kubernetes.easyCerts) 44 to true. This sets up flannel as CNI and activates automatic PKI bootstrapping. 45 46 ::: {.note} 47 As of NixOS 19.03, it is mandatory to configure: 48 [](#opt-services.kubernetes.masterAddress).
-11
nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml
··· 47 <xref linkend="opt-services.kubernetes.easyCerts" /> to true. This 48 sets up flannel as CNI and activates automatic PKI bootstrapping. 49 </para> 50 - <para> 51 - As of kubernetes 1.10.X it has been deprecated to open 52 - non-tls-enabled ports on kubernetes components. Thus, from NixOS 53 - 19.03 all plain HTTP ports have been disabled by default. While 54 - opening insecure ports is still possible, it is recommended not to 55 - bind these to other interfaces than loopback. To re-enable the 56 - insecure port on the apiserver, see options: 57 - <xref linkend="opt-services.kubernetes.apiserver.insecurePort" /> 58 - and 59 - <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress" /> 60 - </para> 61 <note> 62 <para> 63 As of NixOS 19.03, it is mandatory to configure:
··· 47 <xref linkend="opt-services.kubernetes.easyCerts" /> to true. This 48 sets up flannel as CNI and activates automatic PKI bootstrapping. 49 </para> 50 <note> 51 <para> 52 As of NixOS 19.03, it is mandatory to configure:
+2 -15
nixos/modules/services/cluster/kubernetes/apiserver.nix
··· 18 imports = [ 19 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) 20 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) 21 - (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"]) 22 (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") 23 (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ]) 24 (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ]) ··· 162 default = top.featureGates; 163 defaultText = literalExpression "config.${otop.featureGates}"; 164 type = listOf str; 165 - }; 166 - 167 - insecureBindAddress = mkOption { 168 - description = lib.mdDoc "The IP address on which to serve the --insecure-port."; 169 - default = "127.0.0.1"; 170 - type = str; 171 - }; 172 - 173 - insecurePort = mkOption { 174 - description = lib.mdDoc "Kubernetes apiserver insecure listening port. (0 = disabled)"; 175 - default = 0; 176 - type = int; 177 }; 178 179 kubeletClientCaFile = mkOption { ··· 376 "--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \ 377 ${optionalString (cfg.proxyClientKeyFile != null) 378 "--proxy-client-key-file=${cfg.proxyClientKeyFile}"} \ 379 - --insecure-bind-address=${cfg.insecureBindAddress} \ 380 - --insecure-port=${toString cfg.insecurePort} \ 381 ${optionalString (cfg.runtimeConfig != "") 382 "--runtime-config=${cfg.runtimeConfig}"} \ 383 --secure-port=${toString cfg.securePort} \
··· 18 imports = [ 19 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) 20 (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) 21 + (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecureBindAddress" ] "") 22 + (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecurePort" ] "") 23 (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") 24 (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ]) 25 (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ]) ··· 163 default = top.featureGates; 164 defaultText = literalExpression "config.${otop.featureGates}"; 165 type = listOf str; 166 }; 167 168 kubeletClientCaFile = mkOption { ··· 365 "--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \ 366 ${optionalString (cfg.proxyClientKeyFile != null) 367 "--proxy-client-key-file=${cfg.proxyClientKeyFile}"} \ 368 ${optionalString (cfg.runtimeConfig != "") 369 "--runtime-config=${cfg.runtimeConfig}"} \ 370 --secure-port=${toString cfg.securePort} \
+1 -8
nixos/modules/services/cluster/kubernetes/controller-manager.nix
··· 10 { 11 imports = [ 12 (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"]) 13 - (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"]) 14 ]; 15 16 ###### interface ··· 48 default = top.featureGates; 49 defaultText = literalExpression "config.${otop.featureGates}"; 50 type = listOf str; 51 - }; 52 - 53 - insecurePort = mkOption { 54 - description = lib.mdDoc "Kubernetes controller manager insecure listening port."; 55 - default = 0; 56 - type = int; 57 }; 58 59 kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; ··· 133 --leader-elect=${boolToString cfg.leaderElect} \ 134 ${optionalString (cfg.rootCaFile!=null) 135 "--root-ca-file=${cfg.rootCaFile}"} \ 136 - --port=${toString cfg.insecurePort} \ 137 --secure-port=${toString cfg.securePort} \ 138 ${optionalString (cfg.serviceAccountKeyFile!=null) 139 "--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \
··· 10 { 11 imports = [ 12 (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"]) 13 + (mkRemovedOptionModule [ "services" "kubernetes" "controllerManager" "insecurePort" ] "") 14 ]; 15 16 ###### interface ··· 48 default = top.featureGates; 49 defaultText = literalExpression "config.${otop.featureGates}"; 50 type = listOf str; 51 }; 52 53 kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; ··· 127 --leader-elect=${boolToString cfg.leaderElect} \ 128 ${optionalString (cfg.rootCaFile!=null) 129 "--root-ca-file=${cfg.rootCaFile}"} \ 130 --secure-port=${toString cfg.securePort} \ 131 ${optionalString (cfg.serviceAccountKeyFile!=null) 132 "--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \
-1
nixos/modules/services/cluster/kubernetes/flannel.nix
··· 26 }; 27 28 services.kubernetes.kubelet = { 29 - networkPlugin = mkDefault "cni"; 30 cni.config = mkDefault [{ 31 name = "mynet"; 32 type = "flannel";
··· 26 }; 27 28 services.kubernetes.kubelet = { 29 cni.config = mkDefault [{ 30 name = "mynet"; 31 type = "flannel";
+1 -9
nixos/modules/services/cluster/kubernetes/kubelet.nix
··· 62 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") 63 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") 64 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "") 65 ]; 66 67 ###### interface ··· 189 default = {}; 190 }; 191 192 - networkPlugin = mkOption { 193 - description = lib.mdDoc "Network plugin to use by Kubernetes."; 194 - type = nullOr (enum ["cni" "kubenet"]); 195 - default = "kubenet"; 196 - }; 197 - 198 nodeIp = mkOption { 199 description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node."; 200 default = null; ··· 315 "--cluster-dns=${cfg.clusterDns}"} \ 316 ${optionalString (cfg.clusterDomain != "") 317 "--cluster-domain=${cfg.clusterDomain}"} \ 318 - --cni-conf-dir=${cniConfig} \ 319 ${optionalString (cfg.featureGates != []) 320 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ 321 --hairpin-mode=hairpin-veth \ ··· 323 --healthz-port=${toString cfg.healthz.port} \ 324 --hostname-override=${cfg.hostname} \ 325 --kubeconfig=${kubeconfig} \ 326 - ${optionalString (cfg.networkPlugin != null) 327 - "--network-plugin=${cfg.networkPlugin}"} \ 328 ${optionalString (cfg.nodeIp != null) 329 "--node-ip=${cfg.nodeIp}"} \ 330 --pod-infra-container-image=pause \
··· 62 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") 63 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") 64 (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "") 65 + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "") 66 ]; 67 68 ###### interface ··· 190 default = {}; 191 }; 192 193 nodeIp = mkOption { 194 description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node."; 195 default = null; ··· 310 "--cluster-dns=${cfg.clusterDns}"} \ 311 ${optionalString (cfg.clusterDomain != "") 312 "--cluster-domain=${cfg.clusterDomain}"} \ 313 ${optionalString (cfg.featureGates != []) 314 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ 315 --hairpin-mode=hairpin-veth \ ··· 317 --healthz-port=${toString cfg.healthz.port} \ 318 --hostname-override=${cfg.hostname} \ 319 --kubeconfig=${kubeconfig} \ 320 ${optionalString (cfg.nodeIp != null) 321 "--node-ip=${cfg.nodeIp}"} \ 322 --pod-infra-container-image=pause \
+1 -1
nixos/tests/kubernetes/base.nix
··· 43 trustedInterfaces = ["mynet"]; 44 45 extraCommands = concatMapStrings (node: '' 46 - iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT 47 '') (attrValues nodes); 48 }; 49 };
··· 43 trustedInterfaces = ["mynet"]; 44 45 extraCommands = concatMapStrings (node: '' 46 + iptables -A INPUT -s ${node.networking.primaryIPAddress} -j ACCEPT 47 '') (attrValues nodes); 48 }; 49 };
+3 -2
pkgs/applications/graphics/hydrus/default.nix
··· 10 11 python3Packages.buildPythonPackage rec { 12 pname = "hydrus"; 13 - version = "502"; 14 format = "other"; 15 16 src = fetchFromGitHub { 17 owner = "hydrusnetwork"; 18 repo = "hydrus"; 19 rev = "refs/tags/v${version}"; 20 - sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI="; 21 }; 22 23 nativeBuildInputs = [ ··· 30 cbor2 31 chardet 32 cloudscraper 33 html5lib 34 lxml 35 lz4
··· 10 11 python3Packages.buildPythonPackage rec { 12 pname = "hydrus"; 13 + version = "502a"; 14 format = "other"; 15 16 src = fetchFromGitHub { 17 owner = "hydrusnetwork"; 18 repo = "hydrus"; 19 rev = "refs/tags/v${version}"; 20 + sha256 = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw="; 21 }; 22 23 nativeBuildInputs = [ ··· 30 cbor2 31 chardet 32 cloudscraper 33 + dateutil 34 html5lib 35 lxml 36 lz4
+2 -2
pkgs/applications/networking/cluster/kubernetes/default.nix
··· 21 22 buildGoModule rec { 23 pname = "kubernetes"; 24 - version = "1.23.13"; 25 26 src = fetchFromGitHub { 27 owner = "kubernetes"; 28 repo = "kubernetes"; 29 rev = "v${version}"; 30 - sha256 = "sha256-Te31+geLT2hzyDfSGkCoXS0pXC1gbIJmpfC0DNDecAI="; 31 }; 32 33 vendorSha256 = null;
··· 21 22 buildGoModule rec { 23 pname = "kubernetes"; 24 + version = "1.25.3"; 25 26 src = fetchFromGitHub { 27 owner = "kubernetes"; 28 repo = "kubernetes"; 29 rev = "v${version}"; 30 + sha256 = "sha256-UDulyX1PXyAe4cqtekOY1nmQnmMqVLFuHnCswFfE6v0="; 31 }; 32 33 vendorSha256 = null;
+17 -17
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 48 "version": "2.4.2" 49 }, 50 "alicloud": { 51 - "hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=", 52 "owner": "aliyun", 53 "provider-source-address": "registry.terraform.io/aliyun/alicloud", 54 "repo": "terraform-provider-alicloud", 55 - "rev": "v1.187.0", 56 "vendorHash": null, 57 - "version": "1.187.0" 58 }, 59 "ansible": { 60 "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", ··· 515 "version": "5.1.5" 516 }, 517 "hetznerdns": { 518 - "hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", 519 "owner": "timohirt", 520 "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", 521 "repo": "terraform-provider-hetznerdns", 522 - "rev": "v2.1.0", 523 "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", 524 - "version": "2.1.0" 525 }, 526 "htpasswd": { 527 "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", ··· 543 "version": "3.1.0" 544 }, 545 "huaweicloud": { 546 - "hash": "sha256-Hr60bx3fGpfSxQAwGckhmZ80Iw/bPKLNDXeVXV1GTdo=", 547 "owner": "huaweicloud", 548 "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", 549 "repo": "terraform-provider-huaweicloud", 550 - "rev": "v1.41.0", 551 "vendorHash": null, 552 - "version": "1.41.0" 553 }, 554 "huaweicloudstack": { 555 "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", ··· 741 "version": "3.3.0" 742 }, 743 "minio": { 744 - "hash": "sha256-57wks4TYv7+kUPEhlj8V/X1fQ0/J/kbsuFQFlPxXwns=", 745 "owner": "aminueza", 746 "provider-source-address": "registry.terraform.io/aminueza/minio", 747 "repo": "terraform-provider-minio", 748 - "rev": "v1.6.0", 749 - "vendorHash": "sha256-0pWW7CDVwVombuKqAwzmkJmLpB1RCuV2SEoQnWppA1M=", 750 - "version": "1.6.0" 751 }, 752 "mongodbatlas": { 753 "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", ··· 1093 "version": "1.4.0" 1094 }, 1095 "statuscake": { 1096 - "hash": "sha256-wpDe+mtFh96qIbtfg+uilklvFNftQxqF9DOuudKLMm0=", 1097 "owner": "StatusCakeDev", 1098 "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", 1099 "repo": "terraform-provider-statuscake", 1100 - "rev": "v2.0.4", 1101 - "vendorHash": "sha256-FxTGEeJkElMovd6VGUEGss0gjorZPSPc+whqeHe4s2Y=", 1102 - "version": "2.0.4" 1103 }, 1104 "sumologic": { 1105 "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=",
··· 48 "version": "2.4.2" 49 }, 50 "alicloud": { 51 + "hash": "sha256-k5WZpqZvoL4R1kQ0CBWK8JLkWCvfpkl1b849ZbJsPxw=", 52 "owner": "aliyun", 53 "provider-source-address": "registry.terraform.io/aliyun/alicloud", 54 "repo": "terraform-provider-alicloud", 55 + "rev": "v1.188.0", 56 "vendorHash": null, 57 + "version": "1.188.0" 58 }, 59 "ansible": { 60 "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", ··· 515 "version": "5.1.5" 516 }, 517 "hetznerdns": { 518 + "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", 519 "owner": "timohirt", 520 "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", 521 "repo": "terraform-provider-hetznerdns", 522 + "rev": "v2.2.0", 523 "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", 524 + "version": "2.2.0" 525 }, 526 "htpasswd": { 527 "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", ··· 543 "version": "3.1.0" 544 }, 545 "huaweicloud": { 546 + "hash": "sha256-QBRnlBR+gPMy9gtM2P93Lot4GDW94z7B4BgYs+lT5IQ=", 547 "owner": "huaweicloud", 548 "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", 549 "repo": "terraform-provider-huaweicloud", 550 + "rev": "v1.41.1", 551 "vendorHash": null, 552 + "version": "1.41.1" 553 }, 554 "huaweicloudstack": { 555 "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", ··· 741 "version": "3.3.0" 742 }, 743 "minio": { 744 + "hash": "sha256-9EpVDRX5rPJ1TIlC+gI79AC442cBzWq76ebFLKPbwmc=", 745 "owner": "aminueza", 746 "provider-source-address": "registry.terraform.io/aminueza/minio", 747 "repo": "terraform-provider-minio", 748 + "rev": "v1.7.0", 749 + "vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=", 750 + "version": "1.7.0" 751 }, 752 "mongodbatlas": { 753 "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", ··· 1093 "version": "1.4.0" 1094 }, 1095 "statuscake": { 1096 + "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", 1097 "owner": "StatusCakeDev", 1098 "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", 1099 "repo": "terraform-provider-statuscake", 1100 + "rev": "v2.0.5", 1101 + "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=", 1102 + "version": "2.0.5" 1103 }, 1104 "sumologic": { 1105 "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=",
-2
pkgs/development/libraries/clanlib/default.nix
··· 9 , file 10 , freetype 11 , fontconfig 12 - , xlibsWrapper 13 , alsa-lib 14 , libXrender 15 }: ··· 35 xorg.xorgproto 36 freetype 37 fontconfig 38 - xlibsWrapper 39 alsa-lib 40 libXrender 41 ];
··· 9 , file 10 , freetype 11 , fontconfig 12 , alsa-lib 13 , libXrender 14 }: ··· 34 xorg.xorgproto 35 freetype 36 fontconfig 37 alsa-lib 38 libXrender 39 ];
+35 -17
pkgs/development/libraries/uhttpmock/default.nix
··· 1 - { stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }: 2 3 stdenv.mkDerivation rec { 4 - version="0.5.0"; 5 pname = "uhttpmock"; 6 7 src = fetchFromGitLab { 8 repo = "uhttpmock"; 9 - owner = "uhttpmock"; 10 rev = version; 11 - sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; 12 }; 13 14 - nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ]; 15 - buildInputs = [ glib libsoup ]; 16 - 17 - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; 18 19 - # while cross 20 - # /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 21 - preBuild = '' 22 - mkdir -p ${placeholder "out"}/lib 23 - ln -s $PWD/libuhttpmock/.libs/libuhttpmock-0.0.so.0 ${placeholder "out"}/lib/libuhttpmock-0.0.so.0 24 - ''; 25 26 meta = with lib; { 27 description = "Project for mocking web service APIs which use HTTP or HTTPS"; 28 - homepage = "https://gitlab.com/groups/uhttpmock/"; 29 - license = licenses.lgpl21; 30 maintainers = with maintainers; [ ]; 31 - platforms = with platforms; linux; 32 }; 33 }
··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitLab 4 + , meson 5 + , ninja 6 + , pkg-config 7 + , gobject-introspection 8 + , vala 9 + , gtk-doc 10 + , docbook-xsl-nons 11 + , glib 12 + , libsoup 13 + }: 14 15 stdenv.mkDerivation rec { 16 pname = "uhttpmock"; 17 + version = "0.5.5"; 18 + 19 + outputs = [ "out" "dev" "devdoc" ]; 20 21 src = fetchFromGitLab { 22 + domain = "gitlab.freedesktop.org"; 23 + owner = "pwithnall"; 24 repo = "uhttpmock"; 25 rev = version; 26 + sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; 27 }; 28 29 + nativeBuildInputs = [ 30 + meson 31 + ninja 32 + pkg-config 33 + gobject-introspection 34 + vala 35 + gtk-doc 36 + docbook-xsl-nons 37 + ]; 38 39 + buildInputs = [ 40 + glib 41 + libsoup 42 + ]; 43 44 meta = with lib; { 45 description = "Project for mocking web service APIs which use HTTP or HTTPS"; 46 + homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; 47 + license = licenses.lgpl21Plus; 48 maintainers = with maintainers; [ ]; 49 + platforms = platforms.linux; 50 }; 51 }
+2 -2
pkgs/development/python-modules/gcal-sync/default.nix
··· 12 13 buildPythonPackage rec { 14 pname = "gcal-sync"; 15 - version = "0.11.0"; 16 17 disabled = pythonOlder "3.9"; 18 ··· 20 owner = "allenporter"; 21 repo = "gcal_sync"; 22 rev = "refs/tags/${version}"; 23 - hash = "sha256-7eaAgGVPzBc2A57VAlLZvz+SYl8G7hv2iCDAOh8Gmoc="; 24 }; 25 26 propagatedBuildInputs = [
··· 12 13 buildPythonPackage rec { 14 pname = "gcal-sync"; 15 + version = "1.0.0"; 16 17 disabled = pythonOlder "3.9"; 18 ··· 20 owner = "allenporter"; 21 repo = "gcal_sync"; 22 rev = "refs/tags/${version}"; 23 + hash = "sha256-zBWYhCzQDpjlEP1CzimcXpEaNbMCbZTWWyWC+JNZENU="; 24 }; 25 26 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/globus-sdk/default.nix
··· 14 15 buildPythonPackage rec { 16 pname = "globus-sdk"; 17 - version = "3.12.0"; 18 format = "setuptools"; 19 20 disabled = pythonOlder "3.6"; ··· 23 owner = "globus"; 24 repo = "globus-sdk-python"; 25 rev = "refs/tags/${version}"; 26 - hash = "sha256-p5GsJRoOG1vV3+efHDUFdIkfXe75HvjI3h5mveFak/M="; 27 }; 28 29 propagatedBuildInputs = [
··· 14 15 buildPythonPackage rec { 16 pname = "globus-sdk"; 17 + version = "3.13.0"; 18 format = "setuptools"; 19 20 disabled = pythonOlder "3.6"; ··· 23 owner = "globus"; 24 repo = "globus-sdk-python"; 25 rev = "refs/tags/${version}"; 26 + hash = "sha256-d8c/kMfDMz5Z9O7OtAz2hAXQHqTlJ8oKcL9Yk+6MsA4="; 27 }; 28 29 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/google-cloud-pubsub/default.nix
··· 15 16 buildPythonPackage rec { 17 pname = "google-cloud-pubsub"; 18 - version = "2.13.9"; 19 format = "setuptools"; 20 21 disabled = pythonOlder "3.7"; 22 23 src = fetchPypi { 24 inherit pname version; 25 - hash = "sha256-5hD6Pi55OviEF0szcDu6j6ME4gOcr+8dBdBW4ohJzIE="; 26 }; 27 28 propagatedBuildInputs = [
··· 15 16 buildPythonPackage rec { 17 pname = "google-cloud-pubsub"; 18 + version = "2.13.10"; 19 format = "setuptools"; 20 21 disabled = pythonOlder "3.7"; 22 23 src = fetchPypi { 24 inherit pname version; 25 + hash = "sha256-PnRqGpfJa9xj/FSZUp7XJi8UZPbejIuuYjjBIgCRmsA="; 26 }; 27 28 propagatedBuildInputs = [
+15 -14
pkgs/development/tools/build-managers/muon/default.nix
··· 17 stdenv.mkDerivation (finalAttrs: { 18 pname = "muon" 19 + lib.optionalString embedSamurai "-embedded-samurai"; 20 - version = "unstable-2022-09-24"; 21 22 src = fetchFromSourcehut { 23 name = "muon-src"; 24 owner = "~lattis"; 25 repo = "muon"; 26 - rev = "f385c82a6104ea3341ca34756e2812d700bc43d8"; 27 - hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0="; 28 }; 29 30 nativeBuildInputs = [ 31 pkgconf ··· 50 # URLs manually extracted from subprojects directory 51 meson-docs-wrap = fetchurl { 52 name = "meson-docs-wrap"; 53 - url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz"; 54 - hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg="; 55 }; 56 57 samurai-wrap = fetchurl { ··· 79 ''; 80 81 buildPhase = let 82 - featureFlag = feature: flag: 83 "-D${feature}=${if flag then "enabled" else "disabled"}"; 84 - conditionFlag = condition: flag: 85 "-D${condition}=${lib.boolToString flag}"; 86 cmdlineForMuon = lib.concatStringsSep " " [ 87 - (conditionFlag "static" stdenv.targetPlatform.isStatic) 88 - (featureFlag "docs" buildDocs) 89 - (featureFlag "samurai" embedSamurai) 90 ]; 91 cmdlineForSamu = "-j$NIX_BUILD_CORES"; 92 in '' ··· 132 }; 133 }) 134 # TODO LIST: 135 - # 1. setup hook 136 - # 2. multiple outputs 137 - # 3. automate sources acquisition (especially wraps) 138 - # 4. tests
··· 17 stdenv.mkDerivation (finalAttrs: { 18 pname = "muon" 19 + lib.optionalString embedSamurai "-embedded-samurai"; 20 + version = "0.1.0"; 21 22 src = fetchFromSourcehut { 23 name = "muon-src"; 24 owner = "~lattis"; 25 repo = "muon"; 26 + rev = finalAttrs.version; 27 + hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o="; 28 }; 29 + 30 + outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; 31 32 nativeBuildInputs = [ 33 pkgconf ··· 52 # URLs manually extracted from subprojects directory 53 meson-docs-wrap = fetchurl { 54 name = "meson-docs-wrap"; 55 + url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz"; 56 + hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q="; 57 }; 58 59 samurai-wrap = fetchurl { ··· 81 ''; 82 83 buildPhase = let 84 + muonFeatureFlag = feature: flag: 85 "-D${feature}=${if flag then "enabled" else "disabled"}"; 86 + muonConditionFlag = condition: flag: 87 "-D${condition}=${lib.boolToString flag}"; 88 cmdlineForMuon = lib.concatStringsSep " " [ 89 + (muonConditionFlag "static" stdenv.targetPlatform.isStatic) 90 + (muonFeatureFlag "docs" buildDocs) 91 + (muonFeatureFlag "samurai" embedSamurai) 92 ]; 93 cmdlineForSamu = "-j$NIX_BUILD_CORES"; 94 in '' ··· 134 }; 135 }) 136 # TODO LIST: 137 + # 1. automate sources acquisition (especially wraps) 138 + # 2. setup hook 139 + # 3. tests
+3 -3
pkgs/games/gogdl/default.nix
··· 8 9 buildPythonApplication rec { 10 pname = "gogdl"; 11 - version = "0.3"; 12 format = "pyproject"; 13 14 src = fetchFromGitHub { 15 owner = "Heroic-Games-Launcher"; 16 repo = "heroic-gogdl"; 17 - rev = "v${version}"; 18 - sha256 = "sha256-lVNvmdUK7rjSNVdhDuSxyfuEw2FeZt0rVf9pdtsfgqE="; 19 }; 20 21 disabled = pythonOlder "3.8";
··· 8 9 buildPythonApplication rec { 10 pname = "gogdl"; 11 + version = "0.4"; 12 format = "pyproject"; 13 14 src = fetchFromGitHub { 15 owner = "Heroic-Games-Launcher"; 16 repo = "heroic-gogdl"; 17 + rev = "refs/tags/v${version}"; 18 + sha256 = "sha256-4hWuGd0Alzd/ZqtN4zG2aid6C9lnT3Ihrrsjfg9PEYA="; 19 }; 20 21 disabled = pythonOlder "3.8";
+4
pkgs/misc/arm-trusted-firmware/default.nix
··· 53 54 makeFlags = [ 55 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 56 ] ++ (lib.optional (platform != null) "PLAT=${platform}") 57 ++ extraMakeFlags; 58
··· 53 54 makeFlags = [ 55 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 56 + # binutils 2.39 regression 57 + # `warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions` 58 + # See also: https://developer.trustedfirmware.org/T996 59 + "LDFLAGS=-no-warn-rwx-segments" 60 ] ++ (lib.optional (platform != null) "PLAT=${platform}") 61 ++ extraMakeFlags; 62
+2 -2
pkgs/misc/uboot/default.nix
··· 23 }: 24 25 let 26 - defaultVersion = "2022.07"; 27 defaultSrc = fetchurl { 28 url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; 29 - hash = "sha256-krCOtJwk2hTBrb9wpxro83zFPutCMOhZrYtnM9E9z14="; 30 }; 31 buildUBoot = lib.makeOverridable ({ 32 version ? null
··· 23 }: 24 25 let 26 + defaultVersion = "2022.10"; 27 defaultSrc = fetchurl { 28 url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; 29 + hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg="; 30 }; 31 buildUBoot = lib.makeOverridable ({ 32 version ? null
+2 -3
pkgs/os-specific/linux/conky/default.nix
··· 15 , docbook_xsl ? null , docbook_xml_dtd_44 ? null 16 17 , ncursesSupport ? true , ncurses ? null 18 - , x11Support ? true , xlibsWrapper ? null 19 , xdamageSupport ? x11Support, libXdamage ? null 20 , doubleBufferSupport ? x11Support 21 , imlib2Support ? x11Support, imlib2 ? null ··· 43 44 assert ncursesSupport -> ncurses != null; 45 46 - assert x11Support -> xlibsWrapper != null; 47 assert xdamageSupport -> x11Support && libXdamage != null; 48 assert imlib2Support -> x11Support && imlib2 != null; 49 assert luaSupport -> lua != null; ··· 95 buildInputs = [ glib libXinerama ] 96 ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] 97 ++ optional ncursesSupport ncurses 98 - ++ optional x11Support xlibsWrapper 99 ++ optional xdamageSupport libXdamage 100 ++ optional imlib2Support imlib2 101 ++ optional luaSupport lua
··· 15 , docbook_xsl ? null , docbook_xml_dtd_44 ? null 16 17 , ncursesSupport ? true , ncurses ? null 18 + , x11Support ? true , freetype, xorg 19 , xdamageSupport ? x11Support, libXdamage ? null 20 , doubleBufferSupport ? x11Support 21 , imlib2Support ? x11Support, imlib2 ? null ··· 43 44 assert ncursesSupport -> ncurses != null; 45 46 assert xdamageSupport -> x11Support && libXdamage != null; 47 assert imlib2Support -> x11Support && imlib2 != null; 48 assert luaSupport -> lua != null; ··· 94 buildInputs = [ glib libXinerama ] 95 ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] 96 ++ optional ncursesSupport ncurses 97 + ++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ] 98 ++ optional xdamageSupport libXdamage 99 ++ optional imlib2Support imlib2 100 ++ optional luaSupport lua
+3 -3
pkgs/tools/admin/aliyun-cli/default.nix
··· 2 3 buildGoModule rec { 4 pname = "aliyun-cli"; 5 - version = "3.0.128"; 6 7 src = fetchFromGitHub { 8 rev = "v${version}"; 9 owner = "aliyun"; 10 repo = pname; 11 fetchSubmodules = true; 12 - sha256 = "sha256-FKynQXvxWU4adGzLTKkRpGCej1So8XbeqqGYu0RM4Rw="; 13 }; 14 15 - vendorSha256 = "sha256-p1QRYXPetuC8jkPRx54jIKBN5WHgrw4/TZ2RUK2kzDU="; 16 17 subPackages = [ "main" ]; 18
··· 2 3 buildGoModule rec { 4 pname = "aliyun-cli"; 5 + version = "3.0.131"; 6 7 src = fetchFromGitHub { 8 rev = "v${version}"; 9 owner = "aliyun"; 10 repo = pname; 11 fetchSubmodules = true; 12 + sha256 = "sha256-YE4+/pzUPk8wte+3ITFfhb9tn5RvaGCteAnirouITSo="; 13 }; 14 15 + vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; 16 17 subPackages = [ "main" ]; 18
+2 -2
pkgs/tools/networking/checkip/default.nix
··· 5 6 buildGoModule rec { 7 pname = "checkip"; 8 - version = "0.40.4"; 9 10 src = fetchFromGitHub { 11 owner = "jreisinger"; 12 repo = pname; 13 rev = "v${version}"; 14 - sha256 = "sha256-KGRcHtrmgUN7yi6SmJuckFOUec0Bhgz0iL6AUgdCWVw="; 15 }; 16 17 vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";
··· 5 6 buildGoModule rec { 7 pname = "checkip"; 8 + version = "0.41.0"; 9 10 src = fetchFromGitHub { 11 owner = "jreisinger"; 12 repo = pname; 13 rev = "v${version}"; 14 + sha256 = "sha256-n8dKt18Ak+H+6NKMamUaeuaPKylOxFWrLAjMg5iqEdk="; 15 }; 16 17 vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";
+2 -2
pkgs/tools/security/cariddi/default.nix
··· 5 6 buildGoModule rec { 7 pname = "cariddi"; 8 - version = "1.1.8"; 9 10 src = fetchFromGitHub { 11 owner = "edoardottt"; 12 repo = pname; 13 rev = "v${version}"; 14 - sha256 = "sha256-e6mB1Z/PqxD3TbcfoPpWUrgDebcD+nadiTtx3reGqvk="; 15 }; 16 17 vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio=";
··· 5 6 buildGoModule rec { 7 pname = "cariddi"; 8 + version = "1.1.9"; 9 10 src = fetchFromGitHub { 11 owner = "edoardottt"; 12 repo = pname; 13 rev = "v${version}"; 14 + sha256 = "sha256-OW6AdT2sF85WrICHiYMBLRT1lUQSgNNsXvCCs4xQceE="; 15 }; 16 17 vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio=";
+1 -1
pkgs/top-level/all-packages.nix
··· 29495 29496 kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; 29497 29498 - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; 29499 kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; 29500 kubectl-convert = kubectl.convert; 29501
··· 29495 29496 kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; 29497 29498 + kubernetes = callPackage ../applications/networking/cluster/kubernetes { buildGoModule = buildGo119Module; }; 29499 kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; 29500 kubectl-convert = kubectl.convert; 29501