gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 7b38f24f2f into haskell-updates

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-21 00:22:34 +00:00
committed by GitHub
parent 78b49c6a65 7b38f24f2f
commit e7f97488c1
251 changed files with 1363 additions and 1710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2511.section.md
+2
View File
@@ -121,6 +121,8 @@
- `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`.
- `steamcontroller` has been removed due to lack of upstream maintenance. Consider using `sc-controller` instead.
- `linux` and all other Linux kernel packages have moved all in-tree kernel modules into a new `modules` output.
- `webfontkitgenerator` has been renamed to `webfont-bundler`, following the rename of the upstream project.
maintainers/maintainer-list.nix
+8 -50
View File
@@ -2203,12 +2203,6 @@
githubId = 4679721;
name = "Artur Cygan";
};
artuuge = {
email = "artuuge@gmail.com";
github = "artuuge";
githubId = 10285250;
name = "Artur E. Ruuge";
};
arunoruto = {
email = "mirza.arnaut45@gmail.com";
github = "arunoruto";
@@ -2703,6 +2697,14 @@
githubId = 426541;
name = "Tim Kleinschmidt";
};
azey7f = {
email = "me@azey.net";
github = "azey7f";
githubId = 41077433;
name = "azey";
# assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net
keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE 7F75 F94F 4A71 C5C2 1E8F"; } ];
};
azuwis = {
email = "azuwis@gmail.com";
github = "azuwis";
@@ -3198,12 +3200,6 @@
githubId = 442623;
name = "Ben Pye";
};
benwbooth = {
email = "benwboooth@gmail.com";
github = "benwbooth";
githubId = 75972;
name = "Ben Booth";
};
benwis = {
name = "Ben Wishovich";
email = "ben@benw.is";
@@ -6839,12 +6835,6 @@
githubId = 349909;
name = "David Percy";
};
dpflug = {
email = "david@pflug.email";
github = "dpflug";
githubId = 108501;
name = "David Pflug";
};
dr460nf1r3 = {
email = "root@dr460nf1r3.org";
github = "dr460nf1r3";
@@ -15462,12 +15452,6 @@
name = "madonius";
matrix = "@madonius:entropia.de";
};
Madouura = {
email = "madouura@gmail.com";
github = "Madouura";
githubId = 93990818;
name = "Madoura";
};
maeve = {
email = "mrey@mailbox.org";
matrix = "@maeve:catgirl.cloud";
@@ -22254,18 +22238,6 @@
githubId = 1217934;
name = "José Romildo Malaquias";
};
romner-set = {
email = "admin@cynosure.red";
github = "romner-set";
githubId = 41077433;
name = "romner-set";
keys = [
{
# uploaded to https://keys.openpgp.org
fingerprint = "4B75 244B 0279 9598 FF3B C21F 95FC 58F1 8CFD FAB0";
}
];
};
ronanmacf = {
email = "macfhlar@tcd.ie";
github = "RonanMacF";
@@ -25978,12 +25950,6 @@
name = "Chinmay D. Pai";
keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ];
};
thyol = {
name = "thyol";
email = "thyol@pm.me";
github = "thyol";
githubId = 81481634;
};
tiagolobocastro = {
email = "tiagolobocastro@gmail.com";
github = "tiagolobocastro";
@@ -28654,14 +28620,6 @@
githubId = 37774475;
name = "Yusuf Duran";
};
yuu = {
email = "yuunix@grrlz.net";
matrix = "@yuu:matrix.org";
github = "yuuyins";
githubId = 86538850;
name = "Yuu Yin";
keys = [ { fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; } ];
};
yvan-sraka = {
email = "yvan@sraka.xyz";
github = "yvan-sraka";
nixos/modules/services/home-automation/wyoming/piper.nix
+2 -2
View File
@@ -103,8 +103,8 @@ in
useCUDA = mkOption {
type = bool;
default = config.cudaSupport;
defaultText = literalExpression "config.cudaSupport";
default = pkgs.config.cudaSupport;
defaultText = literalExpression "pkgs.config.cudaSupport";
description = ''
Whether to accelerate the underlying onnxruntime library with CUDA.
'';
nixos/modules/services/networking/privoxy.nix
+1 -1
View File
@@ -145,7 +145,7 @@ in
freeformType = configType;
options.listen-address = mkOption {
type = types.str;
type = types.either types.str (types.listOf types.str);
default = "127.0.0.1:8118";
description = "Pair of address:port the proxy server is listening to.";
};
nixos/modules/services/networking/zeronet.nix
+3 -1
View File
@@ -133,5 +133,7 @@ with lib;
] "Zeronet will log by default in /var/lib/zeronet")
];
meta.maintainers = with maintainers; [ Madouura ];
meta = {
inherit (pkgs.zeronet) maintainers;
};
}
nixos/modules/services/search/meilisearch.nix
+3 -1
View File
@@ -256,7 +256,9 @@ in
LockPersonality = true;
MemoryDenyWriteExecute = true;
ProcSubset = "pid";
# Meilisearch needs to determine cgroup memory limits to set its own memory limits.
# This means this can't be set to "pid"
ProcSubset = "all";
ProtectProc = "invisible";
NoNewPrivileges = true;
nixos/modules/services/web-apps/immich.nix
+1
View File
@@ -360,6 +360,7 @@ in
MACHINE_LEARNING_WORKERS = "1";
MACHINE_LEARNING_WORKER_TIMEOUT = "120";
MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich";
XDG_CACHE_HOME = "/var/cache/immich";
IMMICH_HOST = "localhost";
IMMICH_PORT = "3003";
};
nixos/modules/virtualisation/ec2-data.nix
+3 -3
View File
@@ -23,9 +23,9 @@ with lib;
wantedBy = [
"multi-user.target"
"sshd.service"
"sshd-keygen.service"
];
before = [ "sshd.service" ];
before = [ "sshd-keygen.service" ];
after = [ "fetch-ec2-metadata.service" ];
path = [ pkgs.iproute2 ];
@@ -80,7 +80,7 @@ with lib;
systemd.services.print-host-key = {
description = "Print SSH Host Key";
wantedBy = [ "multi-user.target" ];
after = [ "sshd.service" ];
after = [ "sshd-keygen.service" ];
script = ''
# Print the host public key on the console so that the user
# can obtain it securely by parsing the output of
nixos/modules/virtualisation/incus.nix
+3
View File
@@ -449,6 +449,9 @@ in
requires = [ "incus.socket" ];
wantedBy = config.systemd.services.incus.wantedBy;
# restarting this service will affect instances
restartIfChanged = false;
serviceConfig = {
ExecStart = "${incus-startup} start";
ExecStop = "${incus-startup} stop";
nixos/modules/virtualisation/podman/default.nix
-4
View File
@@ -242,10 +242,6 @@ in
# containers cannot reach aardvark-dns otherwise
networking.firewall.interfaces.${network_interface}.allowedUDPPorts = lib.mkIf dns_enabled [ 53 ];
virtualisation.podman.extraPackages = [
pkgs.iptables
]
++ lib.optional config.networking.nftables.enable pkgs.nftables;
virtualisation.containers = {
enable = true; # Enable common /etc/containers configuration
containersConf.settings = {
nixos/tests/bcachefs.nix
+3 -1
View File
@@ -1,7 +1,9 @@
{ pkgs, ... }:
{
name = "bcachefs";
meta.maintainers = with pkgs.lib.maintainers; [ Madouura ];
meta = {
inherit (pkgs.bcachefs-tools.meta) maintainers;
};
nodes.machine =
{ pkgs, ... }:
pkgs/applications/editors/vim/plugins/generated.nix
+26
View File
@@ -5555,6 +5555,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
git-dashboard-nvim = buildVimPlugin {
pname = "git-dashboard-nvim";
version = "2025-01-02";
src = fetchFromGitHub {
owner = "juansalvatore";
repo = "git-dashboard-nvim";
rev = "c54fa2faf8ebe1c4091cc0c17c840835534943a6";
sha256 = "0b7b6glp89pqyff21fnhhbh1r7iwdn7w3f0wklmxvl1cai49mh1y";
};
meta.homepage = "https://github.com/juansalvatore/git-dashboard-nvim/";
meta.hydraPlatforms = [ ];
};
git-messenger-vim = buildVimPlugin {
pname = "git-messenger.vim";
version = "2025-05-30";
@@ -12011,6 +12024,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
oil-git-nvim = buildVimPlugin {
pname = "oil-git.nvim";
version = "2025-09-03";
src = fetchFromGitHub {
owner = "benomahony";
repo = "oil-git.nvim";
rev = "d1f27a5982df35b70fb842aa6bbfac10735c7265";
sha256 = "03pl0n7qs51kbqgzfwkcyinmnbl9wyfbbd6ihqzr06mr9xrgf221";
};
meta.homepage = "https://github.com/benomahony/oil-git.nvim/";
meta.hydraPlatforms = [ ];
};
oil-git-status-nvim = buildVimPlugin {
pname = "oil-git-status.nvim";
version = "2025-04-03";
pkgs/applications/editors/vim/plugins/overrides.nix
+4
View File
@@ -2789,6 +2789,10 @@ assertNoAdditions {
];
};
oil-git-nvim = super.oil-git-nvim.overrideAttrs {
dependencies = [ self.oil-nvim ];
};
oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs {
dependencies = [ self.oil-nvim ];
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+2
View File
@@ -425,6 +425,7 @@ https://github.com/ndmitchell/ghcid/,,
https://github.com/eagletmt/ghcmod-vim/,,
https://github.com/f-person/git-blame.nvim/,,
https://github.com/akinsho/git-conflict.nvim/,HEAD,
https://github.com/juansalvatore/git-dashboard-nvim/,HEAD,
https://github.com/rhysd/git-messenger.vim/,,
https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD,
https://github.com/polarmutex/git-worktree.nvim/,HEAD,
@@ -923,6 +924,7 @@ https://github.com/nvimdev/oceanic-material/,,
https://github.com/mhartington/oceanic-next/,,
https://github.com/pwntester/octo.nvim/,,
https://github.com/refractalize/oil-git-status.nvim/,HEAD,
https://github.com/benomahony/oil-git.nvim/,HEAD,
https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD,
https://github.com/nomnivore/ollama.nvim/,HEAD,
https://github.com/yonlu/omni.vim/,,
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -4323,8 +4323,8 @@ let
mktplcRef = {
publisher = "sonarsource";
name = "sonarlint-vscode";
version = "4.27.0";
hash = "sha256-0BqIJL9Vyccjsov1JQil3dRUdo9w8ecOUotVKzBlYGQ=";
version = "4.30.0";
hash = "sha256-sMiIxsMip2ep8ySOERHIAj+Ndwo+GnPhh9uaUncXO9k=";
};
meta.license = lib.licenses.lgpl3Only;
};
pkgs/applications/emulators/libretro/cores/snes9x.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "snes9x";
version = "0-unstable-2025-08-11";
version = "0-unstable-2025-09-18";
src = fetchFromGitHub {
owner = "snes9xgit";
repo = "snes9x";
rev = "b33f2afb33c61d675aaf0319bd3b8cc8d6924d49";
hash = "sha256-hhe52Ob+WC+wktXIYUoEfOq/FKyKGfeeX+BYyQ3xgXE=";
rev = "b43619754a595ec6feb089a387638118037ef74b";
hash = "sha256-b6YC4qisHPdJtM1IEsrwUjCBZ6JElZuKvakApOLGGvY=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "thepowdertoy";
version = "0-unstable-2024-09-30";
version = "0-unstable-2025-09-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "ThePowderToy";
rev = "5d9c749780063b87bd62ddb025dee4241f196f26";
hash = "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8=";
rev = "cb3cd4c2e5beddb98b34e6b800fa24e8f96322d9";
hash = "sha256-k3XWkkSuQC3IBhhI96qkTrlGH/oJu941HaAvR28V5i0=";
};
extraNativeBuildInputs = [ cmake ];
pkgs/applications/misc/lutris/default.nix
-1
View File
@@ -156,7 +156,6 @@ buildPythonApplication rec {
description = "Open Source gaming platform for GNU/Linux";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
Madouura
rapiteanu
iedame
];
pkgs/applications/misc/lutris/fhsenv.nix
-1
View File
@@ -79,7 +79,6 @@ buildFHSEnv {
# Adventure Game Studio
allegro
dumb
# Battle.net
jansson
pkgs/applications/networking/cluster/terraform-providers/providers.json
+9 -9
View File
@@ -335,13 +335,13 @@
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
},
"datadog": {
"hash": "sha256-0ewJLIrKCdTAb3+up7xdbxXscr3hmcIWWcAEGp2TaG4=",
"hash": "sha256-WyIXWOpplukkdCVcI6EyJxcpL1lE+gOwkgLM7ZYjPMM=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
"rev": "v3.73.0",
"rev": "v3.74.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RsIuWBhiziUeil/buqOKNH5tPuuWcMoGbKKQUMH17sc="
"vendorHash": "sha256-29N8ejKj9kuo56hPZkdrQDEF4nwNNzAS1+BSsYOvvl0="
},
"deno": {
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
@@ -615,13 +615,13 @@
"vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y="
},
"htpasswd": {
"hash": "sha256-Kc3L8oqQOP+k8PZAWkRApDj+3LRgs3P3mm4vX2QcUdg=",
"hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=",
"homepage": "https://registry.terraform.io/providers/loafoe/htpasswd",
"owner": "loafoe",
"repo": "terraform-provider-htpasswd",
"rev": "v1.2.1",
"rev": "v1.5.0",
"spdx": "MIT",
"vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs="
"vendorHash": "sha256-6+ZQVWc4/2RoNjQLzetLTl9L8AdbFu2uFmqJ9Kxcc7Q="
},
"http": {
"hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",
@@ -1219,13 +1219,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-hNMZbrihV+xlfamXRaGszQRqO8Tn2829rd4+pH83lrU=",
"hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v9.19.1",
"rev": "v9.21.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-wpm7J8kfkm4vDZhZ0koQsgpW5JwWY7DngSYXfaWh3FQ="
"vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
pkgs/applications/networking/instant-messengers/discord/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@ let
versions =
if stdenv.hostPlatform.isLinux then
{
stable = "0.0.108";
stable = "0.0.110";
ptb = "0.0.160";
canary = "0.0.756";
development = "0.0.85";
@@ -26,7 +26,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-hKFhylEovj89WxpTexkzR9C6tN47V9iDKQYpCjgojvw=";
hash = "sha256-WwMEtpMlaR5psraDsvTNOb4nPwnGnVif4DgmdE9gCtc=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
pkgs/by-name/al/alcom/deps.json
Generated
-92
View File
@@ -1,92 +0,0 @@
[
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
"version": "8.0.1",
"hash": "sha256-vAqIkIrtqiJbQ8ngqSfxLA4XUyfqO1lr7NiYch5+TTc="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.1",
"hash": "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
"version": "8.0.1",
"hash": "sha256-tiSDf189+7K788Z2qVmsP3PeUzkByUCtcjXR9onOdXA="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "8.0.1",
"hash": "sha256-tYR6xGWvWoR0ITYHra9bsOxIhzhe/GYNVpB4R7KkKik="
},
{
"pname": "Microsoft.DotNet.ILCompiler",
"version": "8.0.1",
"hash": "sha256-u4JMGIe/rmXOzx+Y2tC5qlkP5aNVMHy6AQnYwxsXsN4="
},
{
"pname": "Microsoft.NET.ILLink.Tasks",
"version": "8.0.1",
"hash": "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-arm64",
"version": "8.0.1",
"hash": "sha256-g4RhRWUP4o3dkNt2hV0ZNRRwDGIuAJ6gY02d3xhtFzY="
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.1",
"hash": "sha256-+fUVeiQ2qXBtP4HI+8+/SLqZOEuKi9/zC/pX9g+rhqs="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-arm64",
"version": "8.0.1",
"hash": "sha256-aRGVm8Ckd+uhkuAnJAuqHH6+muT+sXf+b+6nZ/Md77c="
},
{
"pname": "Microsoft.NETCore.App.Host.osx-x64",
"version": "8.0.1",
"hash": "sha256-UiJ5KdJdLg+/eDHsC4HgvYaY9h3av+/92VPoEixHDgQ="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
"version": "8.0.1",
"hash": "sha256-JeYU02u4ln0v56QeCs+8ZLWhRlNxZ6c/xHr8Jy3koww="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.1",
"hash": "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
"version": "8.0.1",
"hash": "sha256-TJbkjj3koeFN068auqXUojMLPrihO6sEMIPqglW7uTE="
},
{
"pname": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "8.0.1",
"hash": "sha256-SYctZpDlsEHxmy+/Oa1Qp99mpx8I7icYoSBKczF1Ybo="
},
{
"pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler",
"version": "8.0.1",
"hash": "sha256-oCzhhcSp2ZZ+R8ITzhVn21nmT+R6upf3IzsRtke4xxY="
},
{
"pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler",
"version": "8.0.1",
"hash": "sha256-BMDOdOJFDuItIL8gbYKJdoycvf2rJ8RI8FHsaaYYflY="
},
{
"pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler",
"version": "8.0.1",
"hash": "sha256-7FJEqNLs8DvqsSJQZETbL2uvRrqO5M1ReWCYkXtqVAE="
},
{
"pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler",
"version": "8.0.1",
"hash": "sha256-WOJqlt/ONpCqhfB2S++rY+iRqW6mlAddxGoqaC/boCM="
}
]
pkgs/by-name/al/alcom/disable-updater-artifacts.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml
index ff969dbb..1339d861 100644
index cd180da8..66a81aa9 100644
--- a/vrc-get-gui/Tauri.toml
+++ b/vrc-get-gui/Tauri.toml
@@ -34,8 +34,6 @@ icon = [
@@ -8,6 +8,6 @@ index ff969dbb..1339d861 100644
-createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI
-
[bundle.linux.deb]
desktopTemplate = "alcom.desktop"
[[bundle.fileAssociations]]
# note: for macOS we directory use info.plist for registering file association.
description = "ALCOM Project Template"
pkgs/by-name/al/alcom/package.nix
+6 -43
View File
@@ -1,8 +1,6 @@
{
buildDotnetModule,
cargo-about,
cargo-tauri,
dotnetCorePackages,
fetchFromGitHub,
fetchNpmDeps,
glib-networking,
@@ -20,33 +18,16 @@
}:
let
pname = "alcom";
version = "1.0.1";
version = "1.1.4";
src = fetchFromGitHub {
owner = "vrc-get";
repo = "vrc-get";
tag = "gui-v${version}";
fetchSubmodules = true;
hash = "sha256-cOx7X3xfTBYpXhv1zIRStaIpyGWSp+d7qzdJLGzXtDY=";
hash = "sha256-pGWDMQIS2WgtnqRoOXRZrc25kJ5c6TY6UE2aZtpxN/s=";
};
subdir = "vrc-get-gui";
dotnetSdk = dotnetCorePackages.sdk_8_0;
dotnetRuntime = dotnetCorePackages.runtime_8_0;
dotnetBuild = buildDotnetModule {
inherit pname version src;
dotnet-sdk = dotnetSdk;
dotnet-runtime = dotnetRuntime;
projectFile = [
"vrc-get-litedb/dotnet/vrc-get-litedb.csproj"
"vrc-get-litedb/dotnet/LiteDB/LiteDB/LiteDB.csproj"
];
nugetDeps = ./deps.json;
};
in
rustPlatform.buildRustPackage {
inherit pname version src;
@@ -58,7 +39,6 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = [
cargo-about
cargo-tauri.hook
dotnetSdk
nodejs
npmHooks.npmConfigHook
wrapGAppsHook4
@@ -73,41 +53,24 @@ rustPlatform.buildRustPackage {
libsoup_3
makeBinaryWrapper
webkitgtk_4_1
]
++ dotnetSdk.packages
++ dotnetBuild.nugetDeps;
];
cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8=";
cargoHash = "sha256-JuZHfpOYuLNdb03srECx73GK5ajgL6bHlbKbiuMN2NE=";
buildAndTestSubdir = subdir;
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}/${subdir}";
hash = "sha256-lWQPBILZn8VGoILfEY2bMxGaBL2ALGbvcT5RqanTNyY=";
hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI=";
};
npmRoot = subdir;
preConfigure = ''
dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true
'';
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
wrapProgram $out/bin/ALCOM \
--set APPIMAGE ALCOM
'';
passthru = {
inherit (dotnetBuild) fetch-deps;
};
meta = {
description = "Experimental GUI application to manage VRChat Unity Projects";
homepage = "https://github.com/vrc-get/vrc-get";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Scrumplex ];
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "alcom";
mainProgram = "ALCOM";
};
}
pkgs/by-name/am/amp-cli/package-lock.json
Generated
+5 -467
View File
@@ -5,36 +5,7 @@
"packages": {
"": {
"dependencies": {
"@sourcegraph/amp": "^0.0.1757347273-geb1b63"
}
},
"node_modules/@colors/colors": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
"integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
"license": "MIT",
"engines": {
"node": ">=0.1.90"
}
},
"node_modules/@dabh/diagnostics": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
"integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
"license": "MIT",
"dependencies": {
"colorspace": "1.1.x",
"enabled": "2.0.x",
"kuler": "^2.0.0"
}
},
"node_modules/@msgpack/msgpack": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz",
"integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==",
"license": "ISC",
"engines": {
"node": ">= 10"
"@sourcegraph/amp": "^0.0.1758297686-ge5ccb5"
}
},
"node_modules/@napi-rs/keyring": {
@@ -257,18 +228,11 @@
}
},
"node_modules/@sourcegraph/amp": {
"version": "0.0.1757347273-geb1b63",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1757347273-geb1b63.tgz",
"integrity": "sha512-HGz6ImderQxdxcd1cLkXP27aaiTsrAt5h53M3YMdH+7HHcI/S/YraQp2e0U8Kt+j43dbeKj6/M4/X4xrMnU3RQ==",
"version": "0.0.1758297686-ge5ccb5",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1758297686-ge5ccb5.tgz",
"integrity": "sha512-fU/Lw/yYfeUwF0+1MUuCdDcqZVEygeLwjMPoIFl9kg8R3u2jgZGVqtbfaS8q6MI8CGCVPQTs/rDgP4nVE0jmyg==",
"dependencies": {
"@napi-rs/keyring": "^1.1.9",
"commander": "^11.1.0",
"jsonc-parser": "^3.3.1",
"neovim": "^5.3.0",
"open-simplex-noise": "^2.5.0",
"winston": "^3.17.0",
"wrap-ansi": "^9.0.0",
"xdg-basedir": "^5.1.0"
"@napi-rs/keyring": "1.1.9"
},
"bin": {
"amp": "dist/main.js"
@@ -276,432 +240,6 @@
"engines": {
"node": ">=20"
}
},
"node_modules/@types/triple-beam": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
"integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
"license": "MIT"
},
"node_modules/ansi-regex": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
}
},
"node_modules/ansi-styles": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/async": {
"version": "3.2.6",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
"license": "MIT"
},
"node_modules/color": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
"integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
"license": "MIT",
"dependencies": {
"color-convert": "^1.9.3",
"color-string": "^1.6.0"
}
},
"node_modules/color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"license": "MIT",
"dependencies": {
"color-name": "1.1.3"
}
},
"node_modules/color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"license": "MIT"
},
"node_modules/color-string": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
"license": "MIT",
"dependencies": {
"color-name": "^1.0.0",
"simple-swizzle": "^0.2.2"
}
},
"node_modules/colorspace": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
"integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
"license": "MIT",
"dependencies": {
"color": "^3.1.3",
"text-hex": "1.0.x"
}
},
"node_modules/commander": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
"integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
"license": "MIT",
"engines": {
"node": ">=16"
}
},
"node_modules/emoji-regex": {
"version": "10.4.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
"integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
"license": "MIT"
},
"node_modules/enabled": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
"integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
"license": "MIT"
},
"node_modules/fecha": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
"integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
"license": "MIT"
},
"node_modules/fn.name": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
"integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
"license": "MIT"
},
"node_modules/get-east-asian-width": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
"integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
"license": "MIT",
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/inherits": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"license": "ISC"
},
"node_modules/is-arrayish": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
"license": "MIT"
},
"node_modules/is-stream": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
"license": "MIT",
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/jsonc-parser": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
"license": "MIT"
},
"node_modules/kuler": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
"integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
"license": "MIT"
},
"node_modules/logform": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
"integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
"license": "MIT",
"dependencies": {
"@colors/colors": "1.6.0",
"@types/triple-beam": "^1.3.2",
"fecha": "^4.2.0",
"ms": "^2.1.1",
"safe-stable-stringify": "^2.3.1",
"triple-beam": "^1.3.0"
},
"engines": {
"node": ">= 12.0.0"
}
},
"node_modules/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
"node_modules/neovim": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/neovim/-/neovim-5.3.0.tgz",
"integrity": "sha512-32Cypq6qh7vzJ5wuVPPzIsBdOlvwo0do8/3jxLu+RGdneFSJjh5CYi0ScHHAw/2HLtIjRKhRjJMXeze21M+uyw==",
"license": "MIT",
"dependencies": {
"@msgpack/msgpack": "^2.8.0",
"winston": "3.14.1"
},
"bin": {
"neovim-node-host": "bin/cli.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/neovim/node_modules/winston": {
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz",
"integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==",
"license": "MIT",
"dependencies": {
"@colors/colors": "^1.6.0",
"@dabh/diagnostics": "^2.0.2",
"async": "^3.2.3",
"is-stream": "^2.0.0",
"logform": "^2.6.0",
"one-time": "^1.0.0",
"readable-stream": "^3.4.0",
"safe-stable-stringify": "^2.3.1",
"stack-trace": "0.0.x",
"triple-beam": "^1.3.0",
"winston-transport": "^4.7.0"
},
"engines": {
"node": ">= 12.0.0"
}
},
"node_modules/one-time": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
"integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
"license": "MIT",
"dependencies": {
"fn.name": "1.x.x"
}
},
"node_modules/open-simplex-noise": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/open-simplex-noise/-/open-simplex-noise-2.5.0.tgz",
"integrity": "sha512-co7x8uWxGcgFtsJNBFqI9ylq+5Isotz2hZR7dsD5Sl+RDPGBeMEG41KAfF+5gF10ksi9Pg6DNpMHEoyTKLbejQ==",
"license": "Unlicense"
},
"node_modules/readable-stream": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
"license": "MIT",
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
],
"license": "MIT"
},
"node_modules/safe-stable-stringify": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
"integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
"license": "MIT",
"engines": {
"node": ">=10"
}
},
"node_modules/simple-swizzle": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
"license": "MIT",
"dependencies": {
"is-arrayish": "^0.3.1"
}
},
"node_modules/stack-trace": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
"integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
"license": "MIT",
"engines": {
"node": "*"
}
},
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"license": "MIT",
"dependencies": {
"safe-buffer": "~5.2.0"
}
},
"node_modules/strip-ansi": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
"license": "MIT",
"dependencies": {
"ansi-regex": "^6.0.1"
},
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
}
},
"node_modules/text-hex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
"integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
"license": "MIT"
},
"node_modules/triple-beam": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
"integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
"license": "MIT",
"engines": {
"node": ">= 14.0.0"
}
},
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
"license": "MIT"
},
"node_modules/winston": {
"version": "3.17.0",
"resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
"integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
"license": "MIT",
"dependencies": {
"@colors/colors": "^1.6.0",
"@dabh/diagnostics": "^2.0.2",
"async": "^3.2.3",
"is-stream": "^2.0.0",
"logform": "^2.7.0",
"one-time": "^1.0.0",
"readable-stream": "^3.4.0",
"safe-stable-stringify": "^2.3.1",
"stack-trace": "0.0.x",
"triple-beam": "^1.3.0",
"winston-transport": "^4.9.0"
},
"engines": {
"node": ">= 12.0.0"
}
},
"node_modules/winston-transport": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz",
"integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==",
"license": "MIT",
"dependencies": {
"logform": "^2.7.0",
"readable-stream": "^3.6.2",
"triple-beam": "^1.3.0"
},
"engines": {
"node": ">= 12.0.0"
}
},
"node_modules/wrap-ansi": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
"integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
"license": "MIT",
"dependencies": {
"ansi-styles": "^6.2.1",
"string-width": "^7.0.0",
"strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
"node_modules/wrap-ansi/node_modules/string-width": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
"integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
"license": "MIT",
"dependencies": {
"emoji-regex": "^10.3.0",
"get-east-asian-width": "^1.0.0",
"strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/xdg-basedir": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
"integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
}
}
}
pkgs/by-name/am/amp-cli/package.nix
+3 -3
View File
@@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: {
pname = "amp-cli";
version = "0.0.1757347273-geb1b63";
version = "0.0.1758297686-ge5ccb5";
src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-8bB7sBdKUZMpHFjRQdEg++Ea3Uv4ykIc88ITAfIzzdM=";
hash = "sha256-D2jElEhvrcuuDIzfB+XAI4VCyYAOC6pu/xNMxkn16o4=";
};
postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js
'';
npmDepsHash = "sha256-CUoT9JzvYvaPBqQrKo5XESISVzi9jRvPcbBVPHETIF4=";
npmDepsHash = "sha256-dePLix9roMYlnYMqBq1nwRQEHdyXdtSEgvsoo7yD3QQ=";
propagatedBuildInputs = [
ripgrep
pkgs/by-name/ap/apache-answer/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "apache-answer";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "apache";
repo = "answer";
tag = "v${version}";
hash = "sha256-OocQsCqyVHjkpGSDS23RbOJ+b10Ax32G2hok5bgNDTI=";
hash = "sha256-QrLYkGiEDBB4uUzG2yrlEUYXpQxovKFBmGZjLbZiGKk=";
};
webui = stdenv.mkDerivation {
@@ -55,7 +55,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-jKpUJD8rq+ZvTgJVaI+AfrwMzrrai+cfd4hjoDLYnxc=";
vendorHash = "sha256-mWSKoEYj23fy6ix3mK1/5HeGugp1UAUO+iwInXkzgU4=";
doCheck = false; # TODO checks are currently broken upstream
pkgs/by-name/ar/ares/package.nix
-3
View File
@@ -121,9 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = lib.licenses.isc;
mainProgram = "ares";
maintainers = with lib.maintainers; [
Madouura
];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/ar/argocd/package.nix
+3 -3
View File
@@ -13,13 +13,13 @@
buildGoModule rec {
pname = "argocd";
version = "3.1.1";
version = "3.1.6";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-+StoJfRlWOnXBAt+D9cxaAc9gn9V4h9QWogtMPf3V+A=";
hash = "sha256-RdqMkyQBJaAJv660bCe+C84BFQNu06t3AaYSz4aMlBA=";
};
ui = stdenv.mkDerivation {
@@ -45,7 +45,7 @@ buildGoModule rec {
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk=";
vendorHash = "sha256-oI0N6V8enziJK21VCgQ4KUOWqbC5TcZd3QnWiTTeTHQ=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile
pkgs/by-name/ar/argtable/package.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
are essential but tedious to implement for a robust CLI program.
'';
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ artuuge ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/av/avalonia/package.nix
+2 -2
View File
@@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation (
}
rec {
pname = "Avalonia";
version = "11.3.5";
version = "11.3.6";
src = fetchFromGitHub {
owner = "AvaloniaUI";
repo = "Avalonia";
tag = version;
fetchSubmodules = true;
hash = "sha256-o3KMfHNFDksz+8WO5TPoHPxVvjwuSZrwmB7kl+rvGDw=";
hash = "sha256-ulGaYlhWxSWKLMh6Hy6gzFuDl4rmF3NDlcAL12YYtAg=";
};
patches = [
pkgs/by-name/ba/bash-language-server/package.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
preInstall = ''
# remove unnecessary files
rm node_modules/.modules.yaml
pnpm --ignore-scripts --prod prune
CI=true pnpm --ignore-scripts --prod prune
rm -r node_modules/.pnpm/@mixmark-io*/node_modules/@mixmark-io/domino/{test,.yarn}
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
# https://github.com/pnpm/pnpm/issues/3645
pkgs/by-name/bc/bcachefs-tools/package.nix
-1
View File
@@ -134,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
davidak
johnrtitor
Madouura
];
platforms = lib.platforms.linux;
mainProgram = "bcachefs";
pkgs/by-name/bl/blaze/package.nix
-1
View File
@@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
description = "High performance C++ math library";
homepage = "https://bitbucket.org/blaze-lib/blaze";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ Madouura ];
platforms = platforms.unix;
};
})
pkgs/by-name/br/brmodelo/package.nix
+1 -1
View File
@@ -127,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/chcandido/brModelo";
license = licenses.gpl3;
mainProgram = "brmodelo";
maintainers = with maintainers; [ yuu ];
maintainers = with maintainers; [ ];
};
})
pkgs/by-name/bt/btop/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "btop";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "aristocratos";
repo = "btop";
rev = "v${version}";
hash = "sha256-4H9UjewJ7UFQtTQYwvHZL3ecPiChpfT6LEZwbdBCIa0=";
hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0=";
};
nativeBuildInputs = [
pkgs/by-name/ca/calibre/package.nix
+7 -3
View File
@@ -3,6 +3,7 @@
stdenv,
fetchurl,
cmake,
espeak-ng,
fetchpatch,
ffmpeg,
fontconfig,
@@ -18,6 +19,7 @@
libusb1,
libwebp,
nix-update-script,
onnxruntime,
optipng,
piper-tts,
pkg-config,
@@ -36,11 +38,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "8.7.0";
version = "8.10.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-LP5Yfjdz2GB/6LvvvNd7XPuBYSTKyJ5JE1PeuPL6kyQ=";
hash = "sha256-ByDUoF9C5FE8ZlQ/zP4H43b9+zUIsgah5/FO5mtXsMU=";
};
patches = [
@@ -79,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
espeak-ng
ffmpeg
fontconfig
hunspell
@@ -91,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
libstemmer
libuchardet
libusb1
piper-tts
onnxruntime
podofo_0_10
poppler-utils
qt6.qtbase
@@ -145,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional unrarSupport unrardll
))
piper-tts
xdg-utils
]
++ lib.optional speechSupport speechd-minimal;
pkgs/by-name/ca/capnproto/fix-libatomic.patch
+35
View File
@@ -0,0 +1,35 @@
From dfbbc505817bd0c3e01af5865196629c2a2a2b5e Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Wed, 10 Sep 2025 20:12:39 +0200
Subject: [PATCH] Check if libatomic is needed
---
c++/src/kj/CMakeLists.txt | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
index 7114ddb80e..8ce355b8b0 100644
--- a/c++/src/kj/CMakeLists.txt
+++ b/c++/src/kj/CMakeLists.txt
@@ -84,6 +84,21 @@ target_compile_features(kj PUBLIC cxx_std_20)
if(UNIX AND NOT ANDROID)
target_link_libraries(kj PUBLIC pthread)
endif()
+
+include(CheckCXXSourceCompiles)
+check_cxx_source_compiles("#include <atomic>
+int main() {
+ std::atomic<uint8_t> w1;
+ std::atomic<uint16_t> w2;
+ std::atomic<uint32_t> w4;
+ std::atomic<uint64_t> w8;
+ return ++w1 + ++w2 + ++w4 + ++w8;
+}" CAPNP_BUILDS_WITHOUT_LIBATOMIC)
+
+if(NOT CAPNP_BUILDS_WITHOUT_LIBATOMIC)
+ target_link_libraries(kj PUBLIC atomic)
+endif()
+
#make sure the lite flag propagates to all users (internal + external) of this library
target_compile_definitions(kj PUBLIC ${CAPNP_LITE_FLAG})
#make sure external consumers don't need to manually set the include dirs
pkgs/by-name/ca/capnproto/package.nix
+2
View File
@@ -46,6 +46,8 @@ clangStdenv.mkDerivation rec {
patches = [
# https://github.com/capnproto/capnproto/pull/2377
./fix-libucontext.patch
# https://github.com/capnproto/capnproto/pull/2410
./fix-libatomic.patch
];
nativeBuildInputs = [
pkgs/by-name/cd/cdrkit/cmake-4.patch
+9
View File
@@ -0,0 +1,9 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57edba6..f28af86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
PROJECT (cdrkit C)
SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
pkgs/by-name/cd/cdrkit/package.nix
+6 -2
View File
@@ -12,16 +12,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cdrkit";
version = "1.1.11-3.5";
version = "1.1.11-4";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "cdrkit";
rev = "debian/9%${finalAttrs.version}";
hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78=";
hash = "sha256-oOqvSA2MAURf0YOrWM5Ft6Ln43gXw7SEvNxxRrDs8sI=";
};
patches = [
./cmake-4.patch
];
nativeBuildInputs = [
cmake
quilt
pkgs/by-name/ch/checkov/package.nix
+15 -3
View File
@@ -17,6 +17,18 @@ let
tag = "v${version}";
hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI=";
};
# The `serializable` package eventually got renamed `py_serializable`, therefore we need
# to patch the imports;
# _c.f._ https://github.com/madpah/serializable/pull/155 .
postPatch = ''
find . -name '*.py' | xargs -I{} sed -i \
-e 's/serializable\./py_serializable\./g' \
-e 's/@serializable/@py_serializable/g' \
-e 's/from serializable/from py_serializable/g' \
-e 's/import serializable/import py_serializable/g' \
{}
'';
});
};
};
@@ -25,14 +37,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.461";
version = "3.2.471";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-CKsQn5IAbfVR/j+wHs1rohFvwNO3f2FZ7UBps5ic5Rk=";
hash = "sha256-dAUokMpBvd2lAKNQJJqAthBUNoI3S1C7gat4Jda7bZk=";
};
pythonRelaxDeps = [
@@ -41,8 +53,8 @@ python3.pkgs.buildPythonApplication rec {
"bc-python-hcl2"
"boto3"
"botocore"
"cachetools"
"cloudsplaining"
"cyclonedx-python-lib"
"dpath"
"igraph"
"importlib-metadata"
pkgs/by-name/ci/circt/package.nix
+2 -2
View File
@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.130.0";
version = "1.131.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-4HAGseBeMfHP5eqaOkpakgtzA3+kv5ue9uvTQSOIHCA=";
hash = "sha256-im+w6vYsLdJ/i88mG/anFjPYgE1HfvJIemLEse0pzco=";
fetchSubmodules = true;
};
pkgs/by-name/cl/clblas/package.nix
+1 -1
View File
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
This package contains a library of BLAS functions on top of OpenCL.
'';
license = licenses.asl20;
maintainers = with maintainers; [ artuuge ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
pkgs/by-name/cl/clickhouse/generic.nix
+10 -2
View File
@@ -21,14 +21,17 @@
darwin,
findutils,
libiconv,
removeReferencesTo,
rustSupport ? true,
rustc,
cargo,
rustPlatform,
nix-update-script,
}:
llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
let
llvmStdenv = llvmPackages_19.stdenv;
in
llvmStdenv.mkDerivation (finalAttrs: {
pname = "clickhouse" + lib.optionalString lts "-lts";
inherit version;
@@ -70,6 +73,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
python3
perl
llvmPackages_19.lld
removeReferencesTo
]
++ lib.optionals stdenv.hostPlatform.isx86_64 [
nasm
@@ -154,8 +158,12 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
substituteInPlace $out/etc/clickhouse-server/config.xml \
--replace-fail "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>" \
--replace-fail "<level>trace</level>" "<level>warning</level>"
remove-references-to -t ${llvmStdenv.cc} $out/bin/clickhouse
'';
# canary for the remove-references-to hook failing
disallowedReferences = [ llvmStdenv.cc ];
# Basic smoke test
doCheck = true;
checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
pkgs/development/python-modules/commitizen/default.nix → pkgs/by-name/co/commitizen/package.nix
+22 -43
View File
@@ -2,45 +2,25 @@
lib,
commitizen,
fetchFromGitHub,
buildPythonPackage,
gitMinimal,
pythonOlder,
stdenv,
installShellFiles,
poetry-core,
nix-update-script,
testers,
argcomplete,
charset-normalizer,
colorama,
decli,
importlib-metadata,
jinja2,
packaging,
pyyaml,
questionary,
termcolor,
tomlkit,
py,
pytest-freezer,
pytest-mock,
pytest-regressions,
pytest7CheckHook,
deprecated,
python3Packages,
versionCheckHook,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
python3Packages.buildPythonPackage rec {
pname = "commitizen";
version = "4.8.3";
version = "4.9.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = "commitizen";
tag = "v${version}";
hash = "sha256-ukmLvv1/Ez04UhwXcb5QYiVWXCV7LvYd13Go6ASxsxI=";
hash = "sha256-vHA+TvKs9TOu/0/FpxLHHbDgshQFhP9Dwe6ZMnUOBKc=";
};
pythonRelaxDeps = [
@@ -49,15 +29,16 @@ buildPythonPackage rec {
"termcolor"
];
build-system = [ poetry-core ];
build-system = with python3Packages; [ poetry-core ];
nativeBuildInputs = [ installShellFiles ];
dependencies = [
dependencies = with python3Packages; [
argcomplete
charset-normalizer
colorama
decli
deprecated
importlib-metadata
jinja2
packaging
@@ -68,23 +49,25 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
argcomplete
deprecated
gitMinimal
versionCheckHook
writableTmpDirAsHomeHook
]
++ (with python3Packages; [
argcomplete
py
pytest-freezer
pytest-mock
pytest-regressions
pytest7CheckHook
];
]);
versionCheckProgramArg = "version";
pythonImportsCheck = [ "commitizen" ];
# The tests require a functional git installation
# which requires a valid HOME directory.
preCheck = ''
export HOME="$(mktemp -d)"
git config --global user.name "Nix Builder"
git config --global user.email "nix-builder@nixos.org"
git init .
@@ -105,7 +88,7 @@ buildPythonPackage rec {
postInstall =
let
register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete";
register-python-argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete";
in
lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd cz \
@@ -116,19 +99,15 @@ buildPythonPackage rec {
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = commitizen;
command = "cz version";
};
};
meta = with lib; {
meta = {
description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs";
homepage = "https://github.com/commitizen-tools/commitizen";
changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
changelog = "https://github.com/commitizen-tools/commitizen/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
mainProgram = "cz";
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
lovesegfault
anthonyroussel
];
pkgs/by-name/cr/crowdsec/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "crowdsec";
version = "1.6.11";
version = "1.7.0";
src = fetchFromGitHub {
owner = "crowdsecurity";
repo = "crowdsec";
tag = "v${version}";
hash = "sha256-fHnd/pnmVAPvCtae4aRS66tXmMp6DgNagqWNrT9hcw8=";
hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc=";
};
vendorHash = "sha256-ImrXOD3kIlNsEZOTeMA6UFvMZCnfMOTZOXtY3ger8YI=";
vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo=";
nativeBuildInputs = [ installShellFiles ];
pkgs/applications/misc/cubiomes-viewer/default.nix → pkgs/by-name/cu/cubiomes-viewer/package.nix
+28 -22
View File
@@ -2,20 +2,16 @@
lib,
stdenv,
fetchFromGitHub,
qtbase,
qmake,
qttools,
wrapQtAppsHook,
qt5,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cubiomes-viewer";
version = "4.1.2";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
repo = "cubiomes-viewer";
tag = finalAttrs.version;
hash = "sha256-izDKS08LNT2rV5rIxlWRHevJAKEbAVzekjfZy0Oen1I=";
fetchSubmodules = true;
};
@@ -27,13 +23,13 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
qtbase
qt5.qtbase
];
nativeBuildInputs = [
qmake
qttools
wrapQtAppsHook
qt5.qmake
qt5.qttools
qt5.wrapQtAppsHook
];
preBuild = ''
@@ -45,17 +41,27 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin
cp cubiomes-viewer $out/bin
${
if stdenv.hostPlatform.isDarwin then
''
mkdir -p "$out/Applications/"
cp -R cubiomes-viewer.app "$out/Applications/cubiomes-viewer.app"
ln -s "$out/Applications/cubiomes-viewer.app/Contents/MacOS/cubiomes-viewer" "$out/bin/cubiomes-viewer"
''
else
''
cp cubiomes-viewer $out/bin
mkdir -p $out/share/{pixmaps,applications}
cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png
cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications
mkdir -p $out/share/{pixmaps,applications}
cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png
cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications
''
}
runHook postInstall
'';
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin;
meta = {
homepage = "https://github.com/Cubitect/cubiomes-viewer";
description = "Graphical Minecraft seed finder and map viewer";
mainProgram = "cubiomes-viewer";
@@ -63,8 +69,8 @@ stdenv.mkDerivation rec {
Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding
utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation.
'';
platforms = platforms.all;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hqurve ];
platforms = lib.platforms.all;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ hqurve ];
};
}
})
pkgs/by-name/cy/cyclone-scheme/package.nix
+8 -6
View File
@@ -7,7 +7,7 @@
}:
let
version = "0.34.0";
version = "0.36.0";
bootstrap = stdenv.mkDerivation {
pname = "cyclone-bootstrap";
inherit version;
@@ -16,7 +16,7 @@ let
owner = "justinethier";
repo = "cyclone-bootstrap";
rev = "v${version}";
sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM=";
sha256 = "sha256-8WK4rsLK3gi9a6PKFaT3KRK256rEDTTO6QvqYrOtYDs=";
};
enableParallelBuilding = true;
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
owner = "justinethier";
repo = "cyclone";
rev = "v${version}";
sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U=";
sha256 = "sha256-5h8jZ8EBgiLLYH/j3p7CqsQGXHhjGtQfOnxPbFnT5WM=";
};
enableParallelBuilding = true;
@@ -47,10 +47,12 @@ stdenv.mkDerivation {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
meta = {
homepage = "https://justinethier.github.io/cyclone/";
description = "Brand-new compiler that allows practical application development using R7RS Scheme";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ siraben ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/db/dbus-cpp/package.nix
+5 -3
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dbus-cpp";
version = "5.0.4";
version = "5.0.5";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lib-cpp/dbus-cpp";
tag = finalAttrs.version;
hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4=";
hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU=";
};
outputs = [
@@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
versionCheck = true;
# Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9
# Try again on next bump.
versionCheck = finalAttrs.version != "5.0.5";
};
updateScript = gitUpdater { };
};
pkgs/by-name/di/diamond/package.nix
+1 -1
View File
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/bbuchfink/diamond";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ thyol ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/do/dolphin-emu-primehack/package.nix
-1
View File
@@ -168,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/shiiion/dolphin";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ Madouura ];
broken = stdenv.hostPlatform.isDarwin;
platforms = lib.platforms.unix;
};
pkgs/by-name/du/duf/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "duf";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "muesli";
repo = "duf";
tag = "v${finalAttrs.version}";
hash = "sha256-cIHFWFSsfS5UG2QKkFEEB34Q1l0pjuICxQlGfgWnLeY=";
hash = "sha256-d/co7EaDk0m/oYxWFATxQYCdH3Z9r8eTtOOo+M+HD4o=";
};
vendorHash = "sha256-Br2jagMynnzH77GNA7NeWbM5qSHbhfW5Bo7X2b6OX28=";
pkgs/by-name/du/dumb/package.nix
-38
View File
@@ -1,38 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
allegro,
SDL2,
}:
stdenv.mkDerivation rec {
pname = "dumb";
version = "2.0.3";
nativeBuildInputs = [ cmake ];
buildInputs = [
allegro
SDL2
];
src = fetchFromGitHub {
owner = "kode54";
repo = "dumb";
rev = version;
sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6";
};
cmakeFlags = [
"-DBUILD_EXAMPLES='OFF'"
];
meta = with lib; {
homepage = "https://github.com/kode54/dumb";
description = "Module/tracker based music format parser and player library";
license = licenses.free; # Derivative of GPL
maintainers = with maintainers; [ Madouura ];
platforms = platforms.all;
};
}
pkgs/by-name/ea/easyjson/package.nix
-1
View File
@@ -23,6 +23,5 @@ buildGoModule rec {
description = "Fast JSON serializer for Go";
mainProgram = "easyjson";
license = licenses.mit;
maintainers = with maintainers; [ Madouura ];
};
}
pkgs/by-name/ea/easytier/package.nix
+12 -3
View File
@@ -6,18 +6,19 @@
protobuf,
nixosTests,
nix-update-script,
installShellFiles,
withQuic ? false, # with QUIC protocol support
}:
rustPlatform.buildRustPackage rec {
pname = "easytier";
version = "2.4.3";
version = "2.4.4";
src = fetchFromGitHub {
owner = "EasyTier";
repo = "EasyTier";
tag = "v${version}";
hash = "sha256-0TuRNxf8xDhwUjBXJsv7dhgeYjr/voIt+/0tinImUhA=";
hash = "sha256-89uRsLeSNR2I+QX0k1VJ0sMrUYLbApEJClk3aFr0faY=";
};
# remove if rust 1.89 merged
@@ -28,16 +29,24 @@ rustPlatform.buildRustPackage rec {
--replace-fail 'rust-version = "1.89.0"' ""
'';
cargoHash = "sha256-FQC3JD051fEZQO9UriNzJPrxE0QcSQ8p3VTk3tQGPBc=";
cargoHash = "sha256-rioo3Eg5xGg4PI4beXWheeymVNq+zZP9uhbfU584u0g=";
nativeBuildInputs = [
protobuf
rustPlatform.bindgenHook
installShellFiles
];
buildNoDefaultFeatures = stdenv.hostPlatform.isMips;
buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd easytier \
--bash <($out/bin/easytier-cli gen-autocomplete bash) \
--fish <($out/bin/easytier-cli gen-autocomplete fish) \
--zsh <($out/bin/easytier-cli gen-autocomplete zsh)
'';
doCheck = false; # tests failed due to heavy rely on network
passthru = {
pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch
+27
View File
@@ -0,0 +1,27 @@
diff --git i/BaseTools/Source/C/VfrCompile/GNUmakefile w/BaseTools/Source/C/VfrCompile/GNUmakefile
index ad6c350876..bc30e25cd3 100644
--- i/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ w/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -32,6 +32,9 @@ LINKER = $(CXX)
EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
+CC_FOR_BUILD ?= $(CC)
+CXX_FOR_BUILD ?= $(CXX)
+
MAKEROOT ?= ../..
include $(MAKEROOT)/Makefiles/header.makefile
@@ -61,10 +64,10 @@ VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg
Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
Pccts/antlr/antlr:
- $(MAKE) -C Pccts/antlr
+ $(MAKE) -C Pccts/antlr CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD)
Pccts/dlg/dlg:
- $(MAKE) -C Pccts/dlg
+ $(MAKE) -C Pccts/dlg CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD)
ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
$(CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
pkgs/by-name/ed/edk2/package.nix
+11 -12
View File
@@ -33,14 +33,14 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "edk2";
version = "202505";
version = "202508";
srcWithVendoring = fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
tag = "edk2-stable${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8=";
hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk=";
};
src = applyPatches {
@@ -53,12 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch";
hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";
})
# https://github.com/tianocore/edk2/pull/5658
(fetchpatch {
name = "fix-cross-compilation-antlr-dlg.patch";
url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch";
hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU=";
})
./fix-cross-compilation-antlr-dlg.patch
];
# FIXME: unvendor OpenSSL again once upstream updates
@@ -86,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "-C BaseTools" ];
env.NIX_CFLAGS_COMPILE =
"-Wno-return-type"
+ lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"
+ lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined";
env = {
NIX_CFLAGS_COMPILE =
"-Wno-return-type"
+ lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"
+ lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined";
PYTHON_COMMAND = lib.getExe pythonEnv;
};
hardeningDisable = [
"format"
pkgs/by-name/em/emhash/package.nix
+39
View File
@@ -0,0 +1,39 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "emhash";
version = "1.0.1";
src = fetchFromGitHub {
owner = "ktprime";
repo = "emhash";
tag = "v${finalAttrs.version}";
hash = "sha256-dFj/QaGdTJYdcxKlS9tES6OHae8xPMnrG9ccRNM/hi8=";
};
nativeBuildInputs = [
cmake
];
cmakeFlags = [
# By default, it will try to build the benchmark suite,
# but we only care about the headers copied by the install target.
"-DWITH_BENCHMARKS=Off"
];
passthru.update-script = nix-update-script { };
meta = {
homepage = "https://github.com/ktprime/emhash";
changelog = "https://github.com/ktprime/emhash/releases/tag/v${finalAttrs.version}";
description = "Fast and memory efficient c++ flat hash map/set";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ blenderfreaky ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/em/emmet-language-server/package.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# remove unnecessary and non-deterministic files
preInstall = ''
pnpm --ignore-scripts --prod prune
CI=true pnpm --ignore-scripts --prod prune
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
# https://github.com/pnpm/pnpm/issues/3645
find node_modules -xtype l -delete
pkgs/by-name/ep/epson-escpr/package.nix
+1 -1
View File
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
nssmdns4 = true;
};'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ artuuge ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/by-name/es/esptool/package.nix
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "esptool";
version = "5.0.2";
version = "5.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
tag = "v${version}";
hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I=";
hash = "sha256-pdkL/QfrrTs/NdXlsr+2Yo+r8UTFLkxw4E6XGDAt1yE=";
};
postPatch = ''
pkgs/by-name/et/etesync-dav/package.nix
-1
View File
@@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec {
mainProgram = "etesync-dav";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
thyol
valodim
];
broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing
pkgs/by-name/et/etherpad-lite/package.nix
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
preInstall = ''
# remove unnecessary files
rm node_modules/.modules.yaml
pnpm prune --prod --ignore-scripts
CI=true pnpm prune --prod --ignore-scripts
find -type f \( -name "*.d.ts" -o -name "*.map" \) -exec rm -rf {} +
# remove non-deterministic files
pkgs/by-name/fa/fava/package.nix
+4 -4
View File
@@ -8,17 +8,17 @@
let
src = buildNpmPackage (finalAttrs: {
pname = "fava-frontend";
version = "1.30.5";
version = "1.30.6";
src = fetchFromGitHub {
owner = "beancount";
repo = "fava";
tag = "v${finalAttrs.version}";
hash = "sha256-46ze+1sdgXq9Unhu1ec4buXbH3s/PCcfCx+rmYc+fZw=";
hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM=";
};
sourceRoot = "${finalAttrs.src.name}/frontend";
npmDepsHash = "sha256-ImBNqccAd61c9ASzklcooQyh7BYdgJW9DTcQRmFHqho=";
npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4=";
makeCacheWritable = true;
preBuild = ''
@@ -34,7 +34,7 @@ let
in
python3Packages.buildPythonApplication {
pname = "fava";
version = "1.30.5";
version = "1.30.6";
pyproject = true;
inherit src;
pkgs/by-name/fo/folo/package.nix
+1 -1
View File
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
cd ../..
# Remove dev dependencies.
pnpm --ignore-scripts prune --prod
CI=true pnpm --ignore-scripts prune --prod
# Clean up broken symlinks left behind by `pnpm prune`
find node_modules/.bin -xtype l -delete
pkgs/by-name/fo/forgejo-runner/package.nix
+2 -2
View File
@@ -41,14 +41,14 @@ let
in
buildGoModule rec {
pname = "forgejo-runner";
version = "11.1.0";
version = "11.1.1";
src = fetchFromGitea {
domain = "code.forgejo.org";
owner = "forgejo";
repo = "runner";
rev = "v${version}";
hash = "sha256-2vR2M0OU0d5AXE5ujXeb4Aol568mDqH/v40Z8P+5ZCI=";
hash = "sha256-gItynq665YLHdSXcUrtgIp282t/TBjThDgAYyVYesx0=";
};
vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U=";
pkgs/by-name/fo/forgejo/lts.nix
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "11.0.5";
hash = "sha256-r1PR2WfJUvt+5K9RQi+9+xJmhtpqP6cGzEk77DiZUlE=";
version = "11.0.6";
hash = "sha256-7rX0B1db0HbZa/em3hX+yzAi4rqsDysJPx3dIInGxpY=";
npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw=";
vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs=";
lts = true;
pkgs/by-name/fo/forgejo/package.nix
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "12.0.3";
hash = "sha256-3uXGDX1uKxXehiMBG1cMIttJFRACIm3UE8U2OtUWjOQ=";
version = "12.0.4";
hash = "sha256-g6PNJYiGR7tUpurVL1gvGzJzDoMCLmkGiLLsSZfkbYQ=";
npmDepsHash = "sha256-V8FUoL9y36bagkg8Scttv/IzKg+MIIqp7witvT8bSWA=";
vendorHash = "sha256-GE3trnaWuAVSEfi11tZo5JXedWOYOMzcHQ3GFyISVTQ=";
lts = false;
pkgs/by-name/fr/frugally-deep/package.nix
+21 -2
View File
@@ -1,19 +1,25 @@
{
lib,
stdenv,
fetchpatch,
fetchFromGitHub,
gitUpdater,
cmake,
functionalplus,
eigen,
nlohmann_json,
doctest,
python3Packages,
buildTests ? false, # Needs tensorflow
# for tests
doctest,
rocmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "frugally-deep";
# be careful bumping this, frugally-deep may change its model metadata format
# in ways that only fail at runtime. MIOpen is currently the only package
# relying on this, run passthru.tests.miopen-can-load-models to check
version = "0.15.24-p0";
src = fetchFromGitHub {
@@ -23,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4=";
};
patches = [
(fetchpatch {
# Backport CMake 4 compat so we can stay on 0.15 for now
name = "update-minimum-cmake4-huntergate.patch";
url = "https://github.com/Dobiasd/frugally-deep/commit/30a4ce4c932ca810a5a77c4ab943a520bb1048fe.patch";
hash = "sha256-J5z+jQis8N2mzWu2Qm7J0fPkrplpjgDCOAJT7binz04=";
})
];
nativeBuildInputs = [
cmake
]
@@ -43,13 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ];
passthru.tests.miopen-can-load-models =
rocmPackages.miopen.passthru.tests.can-load-models.override
{
frugally-deep = finalAttrs.finalPackage;
};
passthru.updateScript = gitUpdater;
meta = with lib; {
description = "Header-only library for using Keras (TensorFlow) models in C++";
homepage = "https://github.com/Dobiasd/frugally-deep";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Madouura ];
platforms = platforms.linux;
};
})
pkgs/by-name/ga/gale/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gale";
version = "1.9.6";
version = "1.9.7";
src = fetchFromGitHub {
owner = "Kesomannen";
repo = "gale";
tag = finalAttrs.version;
hash = "sha256-zgwxr04MGs8EqrZBY5y8F1GNiaJbJUvpND52oLXtCrk=";
hash = "sha256-XEc8h7A1q+WfPl2HojFt2oIlAnNswq3X0o6jMZrEjCQ=";
};
postPatch = ''
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-+ZZwYpYvIYmZFg9PA7kD/mBU1TrpEQIsoMmHSWyX+Xc=";
cargoHash = "sha256-zaTbb1+JK9mA9Tvnatw8lse5PBhKknDM48mN/sWLQ6w=";
nativeBuildInputs = [
jq
pkgs/by-name/ge/geticons/package.nix
-1
View File
@@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec {
mainProgram = "geticons";
homepage = "https://git.sr.ht/~zethra/geticons";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ Madouura ];
};
}
pkgs/by-name/gi/gitlab-ci-local/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildNpmPackage rec {
pname = "gitlab-ci-local";
version = "4.61.1";
version = "4.62.0";
src = fetchFromGitHub {
owner = "firecow";
repo = "gitlab-ci-local";
rev = version;
hash = "sha256-zHYUe5fAjK34zCjTYkg4pvvjRsaeuCyu7Gelcqki8P0=";
hash = "sha256-JcCfrrb/xAvILfHgnKoRxjWG4fvi4kVg0W+s+y25A6Y=";
};
npmDepsHash = "sha256-eLT2ejLOtEI7eqWikBc/wFrStCuvYHvlZk9JiMPfuUI=";
npmDepsHash = "sha256-J/my72RPPwg1r1t4vO3CgMnGDP7H/Cc3apToypaK1YI=";
nativeBuildInputs = [
makeBinaryWrapper
pkgs/by-name/go/go-ios/package.nix
+2 -1
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
nix-update-script,
@@ -27,7 +28,7 @@ buildGoModule rec {
"restapi"
];
postPatch = ''
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace ncm/linux_commands.go \
--replace-fail "ip " "${lib.getExe' iproute2 "ip"} "
pkgs/by-name/h2/h2o/package.nix
+3 -3
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "h2o";
version = "2.3.0-rolling-2025-09-05";
version = "2.3.0-rolling-2025-09-20";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402";
hash = "sha256-GJdZxGHQ6FWznY/PO3YN0yyfQ7RX8ilgEzXA4XciOqk=";
rev = "c3930f0fd75cc1f232b9298592d88b35b648e999";
hash = "sha256-pSWEPXhXTe+El1OwcJFzqHosqrCkKxVs38TeiI/3kRI=";
};
outputs = [
pkgs/by-name/ic/iconpack-obsidian/package.nix
+16
View File
@@ -31,12 +31,28 @@ stdenvNoCC.mkDerivation rec {
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv Obsidian* $out/share/icons
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
# Fix broken symlink only if needed
# https://github.com/NixOS/nixpkgs/issues/394218
broken_symlink="$out/share/icons/Obsidian/actions/96/lock.svg"
target_svg="$out/share/icons/Obsidian/actions/scalable/system-lock-screen.svg"
if [ -h "$broken_symlink" ] && [ ! -e "$broken_symlink" ]; then
echo "=== Fixing broken symlink: $broken_symlink"
rm -f "$broken_symlink"
ln -s "$target_svg" "$broken_symlink"
fi
runHook postInstall
'';
meta = with lib; {
pkgs/by-name/ig/igraph/package.nix
+2 -2
View File
@@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla
stdenv.mkDerivation (finalAttrs: {
pname = "igraph";
version = "0.10.16";
version = "0.10.17";
src = fetchFromGitHub {
owner = "igraph";
repo = "igraph";
rev = finalAttrs.version;
hash = "sha256-Qs2WXAiAQhQ077KEtkapr8ckw6Jlbxj6qwyiplsEaLY=";
hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
};
postPatch = ''
pkgs/by-name/in/inputplumber/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "inputplumber";
version = "0.62.2";
version = "0.64.0";
src = fetchFromGitHub {
owner = "ShadowBlip";
repo = "InputPlumber";
tag = "v${version}";
hash = "sha256-dtRQeB2E/setGm0DEM/ikywU0LIRhOOjyRV0yuvuJQU=";
hash = "sha256-Ai2mozqw8n+L6Yv04OLyiADmXBT4k573qzazePsmfP4=";
};
cargoHash = "sha256-EGIBBriAhqeAUQqlWPcAGdBAYWmYYnvc3ncYGc0ir3o=";
cargoHash = "sha256-oiEBOFDiOKPFsqZcW98hi1xiKEbo2YNXv5Cw1jCg5vw=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/jb/jbrowse/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ appimageTools.wrapType2 {
mainProgram = "jbrowse-desktop";
homepage = "https://jbrowse.org/jb2/";
license = licenses.asl20;
maintainers = with maintainers; [ benwbooth ];
maintainers = with maintainers; [ ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/by-name/je/jellyseerr/package.nix
+1 -1
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preBuild
pnpm build
pnpm prune --prod --ignore-scripts
CI=true pnpm prune --prod --ignore-scripts
rm -rf .next/cache
# Clean up broken symlinks left behind by `pnpm prune`
pkgs/by-name/jf/jflap/package.nix
-1
View File
@@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryBytecode ];
maintainers = with maintainers; [
grnnja
yuu
];
platforms = jre8.meta.platforms;
};
pkgs/by-name/jx/jxplorer/package.nix
+1 -1
View File
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
description = "Java Ldap Browser";
homepage = "https://sourceforge.net/projects/jxplorer/";
license = lib.licenses.asl11;
maintainers = with maintainers; [ benwbooth ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
mainProgram = "jxplorer";
};
pkgs/by-name/ke/kexec-tools/package.nix
+1
View File
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
"riscv32-linux"
"sparc-linux"
"sparc64-linux"
"powerpc-linux"
];
license = licenses.gpl2Only;
mainProgram = "kexec";
pkgs/by-name/ko/kokkos/package.nix
-1
View File
@@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
asl20
llvm-exception
];
maintainers = with maintainers; [ Madouura ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};
pkgs/by-name/li/libcpuid/package.nix
-1
View File
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [
orivej
artuuge
];
platforms = platforms.x86;
};
pkgs/by-name/li/libpinyin/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "libpinyin";
version = "2.10.2";
version = "2.10.3";
src = fetchFromGitHub {
owner = "libpinyin";
repo = "libpinyin";
tag = finalAttrs.version;
hash = "sha256-EexmZFGvuMextbiMZ6mSV58UUUjVVGMQubtS6DzoBs0=";
hash = "sha256-g3DgRYmLrXqAGxbyiI96UKT1gsJxLlx14K+2HzWR7nI=";
};
postUnpack = ''
pkgs/by-name/lu/luau/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
version = "0.691";
version = "0.692";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
hash = "sha256-rqdxnwrvzCWU+A6+VFiffNvUV76s6gIJ//IbhB1BFos=";
hash = "sha256-GMpSXCiM9QznRAfAsGF+UuzyqS84vGkEy6EZPObRUMk=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ma/mako/package.nix
+1 -1
View File
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Lightweight Wayland notification daemon";
homepage = "https://wayland.emersion.fr/mako/";
homepage = "https://github.com/emersion/mako";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
dywedir
pkgs/by-name/mc/mcat-unwrapped/package.nix
+22
View File
@@ -2,6 +2,9 @@
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
stdenv,
buildPackages,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-c3OJURz6eObjIC6AHUP6l/a5zYFV0QZ3VIxShFCcm4U=";
nativeBuildInputs = [
installShellFiles
];
postInstall =
let
mcat =
if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
placeholder "out"
else
buildPackages.mcat-unwrapped;
in
''
installShellCompletion --cmd mcat \
--bash <(${mcat}/bin/mcat --generate bash) \
--fish <(${mcat}/bin/mcat --generate fish) \
--zsh <(${mcat}/bin/mcat --generate zsh)
'';
passthru = {
updateScript = nix-update-script { };
};
pkgs/by-name/mc/mcat/package.nix
+1
View File
@@ -18,6 +18,7 @@ runCommand "mcat"
}
''
mkdir -p $out/bin
ln -s "${mcat-unwrapped}/share" "$out/share"
makeWrapper ${lib.getExe mcat-unwrapped} $out/bin/mcat --prefix PATH : ${
lib.makeBinPath ((lib.optional useChromium chromium) ++ (lib.optional useFfmpeg ffmpeg-headless))
}
pkgs/by-name/md/mdbook-epub/package.nix
-1
View File
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://michael-f-bryan.github.io/mdbook-epub";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [
yuu
matthiasbeyer
];
};
pkgs/by-name/mi/misconfig-mapper/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "misconfig-mapper";
version = "1.14.5";
version = "1.14.9";
src = fetchFromGitHub {
owner = "intigriti";
repo = "misconfig-mapper";
tag = "v${version}";
hash = "sha256-faIjS3B019eYefOIklJMuUVcCzkM3bHu/HJ1kaERtUA=";
hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA=";
};
vendorHash = "sha256-mh66gH4ln/D2OWaD+VISTysszjpPGg2dHF29BD1i6z8=";
vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA=";
ldflags = [
"-s"
pkgs/by-name/mo/monolith/package.nix
+7 -7
View File
@@ -24,12 +24,13 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = true;
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
];
checkFlags = [ "--skip=tests::cli" ];
@@ -41,7 +42,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Y2Z/monolith";
license = licenses.cc0;
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
maintainers = with maintainers; [ Br1ght0ne ];
};
}
pkgs/by-name/mu/mujoco/package.nix
+4 -4
View File
@@ -18,8 +18,8 @@ let
abseil-cpp = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = "76bb24329e8bf5f39704eb10d21b9a80befa7c81";
hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
rev = "987c57f325f7fa8472fa84e1f885f7534d391b0d";
hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI=";
};
benchmark = fetchFromGitHub {
owner = "google";
@@ -86,7 +86,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mujoco";
version = "3.3.5";
version = "3.3.6";
# Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins!
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "google-deepmind";
repo = "mujoco";
tag = finalAttrs.version;
hash = "sha256-HykExdosK5XpAOQeic/jsc6yYxjdoiaP8rRkA/yAfuU=";
hash = "sha256-6lZ36XFMsjzck/ouSSiX47+dxbEzXgrMhw1Mi3PEnq4=";
};
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
pkgs/by-name/mu/muon/darwin-clang.patch
+15
View File
@@ -0,0 +1,15 @@
diff --git a/src/functions/kernel/dependency.c b/src/functions/kernel/dependency.c
index fbfc86f6..46f9be9d 100644
--- a/src/functions/kernel/dependency.c
+++ b/src/functions/kernel/dependency.c
@@ -377,10 +377,6 @@ get_dependency_extraframework(struct workspace *wk, struct dep_lookup_ctx *ctx,
}
struct obj_compiler *comp = get_obj_compiler(wk, compiler);
- if (comp->type[toolchain_component_compiler] != compiler_apple_clang) {
- L("skipping extraframework dependency lookup: compiler type is not apple clang");
- return true;
- }
if (!comp->fwdirs) {
obj cmd;
pkgs/by-name/mu/muon/package.nix
+121 -66
View File
@@ -1,31 +1,36 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchFromSourcehut,
fetchurl,
callPackage,
coreutils,
curl,
libarchive,
libpkgconf,
pkgconf,
python3,
samurai,
scdoc,
zlib,
embedSamurai ? false,
# docs
buildDocs ? true,
scdoc,
# tests
runTests ? false,
gettext,
muon,
nasm,
pkg-config,
python3,
writableTmpDirAsHomeHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai";
version = "0.4.0";
version = "0.5.0";
src = fetchFromSourcehut {
name = "muon-src";
owner = "~lattis";
repo = "muon";
tag = finalAttrs.version;
hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw=";
};
srcs = builtins.attrValues (lib.filterAttrs (_: v: v.use or true) finalAttrs.passthru.srcsAttrs);
sourceRoot = "muon-src";
outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ];
@@ -34,8 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (!embedSamurai) [ samurai ]
++ lib.optionals buildDocs [
(python3.withPackages (ps: [ ps.pyyaml ]))
scdoc
]
++ lib.optionals (buildDocs || finalAttrs.doCheck) [
(python3.withPackages (ps: [ ps.pyyaml ]))
];
buildInputs = [
@@ -47,80 +54,95 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
postUnpack =
let
# URLs manually extracted from subprojects directory
meson-docs-wrap = fetchurl {
name = "meson-docs-wrap";
url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz";
hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM=";
};
postUnpack = ''
for src in $srcs; do
name=$(stripHash $src)
meson-tests-wrap = fetchurl {
name = "meson-tests-wrap";
url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz";
hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w=";
};
in
''
mkdir -p $sourceRoot/subprojects/meson-docs
pushd $sourceRoot/subprojects/meson-docs
${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"}
popd
# skip the main project, only move subprojects
[ "$name" == "$sourceRoot" ] && continue
mkdir -p $sourceRoot/subprojects/meson-tests
pushd $sourceRoot/subprojects/meson-tests
tar xvf ${meson-tests-wrap} --strip-components=1
popd
'';
cp -r "$name" "$sourceRoot/subprojects/$name"
chmod +w -R "$sourceRoot/subprojects/$name"
rm "$sourceRoot/subprojects/$name.wrap"
done
'';
patches = [ ./darwin-clang.patch ];
postPatch = ''
patchShebangs bootstrap.sh
find subprojects -name "*.py" -exec chmod +x {} \;
patchShebangs subprojects
''
+ lib.optionalString buildDocs ''
patchShebangs subprojects/meson-docs/docs/genrefman.py
+ lib.optionalString finalAttrs.doCheck ''
substituteInPlace \
"subprojects/meson-tests/common/14 configure file/test.py.in" \
"subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \
"subprojects/meson-tests/native/8 external program shebang parsing/script.int.in" \
--replace-fail "/usr/bin/env" "${coreutils}/bin/env"
substituteInPlace \
"subprojects/meson-tests/meson.build" \
--replace-fail "['common/66 vcstag', {'python': true}]," ""
'';
# tests try to access "~"
postConfigure = ''
export HOME=$(mktemp -d)
'';
enableParallelBuilding = true;
buildPhase =
let
muonBool = lib.mesonBool;
muonEnable = lib.mesonEnable;
muonOption = lib.mesonOption;
bootstrapFlags = lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\"";
# see `muon options -a` to see built-in options
cmdlineForMuon = lib.concatStringsSep " " [
(muonOption "prefix" (placeholder "out"))
# don't let muon override stdenv C flags
(muonEnable "auto_features" true)
(muonOption "buildtype" "plain")
(muonOption "optimization" "plain")
(muonOption "wrap_mode" "nodownload")
# muon features
(muonBool "static" stdenv.targetPlatform.isStatic)
(muonEnable "docs" buildDocs)
(muonEnable "man-pages" buildDocs)
(muonEnable "meson-docs" buildDocs)
(muonEnable "meson-tests" finalAttrs.doCheck)
(muonEnable "samurai" embedSamurai)
(muonEnable "tracy" false)
(muonEnable "website" false)
];
cmdlineForSamu = "-j$NIX_BUILD_CORES";
in
''
runHook preBuild
${
lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\""
} ./bootstrap.sh stage-1
${bootstrapFlags} ./bootstrap.sh stage-1
./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2
${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2
./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3
${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3
runHook postBuild
'';
# tests are failing because they don't find Python
doCheck = false;
# tests only pass when samurai is embedded
doCheck = embedSamurai && runTests;
nativeCheckInputs = [
# "common/220 fs module"
writableTmpDirAsHomeHook
# "common/44 pkgconfig-gen"
pkg-config
# "frameworks/6 gettext"
gettext
]
++ lib.optionals stdenv.hostPlatform.isx86_64 [
# "nasm/*" tests
nasm
];
checkPhase = ''
runHook preCheck
./stage-3/muon -C stage-3 test
./stage-2/muon -C stage-2 test -d dots -S -j$NIX_BUILD_CORES
runHook postCheck
'';
@@ -128,22 +150,55 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
stage-3/muon -C stage-3 install
stage-2/muon -C stage-2 install
runHook postInstall
'';
meta = with lib; {
homepage = "https://muon.build/";
description = "Implementation of Meson build system in C99";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin; # typical `ar failure`
passthru.srcsAttrs = {
muon-src = fetchFromSourcehut {
name = "muon-src";
owner = "~lattis";
repo = "muon";
tag = finalAttrs.version;
hash = "sha256-bWEYWUD+GK8R3yVnDTnzFWmm4KAuVPI+1yMfCXWcG/A=";
};
meson-docs = fetchFromGitHub {
name = "meson-docs";
repo = "meson-docs";
owner = "muon-build";
rev = "1017b3413601044fb41ad04977445e68a80e8181";
hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY=";
passthru.use = buildDocs;
};
meson-tests = fetchFromGitHub {
name = "meson-tests";
repo = "meson-tests";
owner = "muon-build";
rev = "db92588773a24f67cda2f331b945825ca3a63fa7";
hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM=";
passthru.use = finalAttrs.doCheck;
};
};
# tests are run here in package tests, rather than enabling doCheck by
# default, to reduce the number of required dependencies.
passthru.tests.test = (muon.overrideAttrs { pname = "muon-tests"; }).override {
buildDocs = false;
embedSamurai = true;
runTests = true;
};
passthru.updateScript = callPackage ./update.nix { };
meta = {
homepage = "https://muon.build";
description = "Implementation of the meson build system in C99";
license = lib.licenses.gpl3Only;
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "muon";
};
})
# TODO LIST:
# 1. automate sources acquisition (especially wraps)
# 2. setup hook
# 3. tests
# 1. setup hook
pkgs/by-name/mu/muon/update.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
writeShellApplication,
common-updater-scripts,
curl,
gnugrep,
}:
lib.getExe (writeShellApplication {
name = "update-muon";
runtimeInputs = [
common-updater-scripts
curl
gnugrep
];
text = ''
REPO=$(nix-instantiate --raw --eval -E "with import ./. {}; muon.srcsAttrs.muon-src.meta.homepage")
MUON_VERSION=$(list-git-tags --url="$REPO" | tail -1)
update-source-version "muon" \
"$MUON_VERSION" \
--version-key=version \
--source-key=srcsAttrs.muon-src
update-source-version "muon" \
"$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-docs.wrap" | grep -oP "revision = \K.+$")" \
--version-key=srcsAttrs.meson-docs.rev \
--source-key=srcsAttrs.meson-docs
update-source-version "muon" \
"$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-tests.wrap" | grep -oP "revision = \K.+$")" \
--version-key=srcsAttrs.meson-tests.rev \
--source-key=srcsAttrs.meson-tests
'';
})
pkgs/by-name/mu/muscle/package.nix
-1
View File
@@ -36,7 +36,6 @@ gccStdenv.mkDerivation rec {
homepage = "https://www.drive5.com/muscle/";
maintainers = with maintainers; [
unode
thyol
];
};
}
pkgs/by-name/mv/mvnd/package.nix
+21 -19
View File
@@ -1,8 +1,8 @@
{
lib,
fetchFromGitHub,
graalvmPackages,
installShellFiles,
lib,
makeWrapper,
maven,
mvnd,
@@ -24,18 +24,17 @@ in
maven.buildMavenPackage rec {
pname = "mvnd";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "apache";
repo = "maven-mvnd";
rev = version;
sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
sha256 = "sha256-vlJG2uDY93iri1X7SYPRufAIN4fhAjCd8gCeCdz/QDE=";
};
patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ];
# need graalvm at build-time for the `native-image` tool
mvnJdk = graalvmPackages.graalvm-ce;
mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY=";
mvnHash = "sha256-n6ZKEXDzyzMfUZt3WHkwCDB68gm30UGrFecffFy7ytA=";
nativeBuildInputs = [
graalvmPackages.graalvm-ce
@@ -44,22 +43,25 @@ maven.buildMavenPackage rec {
];
mvnDepsParameters = mvnParameters;
mvnParameters = lib.concatStringsSep " " [
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
"-Dspotless.skip=true" # skip formatting checks
mvnParameters = lib.concatStringsSep " " (
[
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
"-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream
"-Dspotless.skip=true" # skip formatting checks
# skip tests that fail in the sandbox
"-pl"
"!integration-tests"
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest"
"-Dsurefire.failIfNoSpecifiedTests=false"
# skip tests that fail in the sandbox
"-pl"
"!integration-tests"
"-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest,!org.mvndaemon.mvnd.client.NoDaemonTest"
"-Dsurefire.failIfNoSpecifiedTests=false"
"-Pnative"
# propagate linker args required by the darwin build
# see `buildGraalvmNativeImage`
''-Dgraalvm-native-static-opt="-H:-CheckToolchain $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"''
];
"-Pnative"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# see `buildGraalvmNativeImage`
"-DbuildArgs=-H:-CheckToolchain"
]
);
installPhase = ''
runHook preInstall
pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
-34
View File
@@ -1,34 +0,0 @@
From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001
From: Nathan Regner <nathanregner@gmail.com>
Date: Fri, 16 May 2025 23:28:13 -0600
Subject: [PATCH] build: update groovy for compatibility with Java 24
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1cec38b..7534ffd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
<graalvm.version>24.0.2</graalvm.version>
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
- <groovy.version>4.0.22</groovy.version>
+ <groovy.version>4.0.24</groovy.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jline.version>3.26.3</jline.version>
<maven.version>3.9.9</maven.version>
@@ -91,7 +91,7 @@
<!-- plugin versions a..z -->
<buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
- <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
+ <groovy-maven-plugin.version>4.2.0</groovy-maven-plugin.version>
<mrm.version>1.6.0</mrm.version>
<junit-platform-launcher.version>1.10.3</junit-platform-launcher.version>
<takari-provisio.version>1.0.25</takari-provisio.version>
--
2.49.0

Some files were not shown because too many files have changed in this diff Show More