Merge remote-tracking branch 'origin/staging-next' into staging

This commit is contained in:
K900 2025-03-20 13:14:18 +03:00
commit 85b2817da5
97 changed files with 1761 additions and 1369 deletions

View file

@ -227,6 +227,8 @@
- `pkgs.nextcloud28` has been removed since it's out of support upstream.
- `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`.
- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default.
Environment variables have to be passed via the `env` attribute.

View file

@ -58,7 +58,7 @@ let
<fontconfig>
<!-- Font directories -->
${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)}
${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
${lib.optionalString (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages) ''
<!-- Pre-generated font caches -->
<cachedir>${cache}</cachedir>
${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) ''

View file

@ -15,12 +15,13 @@ in
package = lib.mkPackageOption pkgs "cloudflare-dyndns" { };
apiTokenFile = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
type = lib.types.pathWith {
absolute = true;
inStore = false;
};
description = ''
The path to a file containing the CloudFlare API token.
The file must have the form `CLOUDFLARE_API_TOKEN=...`
'';
};
@ -91,19 +92,35 @@ in
Type = "simple";
DynamicUser = true;
StateDirectory = "cloudflare-dyndns";
EnvironmentFile = cfg.apiTokenFile;
Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ];
ExecStart =
let
args =
[ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
++ lib.optional cfg.deleteMissing "--delete-missing"
++ lib.optional cfg.proxied "--proxied";
in
"${lib.getExe cfg.package} ${toString args}";
LoadCredential = [
"apiToken:${cfg.apiTokenFile}"
];
};
script =
let
args =
[ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
++ lib.optional cfg.deleteMissing "--delete-missing"
++ lib.optional cfg.proxied "--proxied";
in
''
export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken")
# Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an
# `EnvironmentFile` to the service, which required it to be of
# the form "CLOUDFLARE_API_TOKEN=" rather than just the secret.
# If we detect this legacy usage, error out.
if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then
echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2
exit 1
fi
exec ${lib.getExe cfg.package} ${toString args}
'';
}
// lib.optionalAttrs (cfg.frequency != null) {
startAt = cfg.frequency;

View file

@ -460,10 +460,13 @@ mkDerivation (finalAttrs: {
NATIVE_FULL_AOT = "1";
LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
}
// lib.optionalAttrs (variant == "macport") {
# Fixes intermittent segfaults when compiled with LLVM >= 7.0.
# See https://github.com/NixOS/nixpkgs/issues/127902
NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";
// {
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
# Fixes intermittent segfaults when compiled with LLVM >= 7.0.
# See https://github.com/NixOS/nixpkgs/issues/127902
(lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}")
(lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT")
];
};
enableParallelBuilding = true;

View file

@ -1,177 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, wrapQtAppsHook
, alsa-lib
, bluez
, bzip2
, cubeb
, curl
, enet
, ffmpeg
, fmt_10
, gtest
, hidapi
, libevdev
, libGL
, libiconv
, libpulseaudio
, libspng
, libusb1
, libXdmcp
, libXext
, libXrandr
, lz4
, lzo
, mbedtls_2
, miniupnpc
, minizip-ng
, openal
, pugixml
, qtbase
, qtsvg
, SDL2
, sfml
, udev
, vulkan-loader
, xxHash
, xz
# Used in passthru
, testers
# Darwin-only dependencies
, CoreBluetooth
, ForceFeedback
, IOBluetooth
, IOKit
, moltenvk
, OpenGL
, VideoToolbox
, xcbuild
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dolphin-emu";
version = "2503";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
tag = finalAttrs.version;
hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs=";
fetchSubmodules = true;
};
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild # for plutil
];
buildInputs = [
bzip2
cubeb
curl
enet
ffmpeg
fmt_10
gtest
hidapi
libiconv
libpulseaudio
libspng
libusb1
libXdmcp
lz4
lzo
mbedtls_2
miniupnpc
minizip-ng
openal
pugixml
qtbase
qtsvg
SDL2
sfml
xxHash
xz
# Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
#zlib-ng
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
bluez
libevdev
libGL
libXext
libXrandr
# FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
#mgba # Derivation doesn't support Darwin
udev
vulkan-loader
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreBluetooth
ForceFeedback
IOBluetooth
IOKit
moltenvk
OpenGL
VideoToolbox
];
cmakeFlags = [
"-DDISTRIBUTOR=NixOS"
"-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}"
"-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}"
"-DDOLPHIN_WC_BRANCH=master"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DOSX_USE_DEFAULT_SEARCH_PATH=True"
"-DUSE_BUNDLED_MOLTENVK=OFF"
"-DMACOS_CODE_SIGNING=OFF"
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
"-DSKIP_POSTPROCESS_BUNDLE=ON"
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
# Note: The updater isn't available on linux, so we don't need to disable it there.
"-DENABLE_AUTOUPDATE=OFF"
];
qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
# https://bugs.dolphin-emu.org/issues/11807
# The .desktop file should already set this, but Dolphin may be launched in other ways
"--set QT_QPA_PLATFORM xcb"
];
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
# Only gets installed automatically if the standalone executable is used
mkdir -p $out/Applications
cp -r ./Binaries/Dolphin.app $out/Applications
ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin
'';
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "dolphin-emu-nogui --version";
inherit (finalAttrs) version;
};
};
meta = with lib; {
homepage = "https://dolphin-emu.org";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
branch = "master";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ pbsds ];
};
})

View file

@ -16,13 +16,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ausweisapp";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = finalAttrs.version;
hash = "sha256-/X+S91EA7jrjSYb/jafmRhbbZJUQyg1DoTkzd4ZRjWY=";
hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8=";
};
nativeBuildInputs = [

View file

@ -2,7 +2,7 @@
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
zettlr = {
version = "3.2.0";
hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8=";
version = "3.4.3";
hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c=";
};
}

View file

@ -1,2 +1,3 @@
source 'https://rubygems.org'
gem 'terraform_landscape'
gem 'abbrev'

View file

@ -1,25 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
abbrev (0.1.2)
colorize (0.8.1)
commander (4.4.6)
highline (~> 1.7.2)
diffy (3.2.1)
highline (1.7.10)
commander (4.6.0)
highline (~> 2.0.0)
diffy (3.4.3)
highline (2.0.3)
polyglot (0.3.5)
terraform_landscape (0.2.1)
terraform_landscape (0.3.4)
colorize (~> 0.7)
commander (~> 4.4)
diffy (~> 3.0)
treetop (~> 1.6)
treetop (1.6.10)
treetop (1.6.14)
polyglot (~> 0.3)
PLATFORMS
ruby
DEPENDENCIES
abbrev
terraform_landscape
BUNDLED WITH
2.1.4
2.6.2

View file

@ -1,5 +1,7 @@
{
colorize = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@ -9,30 +11,38 @@
};
commander = {
dependencies = [ "highline" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf";
sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
type = "gem";
};
version = "4.4.6";
version = "4.6.0";
};
diffy = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
type = "gem";
};
version = "3.2.1";
version = "3.4.3";
};
highline = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
version = "1.7.10";
version = "2.0.3";
};
polyglot = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@ -47,20 +57,24 @@
"diffy"
"treetop"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns";
sha256 = "1lcsqasn8k2i6kxy9sv76mvf8s60qkdg3a3sb5shj6lvh2dk8n8s";
type = "gem";
};
version = "0.2.1";
version = "0.3.4";
};
treetop = {
dependencies = [ "polyglot" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds";
type = "gem";
};
version = "1.6.10";
version = "1.6.14";
};
}

View file

@ -11,14 +11,14 @@
}:
buildGoModule rec {
pname = "alist";
version = "3.42.0";
webVersion = "3.42.0";
version = "3.43.0";
webVersion = "3.43.0";
src = fetchFromGitHub {
owner = "AlistGo";
repo = "alist";
tag = "v${version}";
hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs=";
hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -32,11 +32,11 @@ buildGoModule rec {
};
web = fetchzip {
url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU=";
hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME=";
};
proxyVendor = true;
vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY=";
vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg=";
buildInputs = [ fuse ];

View file

@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
src/comp/wrapper.sh
substituteInPlace src/comp/Makefile \
--replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
--replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'
# For darwin
# ld: library not found for -ltcl8.5
@ -172,12 +172,10 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/B-Lang-org/bsc";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux"
"x86_64-linux"
"aarch64-darwin"
];
] ++ lib.platforms.darwin;
mainProgram = "bsc";
# darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
# aarch64 fails, as GHC fails with "ghc: could not execute: opt"
maintainers = with lib.maintainers; [
jcumming
thoughtpolice

View file

@ -11,18 +11,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "codefresh";
version = "0.87.3";
version = "0.88.5";
src = fetchFromGitHub {
owner = "codefresh-io";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM=";
hash = "sha256-u0K3I65JDu6v4mE0EU6Rv6uJOmC6VuZbIVyreHPH9QE=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY=";
hash = "sha256-cMCJ/ANpHsEuO0SNtvf7zlS0HXp328oBP5aXnHSbpDI=";
};
nativeBuildInputs = [
yarnConfigHook

View file

@ -22,15 +22,15 @@ let
'';
};
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dash-mpd-cli";
version = "0.2.24";
version = "0.2.25";
src = fetchFromGitHub {
owner = "emarsden";
repo = "dash-mpd-cli";
tag = "v${version}";
hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE=";
tag = "v${finalAttrs.version}";
hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4=";
};
patches = [
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
];
useFetchCargoVendor = true;
cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY=";
cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0=";
nativeBuildInputs = [
makeWrapper
@ -52,8 +52,8 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/dash-mpd-cli \
--prefix PATH : ${
lib.makeBinPath [
ffmpeg.bin
libxslt.bin
(lib.getBin ffmpeg)
(lib.getBin libxslt)
shaka-packager-wrapped
]
}
@ -73,4 +73,4 @@ rustPlatform.buildRustPackage rec {
maintainers = with lib.maintainers; [ al3xtjames ];
mainProgram = "dash-mpd-cli";
};
}
})

