Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2024-11-27 18:05:04 +00:00
committed by GitHub
70 changed files with 1085 additions and 878 deletions
+1
View File
@@ -967,6 +967,7 @@ in {
users.users.acme = {
home = "/var/lib/acme";
homeMode = "755";
group = "acme";
isSystemUser = true;
};
@@ -137,7 +137,7 @@ in {
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
after = [ "network-online.target" ] ++ cfg.serviceDependencies;
path = [ pkgs.lottieconverter pkgs.ffmpeg-full ];
path = [ pkgs.lottieconverter pkgs.ffmpeg-headless ];
# mautrix-telegram tries to generate a dotfile in the home directory of
# the running user if using a postgresql database:
@@ -18,7 +18,7 @@ in
type = lib.types.submodule {
freeformType = settingsFormat.type;
options = {
dns.enable = mkOption {
dns.enabled = mkOption {
type = types.bool;
default = true;
description = ''
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "MeerK40t";
version = "0.9.4000";
version = "0.9.5300";
pyproject = true;
src = fetchFromGitHub {
owner = "meerk40t";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ceDnnHdmJ6VOrM9pSxjeKQ748E8fsIqSQ36qFpXc9Ac=";
hash = "sha256-dybmbmEvvTka0wMBIUDYemqDaCvG9odgCbIWYhROJLI=";
};
nativeBuildInputs = [
+11
View File
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, rofi-unwrapped
, wayland-scanner
, pkg-config
@@ -19,6 +20,16 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
hash = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8=";
};
patches = [
# Fix use on niri window manager
# ref. https://github.com/davatorium/rofi/discussions/2008
# this was merged upstream, and can be removed on next release
(fetchpatch {
url = "https://github.com/lbonn/rofi/commit/55425f72ff913eb72f5ba5f5d422b905d87577d0.patch";
hash = "sha256-vTUxtJs4SuyPk0PgnGlDIe/GVm/w1qZirEhKdBp4bHI=";
})
];
depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols wayland-scanner ];
buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
{ lib, stdenv, coreutils, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva, libGL
, freetype, fontconfig, libXft, libXrender, libxcb, expat
@@ -114,6 +114,7 @@ in stdenv.mkDerivation rec {
--set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \
--set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
--prefix PATH : ${coreutils}/bin \
${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + lib.optionalString enableWidevine ''
ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
@@ -0,0 +1,34 @@
{
lib,
buildLua,
fetchFromGitHub,
unstableGitUpdater,
python3Packages,
}:
buildLua {
pname = "mpv-autosub";
version = "0-unstable-2021-06-29";
scriptPath = "autosub.lua";
src = fetchFromGitHub {
owner = "davidde";
repo = "mpv-autosub";
rev = "35115355bd339681f97d067538356c29e5b14afa";
hash = "sha256-BKT/Tzwl5ZA4fbdc/cxz0+CYc1zyY/KOXc58x5GYow0=";
};
preInstall = ''
substituteInPlace autosub.lua --replace-fail \
"local subliminal = '/home/david/.local/bin/subliminal'" \
"local subliminal = '${lib.getExe' python3Packages.subliminal "subliminal"}'"
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Fully automatic subtitle downloading for the MPV media player";
homepage = "https://github.com/davidde/mpv-autosub";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.octvs ];
};
}
@@ -98,6 +98,7 @@ let
;
buildLua = callPackage ./buildLua.nix { };
autosub = callPackage ./autosub.nix { };
autosubsync-mpv = callPackage ./autosubsync-mpv.nix { };
chapterskip = callPackage ./chapterskip.nix { };
convert = callPackage ./convert.nix { };
@@ -135,6 +136,7 @@ let
visualizer = callPackage ./visualizer.nix { };
vr-reversal = callPackage ./vr-reversal.nix { };
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };
youtube-chat = callPackage ./youtube-chat.nix { };
youtube-upnext = callPackage ./youtube-upnext.nix { };
};
@@ -0,0 +1,41 @@
{
lib,
buildLua,
fetchFromGitHub,
yt-dlp,
}:
buildLua {
pname = "youtube-chat";
version = "unstable-2024-06-08";
src = fetchFromGitHub {
owner = "BanchouBoo";
repo = "mpv-youtube-chat";
rev = "4b8d6d5d3ace40d467bc0ed75f3af2a1aefce161";
hash = "sha256-uZC7iDYqLUuXnqSLke4j6rLoufc/vFTE6Ehnpu//dxY=";
};
scriptPath = "youtube-chat";
installPhase = ''
runHook preInstall
install -D -t $out/share/mpv/scripts/youtube-chat main.lua
runHook postInstall
'';
passthru.extraWrapperArgs = [
"--prefix"
"PATH"
":"
(lib.makeBinPath [ yt-dlp ])
];
meta = {
description = "MPV script to overlay youtube chat on top of a video using yt-dlp";
homepage = "https://github.com/BanchouBoo/mpv-youtube-chat";
license = lib.licenses.mit;
platforms = yt-dlp.meta.platforms;
maintainers = with lib.maintainers; [ fliegendewurst ];
};
}
@@ -362,7 +362,8 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps
done
# Translation
ln -sv $libexec/nls "$out/share/virtualbox"
mkdir -p "$out/share/virtualbox"
ln -sv $libexec/nls "$out/share/virtualbox/nls"
''}
${optionalString withModsrc ''
+45
View File
@@ -0,0 +1,45 @@
<?php
declare(strict_types=1);
namespace nixos {
use AdminerPlugin;
use function sprintf;
function adminer_object(): object
{
require_once __DIR__ . '/plugins/plugin.php';
if (!file_exists(__DIR__ . '/plugins.json')) {
return new AdminerPlugin();
}
$plugins = array_map(
static function (string $name): ?object {
$plugin = sprintf('%s/plugins/%s.php', __DIR__, $name);
if (!is_readable($plugin)) {
return null;
}
require $plugin;
preg_match_all('/(\w+)/', $name, $matches);
return new sprintf('Adminer%s', implode('', array_map('ucfirst', $matches[1])));
},
json_decode(file_get_contents(sprintf('%s/plugins.json', __DIR__), true))
);
return new AdminerPlugin(array_filter($plugins));
}
}
namespace {
function adminer_object() {
return \nixos\adminer_object();
}
require(__DIR__ . '/adminer.php');
}
@@ -0,0 +1,75 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
php,
writeText,
nix-update-script,
theme ? null,
plugins ? [ ],
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "adminer-pematon";
version = "4.12";
src = fetchFromGitHub {
owner = "pematon";
repo = "adminer";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-ExCHEsZ+VFmrom3632/1OOjb3zbZgiaZJDapBkBGUnQ=";
};
nativeBuildInputs = [
php
];
buildPhase = ''
runHook preBuild
php compile.php
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp temp/adminer-${finalAttrs.version}.php $out/adminer.php
cp ${./index.php} $out/index.php
${lib.optionalString (theme != null) ''
cp designs/${theme}/adminer.css $out/adminer.css
''}
# Copy base plugin
mkdir -p $out/plugins
cp plugins/plugin.php $out/plugins/plugin.php
${lib.optionalString (plugins != [ ]) ''
cp plugins/*.php $out/plugins/
cp ${writeText "$out/plugins.json" ''
${toString (builtins.toJSON plugins)}
''} $out/plugins.json
''}
runHook postInstall
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Database management in a single PHP file (Pematon fork)";
homepage = "https://github.com/pematon/adminer";
license = with lib.licenses; [
asl20
gpl2Only
];
maintainers = with lib.maintainers; [
johnrtitor
];
platforms = lib.platforms.all;
};
})
@@ -12,16 +12,12 @@
unzip,
}:
let
owner = "angular";
repo = "vscode-ng-language-service";
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "angular-language-server";
version = "18.2.0";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.zip";
url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/ng-template.vsix";
name = "angular-language-server-${finalAttrs.version}.zip";
url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
hash = "sha256-rl04nqSSBMjZfPW8Y+UtFLFLDFd5FSxJs3S937mhDWE=";
};
@@ -56,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
};
updateScript = lib.getExe (writeShellApplication {
name = "update-${finalAttrs.pname}";
name = "update-angular-language-server";
runtimeInputs = [
curl
common-updater-scripts
@@ -68,9 +64,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" \
''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \
-Lsf https://api.github.com/repos/${owner}/${repo}/releases/latest | \
-Lsf https://api.github.com/repos/angular/vscode-ng-language-service/releases/latest | \
jq -r .tag_name | cut -c 2-)
update-source-version ${finalAttrs.pname} "$LATEST_VERSION"
update-source-version angular-language-server "$LATEST_VERSION"
'';
});
};
+2 -2
View File
@@ -5,10 +5,10 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arcticons-sans";
version = "0.580";
version = "0.590";
src = fetchzip {
hash = "sha256-BRyYHOuz7zxD1zD4L4DmI9dFhGePmGFDqYmS0DIbvi8=";
hash = "sha256-0iSkTfUMgrKi6LF+9KAihPus0biGuOFsYN51ydYAF5E=";
url = "https://github.com/arcticons-team/arcticons-font/archive/refs/tags/${finalAttrs.version}.zip";
};
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "argocd-autopilot";
version = "0.4.17";
version = "0.4.18";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = "argocd-autopilot";
rev = "v${version}";
sha256 = "sha256-txbs1SzAaV1nCl104m0Ht5DwzCmK+sBDn4rZ1newdLc=";
sha256 = "sha256-vG2m0HhT9Pd9qzOAE2BbFf8zluH7btAVexznBCETvxA=";
};
vendorHash = "sha256-QbjiQVclT8paEKYQmMwj5MLq40mAVh5Ji5VJJTOmEZI=";
vendorHash = "sha256-gyjxZiccaB5ZfEzxrYYYFx7Z6lhszzNL4ugltAMsfag=";
proxyVendor = true;
+3 -3
View File
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "1.5.4";
version = "1.5.5";
src = fetchCrate {
inherit version pname;
hash = "sha256-+aC6yyQ9IcdliYqteB/UTMqwGNCWW0LZWYfMxnaPMm0=";
hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE=";
};
cargoHash = "sha256-2E6SU4fMHj0NCIMrn0YNfkllZrFwCLn1wGJfzBPqtKQ=";
cargoHash = "sha256-OnD/QVOP3oUFeGW0YeFWW8hQ6SBapxxdAXATIBM+g2Y=";
meta = {
description = "BLAKE3 cryptographic hash function";
+3 -3
View File
@@ -7,7 +7,7 @@
let
pname = "pack";
version = "0.35.1";
version = "0.36.0";
in
buildGoModule {
inherit pname version;
@@ -16,10 +16,10 @@ buildGoModule {
owner = "buildpacks";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA=";
hash = "sha256-WdYV8Pcnzbt3Sd+0wYkw/htHruqFFYopPsRP/xs9WPI=";
};
vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4=";
vendorHash = "sha256-RfidlZHyC/dcIuisvIGzd7Vqk7j2DQuJjgERs8lfr0A=";
nativeBuildInputs = [ installShellFiles ];
+22 -21
View File
@@ -1,39 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, libiconv
, darwin
, openssl
, pkg-config
, git
{
lib,
fetchFromGitHub,
rustPlatform,
openssl,
pkg-config,
git,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "c2patool";
version = "0.9.10";
version = "0.9.12";
src = fetchFromGitHub {
owner = "contentauth";
repo = pname;
rev = "v${version}";
hash = "sha256-1q0s8fwhlD891AhS1Sr2JBHi69SUMdP2cYslM/yFh8o=";
hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY=";
};
cargoHash = "sha256-4LfrafJd2W2HL/Q36lJ1zXw2CDLL79SLEuyKeFR9cUY=";
cargoHash = "sha256-sei1sOhR35tkNW4rObLC+0Y5upxNo6yjRMLNcro0tRY=";
# use the non-vendored openssl
OPENSSL_NO_VENDOR = 1;
env.OPENSSL_NO_VENDOR = 1;
nativeBuildInputs = [
git
pkg-config
];
buildInputs = [
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin [
libiconv
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Carbon
];
checkFlags = [
@@ -52,14 +49,18 @@ rustPlatform.buildRustPackage rec {
];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/c2patool --version | grep "${version}"
'';
nativeInstallCheckInputs = [
versionCheckHook
];
meta = with lib; {
description = "Command line tool for displaying and adding C2PA manifests";
homepage = "https://github.com/contentauth/c2patool";
license = with licenses; [ asl20 /* or */ mit ];
license = with licenses; [
asl20 # or
mit
];
maintainers = with maintainers; [ ok-nick ];
mainProgram = "c2patool";
};
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
hash = "sha256-a6IgPrGI6jA3rVWqGaVPuLxnCJ82SyxWdZZ6xd5DoNs=";
hash = "sha256-Twh8wIXc1bLljTUCxMV/b5qP65FG14hheoMFTnGrO/c=";
};
vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw=";
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "efm-langserver";
version = "0.0.53";
version = "0.0.54";
src = fetchFromGitHub {
owner = "mattn";
repo = "efm-langserver";
rev = "v${version}";
sha256 = "sha256-Csm+2C9hP+dTXliADUquAb1nC+8f5j1rJ+66cqWDrCk=";
sha256 = "sha256-3ZrWc8/4aC5TOoL9vybkMZC9HkIL43TokebFcJYyrcI=";
};
vendorHash = "sha256-0YkUak6+dpxvXn6nVVn33xrTEthWqnC9MhMLm/yjFMA=";
vendorHash = "sha256-FOAKxKqhrUpfXkoasSd7v3kKAqV11p5ieZaMPni5Hx4=";
subPackages = [ "." ];
meta = with lib; {
+25 -24
View File
@@ -1,36 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, cargo
, pkg-config
, meson
, ninja
, blueprint-compiler
, glib
, gtk4
, libadwaita
, rustc
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
cargo,
pkg-config,
meson,
ninja,
blueprint-compiler,
glib,
gtk4,
libadwaita,
rustc,
wrapGAppsHook4,
appstream-glib,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
pname = "eyedropper";
version = "1.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "FineFindus";
repo = pname;
rev = "v${version}";
hash = "sha256-PStQC9n+DTTOiNO9fHUjIkwgvKeA2alVbtX5qfqhTYo=";
hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-WRjoyIoVvOYcw2i/cMycE67iziZ8dvQrZ3EfE2v2jkQ=";
hash = "sha256-jXo7Aq+pXWySe6MyH9GCTQVNwbboER7RwJe6Asqbxxc=";
};
nativeBuildInputs = [
@@ -52,12 +53,12 @@ stdenv.mkDerivation rec {
libadwaita
];
meta = with lib; {
meta = {
description = "Pick and format colors";
mainProgram = "eyedropper";
homepage = "https://github.com/FineFindus/eyedropper";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ zendo ];
mainProgram = "eyedropper";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ zendo ];
};
}
+32 -32
View File
@@ -3,25 +3,25 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
"factorio_linux_2.0.20.tar.xz"
"factorio_linux_2.0.22.tar.xz"
],
"name": "factorio_alpha_x64-2.0.20.tar.xz",
"name": "factorio_alpha_x64-2.0.22.tar.xz",
"needsAuth": true,
"sha256": "999247294680f67b29ea4758014e8337069dccc19f8f3808a99f45d8213972b0",
"sha256": "469fb0bd5e6a30e9a282ca0b4522e1cfc514f5726b8e1b1f3b7b4bc1003d6ca3",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/alpha/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.22/alpha/linux64",
"version": "2.0.22"
},
"stable": {
"candidateHashFilenames": [
"factorio_linux_2.0.20.tar.xz"
"factorio_linux_2.0.21.tar.xz"
],
"name": "factorio_alpha_x64-2.0.20.tar.xz",
"name": "factorio_alpha_x64-2.0.21.tar.xz",
"needsAuth": true,
"sha256": "999247294680f67b29ea4758014e8337069dccc19f8f3808a99f45d8213972b0",
"sha256": "275e0d78d0671da28cf1fbc8d07c99239600ba2fe475ea49ce93436258cf6901",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/alpha/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.21/alpha/linux64",
"version": "2.0.21"
}
},
"demo": {
@@ -51,51 +51,51 @@
"expansion": {
"experimental": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.20.tar.xz"
"factorio-space-age_linux_2.0.22.tar.xz"
],
"name": "factorio_expansion_x64-2.0.20.tar.xz",
"name": "factorio_expansion_x64-2.0.22.tar.xz",
"needsAuth": true,
"sha256": "cbc6e70985295b078fec8b9ce759fbf8a68ac157fcc7bbead934a9c3108d997f",
"sha256": "67ae6c12897519e9d6851b045a5bf6f7fc15c08b4d927832959399492ab18dde",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/expansion/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.22/expansion/linux64",
"version": "2.0.22"
},
"stable": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.20.tar.xz"
"factorio-space-age_linux_2.0.21.tar.xz"
],
"name": "factorio_expansion_x64-2.0.20.tar.xz",
"name": "factorio_expansion_x64-2.0.21.tar.xz",
"needsAuth": true,
"sha256": "cbc6e70985295b078fec8b9ce759fbf8a68ac157fcc7bbead934a9c3108d997f",
"sha256": "55a55ae2bca596b8f4a2b8f72deb543d9b494d8f030f394efa4fd6d9bb0a9802",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/expansion/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.21/expansion/linux64",
"version": "2.0.21"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.20.tar.xz",
"factorio_headless_x64_2.0.20.tar.xz"
"factorio-headless_linux_2.0.22.tar.xz",
"factorio_headless_x64_2.0.22.tar.xz"
],
"name": "factorio_headless_x64-2.0.20.tar.xz",
"name": "factorio_headless_x64-2.0.22.tar.xz",
"needsAuth": false,
"sha256": "c4a901f2f1dbedbb41654560db4c6fab683a30c20334e805d4ef740c0416515a",
"sha256": "14c3eea7600fbe7f35bca52fe4c277e8f5e23b34c35ebebaa46c6752c750cb85",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/headless/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.22/headless/linux64",
"version": "2.0.22"
},
"stable": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.20.tar.xz",
"factorio_headless_x64_2.0.20.tar.xz"
"factorio-headless_linux_2.0.21.tar.xz",
"factorio_headless_x64_2.0.21.tar.xz"
],
"name": "factorio_headless_x64-2.0.20.tar.xz",
"name": "factorio_headless_x64-2.0.21.tar.xz",
"needsAuth": false,
"sha256": "c4a901f2f1dbedbb41654560db4c6fab683a30c20334e805d4ef740c0416515a",
"sha256": "1d6d2785006d6a8d9d5fdcdaa7097a189ec35ba95f3521025dc4e046f7a1398e",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.20/headless/linux64",
"version": "2.0.20"
"url": "https://factorio.com/get-download/2.0.21/headless/linux64",
"version": "2.0.21"
}
}
}
+56
View File
@@ -0,0 +1,56 @@
{
buildNpmPackage,
fetchFromGitHub,
vips,
lib,
pkg-config,
jq,
makeWrapper,
nix-update-script,
}:
buildNpmPackage rec {
pname = "factoriolab";
version = "3.8.1";
src = fetchFromGitHub {
owner = "factoriolab";
repo = "factoriolab";
rev = "refs/tags/v${version}";
hash = "sha256-ZI7nit+DBc1ULGDpGlee7v+NrHc5JhS7sgACGG5fB7I=";
};
buildInputs = [ vips ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
npmDepsHash = "sha256-FX9zxq3kIQ5nxEPW57X53novtCFBPV5w9jg882EC2Lo=";
# By default angular tries to optimize fonts by inlining them
# which needs internet access during building to download said fonts.
# Internet access during build would necessitate turning this into a fixed output derivation
# which is difficult as said fonts are not actually stable.
# This disables font inlining completely in which case the fonts will be loaded on demand by your browser
postPatch = ''
${lib.getExe jq} '.projects.factoriolab.architect.build.options += { "optimization": {"fonts": false } }' ./angular.json > angular.json.new
mv -f angular.json.new angular.json
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share
cp -r dist/browser $out/share/factoriolab
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/factoriolab/factoriolab";
changelog = "https://github.com/factoriolab/factoriolab/releases/tag/${version}";
description = "Angular-based calculator for factory games like Factorio and Dyson Sphere Program";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ patrickdag ];
};
}
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreman";
version = "0.3.15";
version = "0.3.16";
src = fetchFromGitHub {
owner = "mattn";
repo = "goreman";
rev = "v${version}";
hash = "sha256-Z6b245tC6UsTaHTTlKEFH0egb5z8HTmv/554nkileng=";
hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo=";
};
vendorHash = "sha256-Qbi2GfBrVLFbH9SMZOd1JqvD/afkrVOjU4ECkFK+dFA=";
vendorHash = "sha256-Udm0xdrW8Aky26oxUhdbpsNTWziZxkM0G1ZRKLwyl1Q=";
ldflags = [ "-s" "-w" ];
+3 -3
View File
@@ -24,16 +24,16 @@
buildNpmPackage rec {
pname = "kando";
version = "1.4.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "kando-menu";
repo = "kando";
rev = "refs/tags/v${version}";
hash = "sha256-JcPTplqrMgDsT0HDTh7liChUWvLqe9gwS51ANM3Wsds=";
hash = "sha256-0Y6JDTbzrtAU14soyQgnGTkdR/h52gX2ByNGIYCY38A=";
};
npmDepsHash = "sha256-13NuhGq5Pv5GSLeXASWxbXZYaUb9KzMgR7y5I7mv+MA=";
npmDepsHash = "sha256-qmLaUd01Mk6yQYqd/rXy4aZoi6oYYY6eZ2kupGRb1z0=";
npmFlags = [ "--ignore-scripts" ];
+18 -4
View File
@@ -1,21 +1,35 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, pkg-config
, btrfs-progs
, gpgme
, nix-update-script
}:
buildGoModule rec {
pname = "kraftkit";
version = "0.8.6";
version = "0.9.4";
src = fetchFromGitHub {
owner = "unikraft";
repo = "kraftkit";
rev = "v${version}";
hash = "sha256-lBvDKO2+MTSrmQM7szg5yulUi5OZKv7qKNQ75PIZgDo=";
hash = "sha256-4+3yMx/Vf4aZKC5GRhnAeH4oaJ0Rbz8oXptMtPV+5tA=";
};
vendorHash = "sha256-JSE4k/JgWvYCfTUuf2pj4XCcdJ9+j7fY9aAiCipapIk=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
gpgme
] ++ lib.optionals stdenv.hostPlatform.isLinux [
btrfs-progs
];
vendorHash = "sha256-uyoIlNhgL684f+3+I4CFc+iuMRdI5WAUr7dWr0Bt6bA=";
ldflags = [
"-s"
@@ -35,7 +49,7 @@ buildGoModule rec {
description = "Build and use highly customized and ultra-lightweight unikernel VMs";
homepage = "https://github.com/unikraft/kraftkit";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ dit7ya ];
maintainers = with lib.maintainers; [ dit7ya cloudripper ];
mainProgram = "kraft";
};
}
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "magic-vlsi";
version = "8.3.497";
version = "8.3.501";
src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
sha256 = "sha256-toLywrRtaoA8m2YCgwsKRGif4c5nLOt5eFRDp+ZX8/M=";
sha256 = "sha256-jUin8dwzfoVugSQAz6Qw7PBzHGwrG8I3k39AMRZgzcM=";
};
nativeBuildInputs = [ python3 ];
+2 -2
View File
@@ -168,11 +168,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "130.0.2849.46";
version = "131.0.2903.70";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-QschcHSDoYakjf4oYXIc40SyniCufNmjHJPuvRazdSw=";
hash = "sha256-LcinHmzr3o5ILjGdr8uuiOGWok0J9G/kTdASfYQh/tM=";
};
# With strictDeps on, some shebangs were not being patched correctly
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nkeys";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ui/vSa2TGe6Pe2aAzitBa1Pd2vKgTMuHoBhYYy2p6Rw=";
hash = "sha256-/nqYTJq8QPRR6ADAg1300I52agdoR7o84eumRjQY6xU=";
};
vendorHash = "sha256-SiSqmj6ktfiGsJOSu/pBY53e3vnN+RBfTkGwUuW52uo=";
vendorHash = "sha256-NHblFXIRK9moaZKBdfm61Ueo+GH/lGmVhrzYvMvYhjA=";
meta = with lib; {
description = "Public-key signature system for NATS";
+8 -5
View File
@@ -16,18 +16,21 @@ buildGoModule rec {
hash = "sha256-NNrMv4AS7ybuJfTgs+p61btSIxo+iMvzH7Y5ct46Dag=";
};
modRoot = "./cli";
tags = "extension";
sourceRoot = "${src.name}/cli";
ldflags = [
"-s"
"-w"
];
CGO_ENABLED = 0;
meta = with lib; {
meta = {
mainProgram = "nodeinfo";
description = "Command line tool to query nodeinfo based on a given domain";
homepage = "https://codeberg.org/thefederationinfo/nodeinfo-go";
changelog = "https://codeberg.org/thefederationinfo/nodeinfo-go/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ _6543 ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers._6543 ];
};
}
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "powerline-go";
version = "1.24";
version = "1.25";
src = fetchFromGitHub {
owner = "justjanne";
repo = pname;
rev = "v${version}";
hash = "sha256-3IeyxAc+FRcVsL9AiVr6Jku5f5y3MTT9SXwVQW9MkNo=";
hash = "sha256-DLw/6jnJo0IAh0/Y21mfCLP4GgTFlUGvuwyWJwhzYFU=";
};
vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw=";
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "praat";
version = "6.4.22";
version = "6.4.23";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${finalAttrs.version}";
hash = "sha256-bKWjazCCOIJm+VCAcnQGj3s0bbN4Ahx3RMNuLxZENXA=";
hash = "sha256-KZpWQxD+e/QJ8rg0mK4lsMPik+GrqqJf756tsVGev+s=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "qbec";
version = "0.15.2";
version = "0.16.2";
src = fetchFromGitHub {
owner = "splunk";
repo = "qbec";
rev = "v${version}";
sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4=";
sha256 = "sha256-BNVQu4SJl5JsJMEoyfq4ZIo8vGDKyNPdYrKJI/oLxeQ=";
};
vendorHash = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo=";
vendorHash = "sha256-TcIiSoKIS0PX8Jk6dBpc4BJAzR7YeSu9pay/grOQs5w=";
doCheck = false;
+7 -6
View File
@@ -1,18 +1,19 @@
{ lib
, stdenv
, fetchFromGitHub
, libsForQt5
{
lib,
stdenv,
fetchFromGitHub,
libsForQt5,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "qspeakers";
version = "1.6.9";
version = "1.6.10";
src = fetchFromGitHub {
owner = "be1";
repo = "qspeakers";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-V4rcDUJU27ijzsc6zhsEiQ/7SdvHmGR2402iIazrMfE=";
hash = "sha256-ab3+lw3F0CU8OLa7V4itPZsWKCV+6DoUvmFEqhAdklw=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "railway";
version = "3.17.10";
version = "3.18.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
hash = "sha256-WrNWtVlvEscyo/MOQEf+MikxHCKIqfKWfhPtV0DVhXM=";
hash = "sha256-KMmiVA6ubwX8n2MVBOTfsT+05ii89DToMSxpINuizEc=";
};
cargoHash = "sha256-C1lqK60asOW9Kl3cNgJvdDtZEtPUOE/SbBww0qL3fsU=";
cargoHash = "sha256-sDDNZAUt+4H1smA+8Pynu1EQtAdP2U6nHwC7AWo5gnk=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "sasutils";
version = "0.5.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "stanford-rc";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-DK0mEqlPf9UGtUxqbzB0l1xX0P4htYm2NYvV7zilhx0=";
sha256 = "sha256-rx4IxS5q1c3z617F4DBWxuxxSPHKFrw2bTW6b6/qkds=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ nickcao ];
mainProgram = "gpg-sq";
};
}
+5
View File
@@ -15,6 +15,11 @@ buildGoModule rec {
sha256 = "sha256-gMIpDiA5ncZ50WZ2Y57mScTEXzeObgZxP+nkWe+a8Eo=";
};
ldflags = [
"-X main.version=${version}"
"-X main.commit=nixpkgs-${src.rev}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
installShellCompletion --cmd shiori \
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "sing-box";
version = "1.10.1";
version = "1.10.3";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-WGlYaD4u9M1hfT+L6Adc5gClIYOkFsn4c9FAympmscQ=";
hash = "sha256-Xornyh9FT4ZqR0QjYMlgPhWEDFGb1DEPCngGpuix4A0=";
};
vendorHash = "sha256-lyZ2Up1SSaRGvai0gGtq43MSdHfXc2PuxflSbASYZ4A=";
vendorHash = "sha256-3YRtwYkyvtMtMUN1O6yb1JQnSXdsb8KnQ9WsnGtvGnk=";
tags = [
"with_quic"
+2 -2
View File
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "singular";
version = "4.3.2p16";
version = "4.4.0p6";
# since the tarball does not contain tests, we fetch from GitHub.
src = fetchFromGitHub {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# if a release is tagged (which sometimes does not happen), it will
# be in the format below.
rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
hash = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk=";
hash = "sha256-QxMMMnXaWe+0ogA6+3eOtdROb0RolSveya6DIx97/YY=";
# the repository's .gitattributes file contains the lines "/Tst/
# export-ignore" and "/doc/ export-ignore" so some directories are
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sq";
version = "0.48.3";
version = "0.48.4";
src = fetchFromGitHub {
owner = "neilotoole";
repo = pname;
rev = "v${version}";
hash = "sha256-22N8DEaLmGBA3Rx6VzxplUK9UAydo/gx4EsQzzaRHNE=";
hash = "sha256-hg9BKeKly4uK3ib6CGETY/uZHXpxHqorU+YOjaUEiHE=";
};
vendorHash = "sha256-p0r7TuWFpV81Rnxqdj+UJec60EmvVQISURe43SpOpw0=";
vendorHash = "sha256-ofgEQ8vVfP/s9wjSgQKbmSx9Aeq9kv4gkUXkSHC4OOE=";
proxyVendor = true;
+572 -663
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -3,13 +3,13 @@
rustPlatform.buildRustPackage rec {
pname = "svix-server";
version = "1.38.0";
version = "1.40.0";
src = fetchFromGitHub {
owner = "svix";
repo = "svix-webhooks";
rev = "v${version}";
hash = "sha256-gi6Jm0tf1lP10UYpouCleN32K71upYOudxjOoRgsGLg=";
hash = "sha256-3rUyfFtsDOqJYwTipor1YSCdP+9ORYWmzl5Tt3/Kung=";
};
sourceRoot = "${src.name}/server";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"hyper-0.14.28" = "sha256-4HGGpM9Ce3l3EJnu5XsGfqhrD9EykpR+ihEJlSZc03Q=";
"omniqueue-0.2.1" = "sha256-ql3KJRs0SfLdo75vF2HlZT2zRDamDrORsWmK+Oj7m1Q=";
"omniqueue-0.2.1" = "sha256-ab0/WO45m1A56EUY8nLUuxKI9NZqjDar9Y0ua77UCi8=";
};
};
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.38.1";
version = "0.39.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk=";
sha256 = "sha256-yEtHPA1MG+Cud9KhTrsvhQp1Q+Mu073AoNwOvZH8xBU=";
};
vendorHash = null;
+3 -3
View File
@@ -24,13 +24,13 @@
}:
stdenv.mkDerivation {
pname = "wlvncc";
version = "unstable-2023-01-05";
version = "unstable-2024-11-23";
src = fetchFromGitHub {
owner = "any1";
repo = "wlvncc";
rev = "2b9a886edd38204ef36e9f9f65dd32aaa3784530";
hash = "sha256-0HbZEtDaLjr966RS+2GHc7N4nsivPIv57T/+AJliwUI=";
rev = "0489e29fba374a08be8ba4a64d492a3c74018f41";
hash = "sha256-jFP4O6zo1fYULOVX9+nuTNAy4NuBKsDKOy+WUQRUjdI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "yara-x";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-x";
rev = "refs/tags/v${version}";
hash = "sha256-HZA4olgHYTlPnTZNGxQNQlGX//XgqslHOMOil5G76xs=";
hash = "sha256-14YHaaZpqB8448MGdKsYqxZ4N/+p92khQWRov3cO/eU=";
};
cargoHash = "sha256-l66vRrFxwxVThBy98RWIpUi6SJkPH6VZLd5fkq5AStU=";
cargoHash = "sha256-gcRLnPlNVzA5nxdviWz8dDzblFujytYPrt7eyFgm5Lc=";
nativeBuildInputs = [ cmake installShellFiles ];
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-tfAGPBc36o5/XtVZ8IW6SFr+iWOkFzVTfe9jI4PpuA0=";
hash = "sha256-u7O+EAhq1h96yWwQVY74vNKKaB+2r5nqhuD9Pktgqu0=";
};
cargoHash = "sha256-zvQJpAjZNfa54se2xaRPWCWoCWsWw1btaHYrWlyUIZY=";
cargoHash = "sha256-FLMGDD/o+gSPqX2dlHQP7zDx89B/MpjdWVpke9EPsBI=";
nativeBuildInputs = [
rustPlatform.bindgenHook
@@ -2,7 +2,7 @@
, jsonm, ocamlgraph, re, sha, swhid_core, uutf
}:
buildDunePackage rec {
buildDunePackage {
pname = "opam-core";
inherit (opam) src version;
@@ -1,6 +1,6 @@
{ lib, buildDunePackage, opam-core, opam-file-format }:
buildDunePackage rec {
buildDunePackage {
pname = "opam-format";
inherit (opam-core) src version;
@@ -1,6 +1,6 @@
{ lib, buildDunePackage, opam-format, curl }:
buildDunePackage rec {
buildDunePackage {
pname = "opam-repository";
inherit (opam-format) src version;
@@ -1,6 +1,6 @@
{ lib, buildDunePackage, opam, opam-repository, spdx_licenses }:
buildDunePackage rec {
buildDunePackage {
pname = "opam-state";
inherit (opam) src version;
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "airtouch5py";
version = "0.2.10";
version = "0.2.11";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "danzel";
repo = "airtouch5py";
rev = "refs/tags/${version}";
hash = "sha256-8QMyp/Y60V64k1V8Hze5FsgpfHr8ZT1Xj/kQDP7CtjI=";
hash = "sha256-qJSqgdT1G26JOEjmsQv07IdWvApFvtHIdRGi9TFaKZ8=";
};
build-system = [ poetry-core ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.5.18";
version = "1.5.27";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bridgecrewio";
repo = "detect-secrets";
rev = "refs/tags/${version}";
hash = "sha256-5PGEpdCMS9AerX9GZDFen7nhwPY393g1zo9Th9lUOE0=";
hash = "sha256-nfqJTiQpyX3qsmhGXgE91895P+eGBZApDL7EKT/36hQ=";
};
build-system = [ setuptools ];
@@ -57,7 +57,7 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.56.0";
version = "3.57.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc";
rev = "refs/tags/${version}";
hash = "sha256-9TV+YQ9UFgqr3IoM0indUYa48O+mhfNxzAI56UtB3+Y=";
hash = "sha256-2d/soNyOkeNdv4aXrvtfDFCdedT74kkWUlrp0k5skEM=";
};
pythonRelaxDeps = [
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "iteration-utilities";
version = "0.12.1";
version = "0.13.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "MSeifert04";
repo = "iteration_utilities";
rev = "refs/tags/v${version}";
hash = "sha256-BiBbmZHo5B/u//LItqEcKtGXOA6xK+T1zoitR9XIiSU=";
hash = "sha256-SiqNUyuvsD5m5qz5ByYyVln3SSa4/D4EHpmM+pf8ngM=";
};
nativeCheckInputs = [ pytestCheckHook ];
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241124";
version = "1.0.2.20241127";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fgJwTEVA54932I+GfnTuejApGjyupbORJ3xoPm7nwOY=";
hash = "sha256-RoBtvaWAu9VRNSzbYkFZFEPvbUUu0tc/Z16bxm+ELas=";
};
build-system = [ setuptools ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.53.2";
version = "0.54.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-V0oTx2uRz58t5IN2atXVlyLvMg1zavzSbd+2NNEQ6V0=";
hash = "sha256-bKAVSg1WvovLiNHz5bejePEd4+foMuG1VItWKzlQc60=";
};
build-system = [ setuptools ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyvista";
version = "0.44.1";
version = "0.44.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "pyvista";
repo = "pyvista";
rev = "refs/tags/v${version}";
hash = "sha256-P4kmsaeZqwEUdLJmfTRHkh8zdlOGLw+YLp9fa05xLXU=";
hash = "sha256-ZQfI0lmh/cwE224yk6a2G3gLUCsBjCQqPI1y4zYj0FI=";
};
build-system = [ setuptools ];
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.9.12";
version = "0.9.13";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
hash = "sha256-juRzba5TGsjLd+A2AZ3ULRhUXtE0JXhiiYivBjPH7Co=";
hash = "sha256-M8lHODHdWXLvrDbQMeEgGaQMYCXicHTQta+XjJxSQlM=";
};
pythonRelaxDeps = [ "requests-oauthlib" ];
@@ -24,15 +24,15 @@
buildPythonPackage rec {
pname = "samsungtvws";
version = "2.6.0";
version = "2.7.0";
format = "setuptools";
disabled = isPy27;
src = fetchFromGitHub {
owner = "xchwarze";
repo = "samsung-tv-ws-api";
rev = "v${version}";
hash = "sha256-mkjfimzu7paz+ZskartL052AfUBtL1xU0eOlrHgD1UE=";
rev = "refs/tags/v${version}";
hash = "sha256-HwpshNwWZQ5dIS7IaJJ5VaE1bERcX79B/Mu4ISkyDJo=";
};
propagatedBuildInputs = [
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "stookwijzer";
version = "1.5.0";
version = "1.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "fwestenberg";
repo = "stookwijzer";
rev = "refs/tags/v${version}";
hash = "sha256-QZyuzOAz/VAThgZdhOGeOLvC+2wtp1mgCXzIekBm/Xs=";
hash = "sha256-zAlHB4ZAgbUBDBQbnoSXwB+iOKeWKtkwBbA4AAyNv00=";
};
build-system = [ setuptools ];
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "weheat";
version = "2024.09.23";
version = "2024.11.26";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "wefabricate";
repo = "wh-python";
rev = "refs/tags/${version}";
hash = "sha256-egxc4gJaFIjbdvDVmenN61Rsg1NmlJSqxdG/7con9mU=";
hash = "sha256-KM1LcO+hmhG+9yyrL2QpeO+SKumR+SKyc+66NJMJijk=";
};
pythonRelaxDeps = [
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.296";
version = "3.2.316";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-lHfAbgi5Ut3vwkEqIEXrvBFhEn1exIEB1PZmbVnqKbU=";
hash = "sha256-dPjeKMDRPuT0zh7VXeTvw42YRElorJPEQHjrEllKgfA=";
};
patches = [ ./flake8-compat-5.x.patch ];
@@ -119,6 +119,7 @@ python3.pkgs.buildPythonApplication rec {
"console"
# Assertion error
"test_runner"
"test_same_resources_in_report_and_coordinator"
# AssertionError: assert ['<?xml versi...
"test_get_cyclonedx_report"
# Test fails on Hydra
@@ -6,11 +6,11 @@ assert lib.versionAtLeast ocaml.version "4.08.0";
stdenv.mkDerivation {
pname = "opam";
version = "2.2.0";
version = "2.3.0";
src = fetchurl {
url = "https://github.com/ocaml/opam/releases/download/2.2.0/opam-full-2.2.0-2.tar.gz";
sha256 = "459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97";
url = "https://github.com/ocaml/opam/releases/download/2.3.0/opam-full-2.3.0.tar.gz";
hash = "sha256-UGunaGXcMVtn35qonnq9XBqJen8KkteyaUl0/cUys0Y=";
};
strictDeps = true;
@@ -1,12 +1,9 @@
{ unzip, opam, ocamlPackages }:
{ opam, ocamlPackages }:
ocamlPackages.buildDunePackage {
pname = "opam-installer";
duneVersion = "3";
inherit (opam) version src;
nativeBuildInputs = [ unzip ];
configureFlags = [ "--disable-checks" "--prefix=$out" ];
buildInputs = with ocamlPackages; [ opam-format cmdliner ];
+16 -2
View File
@@ -1,4 +1,4 @@
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre2, libxml2, libxslt
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib-ng, pcre2, libxml2, libxslt
, nginx-doc
, nixosTests
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
removeReferencesTo
] ++ nativeBuildInputs;
buildInputs = [ openssl zlib pcre2 libxml2 libxslt perl ]
buildInputs = [ openssl zlib-ng pcre2 libxml2 libxslt perl ]
++ buildInputs
++ mapModules "inputs"
++ lib.optional withGeoIP geoip
@@ -126,6 +126,13 @@ stdenv.mkDerivation {
env.NIX_CFLAGS_COMPILE = toString ([
"-I${libxml2.dev}/include/libxml2"
"-Wno-error=implicit-fallthrough"
(
# zlig-ng patch needs this
if stdenv.cc.isGNU then
"-Wno-error=discarded-qualifiers"
else
"-Wno-error=incompatible-pointer-types-discards-qualifiers"
)
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
# fix build vts module on gcc11
"-Wno-error=stringop-overread"
@@ -155,6 +162,13 @@ stdenv.mkDerivation {
'';
})
./nix-skip-check-logs-path.patch
] ++ lib.optionals (pname != "openresty") [
# https://github.com/NixOS/nixpkgs/issues/357522
# https://github.com/zlib-ng/patches/blob/5a036c0a00120c75ee573b27f4f44ade80d82ff2/nginx/README.md
(fetchpatch {
url = "https://raw.githubusercontent.com/zlib-ng/patches/38756e6325a5d2cc32709b8e9549984c63a78815/nginx/1.26.2-zlib-ng.patch";
hash = "sha256-LX5kP6jFiqgt4ApKw5eqOAFJNkc5QI6kX8ZRvBYTi9k=";
})
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
(fetchpatch {
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch";
+2 -2
View File
@@ -17,8 +17,8 @@ in bootStages ++ [
(vanillaPackages: {
inherit config overlays;
stdenv =
assert vanillaPackages.hostPlatform == localSystem;
assert vanillaPackages.targetPlatform == localSystem;
assert vanillaPackages.stdenv.hostPlatform == localSystem;
assert vanillaPackages.stdenv.targetPlatform == localSystem;
config.replaceStdenv { pkgs = vanillaPackages; };
})
+1
View File
@@ -62,6 +62,7 @@ mapAliases {
### _ ###
_1password = lib.warn "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
"7z2hashcat" = throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
### A ###
+1 -5
View File
@@ -1606,7 +1606,6 @@ with pkgs;
android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });
angie = callPackage ../servers/http/angie {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@@ -1614,7 +1613,6 @@ with pkgs;
};
angieQuic = callPackage ../servers/http/angie {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
withQuic = true;
# We don't use `with` statement here on purpose!
@@ -11771,7 +11769,6 @@ with pkgs;
nginx = nginxStable;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@@ -11781,7 +11778,6 @@ with pkgs;
};
nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334
@@ -11789,7 +11785,6 @@ with pkgs;
};
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withKTLS = true;
withPerl = false;
# We don't use `with` statement here on purpose!
@@ -11818,6 +11813,7 @@ with pkgs;
openafs = callPackage ../servers/openafs/1.8 { };
openresty = callPackage ../servers/http/openresty {
zlib-ng = zlib;
withPerl = false;
modules = [];
};