movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-04-09 06:05:14 +00:00 • committed by GitHub
commit c245ddff1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 152 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
maintainers/maintainer-list.nix
View file

@ -3960,16 +3960,6 @@
github = "CaptainJawZ"; github = "CaptainJawZ";
githubId = 43111068; githubId = 43111068;
}; };
caralice = {
name = "Alice Carroll";
email = "nix@alice-carroll.pet";
github = "thecaralice";
githubId = 43097806;
keys = [
{ fingerprint = "C7EA B182 2AB1 246C 0FB8 DD72 0514 0B67 902C D3AF"; }
{ fingerprint = "DA77 EDDB 4AF5 244C 665E 9176 A05E A86A 5834 1AA8"; }
];
};
CardboardTurkey = { CardboardTurkey = {
name = "Kiran Ostrolenk"; name = "Kiran Ostrolenk";
email = "kiran@ostrolenk.co.uk"; email = "kiran@ostrolenk.co.uk";
@ -14533,6 +14523,16 @@
githubId = 1809783; githubId = 1809783;
name = "Marco Maggesi"; name = "Marco Maggesi";
}; };
magistau = {
name = "Mg. Tau";
email = "nix@alice-carroll.pet";
github = "magistau";
githubId = 43097806;
keys = [
{ fingerprint = "C7EA B182 2AB1 246C 0FB8 DD72 0514 0B67 902C D3AF"; }
{ fingerprint = "DA77 EDDB 4AF5 244C 665E 9176 A05E A86A 5834 1AA8"; }
];
};
magneticflux- = { magneticflux- = {
email = "skaggsm333@gmail.com"; email = "skaggsm333@gmail.com";
github = "magneticflux-"; github = "magneticflux-";

12
nixos/modules/installer/tools/nix-fallback-paths.nix
View file

@ -1,8 +1,8 @@
{ {
x86_64-linux = "/nix/store/kvqnqgjw3k0xmv3ypzajz3c5wf1pxnbs-nix-2.24.14"; x86_64-linux = "/nix/store/ppvbj1hzk77il5wd5g6q5ibyyd4jsnrl-nix-2.28.1";
i686-linux = "/nix/store/292xy9z1vjmy0888bzadmj9fmq1ccapv-nix-2.24.14"; i686-linux = "/nix/store/5lb00s5p37715jh8y9nw6ihdjlzrs2bq-nix-2.28.1";
aarch64-linux = "/nix/store/qsy62z6rk31s8s937nvkcdhn0ds62yax-nix-2.24.14"; aarch64-linux = "/nix/store/2zy7z2ablw09s0fj511x6d6za2vswv09-nix-2.28.1";
riscv64-linux = "/nix/store/zvrzwzv534zcmhw4ai1hbc4iz229hk3p-nix-riscv64-unknown-linux-gnu-2.24.14"; riscv64-linux = "/nix/store/m4fw1gfzx7z3lp2pra1x1bajjb5d4fvi-nix-riscv64-unknown-linux-gnu-2.28.1";
x86_64-darwin = "/nix/store/jc7x6906wyy6csgf6br1gbwkw56nxm4l-nix-2.24.14"; x86_64-darwin = "/nix/store/yi9ysd086218v1k1i16ilkmnkavgrxsi-nix-2.28.1";
aarch64-darwin = "/nix/store/sfrmn30fijs6qpfi7ckjkv2vdr4z590h-nix-2.24.14"; aarch64-darwin = "/nix/store/v4g8bccvg56b8y4r93c6w1f8125qs3cm-nix-2.28.1";
} }

4
nixos/modules/tasks/filesystems/zfs.nix
View file

@ -233,7 +233,7 @@ let
tries=3 tries=3
success=false success=false
while [[ $success != true ]] && [[ $tries -gt 0 ]]; do while [[ $success != true ]] && [[ $tries -gt 0 ]]; do
${systemd}/bin/systemd-ask-password --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ ${systemd}/bin/systemd-ask-password ${lib.optionalString cfgZfs.useKeyringForCredentials ("--keyname=zfs-$ds")} --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \
&& success=true \ && success=true \
|| tries=$((tries - 1)) || tries=$((tries - 1))
done done
@ -403,6 +403,8 @@ in
''; '';
}; };
useKeyringForCredentials = lib.mkEnableOption "Uses the kernel keyring for encryption credentials with keyname=zfs-<poolname>";
passwordTimeout = lib.mkOption { passwordTimeout = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 0; default = 0;

4
pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
View file

@ -5,13 +5,13 @@
}: }:
vimUtils.buildVimPlugin rec { vimUtils.buildVimPlugin rec {
pname = "bitbake-vim"; pname = "bitbake-vim";
version = "2.8.8"; version = "2.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openembedded"; owner = "openembedded";
repo = "bitbake"; repo = "bitbake";
tag = version; tag = version;
hash = "sha256-ShNMTsDL2N2BxwsHetn9rSQdWUBtF/N1EVAbYHXgBSY="; hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA=";
}; };
sourceRoot = "source/contrib/vim"; sourceRoot = "source/contrib/vim";