View file

@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE=";
})
]
++ lib.optionals (lib.versionOlder version "2.110.0") [
++ [
(fetchpatch {
url = "https://github.com/dlang/dmd/commit/fdd25893e0ac04893d6eba8652903d499b7b0dfc.patch";
stripLen = 1;

View file

@ -1,5 +1,5 @@
import ./generic.nix {
version = "2.109.1";
dmdHash = "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU=";
phobosHash = "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y=";
version = "2.110.0";
dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y=";
phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk=";
}

View file

@ -2,123 +2,125 @@
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
pkg-config,
cmake,
wrapQtAppsHook,
qtbase,
qtsvg,
bluez,
qt6,
# buildInputs
curl,
enet,
ffmpeg,
libao,
libGLU,
libGL,
pcre,
fmt,
gettext,
libXrandr,
libusb1,
libpthreadstubs,
libXext,
libXxf86vm,
libXinerama,
libGL,
libGLU,
libSM,
libXdmcp,
readline,
openal,
udev,
libevdev,
portaudio,
curl,
alsa-lib,
miniupnpc,
enet,
mbedtls_2,
soundtouch,
sfml,
fmt,
xz,
vulkan-loader,
libXext,
libXinerama,
libXrandr,
libXxf86vm,
libao,
libpthreadstubs,
libpulseaudio,
# - Inputs used for Darwin
CoreBluetooth,
ForceFeedback,
IOKit,
OpenGL,
libpng,
libusb1,
mbedtls_2,
miniupnpc,
openal,
pcre,
portaudio,
readline,
sfml,
soundtouch,
xz,
# linux-only
alsa-lib,
bluez,
libevdev,
udev,
vulkan-loader,
# darwin-only
hidapi,
libpng,
# passthru
testers,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dolphin-emu-primehack";
version = "1.0.7a";
src = fetchFromGitHub {
owner = "shiiion";
repo = "dolphin";
rev = version;
hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
};
nativeBuildInputs = [
pkg-config
cmake
] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook;
nativeBuildInputs =
[
pkg-config
cmake
]
++ lib.optionals stdenv.hostPlatform.isLinux [
qt6.wrapQtAppsHook
];
buildInputs =
[
curl
enet
ffmpeg
libao
libGLU
libGL
pcre
fmt
gettext
libGL
libGLU
libSM
libXdmcp
libXext
libXinerama
libXrandr
libXxf86vm
libao
libpthreadstubs
libpulseaudio
libXrandr
libXext
libXxf86vm
libXinerama
libSM
readline
openal
libXdmcp
portaudio
libusb1
libpng
hidapi
miniupnpc
enet
mbedtls_2
soundtouch
miniupnpc
openal
pcre
portaudio
qt6.qtbase
qt6.qtsvg
readline
sfml
fmt
soundtouch
xz
qtbase
qtsvg
]
++ lib.optionals stdenv.hostPlatform.isLinux [
bluez
udev
libevdev
alsa-lib
bluez
libevdev
udev
vulkan-loader
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreBluetooth
OpenGL
ForceFeedback
IOKit
++ lib.optionals stdenv.hostPlatform.isLinux [
hidapi
libpng
];
cmakeFlags =
[
"-DUSE_SHARED_ENET=ON"
"-DENABLE_LTO=ON"
(lib.cmakeBool "USE_SHARED_ENET" true)
(lib.cmakeBool "ENABLE_LTO" true)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DOSX_USE_DEFAULT_SEARCH_PATH=True"
(lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
];
qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
@ -131,11 +133,13 @@ stdenv.mkDerivation rec {
# - Allow Dolphin to use nix-provided libraries instead of building them
postPatch =
''
substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
substituteInPlace CMakeLists.txt \
--replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)'
substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
substituteInPlace CMakeLists.txt \
--replace-fail 'if(NOT APPLE)' 'if(true)' \
--replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
'';
postInstall =
@ -144,19 +148,31 @@ stdenv.mkDerivation rec {
mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui
mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop
mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png
substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack'
substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack'
substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \
--replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \
--replace-fail 'Dolphin Emulator' 'PrimeHack'
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
'';
meta = with lib; {
passthru = {
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "dolphin-emu-primehack-nogui --version";
version = "v${finalAttrs.version}";
};
};
updateScript = nix-update-script { };
};
meta = {
homepage = "https://github.com/shiiion/dolphin";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ Madouura ];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ Madouura ];
broken = stdenv.hostPlatform.isDarwin;
platforms = platforms.unix;
platforms = lib.platforms.unix;
};
}
})

View file

@ -0,0 +1,185 @@
{
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
cmake,
pkg-config,
qt6,
# darwin-only
xcbuild,
# buildInputs
bzip2,
cubeb,
curl,
enet,
ffmpeg,
fmt_10,
gtest,
hidapi,
libXdmcp,
libpulseaudio,
libspng,
libusb1,
lz4,
lzo,
mbedtls_2,
miniupnpc,
minizip-ng,
openal,
pugixml,
SDL2,
sfml,
xxHash,
xz,
# linux-only
alsa-lib,
bluez,
libGL,
libXext,
libXrandr,
libevdev,
udev,
vulkan-loader,
# darwin-only
moltenvk,
# passthru
testers,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dolphin-emu";
version = "2503";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs=";
};
strictDeps = true;
nativeBuildInputs =
[
cmake
pkg-config
qt6.wrapQtAppsHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild # for plutil
];
buildInputs =
[
bzip2
cubeb
curl
enet
ffmpeg
fmt_10
gtest
hidapi
libXdmcp
libpulseaudio
libspng
libusb1
lz4
lzo
mbedtls_2
miniupnpc
minizip-ng
openal
pugixml
qt6.qtbase
qt6.qtsvg
SDL2
sfml
xxHash
xz
# Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
#zlib-ng
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
bluez
libGL
libXext
libXrandr
libevdev
# FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
#mgba # Derivation doesn't support Darwin
udev
vulkan-loader
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
moltenvk
];
cmakeFlags =
[
(lib.cmakeFeature "DISTRIBUTOR" "NixOS")
(lib.cmakeFeature "DOLPHIN_WC_REVISION" finalAttrs.src.rev)
(lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version)
(lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master")
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
(lib.cmakeBool "USE_BUNDLED_MOLTENVK" false)
(lib.cmakeBool "MACOS_CODE_SIGNING" false)
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
(lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true)
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
# Note: The updater isn't available on linux, so we don't need to disable it there.
(lib.cmakeBool "ENABLE_AUTOUPDATE" false)
];
qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
# https://bugs.dolphin-emu.org/issues/11807
# The .desktop file should already set this, but Dolphin may be launched in other ways
"--set QT_QPA_PLATFORM xcb"
];
postInstall =
lib.optionalString stdenv.hostPlatform.isLinux ''
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# Only gets installed automatically if the standalone executable is used
mkdir -p $out/Applications
cp -r ./Binaries/Dolphin.app $out/Applications
ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin
'';
passthru = {
tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "dolphin-emu-nogui --version";
inherit (finalAttrs) version;
};
};
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"([0-9]+)"
];
};
};
meta = {
homepage = "https://dolphin-emu.org";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
branch = "master";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ pbsds ];
};
})

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dosage";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "diegopvlk";
repo = "Dosage";
tag = "v${finalAttrs.version}";
hash = "sha256-euGyTaufL8Ifsy1RT4jcqlz8XZfCN7GfvFFvo85f/3c=";
hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c=";
};
# https://github.com/NixOS/nixpkgs/issues/318830

View file

