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

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -126,13 +126,13 @@
		"vendorHash": null
		},
		"aws": {
		"hash": "sha256-k2lbdaDt/jpkoF5jKll7ZxU+3zkspGvGx/kToqYipAo=",
		"hash": "sha256-6ZBQ2AFZBwyEUylCqHn4pn6hmYLIpjMzv5L2pvmCT5Q=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
		"owner": "hashicorp",
		"repo": "terraform-provider-aws",
		"rev": "v6.14.1",
		"rev": "v6.15.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-hG1XnJtN95+jW6AGnV4+EkKaVZwG0PPTMLyHFQ3nXtc="
		"vendorHash": "sha256-j4tAFLBdQR35EvQNd12XwQ0kD5wSSVi9/f/N1YbI6IM="
		},
		"awscc": {
		"hash": "sha256-wAQLtx+eVtKucdokQLfq1zTAOdMPI2Frio5ILxLGyt8=",
		@@ -144,11 +144,11 @@
		"vendorHash": "sha256-xIROXf39bvPjtiKpfn7bfL7SXwHOqUxNqlhrCmDLYGA="
		},
		"azuread": {
		"hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",
		"hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
		"owner": "hashicorp",
		"repo": "terraform-provider-azuread",
		"rev": "v3.5.0",
		"rev": "v3.6.0",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},
		@@ -225,13 +225,13 @@
		"vendorHash": "sha256-pCBmeisWcyw/Box1yrWwYj+hSrsqmToiiom2jS8I1SU="
		},
		"buildkite": {
		"hash": "sha256-w+ljPDKyVlylr87tFhuu/7oCkY/fFeK+LPr7mY7rbP0=",
		"hash": "sha256-WP1CcGYtyItpMzKvYFiv5q0jQfvB5nSv8suDmSB1tSs=",
		"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
		"owner": "buildkite",
		"repo": "terraform-provider-buildkite",
		"rev": "v1.24.0",
		"rev": "v1.26.0",
		"spdx": "MIT",
		"vendorHash": "sha256-2xZ2//qMKfgqob39k++fX6vJEx9YE1NJpGCbDyM1L10="
		"vendorHash": "sha256-nKXQsAu1tHOHnle7G0Bt+CCNU9AGvxIIv6LJ/INiU7g="
		},
		"ccloud": {
		"hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
		@@ -525,11 +525,11 @@
		"vendorHash": "sha256-29uvPCepGHRPohGY7viaPD9VQPPj9XB/plragACC4e4="
		},
		"google": {
		"hash": "sha256-xQW0UxGIcxD0Y4zdCBnGJhUWfWdMIERk0lkot96ztzI=",
		"hash": "sha256-463G4/NtViaBH1B1XVzHT6KVQu+4HnqGWX7hw4CjgNA=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/google",
		"owner": "hashicorp",
		"repo": "terraform-provider-google",
		"rev": "v7.4.0",
		"rev": "v7.5.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc="
		},
		@@ -1138,13 +1138,13 @@
		"vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU="
		},
		"rootly": {
		"hash": "sha256-SRE1T9C3qggCwjl/PdehkabdnuRV8ZW58dc8zhSwPXo=",
		"hash": "sha256-6m4jzzn5kTGUqY5bitPZI82v+/RA3BXqCYy5aWUCO4c=",
		"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
		"owner": "rootlyhq",
		"repo": "terraform-provider-rootly",
		"rev": "v4.1.0",
		"rev": "v4.2.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA="
		"vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
		},
		"routeros": {
		"hash": "sha256-k+q4n20bvYK7nn9ZGQEQH70xt6ugNKzK58XyzwrKh0Q=",

pkgs/shells/carapace/default.nix→pkgs/by-name/ca/carapace/package.nix

+0 −0

File moved.

View file

pkgs/by-name/ca/cargo-nextest/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,16 +7,16 @@

		rustPlatform.buildRustPackage rec {
		pname = "cargo-nextest";
		version = "0.9.104";
		version = "0.9.105";

		src = fetchFromGitHub {
		owner = "nextest-rs";
		repo = "nextest";
		rev = "cargo-nextest-${version}";
		hash = "sha256-CZNnOuMF5P3OgdwlAfUgbbXnDVm4IQ7P617Rblq0lgk=";
		hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o=";
		};

		cargoHash = "sha256-jppSWm20Md++mxvs/h1pB1Bh/02muWqUm1DyR46nusY=";
		cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o=";

		cargoBuildFlags = [
		"-p"

pkgs/by-name/cb/cbc/package.nix

+22 −12

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		zlib,
		fetchFromGitHub,
		bzip2,
		cgl,
		clp,
		pkg-config,
		zlib,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "cbc";
		version = "2.10.4";
		version = "2.10.12";

		# Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug
		# that breaks or-tools https://github.com/coin-or/Clp/issues/130

		src = fetchurl {
		url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
		sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39";
		src = fetchFromGitHub {
		owner = "coin-or";
		repo = "Cbc";
		tag = "releases/${finalAttrs.version}";
		sha256 = "sha256-0Sz4/7CRKrArIUy/XxGIP7WMmICqDJ0VxZo62thChYQ=";
		};

		# or-tools has a hard dependency on Cbc static libraries, so we build both
		@@ -25,13 +27,21 @@ stdenv.mkDerivation rec {
		]
		++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ];

		nativeBuildInputs = [ pkg-config ];

		enableParallelBuilding = true;

		hardeningDisable = [ "format" ];

		buildInputs = [
		zlib
		bzip2
		zlib
		];

		# cbc lists cgl and clp in its .pc requirements, so it needs to be propagated.
		propagatedBuildInputs = [
		cgl
		clp
		];

		# FIXME: move share/coin/Data to a separate output?
		@@ -43,4 +53,4 @@ stdenv.mkDerivation rec {
		platforms = lib.platforms.linux ++ lib.platforms.darwin;
		description = "Mixed integer programming solver";
		};
		}
		})

