Merge master into staging-next (1a879ae5) · Commits · nix / nixpkgs

maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ if test -z "$CABAL_DIR"; then
		fi
		fi

		package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
		package_list="$(nix-build --arg config '{ allowAliases = false; }' -A haskell.package-list)/nixos-hackage-packages.csv"
		username=$(grep "^username:" "$CABAL_DIR/config" \| sed "s/^username: //")
		password_command=$(grep "^password-command:" "$CABAL_DIR/config" \| sed "s/^password-command: //")
		curl -u "$username:$($password_command \| head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv

nixos/modules/services/development/athens.nix

+8 −48

Original line number	Diff line number	Diff line
		@@ -81,14 +81,6 @@ let
		Bucket = cfg.storage.gcp.bucket;
		JSONKey = cfg.storage.gcp.jsonKey;
		};
		Minio = {
		Endpoint = cfg.storage.minio.endpoint;
		Key = cfg.storage.minio.key;
		Secret = cfg.storage.minio.secret;
		EnableSSL = cfg.storage.minio.enableSSL;
		Bucket = cfg.storage.minio.bucket;
		region = cfg.storage.minio.region;
		};
		Mongo = {
		URL = cfg.storage.mongo.url;
		DefaultDBName = cfg.storage.mongo.defaultDBName;
		@@ -303,7 +295,6 @@ in
		"disk"
		"mongo"
		"gcp"
		"minio"
		"s3"
		"azureblob"
		"external"
		@@ -700,44 +691,6 @@ in
		};
		};

		minio = {
		endpoint = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Endpoint of the minio storage backend.";
		example = "minio.example.com:9001";
		default = null;
		};
		key = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Access key id for the minio storage backend.";
		example = "minio";
		default = null;
		};
		secret = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Secret key for the minio storage backend. Warning: this is stored in plain text in the config file.";
		example = "minio123";
		default = null;
		};
		enableSSL = lib.mkOption {
		type = lib.types.bool;
		description = "Enable SSL for the minio storage backend.";
		default = false;
		};
		bucket = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Bucket name for the minio storage backend.";
		example = "gomods";
		default = null;
		};
		region = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Region for the minio storage backend.";
		example = "us-east-1";
		default = null;
		};
		};

		mongo = {
		url = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		@@ -774,7 +727,6 @@ in
		key = lib.mkOption {
		type = lib.types.nullOr lib.types.str;
		description = "Access key id for the S3 storage backend.";
		example = "minio";
		default = null;
		};
		secret = lib.mkOption {
		@@ -991,4 +943,12 @@ in
		};
		};

		imports = [
		(lib.mkRemovedOptionModule [
		"services"
		"athens"
		"storage"
		"minio"
		] "Support for Minio storage backend has been removed, as minio is unmaintained.")
		];
		}

nixos/modules/services/monitoring/prometheus/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ let
		rule_files = optionals (!(cfg.enableAgentMode)) (
		map (promtoolCheck "check rules" "rules") (
		cfg.ruleFiles
		++ [
		++ optionals (builtins.length cfg.rules > 0) [
		(pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
		]
		)

pkgs/applications/editors/vim/common.nix

+2 −2

Original line number	Diff line number	Diff line
		{ lib, fetchFromGitHub }:
		rec {
		version = "9.1.2109";
		version = "9.1.2148";

		outputs = [
		"out"
		@@ -11,7 +11,7 @@ rec {
		owner = "vim";
		repo = "vim";
		rev = "v${version}";
		hash = "sha256-Lglu940Uf0ZOaitoI41XK4Xgk7e1UeXsfdIxOMgNQ18=";
		hash = "sha256-4ZEbfpffPp6kqSQRp7NFioWGRdG+JsVf7unU0Hqn/Xk=";
		};

		enableParallelBuilding = true;

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3

Original line number	Diff line number	Diff line
		@@ -1418,13 +1418,13 @@
		"vendorHash": null
		},
		"vancluever_acme": {
		"hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=",
		"hash": "sha256-uRIOLFIzT4hIXMtoyHk0UB5R5xGr0DELF5hd+E5Xx1k=",
		"homepage": "https://registry.terraform.io/providers/vancluever/acme",
		"owner": "vancluever",
		"repo": "terraform-provider-acme",
		"rev": "v2.44.1",
		"rev": "v2.45.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0="
		"vendorHash": "sha256-S8eG43mHNyPOm2Iuww9DjU7o/x2MMSJExpmBAQ8QDGY="
		},
		"venafi_venafi": {
		"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",

Admin message