@ -8,10 +8,10 @@
}:
let
version = "2.5.0";
srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI=";
vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk=";
manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo=";
version = "2.5.1";
srcHash = "sha256-BuFylOWR30aK7d1eN+9getR5amtAtkkhHNAPfdfASHs=";
vendorHash = "sha256-2fThvz/5A1/EyS6VTUQQa5Unx1BzYfsVRE18xOHtLHE=";
manifestsHash = "sha256-bIIK8igtx0gUcn3hlBohE0MG9PMhyThz4a71pkonBpE=";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "follow";
version = "0.2.0-beta.2";
version = "0.3.7";
src = fetchFromGitHub {
owner = "RSSNext";
repo = "Follow";
rev = "v${version}";
hash = "sha256-7KSPZj9QG6zksji/eY8jczBDHr/9tStlw26LKVqXTAw=";
hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio=";
};
nativeBuildInputs = [
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU=";
hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
};
env = {
@ -38,11 +38,10 @@ stdenv.mkDerivation rec {
# This environment variables inject the production Vite config at build time.
# Copy from:
# 1. https://github.com/RSSNext/Follow/blob/v0.2.0-beta.2/.github/workflows/build.yml#L18
# 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18
# 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml
VITE_WEB_URL = "https://app.follow.is";
VITE_API_URL = "https://api.follow.is";
VITE_IMGPROXY_URL = "https://thumbor.follow.is";
VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008";
VITE_OPENPANEL_CLIENT_ID = "0e477ab4-d92d-4d6e-b889-b09d86ab908e";
VITE_OPENPANEL_API_URL = "https://openpanel.follow.is/api";
@ -57,6 +56,8 @@ stdenv.mkDerivation rec {
};
};
dontCheckForBrokenSymlinks = true;
desktopItem = makeDesktopItem {
name = "follow";
desktopName = "Follow";

View file

@ -8,13 +8,13 @@
}:
let
version = "1.6.10";
version = "1.6.11";
src = fetchFromGitHub {
owner = "GopeedLab";
repo = "gopeed";
tag = "v${version}";
hash = "sha256-sTKPSgy1jDavEd/IM8F6dxojp8oOQTo3/w/YV21JR/Q=";
hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60=";
};
metaCommon = {
@ -45,14 +45,17 @@ let
};
in
flutter324.buildFlutterApplication {
inherit version src libgopeed;
inherit version src;
pname = "gopeed";
sourceRoot = "${src.name}/ui/flutter";
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes.permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
gitHashes = {
install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=";
permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
};
nativeBuildInputs = [ autoPatchelfHook ];
@ -61,7 +64,7 @@ flutter324.buildFlutterApplication {
preBuild = ''
mkdir -p linux/bundle/lib
cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so
cp ${libgopeed}/bin/host assets/host/host
cp ${libgopeed}/bin/host assets/exec/host
'';
postInstall = ''
@ -75,7 +78,10 @@ flutter324.buildFlutterApplication {
--add-rpath $out/app/gopeed/lib $out/app/gopeed/gopeed
'';
passthru.updateScript = ./update.sh;
passthru = {
inherit libgopeed;
updateScript = ./update.sh;
};
meta = metaCommon // {
mainProgram = "gopeed";

View file

@ -337,7 +337,7 @@
"version": "0.3.4+2"
},
"crypto": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
@ -680,6 +680,17 @@
"source": "hosted",
"version": "4.3.0"
},
"install_plugin": {
"dependency": "direct main",
"description": {
"path": ".",
"ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa",
"resolved-ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa",
"url": "https://github.com/hui-z/flutter_install_plugin.git"
},
"source": "git",
"version": "2.1.0"
},
"intl": {
"dependency": "transitive",
"description": {

View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE
, libXext , freetype, libXrender, fontconfig, libXft, libXinerama
, libXext , freetype, libXrender, fontconfig, libXft, libXinerama, libXcursor, cairo
, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3
, curl, writeShellScript, common-updater-scripts, xmlstarlet }:
let
url = "https://app.hubstaff.com/download/8792-standard-linux-1-6-29-release/sh";
version = "1.6.29-7f771670";
sha256 = "sha256:09vdpsmaj26bmnbsyxp76g3677lzi8p86gz66qbdvxly6a4x1hq9";
url = "https://app.hubstaff.com/download/9353-standard-linux-1-6-31-release/sh";
version = "1.6.31-a6da06ad";
sha256 = "sha256:07x8di08ln15mv3x7vp01wgs8zcd1rrzvmzygrl9anhx9zhgsr3b";
rpath = lib.makeLibraryPath
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3
curl libXfixes libXScrnSaver ];
curl libXfixes libXScrnSaver libXcursor cairo ];
in

View file

@ -6,10 +6,10 @@
}:
let
pname = "hydralauncher";
version = "3.2.3";
version = "3.3.0";
src = fetchurl {
url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig=";
hash = "sha256-5F/RcsRKMAMfXaPOmEkqTrJ4Zgp0+sQ36kPj0p5VUa0=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

View file

@ -21,11 +21,11 @@ in
stdenv.mkDerivation rec {
pname = "iozone";
version = "3.506";
version = "3.507";
src = fetchurl {
url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings [ "." ] [ "_" ] version}.tar";
hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c=";
hash = "sha256-HoCHraBW9dgBjuC8dmhtQW/CJR7QMDgFXb0K940eXOM=";
};
license = fetchurl {
@ -38,7 +38,10 @@ stdenv.mkDerivation rec {
buildFlags = target;
enableParallelBuilding = true;
# The makefile doesn't define a rule for e.g. libbif.o
# Make will try to evaluate implicit built-in rules for these outputs if building in parallel
# Build in serial so that the main rule builds everything before the implicit ones are attempted
enableParallelBuilding = false;
installPhase = ''
mkdir -p $out/{bin,share/doc,libexec,share/man/man1}

View file

@ -13,7 +13,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "irpf";
version = "2024-1.6";
version = "2025-1.0";
# https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
# Para outros sistemas operacionais -> Multi
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
in
fetchzip {
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0=";
hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY=";
};
passthru.updateScript = writeScript "update-irpf" ''

View file

@ -6,7 +6,7 @@
, git
, postgresql
, postgresqlTestHook
, redis
, valkey
, redisTestHook
}:
@ -85,7 +85,7 @@ py.pkgs.buildPythonPackage rec {
nativeCheckInputs = [
git
redis
valkey
redisTestHook
postgresql
postgresqlTestHook

View file

@ -56,21 +56,21 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.40.0";
version = "0.40.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
tag = "v${version}";
hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM=";
hash = "sha256-ta9MTbSkIkowkd5zBUbtauFNGVRDgxof1SSQXuEgFTQ=";
};
goModules =
(buildGo123Module {
pname = "kitty-go-modules";
inherit src version;
vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs=";
vendorHash = "sha256-wr5R2X+lV8vVVWsDYLLSaz7HRNOB7Zzk/a7knsdDlXs=";
}).goModules;
buildInputs =
@ -159,18 +159,6 @@ buildPythonApplication rec {
# Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
# OSError: master_fd is in error condition
./disable-test_ssh_bootstrap_with_different_launchers.patch
# Remove after 0.40.1
(fetchpatch {
url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch";
hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k=";
})
(fetchpatch {
url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch";
hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw=";
})
];
hardeningDisable = [

View file

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "lintspec";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "beeb";
repo = "lintspec";
tag = "v${version}";
hash = "sha256-QLD2eGuMiNh4qlzGPJOS2VbwpNCQ8+l3qKj2hDNe1oA=";
hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EECQpihj+N8TmbSLtheyRo/ZtuTvyLT32D0mVPRR2FI=";
cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc=";
meta = {
description = "Blazingly fast linter for NatSpec comments in Solidity code";

View file

@ -62,7 +62,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
unzip
libnotify
]
}
} \
--prefix XDG_DATA_DIRS : "$out"
'';
passthru.updateScript = nix-update-script { };

View file

@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "mago";
version = "0.10.0";
version = "0.20.2";
src = fetchFromGitHub {
owner = "carthage-software";
repo = "mago";
tag = version;
hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU=";
hash = "sha256-XRPP57ylTLodOCzRTLO1IXLq9Yuk/vkDovSlMcushy0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM=";
cargoHash = "sha256-Mlxs0ApYOOHNYEt2AWuOixLqBJrJ/++Gy+EFGsb9wKM=";
env = {
# Get openssl-sys to use pkg-config
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
tests.version = testers.testVersion {
package = mago;
command = "mago --version";
version = "mago-cli ${version}";
version = "mago ${version}";
};
};

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mautrix-gmessages";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "gmessages";
tag = "v${version}";
hash = "sha256-FNjFGO/4j3kLo79oU5fsYA2/yhc9cAsAGIAQ5OJ2VPE=";
hash = "sha256-qpqFWQ4ZhgzG7SG6phW6LnS52Ve1S+Ky6YtjzfBkBmE=";
};
vendorHash = "sha256-QZ16R5i0I7uvQCDpa9/0Fh3jP6TEiheenRnRUXHvYIQ=";
vendorHash = "sha256-Ps9I8WtTtrc3gSMxt4XZ/IUipZL2+kbgNfbY2PYFoa8=";
ldflags = [
"-s"

View file

@ -13,7 +13,7 @@
withGoolm ? false,
}:
let
version = "0.1.4";
version = "0.2.0";
in
buildGoModule {
pname = "mautrix-slack";
@ -23,10 +23,10 @@ buildGoModule {
owner = "mautrix";
repo = "slack";
tag = "v${version}";
hash = "sha256-MDbWvbEY8+CrUL1SnjdJ4SqyOH/5gPsEQkLnTHyJdOo=";
hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM=";
};
vendorHash = "sha256-8U6ifMLRF7PJyG3hWKgBtj/noO/eCXXD60aeB4p2W54=";
vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY=";
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";

View file

@ -9,18 +9,18 @@
buildGoModule rec {
pname = "meowlnir";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "maunium";
repo = "meowlnir";
tag = "v${version}";
hash = "sha256-Fzi9KI6bPrmKMku176rAnLpfVcAjYlKUQ8MiSQB9hpU=";
hash = "sha256-ig803e4onU3E4Nj5aJo2+QfwZt12iKIJ7fS/BjXsojc=";
};
buildInputs = [ olm ];
vendorHash = "sha256-G1+KDssamPRFlGs/moBk0qJDT/IctiKgnM+mVfCDMwg=";
vendorHash = "sha256-+P7tlpGTo9N+uSn22uAlzyB36hu3re+KfOe3a/uzLZE=";
doCheck = true;
doInstallCheck = true;

View file

@ -5,6 +5,7 @@
unzip,
pkg-config,
glib,
llvm,
llvmPackages,
}:
@ -13,32 +14,44 @@ stdenv.mkDerivation {
version = "2016-05-09";
src = fetchFromGitHub {
sha256 = "14cglw04cliwlpvw7qrs6rfm5sv6qa558d7iby5ng3wdjcwx43nk";
rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1";
repo = "Milu";
owner = "yuejia";
repo = "Milu";
rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1";
hash = "sha256-0w7SOZONj2eLX/E0VIrCZutSXTY648P3pTxSRgCnj5E=";
};
hardeningDisable = [ "format" ];
preConfigure = ''
sed -i 's#/usr/bin/##g' Makefile
'';
installPhase = ''
mkdir -p $out/bin
cp bin/milu $out/bin
substituteInPlace Makefile \
--replace-fail /usr/bin/ "" \
--replace-fail bin/milu $out/bin/milu
'';
nativeBuildInputs = [
pkg-config
unzip
];
buildInputs = [
glib
llvm.dev
llvmPackages.libclang
];
preBuild = ''
mkdir -p $out/bin
'';
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-incompatible-pointer-types"
"-Wno-implicit-function-declaration"
"-Wno-error=int-conversion"
];
# `make all` already installs the binaries
dontInstall = true;
meta = {
description = "Higher Order Mutation Testing Tool for C and C++ programs";
homepage = "https://github.com/yuejia/Milu";

View file

@ -8,7 +8,7 @@
let
pname = "mqttx";
version = "1.10.1";
version = "1.11.1";
suffixedUrl =
suffix:
@ -16,11 +16,11 @@ let
sources = {
"aarch64-linux" = fetchurl {
url = suffixedUrl "-arm64";
hash = "sha256-QumOqOOFXOXf0oqXWVaz0+69kHDk3HQKvNcQl8X7Fp8=";
hash = "sha256-gRR0gFHqIPXOrSytqERAi7msfrrYXm2xP84Jy+UhrKg=";
};
"x86_64-linux" = fetchurl {
url = suffixedUrl "";
hash = "sha256-+TyZnx3/qraoA3rcpIDKedGyTzFvdaAE/v4pzXrB0zU=";
hash = "sha256-rqzh4whp8NaeQb98mKTu+hL3RXQBEOKgvJKwLhzu+hg=";
};
};
@ -35,6 +35,8 @@ in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
@ -43,7 +45,7 @@ appimageTools.wrapType2 {
install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {

View file

@ -77,6 +77,12 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py
# Add a missing include to fix the build against luajit-2.1.1741730670.
# Otherwise the build fails as:
# src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
# TODO: drop after 0.12.3 release
sed -i '1i#include <limits.h>' src/lutf8lib.c
'';
meta = {

View file

@ -13,6 +13,7 @@
libepoxy,
makeWrapper,
pkg-config,
libsamplerate,
stdenv,
unzip,
wrapGAppsHook3,
@ -21,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nestopia";
version = "1.52.1";
version = "1.53.0";
src = fetchFromGitHub {
owner = "0ldsk00l";
repo = "nestopia";
rev = finalAttrs.version;
hash = "sha256-r8Z0Ejf5vWcdvxkUkUKJtipQIRoiwoRj0Bx06Gnxd08=";
hash = "sha256-C2uiC8zlleXQlThrRETJa9vu++mJy1ySJKAkgu5zuxc=";
};
buildInputs = [
@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
libarchive
libao
xdg-utils
libsamplerate
];
nativeBuildInputs = [

View file

@ -0,0 +1,44 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
pname = "ninjavis";
version = "0.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "chagui";
repo = "ninjavis";
tag = "v${version}";
hash = "sha256-4MXU43noG0mKwiXWrLu1tW9YGkU1YjP/UoUKZzVer14=";
};
build-system = [
python3Packages.poetry-core
];
pythonImportsCheck = [
"ninjavis"
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
env --ignore-environment $out/bin/ninjavis --help
runHook postInstallCheck
'';
meta = {
description = "Generate visualization from Ninja build logs";
homepage = "https://github.com/chagui/ninjavis";
changelog = "https://github.com/chagui/ninjavis/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pbsds ];
mainProgram = "ninjavis";
};
}

View file

@ -5,7 +5,7 @@
dbus,
fetchFromGitHub,
gamescope,
godot_4_3,
godot_4_4,
hwdata,
lib,
libGL,
@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "opengamepadui";
version = "0.35.8";
version = "0.37.0";
buildType = if withDebug then "debug" else "release";
@ -32,21 +32,21 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ShadowBlip";
repo = "OpenGamepadUI";
tag = "v${finalAttrs.version}";
hash = "sha256-vMb08Wqjt5j6IgMnXuZr6MGNk1CprVn2GTNDdOxnFG0=";
hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
sourceRoot = "source/${finalAttrs.cargoRoot}";
hash = "sha256-sTzMewIfKHbmVhSPZgUIzFFz1ahK+PMoQ5oB4GEt8nY=";
hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg=";
};
cargoRoot = "extensions";
nativeBuildInputs = [
autoPatchelfHook
cargo
godot_4_3
godot_4_3.export-templates-bin
godot_4_4
godot_4_4.export-templates-bin
pkg-config
rustPlatform.cargoSetupHook
];
@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
env =
let
versionAndRelease = lib.splitString "-" godot_4_3.version;
versionAndRelease = lib.splitString "-" godot_4_4.version;
in
{
GODOT = lib.getExe godot_4_3;
GODOT = lib.getExe godot_4_4;
GODOT_VERSION = lib.elemAt versionAndRelease 0;
GODOT_RELEASE = lib.elemAt versionAndRelease 1;
EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}";
EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}";
BUILD_TYPE = "${finalAttrs.buildType}";
};
@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
# Godot looks for export templates in HOME
export HOME=$(mktemp -d)
mkdir -p $HOME/.local/share/godot/export_templates
ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
'';
postInstall = ''

View file

@ -11,13 +11,13 @@
flutter324.buildFlutterApplication rec {
pname = "pilipalax";
version = "1.1.0-beta.5";
version = "1.1.2-beta";
src = fetchFromGitHub {
owner = "orz12";
repo = "PiliPalaX";
tag = "${version}+180";
hash = "sha256-bKs0EZjJCJvtVOZYl3GqXPE2MxX7DRjMwtmFUcNgrOQ=";
tag = "${version}+187";
hash = "sha256-8GQtPYgeYM7yTw3i5H9REWfM5j3G0aQz3oHxz8i9p2Y=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;

View file

@ -1718,61 +1718,61 @@
"dependency": "direct overridden",
"description": {
"name": "screen_brightness",
"sha256": "a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f",
"sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
"version": "2.1.1"
},
"screen_brightness_android": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_android",
"sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c",
"sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.0"
},
"screen_brightness_ios": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_ios",
"sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08",
"sha256": "bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.1"
},
"screen_brightness_macos": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_macos",
"sha256": "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a",
"sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.1"
},
"screen_brightness_platform_interface": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_platform_interface",
"sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b",
"sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.0"
},
"screen_brightness_windows": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_windows",
"sha256": "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155",
"sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
"version": "2.1.0"
},
"scrollable_positioned_list": {
"dependency": "direct main",

View file

@ -20,13 +20,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "protonplus";
version = "0.4.25";
version = "0.4.27";
src = fetchFromGitHub {
owner = "Vysp3r";
repo = "protonplus";
rev = "v${finalAttrs.version}";
hash = "sha256-IDEJ1/53fVq8FA58e3Fk/SPD8+xtXWLQr5IgNiim1jk=";
hash = "sha256-y6fqn02Ui5RbBy5oMeX5HPRHQDUYD2MphoubZxIwQI8=";
};
nativeBuildInputs = [

View file

@ -43,18 +43,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "pwvucontrol";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "saivert";
repo = "pwvucontrol";
tag = finalAttrs.version;
hash = "sha256-E3UfZO0R6WGeUffgGQ2ceHiG4hwIuFntTdCpojaWL8E=";
hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-uaRpaiVjxc0j4oDbmmwt8SPS7O7hWzoYO62jLYzHl1c=";
hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
};
nativeBuildInputs = [

View file

@ -3,16 +3,15 @@
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "quicktemplate";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "valyala";
repo = "quicktemplate";
rev = "v${version}";
sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr";
sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw=";
};
vendorHash = null;

View file

@ -9,7 +9,7 @@
rainfrog,
}:
let
version = "0.2.14";
version = "0.2.15";
in
rustPlatform.buildRustPackage {
inherit version;
@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl";
repo = "rainfrog";
tag = "v${version}";
hash = "sha256-mN7xZs95bi+/wjmOZnOC6LRF7frF0xGJvTMseK2Uorc=";
hash = "sha256-r+tual/ko8SjToMR9ek/Gf5GJieu2wPsMMkjKXw+cLk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-a5uMHiuxVyfRNdGBf7LW00qfQNqAyRnxMq/rMYz3dBg=";
cargoHash = "sha256-JkH771cXGz8YcRy+zO/mB4hkFrA6l0Yg86cLCgsjbrE=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;

View file

@ -19,13 +19,13 @@
rustPlatform.buildRustPackage rec {
pname = "readest";
version = "0.9.19";
version = "0.9.23";
src = fetchFromGitHub {
owner = "readest";
repo = "readest";
tag = "v${version}";
hash = "sha256-Z84vH6vEtUMly++I+2AWBGl+3NXEAyjSIVJ57DnUS54=";
hash = "sha256-MveWZ+9SSd6mPw580U8d8aP7c4rl4861VzCKHpOKiXU=";
fetchSubmodules = true;
};
@ -38,14 +38,14 @@ rustPlatform.buildRustPackage rec {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
hash = "sha256-gHYZpUQOznFIwH0w0tyWyQYyOwNwL8aRcDthx902h+4=";
hash = "sha256-faLytJLMlWs80HZpN0TnCCEWPe9SPP9QH0bx3HLDO5o=";
};
pnpmRoot = "../..";
useFetchCargoVendor = true;
cargoHash = "sha256-uAVYvyNKK0megsl3QEfN3vbuO1gJfwbOm9K0SohuGfg=";
cargoHash = "sha256-5E+3Hpa6hiOORtZ5ykrXVOPucbppwO5KVVS1mb9mVXY=";
cargoRoot = "../..";

View file

@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
--timeout 2000 \
--clients $NIX_BUILD_CORES \
--tags -leaks \
--skipunit integration/aof-multi-part \
--skipunit integration/failover # flaky and slow
runHook postCheck

View file

@ -2,14 +2,14 @@
lib,
callPackage,
makeSetupHook,
redis,
valkey,
}:
makeSetupHook {
name = "redis-test-hook";
substitutions = {
cli = lib.getExe' redis "redis-cli";
server = lib.getExe' redis "redis-server";
cli = lib.getExe' valkey "redis-cli";
server = lib.getExe' valkey "redis-server";
};
passthru.tests = {
simple = callPackage ./test.nix { };

View file

@ -1,5 +1,5 @@
{
redis,
valkey,
redisTestHook,
stdenv,
}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
name = "redis-test-hook-test";
nativeCheckInputs = [
redis
valkey
redisTestHook
];

View file

@ -34,7 +34,7 @@ in
python3Packages.buildPythonApplication rec {
pname = "refine";
version = "0.5.2";
version = "0.5.5";
pyproject = false; # uses meson
src = fetchFromGitLab {
@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
owner = "TheEvilSkeleton";
repo = "Refine";
tag = version;
hash = "sha256-G1G9uuch7kdqWvSfCSOgb9o67da7spNKnnka47k4/rY=";
hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8=";
};
nativeBuildInputs = [

View file

@ -19,7 +19,7 @@
python3Packages.buildPythonApplication rec {
pname = "showtime";
version = "47.0";
version = "48.0";
pyproject = false;
src = fetchFromGitLab {
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
owner = "Incubator";
repo = "showtime";
rev = "refs/tags/${version}";
hash = "sha256-Bnz+LFyvwSjkrbePmoVZZqy2pNLqiyJTsZsSuUyDy+E=";
hash = "sha256-w6ERJNBw+YgPHfm24KKYFS6T4EKEguHOeron0ofLxIg=";
};
strictDeps = true;

View file

@ -35,20 +35,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "siyuan";
version = "3.1.24";
version = "3.1.25";
src = fetchFromGitHub {
owner = "siyuan-note";
repo = "siyuan";
rev = "v${finalAttrs.version}";
hash = "sha256-BrFyMaxACkdjQy151vIYiJ9WotogEbEKWnFXNhyqKw4=";
hash = "sha256-ZLhLuRj5gdqca9Sbty7BEUBB/+8SgPYhnhoSOR5j4YE=";
};
kernel = buildGo123Module {
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/kernel";
vendorHash = "sha256-2ryd+GciVGmvqLNgdvoHC1tjjnFZgWO2uObj8uNwu0E=";
vendorHash = "sha256-pW52K3nvIdhpeBj2CtJwwsihcV10+FEf2mgAX61s5nM=";
patches = [
(replaceVars ./set-pandoc-path.patch {
@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
src
sourceRoot
;
hash = "sha256-yfcgSCL78hGcq/QDvqx9jMLivW06oRVzI8iqQ7gCrlQ=";
hash = "sha256-01UyupFLr82w0LmainA/7u6195Li/QoTzz/tVxXSVQE=";
};
sourceRoot = "${finalAttrs.src.name}/app";

View file

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "stackit-cli";
version = "0.24.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "stackitcloud";
repo = "stackit-cli";
rev = "v${version}";
hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg=";
hash = "sha256-7XI5YkfLY/Jo1lVEQ2waN7/g8xN8LUTXIva8OzRdRSo=";
};
vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc=";
vendorHash = "sha256-ZVDe28D2vw/p5i6MoBZ1KS9pjncOzul3/bLB4cGoY80=";
subPackages = [ "." ];

View file

@ -22,6 +22,9 @@ rustPlatform.buildRustPackage {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
# Prerelease reports incorrect version
dontVersionCheck = true;
meta = {
inherit (stalwart-mail.meta) license homepage changelog;
description = "Stalwart Mail Server CLI";

View file

@ -27,7 +27,7 @@
python3,
zlib,
redisSupport ? true,
redis,
valkey,
hiredis,
rustSupport ? true,
rustc,
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
]
++ lib.optional hyperscanSupport hyperscan
++ lib.optionals redisSupport [
redis
valkey
hiredis
];

View file

@ -22,6 +22,7 @@
libexif,
libavif,
libsixel,
libraw,
openexr_3,
bash-completion,
testers,
@ -30,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "swayimg";
version = "3.8";
version = "3.9";
src = fetchFromGitHub {
owner = "artemsen";
repo = "swayimg";
tag = "v${finalAttrs.version}";
hash = "sha256-nPmVUJy5hlWk6Q+s6rRBEzlJvpDKLStKTRjLwj7iA/c=";
hash = "sha256-QPTODuVVDQCP7Ix63F0J0tOzfg5Q9B4GXaxjuTerkI0=";
};
strictDeps = true;
@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
libexif
libavif
libsixel
libraw
openexr_3
];

View file

@ -1,3 +1,5 @@
source 'https://rubygems.org'
gem 'taskjuggler'
gem 'webrick'
gem 'base64'
gem 'drb'

View file

@ -1,39 +1,45 @@
GEM
remote: https://rubygems.org/
specs:
date (3.3.3)
base64 (0.2.0)
bigdecimal (3.1.9)
date (3.4.1)
drb (2.2.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
mini_mime (1.1.2)
net-imap (0.3.4)
mini_mime (1.1.5)
net-imap (0.5.6)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.5.1)
net-protocol
sync (0.5.0)
taskjuggler (3.7.2)
taskjuggler (3.8.1)
mail (~> 2.7, >= 2.7.1)
term-ansicolor (~> 1.7, >= 1.7.1)
term-ansicolor (1.7.1)
term-ansicolor (1.11.2)
tins (~> 1.0)
timeout (0.3.2)
tins (1.32.1)
timeout (0.4.3)
tins (1.38.0)
bigdecimal
sync
webrick (1.8.1)
webrick (1.9.1)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
base64
drb
taskjuggler
webrick
BUNDLED WITH
2.4.12
2.5.22

View file

@ -1,13 +1,43 @@
{
base64 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
type = "gem";
};
version = "3.1.9";
};
date = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
type = "gem";
};
version = "3.3.3";
version = "3.4.1";
};
drb = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.1";
};
mail = {
dependencies = [
@ -30,10 +60,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
type = "gem";
};
version = "1.1.2";
version = "1.1.5";
};
net-imap = {
dependencies = [
@ -44,10 +74,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy";
type = "gem";
};
version = "0.3.4";
version = "0.5.6";
};
net-pop = {
dependencies = [ "net-protocol" ];
@ -66,10 +96,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
type = "gem";
};
version = "0.2.1";
version = "0.2.2";
};
net-smtp = {
dependencies = [ "net-protocol" ];
@ -77,10 +107,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
type = "gem";
};
version = "0.3.3";
version = "0.5.1";
};
sync = {
groups = [ "default" ];
@ -101,10 +131,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j";
sha256 = "16d5vgz54all8vl3haqy6j69plny3np4kc3wq7wy3xa3i0h7v60z";
type = "gem";
};
version = "3.7.2";
version = "3.8.1";
};
term-ansicolor = {
dependencies = [ "tins" ];
@ -112,40 +142,43 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj";
sha256 = "10shkrl9sl1qhrzbmch2cn67w1yy63d0f2948m80b5nl44zwc02b";
type = "gem";
};
version = "1.7.1";
version = "1.11.2";
};
timeout = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm";
type = "gem";
};
version = "0.3.2";
version = "0.4.3";
};
tins = {
dependencies = [ "sync" ];
dependencies = [
"bigdecimal"
"sync"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p";
sha256 = "0vc80cw3qbbdfiydv7bj7zvch189mh3ifbz7v0ninnrxnwwd3b4r";
type = "gem";
};
version = "1.32.1";
version = "1.38.0";
};
webrick = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
type = "gem";
};
version = "1.8.1";
version = "1.9.1";
};
}

