Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -51,10 +51,10 @@ let
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${cfg.filesDir} $out/share/php/drupal/sites/default/files
|
||||
ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/drupal/sites/default/settings.php
|
||||
ln -s ${cfg.modulesDir} $out/share/php/drupal/modules
|
||||
ln -s ${cfg.themesDir} $out/share/php/drupal/themes
|
||||
ln -s ${cfg.filesDir} $out/share/php/${cfg.package.pname}/sites/default/files
|
||||
ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/${cfg.package.pname}/sites/default/settings.php
|
||||
ln -s ${cfg.modulesDir} $out/share/php/${cfg.package.pname}/modules
|
||||
ln -s ${cfg.themesDir} $out/share/php/${cfg.package.pname}/themes
|
||||
'';
|
||||
});
|
||||
|
||||
@@ -387,7 +387,7 @@ in
|
||||
|
||||
if [ ! -d "${cfg.stateDir}/sites" ]; then
|
||||
echo "Preparing sites directory..."
|
||||
cp -r "${cfg.package}/share/php/drupal/sites" "${cfg.stateDir}"
|
||||
cp -r "${cfg.package}/share/php/${cfg.package.pname}/sites" "${cfg.stateDir}"
|
||||
fi
|
||||
|
||||
if [ ! -d "${cfg.filesDir}" ]; then
|
||||
@@ -397,7 +397,7 @@ in
|
||||
fi
|
||||
|
||||
settings_file="${cfg.stateDir}/sites/default/settings.php"
|
||||
default_settings="${cfg.package}/share/php/drupal/sites/default/default.settings.php"
|
||||
default_settings="${cfg.package}/share/php/${cfg.package.pname}/sites/default/default.settings.php"
|
||||
|
||||
if [ ! -f "$settings_file" ]; then
|
||||
echo "Preparing settings.php for ${hostName}..."
|
||||
@@ -434,7 +434,7 @@ in
|
||||
enable = true;
|
||||
virtualHosts = mapAttrs (hostName: cfg: {
|
||||
serverName = mkDefault hostName;
|
||||
root = "${pkg hostName cfg}/share/php/drupal";
|
||||
root = "${pkg hostName cfg}/share/php/${cfg.package.pname}";
|
||||
extraConfig = ''
|
||||
index index.php;
|
||||
'';
|
||||
@@ -535,7 +535,7 @@ in
|
||||
hostName: cfg:
|
||||
(nameValuePair hostName {
|
||||
extraConfig = ''
|
||||
root * ${pkg hostName cfg}/share/php/drupal
|
||||
root * ${pkg hostName cfg}/share/php/${cfg.package.pname}
|
||||
file_server
|
||||
|
||||
encode zstd gzip
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aztfexport";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "aztfexport";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-j6WdQvbxmHOMEfCvnFDxr9ZNOZg0BIOC6u1nw+n3hA0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qb4/sUjtfw/USITTLSuB2fXWR2mAuAcvbawrNA/ilRo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Tool to bring existing Azure resources under Terraform's management";
|
||||
homepage = "https://github.com/Azure/aztfexport";
|
||||
changelog = "https://github.com/Azure/aztfexport/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = [ lib.maintainers.john-rodewald ];
|
||||
mainProgram = "aztfexport";
|
||||
};
|
||||
})
|
||||
@@ -27,7 +27,7 @@ let
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
name = "bigpemu";
|
||||
pname = "bigpemu";
|
||||
version = bigpemu-unwrapped.version;
|
||||
targetPkgs = pkgs: [
|
||||
glui
|
||||
|
||||
@@ -14,19 +14,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chawan";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bptato";
|
||||
repo = "chawan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JPFQsu5vLSesgpbX79Z5e0GGFIsC4PUJuZQS8a5Oq2c=";
|
||||
hash = "sha256-GVDh94pgdMlwHMyqtT8q2yM+rwioodBYQfA+AOZ/CsU=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
|
||||
);
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
nim
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ferron";
|
||||
version = "2.3.2";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ferronweb";
|
||||
repo = "ferron";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-va9OUI2jQiJ3K/Cq3Wrh7RmMST3dBJLB5REcqp7WRP0=";
|
||||
hash = "sha256-darDJYPh0x1o1NHeXK2gyp48Zppbs2ovTXN/xX71eag=";
|
||||
};
|
||||
|
||||
# ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '#![doc = include_str!("../../README.md")]' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-cOkZ8WVcgfIrwEBAGN/U3qp9VZl5S78Bmrpe4nxn994=";
|
||||
cargoHash = "sha256-YJ4Ur/4IUiupVE2gZyn0IAYwpIppVKB0hWtmc5Ue7jQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "7.5.0";
|
||||
version = "7.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-IwZ2Jt9s2kDgjCM3pm5o3iLb2xYtp596109/nLXFgvs=";
|
||||
hash = "sha256-wBFLfZ/z4NH0YswQcwAYbvSLZkW1kZ0pBxhVCREV0qk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -3,22 +3,22 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
fltk,
|
||||
fltk-minimal,
|
||||
which,
|
||||
libjpeg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fltrator";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fltrator/fltrator-${version}-code.zip";
|
||||
url = "mirror://sourceforge/fltrator/fltrator-${finalAttrs.version}-code.zip";
|
||||
sha256 = "125aqq1sfrm0c9cm6gyylwdmc8xrb0rjf563xvw7q28sdbl6ayp7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fltk
|
||||
fltk-minimal
|
||||
libjpeg
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
@@ -61,4 +61,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpu-screen-recorder";
|
||||
version = "5.11.5";
|
||||
version = "5.12.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/${pname}";
|
||||
tag = version;
|
||||
hash = "sha256-o9IjuKuE2/41I52vpR7EOLCDSLJty/Wq0k7UiFHHlDk=";
|
||||
hash = "sha256-FUt3R2clnWYNKgW5uo2HtON91zB2+u+Ini15/ccTJdk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,20 +9,20 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "immich-kiosk";
|
||||
version = "0.30.2";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "damongolding";
|
||||
repo = "immich-kiosk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-q321eiHXzYfch3qod1w1EAk95AAvLiDZhhiKmyL2Ki4=";
|
||||
hash = "sha256-PHdHhhVy0RWMFzR4ZEyWLOiRYHROadLiPIdqkUZMTow=";
|
||||
};
|
||||
|
||||
# Delete vendor directory to regenerate it consistently across platforms
|
||||
postPatch = ''
|
||||
rm -rf vendor
|
||||
'';
|
||||
vendorHash = "sha256-XZ49wYC+oUqEL0HXeqdRQAI2Y4zJAMgfqL/+6RrBWos=";
|
||||
vendorHash = "sha256-3M3fXwCkljfY8wjXf+PdcbqnkyPKaDCJWt9/nRA/+Dc=";
|
||||
proxyVendor = true;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "libdjinterop";
|
||||
pname = "libdjinterop";
|
||||
|
||||
version = "0.26.1";
|
||||
|
||||
|
||||
@@ -138,13 +138,13 @@ in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NDtXMRpglUG0XhkTJrd90kv1utpxXGNppMHOG3Zmt54=";
|
||||
hash = "sha256-SVzJDuy5qXaqxE4HqiqVhoyGLTOt57370q8r3YV18Og=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WdHAjCD20eLj0d9v1K6VYP8vJ+IZ8BEZ3CciYLLMtxc=";
|
||||
|
||||
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/BYVoid/OpenCC/commit/72cae18cfe4272f2b11c9ec1c44d6af7907abcab.patch";
|
||||
hash = "sha256-Cd95AsW/tLk2l8skxqfEfQUm0t23G4ocoirauwMbuwk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2025-15536.patch";
|
||||
url = "https://github.com/BYVoid/OpenCC/commit/345c9a50ab07018f1b4439776bad78a0d40778ec.patch";
|
||||
hash = "sha256-lwzVRcCkMjHniaOQeoicO9fpEhyku2yhiPREk0WoXVM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
let
|
||||
|
||||
pixart2svg = stdenvNoCC.mkDerivation {
|
||||
name = "pixart2svg";
|
||||
pname = "pixart2svg";
|
||||
version = "0-unstable-2021-07-18";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -51,7 +51,7 @@ let
|
||||
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "serenityos-emoji-font";
|
||||
pname = "serenityos-emoji-font";
|
||||
version = "0-unstable-2025-05-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "swgp-go";
|
||||
version = "1.8.0-0-unstable-2026-01-18";
|
||||
version = "1.8.0-0-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "database64128";
|
||||
repo = "swgp-go";
|
||||
rev = "e8ed210b0a016c450ba371ee43041f2f53444841";
|
||||
hash = "sha256-LDYNQwc6vdVkI0bqD96p64D25fz0aGclFDc8SqvCdJQ=";
|
||||
rev = "12be9c3ac0ea2c39b167cde708192935f7263a76";
|
||||
hash = "sha256-0W7yioZc86xfjrJKeCAPT4mLWyrQDaBa9QbGjrR/Tpc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ghv5FwSPQSUFQ1t2zWTXpFggCA4/qrQmnVYkYBF8AQ4=";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -43,13 +43,13 @@ assert (
|
||||
);
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xremap${variant.suffix or ""}";
|
||||
version = "0.14.9";
|
||||
version = "0.14.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xremap";
|
||||
repo = "xremap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ftGg6xai4WbaoXmgNXW4RbpOWvIZMPhUlqWkg1xVin0=";
|
||||
hash = "sha256-2wylBk3+Zu1pHa41dhKwvUtxOVyHSMRDfOD9fIp8x2I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = variant.features;
|
||||
|
||||
cargoHash = "sha256-eoCl5RQ5cNVEoOp8CA5Q/0xWnWcfKK1OvPNLOu/x9Dg=";
|
||||
cargoHash = "sha256-S9mevRDGx23mquABVH/cC1zKNxW1607mS/vaRxRqKfk=";
|
||||
|
||||
passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
|
||||
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
gst_all_1,
|
||||
gobject-introspection,
|
||||
gst-python,
|
||||
pygobject3,
|
||||
adwaita-icon-theme,
|
||||
}:
|
||||
|
||||
buildPythonApplication {
|
||||
pname = "gscrabble";
|
||||
version = "unstable-2020-04-21";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaaH";
|
||||
repo = "gscrabble";
|
||||
rev = "aba37f062a6b183dcc084c453f395af1dc437ec8";
|
||||
sha256 = "sha256-rYpPHgOlPRnlA+Nkvo/J+/8/vl24/Ssk55fTq9oNCz4=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = with gst_all_1; [
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gst-plugins-bad
|
||||
adwaita-icon-theme
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gst-python
|
||||
pygobject3
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$out/share/GScrabble/modules"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# Fails to build, probably incompatible with latest Python
|
||||
# error: Multiple top-level packages discovered in a flat-layout
|
||||
# https://github.com/RaaH/gscrabble/issues/13
|
||||
broken = true;
|
||||
description = "Golden Scrabble crossword puzzle game";
|
||||
homepage = "https://github.com/RaaH/gscrabble/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
@@ -805,6 +805,7 @@ mapAliases {
|
||||
graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
|
||||
grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27
|
||||
gscrabble = throw "'gscrabble' has been removed, as it is unmaintained upstream, and broken in nixpkgs"; # Added 2026-01-03
|
||||
gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06
|
||||
gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
|
||||
gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
|
||||
|
||||
@@ -12286,10 +12286,6 @@ with pkgs;
|
||||
d2x-rebirth-full
|
||||
;
|
||||
|
||||
fltrator = callPackage ../games/fltrator {
|
||||
fltk = fltk-minimal;
|
||||
};
|
||||
|
||||
factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; };
|
||||
|
||||
factorio-experimental = factorio.override {
|
||||
@@ -12340,8 +12336,6 @@ with pkgs;
|
||||
|
||||
freeciv_gtk = freeciv;
|
||||
|
||||
gscrabble = python3Packages.callPackage ../games/gscrabble { };
|
||||
|
||||
ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
|
||||
|
||||
# used as base package for iortcw forks
|
||||
|
||||
Reference in New Issue
Block a user