19
pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix Normal file
View file

@ -0,0 +1,19 @@
{
lib,
vscode-utils,
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "blueprint-gtk";
publisher = "bodil";
version = "0.2.0";
hash = "sha256-A4H/o/HsjQKKee46VZJsjY7EB+1iOm4RWxHKcRLmkEY=";
};
meta = {
description = "Gtk Blueprint language support.";
license = lib.licenses.lgpl3;
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bodil.blueprint-gtk";
maintainers = [ lib.maintainers.lyndeno ];
};
}

2
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -762,6 +762,8 @@ let
}; };
}; };
bodil.blueprint-gtk = callPackage ./bodil.blueprint-gtk { };
bradgashler.htmltagwrap = buildVscodeMarketplaceExtension { bradgashler.htmltagwrap = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
publisher = "bradgashler"; publisher = "bradgashler";

4
pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
View file

@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
publisher = "ms-pyright"; publisher = "ms-pyright";
name = "pyright"; name = "pyright";
version = "1.1.398"; version = "1.1.399";
hash = "sha256-fSBn4c1e1e4atJUV6STmEYB/++WXZFsN2v5+zyfYnZA="; hash = "sha256-dKkx01NVbg0f6+LkZPs1/djqJjOAY/BjROEr4455Shc=";
}; };
meta = { meta = {

2
pkgs/by-name/ai/aircrack-ng/package.nix
View file

@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
description = "WiFi security auditing tools suite"; description = "WiFi security auditing tools suite";
homepage = "https://www.aircrack-ng.org/"; homepage = "https://www.aircrack-ng.org/";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ caralice ]; maintainers = with lib.maintainers; [ magistau ];
platforms = platforms =
with lib.platforms; with lib.platforms;
builtins.concatLists [ builtins.concatLists [

6
pkgs/by-name/di/dioxionary/package.nix
View file

@ -11,17 +11,17 @@
}: }:
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "dioxionary"; pname = "dioxionary";
version = "1.1.4"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vaaandark"; owner = "vaaandark";
repo = "dioxionary"; repo = "dioxionary";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-7Kex5o518L7v5EAhlr4BGoT7LynTe5JmDU8Urn0H3vA="; hash = "sha256-xIieWhT/a5dZ+UPfsMWtgwru5nkUdzr8/0pOiqCSnqo=";
# enable fetchSubmodules since the tests require dictionaries from the submodules # enable fetchSubmodules since the tests require dictionaries from the submodules
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoHash = "sha256-3Cny2OtEoevlUilL0/xtYbyHcuBsFGEFZG6EX35PL+M="; cargoHash = "sha256-YFx8V86awxVUX83bNLHRP6nIBZGHck/0ywriBgVqvxY=";
useFetchCargoVendor = true; useFetchCargoVendor = true;
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/by-name/re/revolt-desktop/package.nix
View file

@ -19,7 +19,7 @@
license = lib.licenses.agpl3Only; license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
heyimnova heyimnova
caralice magistau
]; ];
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

31
pkgs/by-name/se/sendgmail/package.nix Normal file
View file