View file

@ -11,8 +11,8 @@
},
{
"pname": "Avalonia",
"version": "11.2.4",
"hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
"version": "11.2.5",
"hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@ -31,38 +31,38 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.2.4",
"hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo="
"version": "11.2.5",
"hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg="
},
{
"pname": "Avalonia.Controls.DataGrid",
"version": "11.2.4",
"hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo="
"version": "11.2.5",
"hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s="
},
{
"pname": "Avalonia.Desktop",
"version": "11.2.4",
"hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo="
"version": "11.2.5",
"hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.2.4",
"hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4="
"version": "11.2.5",
"hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.2.4",
"hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk="
"version": "11.2.5",
"hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM="
},
{
"pname": "Avalonia.Native",
"version": "11.2.4",
"hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM="
"version": "11.2.5",
"hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0="
},
{
"pname": "Avalonia.ReactiveUI",
"version": "11.2.4",
"hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw="
"version": "11.2.5",
"hash": "sha256-p3ELTiH4kYdcrUF87zZzRMsOU41Q3XBCBKRmQYWdLBs="
},
{
"pname": "Avalonia.Remote.Protocol",
@ -76,33 +76,33 @@
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.2.4",
"hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
"version": "11.2.5",
"hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w="
},
{
"pname": "Avalonia.Skia",
"version": "11.2.4",
"hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI="
"version": "11.2.5",
"hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.2.4",
"hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak="
"version": "11.2.5",
"hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU="
},
{
"pname": "Avalonia.Win32",
"version": "11.2.4",
"hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY="
"version": "11.2.5",
"hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8="
},
{
"pname": "Avalonia.X11",
"version": "11.2.4",
"hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk="
"version": "11.2.5",
"hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E="
},
{
"pname": "CliWrap",
"version": "3.8.1",
"hash": "sha256-9XmdodZ2Is+LkuMlc/BNFiBUNWA5tDwBl9kYnReJIhU="
"version": "3.8.2",
"hash": "sha256-sZQqu03sJL0LlnLssXVXHTen9marNbC/G15mAKjhFJU="
},
{
"pname": "DialogHost.Avalonia",
@ -111,8 +111,8 @@
},
{
"pname": "Downloader",
"version": "3.3.3",
"hash": "sha256-H8HJKL71qC+nHVmuhhPDEHy434/NXJNqPeitJOe856k="
"version": "3.3.4",
"hash": "sha256-QbbWlP3IzDzPWuZcQCfqpKQZMPSMETL/+6AXlhcjVc8="
},
{
"pname": "DynamicData",
@ -196,13 +196,13 @@
},
{
"pname": "Semi.Avalonia",
"version": "11.2.1.4",
"hash": "sha256-X1YIonqLNySnMMope2/+O2HfpArc8AhT/gNBOI+0Ts8="
"version": "11.2.1.5",
"hash": "sha256-xomim/K3C6F0/105KCVc054AG80Z4cQw1bycHF9MD/U="
},
{
"pname": "Semi.Avalonia.DataGrid",
"version": "11.2.1.4",
"hash": "sha256-UDb+Gw8nDsuxbMlV8CJaGItfJ85k+p3XPGPuZrIl0KM="
"version": "11.2.1.5",
"hash": "sha256-xebEht0T5hPSYhyuqbZEzHw3D7/9K920SZhnIXDrM3s="
},
{
"pname": "SkiaSharp",
@ -321,8 +321,8 @@
},
{
"pname": "TaskScheduler",
"version": "2.12.0",
"hash": "sha256-zkaWlCHzUrexHMtXVitbNsgZrbgoLrJ4BBrhujvZr+4="
"version": "2.12.1",
"hash": "sha256-eM4vgA+/ukoXCX3y4Ad5WPeIPiwLLDfhh4P0ukWf4lQ="
},
{
"pname": "Tmds.DBus.Protocol",

View file

@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "v2rayn";
version = "7.10.0";
version = "7.10.5";
src = fetchFromGitHub {
owner = "2dust";
repo = "v2rayN";
tag = version;
hash = "sha256-j2s88MRyKcrNbUN+Ypewk+vRbhMtFwHpBy2xbabOe1w=";
hash = "sha256-5tLO7KVHj0DXQdJg02Jxs6fgRLJSfFWPbARg9dqKcSI=";
fetchSubmodules = true;
};

View file

@ -11,7 +11,7 @@
buildGoModule rec {
pname = "vale";
version = "3.9.6";
version = "3.10.0";
subPackages = [ "cmd/vale" ];
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
hash = "sha256-KerHI0+0oHwKrAbE5JIi50+L20It9ubhhIaTJMKnh3I=";
hash = "sha256-aZ+ihq4ft6HpKBZu7idq0m298WSxBubuEsIPNLvu1RU=";
};
vendorHash = "sha256-ivHOUkX9a4mRsw/ruYr3CzVbAovYMGQI+ExmaB+lP5E=";
vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0=";
ldflags = [
"-s"

View file

@ -11,18 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "veryl";
version = "0.13.5";
version = "0.14.1";
src = fetchFromGitHub {
owner = "veryl-lang";
repo = "veryl";
rev = "v${version}";
hash = "sha256-rZ2Psbs3s5NfY1Mktr3RLGwQYciMh5FCs4d0I1zBaA8=";
hash = "sha256-J1FYgVrpiczTTaMvE7IBdd4aqNI4XXXqvgR7SWaVen0=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-syvW5Lm2ed/AXksDmIAEAbrw+mW1aA0FugJirBZLtLw=";
cargoHash = "sha256-2AWVmdVQAA0+h9xegcWSAjnpa68A+2zazHwKzNKqaTo=";
nativeBuildInputs = [
pkg-config
@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Modern Hardware Description Language";
homepage = "https://veryl-lang.org/";
changelog = "https://github.com/veryl-lang/veryl/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/veryl-lang/veryl/releases/tag/v${version}";
license = with lib.licenses; [
mit
asl20

View file

@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.4.6",
"version": "1.5.6",
"vscodeVersion": "1.94.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-arm64-1.4.6.zip",
"sha256": "156d4d4d54033e15fb0edd0c8f17a30ae26c622692cfcb915fd548a1596ec103"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-arm64-1.5.6.zip",
"sha256": "174fcd06dc73a760edf06105678af9b427303c8091cbe0f1454207107383076a"
},
"x86_64-darwin": {
"version": "1.4.6",
"version": "1.5.6",
"vscodeVersion": "1.94.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-x64-1.4.6.zip",
"sha256": "f41e4ab9d79062357765064993fdf993a05358aae675fdf511996fa3fdf01e55"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-x64-1.5.6.zip",
"sha256": "a3891e831ab43452f791a6856f0fd3c63535348583ae673bfcdae4466f36f8df"
},
"x86_64-linux": {
"version": "1.4.6",
"version": "1.5.6",
"vscodeVersion": "1.94.0",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-linux-x64-1.4.6.tar.gz",
"sha256": "116e1fcefe98321764f4d6a5e36a8e16282b20d994c385fd3e3826dd9945e8f4"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-linux-x64-1.5.6.tar.gz",
"sha256": "5b01ce09139d7d8932be5c297a1c71a891a299825b2d5304f3fed22367188ecb"
}
}

View file

@ -3,28 +3,32 @@
stdenv,
fetchFromGitHub,
libxcb,
xcb-util-cursor,
}:
stdenv.mkDerivation rec {
pname = "wmutils-libwm";
version = "1.0";
version = "1.3";
src = fetchFromGitHub {
owner = "wmutils";
repo = "libwm";
rev = "v${version}";
sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0";
tag = "v${version}";
hash = "sha256-ROWRgTn33c5gH4ZdkwZ05rRg/Z9e2NppAQSNExSGZ4s=";
};
buildInputs = [ libxcb ];
buildInputs = [
libxcb
xcb-util-cursor
];
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
meta = {
description = "Small library for X window manipulation";
homepage = "https://github.com/wmutils/libwm";
license = licenses.isc;
maintainers = with maintainers; [ bhougland ];
platforms = platforms.unix;
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ bhougland ];
platforms = lib.platforms.unix;
};
}

View file

@ -34,16 +34,6 @@
"version": "3.26.1",
"hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "8.0.10",
"hash": "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "8.0.10",
"hash": "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs="
},
{
"pname": "Microsoft.CodeCoverage",
"version": "17.11.1",
@ -54,26 +44,6 @@
"version": "17.11.1",
"hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "8.0.10",
"hash": "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "8.0.10",
"hash": "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "8.0.10",
"hash": "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "8.0.10",
"hash": "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.11.1",

View file

@ -12,13 +12,13 @@ let
in
buildDotnetModule (finalAttrs: {
pname = "yafc-ce";
version = "2.8.0";
version = "2.10.0";
src = fetchFromGitHub {
owner = "shpaass";
repo = "yafc-ce";
rev = finalAttrs.version;
hash = "sha256-d0LLwol68ywwFsUx7gC4S1MF+3HUTt7+F6rcL1j0Oj8=";
hash = "sha256-AFFu4yqnBq0OD3XY1V97zxAIfZuXswT9KOJzU8GqQuU";
};
projectFile = [ "Yafc/Yafc.csproj" ];

View file

@ -14,7 +14,7 @@
nodejs,
pnpm_9,
cacert,
redis,
valkey,
dataDir ? "/var/lib/zammad",
}:
@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation {
];
nativeBuildInputs = [
redis
valkey
postgresql
pnpm_9.configHook
nodejs

View file

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "zoraxy";
version = "3.1.1";
version = "3.1.8";
src = fetchFromGitHub {
owner = "tobychui";
repo = "zoraxy";
tag = version;
hash = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY=";
tag = "v${version}";
hash = "sha256-0BJuomRz/ZnvHQXPZBBrVv1nk2UFPGGdjsZ/FpUAtwk=";
};
sourceRoot = "${src.name}/src";
vendorHash = "sha256-p2nczUMT3FfYX32yvbR0H5FyHV2v9I18yvn0lwUwy+A=";
vendorHash = "sha256-gqDgM+xyvzrpQEQz0fju8GEtQhJOaL6FeuwYxgeSRmo=";
checkFlags =
let
@ -27,6 +27,8 @@ buildGoModule rec {
"TestReplaceLocationHostRelative"
"TestHandleTraceRoute"
"TestHandlePing"
"TestListTable"
"TestWriteAndRead"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

View file

@ -1,13 +1,20 @@
{
runCommand,
lib,
buildPackages,
fontconfig,
lib,
runCommand,
stdenv,
}:
let
fontconfig' = fontconfig;
in
{
fontconfig ? fontconfig',
fontDirectories,
}:
runCommand "fc-cache"
{
nativeBuildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
allowSubstitutes = false;
passAsFile = [ "fontDirs" ];
@ -29,8 +36,11 @@ runCommand "fc-cache"
cat "$fontDirsPath" >> fonts.conf
echo "</fontconfig>" >> fonts.conf
# N.B.: fc-cache keys its cache entries by architecture.
# We must invoke the host `fc-cache` (not the build fontconfig) if we want
# the cache to be usable by the host.
mkdir -p $out
fc-cache -sv
${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe' fontconfig "fc-cache"} -sv
# This is not a cache dir in the normal sense -- it won't be automatically
# recreated.

View file

@ -19,6 +19,21 @@
grpcio-tools,
}:
let
# using a older version of pytest-asyncio only for tests
# https://github.com/pytest-dev/pytest-asyncio/issues/928
pytest-asyncio_23_8 = (
pytest-asyncio.overridePythonAttrs (old: rec {
version = "0.23.8";
src = fetchFromGitHub {
inherit (old.src) owner repo;
tag = "v${version}";
hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY=";
};
})
);
in
buildPythonPackage rec {
pname = "betterproto";
version = "2.0.0b6";
@ -55,7 +70,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
grpcio-tools
pydantic
pytest-asyncio
pytest-asyncio_23_8
pytest-mock
pytest7CheckHook
tomlkit

View file

@ -53,7 +53,7 @@ buildPythonPackage rec {
jinja2
before-after
nettools
pkgs.redis
pkgs.valkey
redisTestHook
];

View file

@ -65,7 +65,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "django_q" ];
preCheck = ''
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -52,7 +52,7 @@ buildPythonPackage rec {
preCheck = ''
export DJANGO_SETTINGS_MODULE=tests.settings.sqlite
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -6,7 +6,7 @@
pytestCheckHook,
pythonAtLeast,
pythonOlder,
redis-server,
valkey,
redis,
setuptools,
}:
@ -27,7 +27,7 @@ buildPythonPackage rec {
substituteInPlace tests/test_dictconfig.py \
--replace-fail "assertEquals" "assertEqual"
substituteInPlace tests/test_redis.py \
--replace-fail "'redis-server'" "'${redis-server}/bin/redis-server'"
--replace-fail "'redis-server'" "'${valkey}/bin/redis-server'"
'';
build-system = [ setuptools ];

View file

@ -54,7 +54,7 @@ buildPythonPackage rec {
gevent
pytestCheckHook
process-tests
pkgs.redis
pkgs.valkey
] ++ optional-dependencies.django;
# For Django tests

View file

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
rufo (0.17.0)
rufo (0.18.1)
PLATFORMS
ruby
@ -10,4 +10,4 @@ DEPENDENCIES
rufo
BUNDLED WITH
2.5.3
2.6.2

View file

@ -4,9 +4,9 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rqq6mf7fvwvc9m3d5w5ysch3h7z4ml1vvdvy26064fb6lrnn5ai";
sha256 = "0jcdkl9kpk96kby9qw46klgdy0nxswsbicxdq0dbdhhg7v00cc3r";
type = "gem";
};
version = "0.17.0";
version = "0.18.1";
};
}

View file

@ -1,2 +1,4 @@
source 'https://rubygems.org'
gem 'xcode-install'
gem "abbrev", "~> 0.1.2"

View file

@ -1,62 +1,84 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.15)
CFPropertyList (3.0.7)
base64
nkf
rexml
abbrev (0.1.2)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.419.0)
aws-sdk-core (3.111.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.41.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.87.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-eventstream (1.3.2)
aws-partitions (1.1068.0)
aws-sdk-core (3.220.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.99.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.182.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.0.3)
base64 (0.2.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
declarative-option (0.1.0)
digest-crc (0.6.3)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
emoji_regex (3.2.1)
excon (0.78.1)
faraday (1.3.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-net_http (1.0.1)
faraday_middleware (1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.2.1)
fastlane (2.172.0)
fastimage (2.4.0)
fastlane (2.227.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
@ -64,133 +86,135 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
security (= 0.1.5)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
xcpretty (~> 0.4.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-api-client (0.38.0)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
google-apis-core (0.2.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.14)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
retriable (>= 2.0, < 4.a)
rexml
signet (~> 0.14)
webrick
google-apis-iamcredentials_v1 (0.1.0)
google-apis-core (~> 0.1)
google-apis-storage_v1 (0.1.0)
google-apis-core (~> 0.1)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.30.0)
addressable (~> 2.5)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.5.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (0.15.0)
faraday (>= 0.17.3, < 2.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.4.0)
json (2.5.1)
jwt (2.2.2)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.0.2)
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.10.2)
jwt (2.10.1)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.2.1)
os (1.1.1)
plist (3.6.0)
public_suffix (4.0.6)
rake (13.0.3)
representable (3.0.4)
nkf (0.2.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.2)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.4)
rouge (2.0.7)
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
security (0.1.3)
signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
rexml (3.4.1)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
simctl (1.6.10)
CFPropertyList
naturally
slack-notifier (2.3.2)
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
webrick (1.7.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcode-install (2.6.8)
claide (>= 0.9.1, < 1.1.0)
xcode-install (2.8.1)
claide (>= 0.9.1)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.19.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.0)
rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
@ -198,7 +222,8 @@ PLATFORMS
ruby
DEPENDENCIES
abbrev (~> 0.1.2)
xcode-install
BUNDLED WITH
1.17.2
2.6.2

View file

@ -1,6 +1,7 @@
{
lib,
bundlerApp,
bundlerUpdateScript,
}:
bundlerApp {
@ -8,6 +9,8 @@ bundlerApp {
gemdir = ./.;
exes = [ "xcversion" ];
passthru.updateScript = bundlerUpdateScript "xcode-install";
meta = with lib; {
description = "Install and update your Xcodes automatically";
homepage = "https://github.com/xcpretty/xcode-install";

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
rouge (2.0.7)
xcpretty (0.3.0)
rouge (~> 2.0.7)
rouge (3.28.0)
xcpretty (0.4.0)
rouge (~> 3.28.0)
PLATFORMS
ruby
@ -12,4 +12,4 @@ DEPENDENCIES
xcpretty
BUNDLED WITH
2.1.4
2.6.2

View file

@ -1,19 +1,23 @@
{
rouge = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d";
type = "gem";
};
version = "2.0.7";
version = "3.28.0";
};
xcpretty = {
dependencies = [ "rouge" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
}

View file

@ -1,2 +1,6 @@
source 'https://rubygems.org'
gem 'showoff'
gem "rexml", "~> 3.4"
gem "pdfkit", "~> 0.8.7"

View file

@ -20,31 +20,16 @@ GEM
concurrent-ruby (~> 1.0)
iso-639 (0.3.8)
csv
json (2.10.1)
json (2.10.2)
mini_portile2 (2.8.8)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
nokogiri (1.18.3)
nokogiri (1.18.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.3-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.3-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.3-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.3-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.3-x86_64-linux-musl)
racc (~> 1.4)
ostruct (0.6.1)
parslet (2.0.0)
pdfkit (0.8.7.3)
public_suffix (6.0.1)
racc (1.8.1)
rack (2.2.13)
@ -53,6 +38,7 @@ GEM
rack-protection (2.2.4)
rack
redcarpet (3.6.1)
rexml (3.4.1)
ruby-dbus (0.14.1)
ruby2_keywords (0.0.5)
showoff (0.20.4)
@ -86,17 +72,11 @@ GEM
tilt (2.6.0)
PLATFORMS
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
ruby
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl
DEPENDENCIES
pdfkit (~> 0.8.7)
rexml (~> 3.4)
showoff
BUNDLED WITH

View file

@ -55,6 +55,8 @@
"addressable"
"eventmachine"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq";
@ -63,6 +65,8 @@
version = "0.3.8";
};
eventmachine = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
@ -72,6 +76,8 @@
};
fidget = {
dependencies = [ "ruby-dbus" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb";
@ -91,6 +97,8 @@
version = "2.22.2";
};
htmlentities = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@ -125,10 +133,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
type = "gem";
};
version = "2.10.1";
version = "2.10.2";
};
mini_portile2 = {
groups = [ "default" ];
@ -160,10 +168,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb";
sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
type = "gem";
};
version = "1.18.3";
version = "1.18.5";
};
ostruct = {
groups = [ "default" ];
@ -185,6 +193,16 @@
};
version = "2.0.0";
};
pdfkit = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nmp0csvkh99x1ii6pq29j8424g40lfb7k9ajfkkpzgwygpfk6fd";
type = "gem";
};
version = "0.8.7.3";
};
public_suffix = {
groups = [ "default" ];
platforms = [ ];
@ -247,7 +265,19 @@
};
version = "3.6.1";
};
rexml = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
type = "gem";
};
version = "3.4.1";
};
ruby-dbus = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4";
@ -313,6 +343,8 @@
"eventmachine"
"thin"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m";