pkgs/by-name/ch/chez/package.nix

+80 −38

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		coreutils,
		fetchFromGitHub,
		zuo,
		zlib,
		lz4,
		libffi,
		cctools,
		darwin,
		ncurses,
		libiconv,
		libX11,
		libuuid,
		testers,
		}@args:
		writableTmpDirAsHomeHook,
		buildPackages,
		}:
		let
		inherit (stdenv.hostPlatform) extensions;

		arch =
		{
		"x86_64-linux" = "ta6le";
		"x86-linux" = "ti3le";
		"aarch64-linux" = "tarm64le";
		"x86_64-darwin" = "ta6osx";
		"aarch64-darwin" = "tarm64osx";
		"x86_64-windows" = "ta6nt";
		"aarch64-windows" = "tarm64nt";
		}
		.${stdenv.hostPlatform.system}
		or (throw "Unsupported host system, try checking https://cisco.github.io/ChezScheme/release_notes/latest/release_notes.html to see if ${stdenv.hostPlatform.system} is supported");
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "chez-scheme";
		version = "10.2.0";

		src = fetchurl {
		url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz";
		hash = "sha256-t5WRbUz+1ZJAxfRLG1B6hlfv0o5i5y4TTQNIbp8+N0o=";
		src = fetchFromGitHub {
		owner = "cisco";
		repo = "ChezScheme";
		tag = "v${finalAttrs.version}";
		hash = "sha256-wAEnuC6hktCK/l00G48jYD9fwdyiXkzHjC2YYVeCJXo=";
		# Vendored nanopass and stex
		fetchSubmodules = true;
		};

		strictDeps = true;
		depsBuildBuild = [
		zuo # Used as the build driver
		buildPackages.stdenv.cc # Needed for cross
		];
		nativeBuildInputs =
		lib.optionals stdenv.hostPlatform.isDarwin [
		cctools
		@@ -28,42 +56,54 @@ stdenv.mkDerivation (finalAttrs: {
		++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
		darwin.autoSignDarwinBinariesHook
		];

		buildInputs = [
		ncurses
		libiconv
		zlib
		lz4
		libffi
		]
		++ lib.optionals stdenv.hostPlatform.isUnix [
		libX11
		libuuid
		];

		enableParallelBuilding = true;

		env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";

		/*
		** We have to fix a few occurrences to tools with absolute
		** paths in some helper scripts, otherwise the build will fail on
		** NixOS or in any chroot build.
		*/
		patchPhase = ''
		substituteInPlace ./makefiles/installsh \
		--replace-warn "/usr/bin/true" "${coreutils}/bin/true"

		substituteInPlace zlib/configure \
		--replace-warn "/usr/bin/libtool" libtool
		'';

		/*
		** Don't use configureFlags, since that just implicitly appends
		** everything onto a --prefix flag, which ./configure gets very angry
		** about.
		** Set to use Nixpkgs dependencies when possible
		** instead of vendored dependencies.
		**
		** Also, carefully set a manual workarea argument, so that we
		** Carefully set a manual workarea argument, so that we
		** can later easily find the machine type that we built Chez
		** for.
		*/
		configurePhase = ''
		./configure --as-is --threads --installprefix=$out --installman=$out/share/man
		'';
		enableParallelBuilding = true;
		dontAddPrefix = true;
		configurePlatforms = [ ]; # So it doesn't add the default --build --host flags
		configureFlags = [
		# Skip submodule update
		"--as-is"
		# Threaded version
		"--threads"
		"--installprefix=${placeholder "out"}"
		"--installman=${placeholder "out"}/share/man"
		"--enable-libffi"
		"CC_FOR_BUILD=cc"
		# Use Nixpkgs dependencies
		"ZUO=zuo"
		"ZLIB=${zlib}/lib/libz${extensions.sharedLibrary}"
		"LZ4=${lz4.lib}/lib/liblz4${extensions.sharedLibrary}"
		# Append to CFLAGS or else get errors
		# Don't set CFLAGS so it can do some detections stuff
		"CFLAGS+=${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}"
		]
		++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
		"--cross"
		"-m=${arch}"
		];

		enableParallelChecking = true;
		nativeCheckInputs = [ writableTmpDirAsHomeHook ];
		doCheck = false; # Filesystem checks are impure

		# ** Clean up some of the examples from the build output.
		postInstall = ''
		@@ -72,18 +112,20 @@ stdenv.mkDerivation (finalAttrs: {

		setupHook = ./setup-hook.sh;

		passthru.tests = {
		version = testers.testVersion {
		passthru.tests.version = testers.testVersion {
		package = finalAttrs.finalPackage;
		};
		};

		meta = {
		description = "Powerful and incredibly fast R6RS Scheme compiler";
		homepage = "https://cisco.github.io/ChezScheme/";
		changelog = "https://cisco.github.io/ChezScheme/release_notes/v${finalAttrs.version}/release_notes.html";
		license = lib.licenses.asl20;
		maintainers = with lib.maintainers; [ thoughtpolice ];
		platforms = lib.platforms.unix;
		maintainers = with lib.maintainers; [
		thoughtpolice
		RossSmyth
		];
		platforms = lib.platforms.all;
		mainProgram = "scheme";
		};
		})