@ -0,0 +1,31 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule {
pname = "sendgmail";
version = "0-unstable-2025-03-06";
src = fetchFromGitHub {
owner = "google";
repo = "gmail-oauth2-tools";
rev = "85c6b4f07e637683cc5e0ec6a66ce8e4397a4b18";
hash = "sha256-bzbTU9SA4dJKtQVkqESvV5o3l3MY4Uy7HDqo7jI3dhM=";
};
sourceRoot = "source/go/sendgmail";
vendorHash = "sha256-0pjcO2Ati+mUSw614uEL3CatHSgbgDUfOBE8bWpjmcw=";
passthru.updateScript = nix-update-script { };
meta = {
description = "Mimic sendmail with Gmail for git send-email";
homepage = "https://github.com/google/gmail-oauth2-tools/tree/master/go/sendgmail";
maintainers = [ lib.maintainers.samw ];
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
};
}

2
pkgs/by-name/sr/srgn/package.nix
View file

@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A code surgeon for precise text and code transplantation"; description = "A code surgeon for precise text and code transplantation";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ caralice ]; maintainers = with maintainers; [ magistau ];
mainProgram = "srgn"; mainProgram = "srgn";
homepage = "https://github.com/${src.owner}/${src.repo}/"; homepage = "https://github.com/${src.owner}/${src.repo}/";
downloadPage = "https://github.com/${src.owner}/${src.repo}/releases/tag/${src.rev}"; downloadPage = "https://github.com/${src.owner}/${src.repo}/releases/tag/${src.rev}";

11
pkgs/development/libraries/astal/buildAstalModule.nix
View file

@ -1,7 +1,7 @@
{ {
lib, lib,
stdenv, stdenv,
fetchFromGitHub, source, # this is ./source.nix
glib, glib,
wrapGAppsHook3, wrapGAppsHook3,
@ -39,17 +39,12 @@ let
cleanArgs args cleanArgs args
// { // {
pname = "astal-${name}"; pname = "astal-${name}";
version = "0-unstable-2025-03-21"; inherit (source) version;
__structuredAttrs = true; __structuredAttrs = true;
strictDeps = true; strictDeps = true;
src = fetchFromGitHub { src = source;
owner = "Aylur";
repo = "astal";
rev = "dc0e5d37abe9424c53dcbd2506a4886ffee6296e";
hash = "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=";
};
sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}";

1
pkgs/development/libraries/astal/default.nix
View file

@ -1,5 +1,6 @@
{ wireplumber }: { wireplumber }:
self: { self: {
source = self.callPackage ./source.nix { };
buildAstalModule = self.callPackage ./buildAstalModule.nix { }; buildAstalModule = self.callPackage ./buildAstalModule.nix { };
apps = self.callPackage ./modules/apps.nix { }; apps = self.callPackage ./modules/apps.nix { };

19
pkgs/development/libraries/astal/modules/io.nix
View file

@ -1,17 +1,6 @@
{ buildAstalModule, nix-update-script }: { buildAstalModule }:
(buildAstalModule { buildAstalModule {
name = "io"; name = "io";
sourceRoot = "lib/astal/io"; sourceRoot = "lib/astal/io";
meta = { meta.description = "Astal core library";
description = "Astal core library"; }
longDescription = ''
Astal is a collection of building blocks for creating custom desktop shells
'';
mainProgram = "astal";
};
}).overrideAttrs
{
# add an update script only in one place,
# so r-ryantm won't run it multiple times
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
}

33
pkgs/development/libraries/astal/source.nix Normal file
View file

@ -0,0 +1,33 @@
{
lib,
nix-update-script,
fetchFromGitHub,
}:
(fetchFromGitHub {
owner = "Aylur";
repo = "astal";
rev = "dc0e5d37abe9424c53dcbd2506a4886ffee6296e";
hash = "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=";
}).overrideAttrs
(
final: prev: {
name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
pname = "astal-source";
version = "0-unstable-2025-03-21";
meta = prev.meta // {
description = "Building blocks for creating custom desktop shells (source)";
longDescription = ''
Please don't use this package directly, use one of subpackages in
`astal` namespace. This package is just a `fetchFromGitHub`, which is
reused between all subpackages.
'';
maintainers = with lib.maintainers; [ perchun ];
platforms = lib.platforms.linux;
};
passthru = prev.passthru // {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
};
}
)

4
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -80,7 +80,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: { clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.48.0"; version = "2.48.1";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then if lib.versionAtLeast gtk3.version "4.0" then
"6.0" "6.0"
@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4="; hash = "sha256-mO/fIcTNyg/gtzq1qMtSCTtapS2bGwFqk/cdv6HrJY8=";
}; };
patches = lib.optionals clangStdenv.hostPlatform.isLinux [ patches = lib.optionals clangStdenv.hostPlatform.isLinux [

4
pkgs/development/python-modules/firecrawl-py/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "firecrawl-py"; pname = "firecrawl-py";
version = "1.6.0"; version = "1.7.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mendableai"; owner = "mendableai";
repo = "firecrawl"; repo = "firecrawl";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-xr2curv7Inzav0wGOEfWwKn1XhBg8EIotJbwhXc+aBQ="; hash = "sha256-Tsw5OMjv/t9lt3seG31958R9o+s/6N7MGzHgqgkHrzQ=";
}; };
sourceRoot = "${src.name}/apps/python-sdk"; sourceRoot = "${src.name}/apps/python-sdk";