View file

@ -1,2 +1,4 @@
source 'https://rubygems.org'
gem 'fastlane'
gem "abbrev", "~> 0.1.2"

View file

@ -5,25 +5,26 @@ GEM
base64
nkf
rexml
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.909.0)
aws-sdk-core (3.191.6)
aws-eventstream (1.3.2)
aws-partitions (1.1068.0)
aws-sdk-core (3.220.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.78.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.146.1)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (1.99.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.182.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
@ -33,13 +34,13 @@ GEM
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.5)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.110.0)
faraday (1.10.3)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@ -58,17 +59,17 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.220.0)
fastimage (2.4.0)
fastlane (2.227.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@ -84,6 +85,7 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
@ -107,8 +109,10 @@ GEM
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty (~> 0.4.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
@ -126,12 +130,12 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.4.0)
google-cloud-errors (1.5.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
@ -147,34 +151,36 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.1)
json (2.10.2)
jwt (2.10.1)
base64
mini_magick (4.12.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.0)
nanaimo (0.3.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.4.0)
optparse (0.6.0)
os (1.1.4)
plist (3.7.1)
public_suffix (5.0.5)
plist (3.7.2)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rouge (2.0.7)
rexml (3.4.1)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rubyzip (2.4.1)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
@ -184,6 +190,7 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
@ -193,17 +200,17 @@ GEM
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.0)
rouge (~> 3.28.0)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
@ -214,4 +221,4 @@ DEPENDENCIES
fastlane
BUNDLED WITH
2.5.6
2.6.2

View file

@ -5,10 +5,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
version = "2.8.6";
version = "2.8.7";
};
artifactory = {
groups = [ "default" ];
@ -35,36 +35,37 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
type = "gem";
};
version = "1.3.0";
version = "1.3.2";
};
aws-partitions = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00iknq94smbskgmxqmlxlcgpq5famd968l12nvv8bxi7gk1hagsk";
sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i";
type = "gem";
};
version = "1.909.0";
version = "1.1068.0";
};
aws-sdk-core = {
dependencies = [
"aws-eventstream"
"aws-partitions"
"aws-sigv4"
"base64"
"jmespath"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk";
sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y";
type = "gem";
};
version = "3.191.6";
version = "3.220.1";
};
aws-sdk-kms = {
dependencies = [
@ -75,10 +76,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb";
sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
type = "gem";
};
version = "1.78.0";
version = "1.99.0";
};
aws-sdk-s3 = {
dependencies = [
@ -90,10 +91,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq";
sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
type = "gem";
};
version = "1.146.1";
version = "1.182.0";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
@ -101,10 +102,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
type = "gem";
};
version = "1.8.0";
version = "1.11.0";
};
babosa = {
groups = [ "default" ];
@ -198,10 +199,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4";
type = "gem";
};
version = "0.6.5";
version = "0.7.0";
};
domain_name = {
groups = [ "default" ];
@ -238,10 +239,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz";
sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs";
type = "gem";
};
version = "0.110.0";
version = "0.112.0";
};
faraday = {
dependencies = [
@ -261,10 +262,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153";
type = "gem";
};
version = "1.10.3";
version = "1.10.4";
};
faraday-cookie_jar = {
dependencies = [
@ -326,20 +327,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
type = "gem";
};
version = "1.0.4";
version = "1.1.0";
};
faraday-net_http = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3";
type = "gem";
};
version = "1.0.1";
version = "1.0.2";
};
faraday-net_http_persistent = {
groups = [ "default" ];
@ -387,20 +388,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl";
type = "gem";
};
version = "1.2.0";
version = "1.2.1";
};
fastimage = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3";
sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz";
type = "gem";
};
version = "2.3.1";
version = "2.4.0";
};
fastlane = {
dependencies = [
@ -418,6 +419,7 @@
"faraday-cookie_jar"
"faraday_middleware"
"fastimage"
"fastlane-sirp"
"gh_inspector"
"google-apis-androidpublisher_v3"
"google-apis-playcustomapp_v1"
@ -448,10 +450,21 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3";
sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb";
type = "gem";
};
version = "2.220.0";
version = "2.227.0";
};
fastlane-sirp = {
dependencies = [ "sysrandom" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6";
type = "gem";
};
version = "1.0.0";
};
gh_inspector = {
groups = [ "default" ];
@ -535,10 +548,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l";
sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5";
type = "gem";
};
version = "1.7.0";
version = "1.8.0";
};
google-cloud-env = {
dependencies = [ "faraday" ];
@ -556,10 +569,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb";
sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm";
type = "gem";
};
version = "1.4.0";
version = "1.5.0";
};
google-cloud-storage = {
dependencies = [
@ -613,20 +626,21 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
type = "gem";
};
version = "1.0.5";
version = "1.0.8";
};
httpclient = {
dependencies = [ "mutex_m" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b";
type = "gem";
};
version = "2.8.3";
version = "2.9.0";
};
jmespath = {
groups = [ "default" ];
@ -643,10 +657,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
type = "gem";
};
version = "2.7.2";
version = "2.10.2";
};
jwt = {
dependencies = [ "base64" ];
@ -654,20 +668,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb";
sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
type = "gem";
};
version = "2.8.1";
version = "2.10.1";
};
mini_magick = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki";
type = "gem";
};
version = "4.12.0";
version = "4.13.2";
};
mini_mime = {
groups = [ "default" ];
@ -694,20 +708,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67";
sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq";
type = "gem";
};
version = "2.4.0";
version = "2.4.1";
};
mutex_m = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg";
type = "gem";
};
version = "0.3.0";
};
nanaimo = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
naturally = {
groups = [ "default" ];
@ -734,10 +758,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m";
sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95";
type = "gem";
};
version = "0.4.0";
version = "0.6.0";
};
os = {
groups = [ "default" ];
@ -754,20 +778,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z";
sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk";
type = "gem";
};
version = "3.7.1";
version = "3.7.2";
};
public_suffix = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
version = "5.0.5";
version = "6.0.1";
};
rake = {
groups = [ "default" ];
@ -809,20 +833,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
type = "gem";
};
version = "3.2.6";
version = "3.4.1";
};
rouge = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d";
type = "gem";
};
version = "2.0.7";
version = "3.28.0";
};
ruby2_keywords = {
groups = [ "default" ];
@ -839,10 +863,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
type = "gem";
};
version = "2.3.2";
version = "2.4.1";
};
security = {
groups = [ "default" ];
@ -884,6 +908,16 @@
};
version = "1.6.10";
};
sysrandom = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas";
type = "gem";
};
version = "1.0.5";
};
terminal-notifier = {
groups = [ "default" ];
platforms = [ ];
@ -961,10 +995,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
version = "2.5.0";
version = "2.6.0";
};
word_wrap = {
groups = [ "default" ];
@ -989,10 +1023,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
type = "gem";
};
version = "1.24.0";
version = "1.27.0";
};
xcpretty = {
dependencies = [ "rouge" ];
@ -1000,10 +1034,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
xcpretty-travis-formatter = {
dependencies = [ "xcpretty" ];

View file

@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
bundler-audit (0.9.1)
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
thor (1.2.1)
thor (1.3.2)
PLATFORMS
ruby
@ -13,4 +13,4 @@ DEPENDENCIES
bundler-audit
BUNDLED WITH
2.3.9
2.6.2

View file

@ -5,19 +5,19 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx";
sha256 = "0j0h5cgnzk0ms17ssjkzfzwz65ggrs3lsp53a1j46p4616m1s1bk";
type = "gem";
};
version = "0.9.1";
version = "0.9.2";
};
thor = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
type = "gem";
};
version = "1.2.1";
version = "1.3.2";
};
}

View file

@ -1431,19 +1431,6 @@ with pkgs;
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
### APPLICATIONS/EMULATORS/BSNES
### APPLICATIONS/EMULATORS/DOLPHIN-EMU
dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
};
dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};
### APPLICATIONS/EMULATORS/RETROARCH
libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { });
@ -8753,10 +8740,7 @@ with pkgs;
makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };
makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
callPackage ../development/libraries/fontconfig/make-fonts-cache.nix {
inherit fontconfig fontDirectories;
};
makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { };
freenect = callPackage ../development/libraries/freenect {
inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;

View file

@ -7911,9 +7911,7 @@ self: super: with self; {
loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { };
logutils = callPackage ../development/python-modules/logutils {
redis-server = pkgs.redis;
};
logutils = callPackage ../development/python-modules/logutils { };
logzero = callPackage ../development/python-modules/logzero { };