4
pkgs/servers/monitoring/icinga2/default.nix
View file

@ -30,13 +30,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "icinga2${nameSuffix}"; pname = "icinga2${nameSuffix}";
version = "2.14.3"; version = "2.14.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "icinga"; owner = "icinga";
repo = "icinga2"; repo = "icinga2";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8="; hash = "sha256-5FQIcOvuq1GHX80rYuZ3jCM3CF9Fq1149nvlO1njqfA=";
}; };
patches = [ patches = [

42
pkgs/servers/monitoring/icinga2/no-var-directories.patch
View file

@ -1,25 +1,29 @@
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index 87993df..819c87b 100644 index 1c92d8331..e77199959 100644
--- a/icinga-app/CMakeLists.txt --- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt +++ b/icinga-app/CMakeLists.txt
@@ -106,7 +106,3 @@ install( @@ -94,9 +94,3 @@ install(
TARGETS icinga-app TARGETS icinga-app
RUNTIME DESTINATION ${InstallPath} RUNTIME DESTINATION ${InstallPath}
) )
- -
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") -if(NOT WIN32)
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")")
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")")
-endif()
diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 5dda179..22cf69f 100644 index 986050017..39711c79e 100644
--- a/lib/base/CMakeLists.txt --- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt +++ b/lib/base/CMakeLists.txt
@@ -125,7 +125,4 @@ set_target_properties ( @@ -154,9 +154,4 @@ set_target_properties (
FOLDER Lib FOLDER Lib
) )
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") -if(NOT WIN32)
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")")
- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")")
-endif()
- -
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
@ -35,22 +39,22 @@ index ab963f7..3d9d506 100644
- -
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt
index 65113d2..5e4398f 100644 index 2271abff6..fc03b5c6b 100644
--- a/lib/remote/CMakeLists.txt --- a/lib/remote/CMakeLists.txt
+++ b/lib/remote/CMakeLists.txt +++ b/lib/remote/CMakeLists.txt
@@ -55,12 +55,3 @@ set_target_properties ( @@ -57,12 +57,3 @@ set_target_properties (
remote PROPERTIES remote PROPERTIES
FOLDER Lib FOLDER Lib
) )
- -
-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") -if(NOT WIN32)
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") - #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")")
-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")")
- - install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")")
- -endif()
diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
index 1438626..d882ae2 100644 index 1438626..d882ae2 100644
--- a/lib/compat/CMakeLists.txt --- a/lib/compat/CMakeLists.txt

7
pkgs/tools/package-management/nix/default.nix
View file

@ -176,12 +176,6 @@ lib.makeExtensible (
self_attribute_name = "nix_2_24"; self_attribute_name = "nix_2_24";
}; };
nix_2_25 = commonAutoconf {
version = "2.25.5";
hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ=";
self_attribute_name = "nix_2_25";
};
nix_2_26 = commonMeson { nix_2_26 = commonMeson {
version = "2.26.3"; version = "2.26.3";
hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI=";
@ -243,6 +237,7 @@ lib.makeExtensible (
// { // {
nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28."; nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28.";
nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28."; nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28.";
nix_2_25 = throw "nix_2_25 has been removed. use nix_2_28.";
unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake."; unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
} }