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

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-28 00:17:31 +00:00
committed by GitHub
parent 5a1dd4fefb ffd606cd6e
commit 8dcc425d08
265 changed files with 2925 additions and 2791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/python.section.md
+3
View File
@@ -2196,6 +2196,9 @@ The following rules are desired to be respected:
and using a `-` as delimiter.
* Attribute names in `python-packages.nix` should be sorted alphanumerically to
avoid merge conflicts and ease locating attributes.
* Non-python runtime dependencies should be added via explicit wrapping or
patching (using e.g. `substituteInPlace`), rather than through propagation via
`dependencies`/`propagatedBuildInputs`, to reduce clutter in `$PATH`.
This list is useful for reviewers as well as for self-checking when submitting packages.
maintainers/maintainer-list.nix
+12
View File
@@ -11007,6 +11007,12 @@
githubId = 5579359;
name = "Jason Yundt";
};
jayrovacsek = {
email = "nixpkgs@jay.rovacsek.com";
github = "JayRovacsek";
githubId = 29395089;
name = "Jay Rovacsek";
};
jb55 = {
email = "jb55@jb55.com";
github = "jb55";
@@ -11652,6 +11658,12 @@
githubId = 1385934;
keys = [ { fingerprint = "3A13 5C15 E1D5 850D 2F90 AB25 6E14 46DD 451C 6BAF"; } ];
};
joblade = {
email = "bladeur13@free.fr";
github = "Jo-Blade";
githubId = 59778661;
name = "Jo Blade";
};
jobojeha = {
email = "jobojeha@jeppener.de";
github = "jobojeha";
nixos/lib/systemd-unit-options.nix
+15 -3
View File
@@ -398,9 +398,21 @@ rec {
enableStrictShellChecks = mkOption {
type = types.bool;
description = "Enable running shellcheck on the generated scripts for this unit.";
# The default gets set in systemd-lib.nix because we don't have access to
# the full NixOS config here.
description = ''
Enable running `shellcheck` on the generated scripts for this unit.
When enabled, scripts generated by the unit will be checked with
`shellcheck` and any errors or warnings will cause the build to
fail.
This affects all scripts that have been created through the
`script`, `reload`, `preStart`, `postStart`, `preStop` and
`postStop` options for systemd services. This does not affect
command lines passed directly to `ExecStart`, `ExecReload`,
`ExecStartPre`, `ExecStartPost`, `ExecStop` or `ExecStopPost`.
'';
# The default gets set in systemd-lib.nix because we don't have
# access to the full NixOS config here.
defaultText = literalExpression "config.systemd.enableStrictShellChecks";
};
nixos/modules/services/misc/tzupdate.nix
-1
View File
@@ -68,7 +68,6 @@ in
systemd.timers.tzupdate = {
enable = cfg.timer.enable;
interval = cfg.timer.interval;
timerConfig = {
OnStartupSec = "30s";
OnCalendar = cfg.timer.interval;
nixos/modules/system/boot/systemd.nix
+26 -1
View File
@@ -226,7 +226,32 @@ in
package = mkPackageOption pkgs "systemd" { };
enableStrictShellChecks = mkEnableOption "" // {
description = "Whether to run shellcheck on the generated scripts for systemd units.";
description = ''
Whether to run `shellcheck` on the generated scripts for systemd
units.
When enabled, all systemd scripts generated by NixOS will be checked
with `shellcheck` and any errors or warnings will cause the build to
fail.
This affects all scripts that have been created through the `script`,
`reload`, `preStart`, `postStart`, `preStop` and `postStop` options for
systemd services. This does not affect command lines passed directly
to `ExecStart`, `ExecReload`, `ExecStartPre`, `ExecStartPost`,
`ExecStop` or `ExecStopPost`.
It therefore also does not affect systemd units that are coming from
packages and that are not defined through the NixOS config. This option
is disabled by default, and although some services have already been
fixed, it is still likely that you will encounter build failures when
enabling this.
We encourage people to enable this option when they are willing and
able to submit fixes for potential build failures to Nixpkgs. The
option can also be enabled or disabled for individual services using
the `enableStrictShellChecks` option on the service itself, which will
take precedence over the global setting.
'';
};
units = mkOption {
nixos/tests/all-tests.nix
+1
View File
@@ -1389,6 +1389,7 @@ in
tuxguitar = runTest ./tuxguitar.nix;
twingate = runTest ./twingate.nix;
typesense = handleTest ./typesense.nix { };
tzupdate = runTest ./tzupdate.nix;
ucarp = handleTest ./ucarp.nix { };
udisks2 = handleTest ./udisks2.nix { };
ulogd = handleTest ./ulogd/ulogd.nix { };
nixos/tests/tzupdate.nix
+22
View File
@@ -0,0 +1,22 @@
{ lib, ... }:
let
clientNodeName = "client";
in
{
name = "tzupdate";
# TODO: Test properly:
# - Add server node
# - Add client configuration to talk to the server node
# - Assert that the time zone changes appropriately
nodes.${clientNodeName} = {
services.tzupdate.enable = true;
};
testScript = ''
start_all()
${clientNodeName}.wait_for_unit("multi-user.target")
'';
meta.maintainers = [ lib.maintainers.l0b0 ];
}
nixos/tests/web-apps/tt-rss.nix
+26 -1
View File
@@ -10,13 +10,38 @@ import ../make-test-python.nix (
enable = true;
virtualHost = "localhost";
selfUrlPath = "http://localhost/";
pluginPackages = with pkgs; [
tt-rss-plugin-auth-ldap
tt-rss-plugin-feediron
];
plugins = [
"auth_internal"
"feediron"
"note"
];
singleUserMode = true;
themePackages = with pkgs; [ tt-rss-theme-feedly ];
};
};
testScript = ''
import json
import re
machine.wait_for_unit("tt-rss.service")
machine.succeed("curl -sSfL http://localhost/ | grep 'Tiny Tiny RSS'")
matches = re.search('__csrf_token = "([^"]*)"', machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar -sSfL http://localhost/"))
if matches is None:
assert False, "CSRF token not found"
csrf_token = matches.group(1)
# Ensure themes are loaded. No API found for these, so it's a crude check.
preference_page = machine.succeed("curl -sSfL --cookie cjar --cookie-jar cjar http://localhost/backend.php?op=Pref_Prefs")
assert "feedly" in preference_page
plugins = json.loads(machine.succeed(f"curl -sSfL --cookie cjar --cookie-jar cjar 'http://localhost/backend.php' -X POST --data-raw 'op=Pref_Prefs&method=getPluginsList&csrf_token={csrf_token}'"))["plugins"]
expected_plugins = ["auth_internal", "auth_ldap", "feediron", "note"];
found_plugins = [p["name"] for p in plugins if p["name"] in expected_plugins]
assert len(found_plugins) == len(expected_plugins), f"Expected plugins {expected_plugins}, found {found_plugins}"
'';
}
)
pkgs/applications/audio/musescore/default.nix
+2 -2
View File
@@ -36,13 +36,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "musescore";
version = "4.5.1";
version = "4.5.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${finalAttrs.version}";
sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg=";
sha256 = "sha256-9jafh9zyf+tuC+WU6nQIMBVm+Gqqcig8jS2R1h/YnIo=";
};
# Backport + additional patch to fix build on Qt 6.9
pkgs/applications/audio/youtube-music/default.nix
+3 -3
View File
@@ -13,18 +13,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "youtube-music";
version = "3.8.1";
version = "3.9.0";
src = fetchFromGitHub {
owner = "th-ch";
repo = "youtube-music";
rev = "v${finalAttrs.version}";
hash = "sha256-KypGAP3dx1g5x5IWbmzXIR9olZo190s5r+VkbzIjvuQ=";
hash = "sha256-xaHYNfW5ZLYiaeJ0F32NQ87woMh6K4Ea9rjgNOyabck=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-5Vlf2+l77r6HvuSGy7NrGV1HDX+l5DC0fq/pMWDKSas=";
hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
};
nativeBuildInputs = [
pkgs/applications/editors/texmaker/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "texmaker";
version = "6.0.0";
version = "6.0.1";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w=";
hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
};
buildInputs = [
pkgs/applications/editors/vim/plugins/generated.nix
+321 -308
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
+2 -8
View File
@@ -1,12 +1,13 @@
{
vimUtils,
fetchFromGitHub,
nix-update-script,
}:
vimUtils.buildVimPlugin rec {
pname = "bitbake-vim";
version = "2.10.4";
# The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin.
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "openembedded";
repo = "bitbake";
@@ -17,11 +18,4 @@ vimUtils.buildVimPlugin rec {
sourceRoot = "source/contrib/vim";
meta.homepage = "https://github.com/openembedded/bitbake/";
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^(\\d+\\.\\d+\\.\\d+)$"
];
};
}
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -245,6 +245,7 @@ https://github.com/Olical/conjure/,,
https://github.com/wellle/context.vim/,,
https://github.com/Shougo/context_filetype.vim/,,
https://github.com/zbirenbaum/copilot-cmp/,HEAD,
https://github.com/copilotlsp-nvim/copilot-lsp/,HEAD,
https://github.com/AndreM222/copilot-lualine/,HEAD,
https://github.com/zbirenbaum/copilot.lua/,HEAD,
https://github.com/github/copilot.vim/,,
pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "25.0.0";
hash = "sha256-n/7y2nbD+ziUCDmNbfuT01GK/ls8rTfghpntj6SmsbA=";
version = "25.0.1";
hash = "sha256-4Q/38zO8G39oeZh4N9hOSFBeB0rI7ouH5vlBmV78EnQ=";
};
meta = {
pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+2 -2
View File
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "calva";
publisher = "betterthantomorrow";
version = "2.0.501";
hash = "sha256-j/WCtyrBc/D37kcjzJ/TVrqXSh9EzDoAe18mYXs43fk=";
version = "2.0.502";
hash = "sha256-TEU1+8IUz0GqWoB2DSE+TzyHFLL0nMSMiZyzWD6IoEA=";
};
nativeBuildInputs = [
jq
pkgs/applications/editors/vscode/extensions/default.nix
+46 -42
View File
@@ -410,8 +410,8 @@ let
mktplcRef = {
name = "vscode-neovim";
publisher = "asvetliakov";
version = "1.18.19";
hash = "sha256-JGyyvDZQmlVGwEwQHh+82yK7uSrtt/HBaWHzbiGJ614=";
version = "1.18.20";
hash = "sha256-g3rRdFjbxrp9y/dVhj/2GUJvDbG92VGq/jPtlLXV2kM=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
@@ -492,8 +492,8 @@ let
mktplcRef = {
publisher = "banacorn";
name = "agda-mode";
version = "0.5.5";
hash = "sha256-xz+KO743jGziLzO7pINTcOX9JV68MJ0juDl+rpr9hk8=";
version = "0.5.6";
hash = "sha256-FKcPJzdhK0QbaG3wBkdGOkiDkZ4qVJh3RBTnD4wLIh8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
@@ -785,8 +785,8 @@ let
mktplcRef = {
name = "vscode-tailwindcss";
publisher = "bradlc";
version = "0.14.15";
hash = "sha256-BJKPAyXBHX9W0pSxtri67PFL1zA4Vd2OMFfWi5bDnYQ=";
version = "0.14.16";
hash = "sha256-U2oZSIsLpqEqYBIEjSnIToEOOnTCUi4vR6XwjnNUDN8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
@@ -1015,8 +1015,8 @@ let
mktplcRef = {
name = "coder-remote";
publisher = "coder";
version = "1.7.1";
hash = "sha256-egtB8mF9bbGb5YJ2pS9uGMzLmJcHAZ7UTswrn6k2k3A=";
version = "1.8.0";
hash = "sha256-zAe2IFT69oZ/OLVSaaY5lGSiF/7FGiQngz/EXekwQtM=";
};
meta = {
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
@@ -1178,8 +1178,8 @@ let
mktplcRef = {
name = "vscode-database-client2";
publisher = "cweijan";
version = "8.2.5";
hash = "sha256-t6+LLLGuh67cuvGzv9+ic7AFqQU+bxDc6UByJM0OF7s=";
version = "8.2.7";
hash = "sha256-RH+nqLiT5atyTC9WMFpY5ARTolK8+d1VZJY8oHK1G7E=";
};
meta = {
description = "Database Client For Visual Studio Code";
@@ -1207,8 +1207,8 @@ let
mktplcRef = {
publisher = "DanielSanMedium";
name = "dscodegpt";
version = "3.10.84";
hash = "sha256-s7Zo8zRZ4nsEuoSPwQL3osRs5zlmbcEsCjIJ8janhPs=";
version = "3.11.24";
hash = "sha256-bQf8kr4wvbUk+IMdoevBqZxTKg81uKlQO9yD6xJd1TM=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
@@ -1259,8 +1259,8 @@ let
mktplcRef = {
name = "databricks";
publisher = "databricks";
version = "2.9.2";
hash = "sha256-lGVp/pkYQFqCa1fCEydrNke1yRxUmTRaaN+giuLdISQ=";
version = "2.9.4";
hash = "sha256-6BSwkK6/YbCFci0p8aox8E9KP2M1daj3bu4qBxjybUE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
@@ -1486,8 +1486,8 @@ let
mktplcRef = {
publisher = "discloud";
name = "discloud";
version = "2.22.42";
hash = "sha256-jIjRMQ279KK8BxcQWWzcRcwfhkTg8W4aGUwqijje7ZY=";
version = "2.22.45";
hash = "sha256-5nTNidm/oR1CazYXJfb6pKKXS5CSo3UUuW3xDp6yYGk=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -1918,8 +1918,8 @@ let
mktplcRef = {
name = "foam-vscode";
publisher = "foam";
version = "0.26.10";
hash = "sha256-vhQtdc0553TyPkQnTHwg7Nr+UbDMf9yR+2jj40ANPdQ=";
version = "0.26.11";
hash = "sha256-tq4Woc4+vBVWox1ldTmJQJG/NGQPDAVEi+rviFEbVt0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -2109,8 +2109,8 @@ let
publisher = "github";
name = "copilot";
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
version = "1.303.0";
hash = "sha256-xh1jdosoSdIdLbmKQJjIwqwC5aF6Ko7y+GC3Y+gBazI=";
version = "1.309.0";
hash = "sha256-i1PcbbOBgULd+inwypezE/ZsePrJaqM2z6qrDcNBLVA=";
};
meta = {
@@ -2127,8 +2127,8 @@ let
publisher = "github";
name = "copilot-chat";
# Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json
version = "0.26.2025040204"; # latest compatible with vscode ^1.98
hash = "sha256-grG/pn+R4paCqkSx6DGzKjyjQVZ2FINRxdpXynGF35g=";
version = "0.26.7"; # latest compatible with vscode ^1.98
hash = "sha256-aR6AGU/boDmYef0GWna5sUsyv9KYGCkugWpFIusDMNE=";
};
meta = {
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
@@ -2187,8 +2187,8 @@ let
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "6.11.0";
hash = "sha256-4fzjJKj4RGzqD+ionUA2Al7UGv5aJNCo8O1JOnS+nqY=";
version = "6.12.0";
hash = "sha256-0Pka2v2nXMfRD3TCiVAfLaxEhpQml9R/6Lg3/tk03zQ=";
};
meta = {
description = "GitLab extension for Visual Studio Code";
@@ -2203,8 +2203,8 @@ let
mktplcRef = {
name = "gleam";
publisher = "gleam";
version = "2.11.1";
hash = "sha256-tySY6vPg71QQKeKivCoJzcAH73nML/NWhtr+TgaSKRg=";
version = "2.12.0";
hash = "sha256-kAs3+ecfMl2IcL+I4TXhbzq55AbHZ9NiQLhK6Eg+iZI=";
};
meta = {
description = "Support for the Gleam programming language";
@@ -2219,8 +2219,8 @@ let
mktplcRef = {
name = "Go";
publisher = "golang";
version = "0.47.1";
hash = "sha256-FKbPvXIO7SGt9C2lD7+0Q6yD0QNzrdef1ltsYXPmAi0=";
version = "0.47.2";
hash = "sha256-d2JXrKd3pMPWshy1pZ0HGmk2ZTVn4W5IrwakkibZTgk=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog";
@@ -3017,8 +3017,8 @@ let
mktplcRef = {
name = "asn1js";
publisher = "lapo";
version = "0.2.1";
hash = "sha256-/75tsueW1PQIHN6YOLajREcMbRnzxzBIGnd7LGAxwBs=";
version = "0.2.2";
hash = "sha256-U1mvxDqyNbTalKgxtCLxLOMT3ZxVGC2KXWW47khtQKA=";
};
meta = {
description = "Decode ASN.1 content inside VSCode";
@@ -4065,8 +4065,8 @@ let
mktplcRef = {
name = "ansible";
publisher = "redhat";
version = "25.3.1";
hash = "sha256-1w4B5+WHDJzU4Fz5x2pXDAssRWjZPl79ykTNbk2rQXo=";
version = "25.4.0";
hash = "sha256-E/BogNtax4dkv6hlYcaRinTxr4jnVyV9hVCdkIkul9s=";
};
meta = {
description = "Ansible language support";
@@ -4649,8 +4649,8 @@ let
mktplcRef = {
publisher = "streetsidesoftware";
name = "code-spell-checker";
version = "4.0.45";
hash = "sha256-2goKjykQMLTRPP9Y0aBXLu3qDlhEKO00x82C18nKlIY=";
version = "4.0.47";
hash = "sha256-g9r8I909ge44JfBRm1JBHFluXr9H8zl0ERqkwoxtQaI=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
@@ -4662,6 +4662,10 @@ let
};
};
streetsidesoftware.code-spell-checker-french =
callPackage ./streetsidesoftware.code-spell-checker-french
{ };
streetsidesoftware.code-spell-checker-german =
callPackage ./streetsidesoftware.code-spell-checker-german
{ };
@@ -4759,8 +4763,8 @@ let
mktplcRef = {
name = "tabnine-vscode";
publisher = "tabnine";
version = "3.259.0";
hash = "sha256-BhJskqQr222VA6Sf7okttUIeYpsi99IyXJIOOWZKQ9M=";
version = "3.260.0";
hash = "sha256-Ve9PGpsqc7q5wCu62X0I5xJsQJ0xAJKN6VNi6HfWNDk=";
};
meta = {
license = lib.licenses.mit;
@@ -5086,8 +5090,8 @@ let
mktplcRef = {
name = "vscode-mdx";
publisher = "unifiedjs";
version = "1.8.13";
hash = "sha256-QTIDs+HVnM+zJ3jqhiBhUTsrI44kaHInYDXLXMC1/9E=";
version = "1.8.14";
hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
@@ -5394,8 +5398,8 @@ let
mktplcRef = {
name = "volar";
publisher = "Vue";
version = "2.2.8";
hash = "sha256-efEeTq/y4al38Tdut3bHVdluf3tUYqc6CFPX+ch1gLg=";
version = "2.2.10";
hash = "sha256-cQxDoKDfzifcGTkhS8rC+JUQofbxMfXmkJF1CwiU1nc=";
};
meta = {
changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
@@ -5548,8 +5552,8 @@ let
mktplcRef = {
name = "php-debug";
publisher = "xdebug";
version = "1.35.0";
hash = "sha256-HQYxQPKirPCnje2lrOFprBG3ha7YaV5iytmeI8CTQJU=";
version = "1.36.1";
hash = "sha256-4r3mf7q6n1b/cVYIGZyRNK5nEAJYzTz4cJrKNH+R01s=";
};
meta = {
description = "PHP Debug Adapter";
pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix
+4 -5
View File
@@ -7,14 +7,13 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.19.0";
hash = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY=";
version = "2.34.3";
hash = "sha256-kE9xH0cp741aCqhrwFDW+lQxOAsdLNzCCOTWMxd+li0=";
};
patches = [ ./fix-terraform-ls.patch ];
postPatch = ''
substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
substituteInPlace dist/extension.js \
--replace-fail 'this.customBinPath=Ga("terraform").get("languageServer.path")' 'this.customBinPath = Ga("terraform").get("languageServer.path") || '${terraform-ls}/bin/terraform-ls';'
'';
meta = {
pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch
-19
View File
@@ -1,19 +0,0 @@
diff --git a/out/serverPath.js b/out/serverPath.js
index fafa915..2e6d376 100644
--- a/out/serverPath.js
+++ b/out/serverPath.js
@@ -18,7 +18,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary';
class ServerPath {
constructor(context) {
this.context = context;
- this.customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
+
+ const customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
+ if (!customBinPath) {
+ this.customBinPath = 'TERRAFORM-LS-PATH';
+ } else {
+ this.customBinPath = customBinPath;
+ }
}
installPath() {
return path.join(this.context.globalStorageUri.fsPath, INSTALL_FOLDER_NAME);
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+5 -5
View File
@@ -14,19 +14,19 @@ let
{
x86_64-linux = {
arch = "linux-x64";
hash = "sha256-5B2LAV5azD1mGDFWnxIOYjyyJMXxqxyL5qP0zs6jWgs=";
hash = "sha256-NTmo45hhvVp5atYWt3046Fe7AtHouH6UBF/FPUllIQQ=";
};
aarch64-linux = {
arch = "linux-arm64";
hash = "sha256-6tmHa8XbuNLheUzY8pr6oEJlkUJpeCeT3O7xfo2Iqls=";
hash = "sha256-7K7i+4NtoTmwT1a3dIBF7M2oXyqc66Evos8q1B1RWkk=";
};
x86_64-darwin = {
arch = "darwin-x64";
hash = "sha256-KRJ148+N3Hzht1GgnO0s5Mv27q+onPyZlY9myXw3zjg=";
hash = "sha256-O/bpKFoCqtzwdNjwWA4WfaeFPUdZtfn14opiSXtjD90=";
};
aarch64-darwin = {
arch = "darwin-arm64";
hash = "sha256-vmtE6oeLs1B9s69yaOHASdFKznV1p3v+SsJUAJrwUrU=";
hash = "sha256-9kNKHg8lpXf94RT1/oYYeSOX0uHqjpg+zW64NNMQs7A=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -36,7 +36,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csdevkit";
publisher = "ms-dotnettools";
version = "1.18.23";
version = "1.18.25";
inherit (extInfo) hash arch;
};
sourceRoot = "extension"; # This has more than one folder.
pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
+3 -3
View File
@@ -8,12 +8,12 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
version = "1.0.5918";
hash = "sha256-Tk0mKydUF8M7l7NC9wEA7t2rzJWy/mq4/HvIHI2/ldQ=";
version = "1.0.5948";
hash = "sha256-KOu9zF5l6MTLU8z/l4xBwRl2X3uIE15YgHEZJrKSHGY=";
};
postPatch = ''
substituteInPlace extension.js \
substituteInPlace vendor.js \
--replace-fail '"xsel"' '"${xsel}/bin/xsel"'
'';
pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "RooVeterinaryInc";
name = "roo-cline";
version = "3.13.2";
hash = "sha256-ezmBS84RonkqlguLcgGZa4663GpY6yReKKb+r6YzQms=";
version = "3.14.3";
hash = "sha256-hYtjcxlHwtvESs08WdWuMGi10LIvdH5SEBeAI7ah8oc=";
};
passthru.updateScript = vscode-extension-update-script { };
pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-dev";
publisher = "saoudrizwan";
version = "3.12.3";
hash = "sha256-HluLBJe7v21vViI7NcbmrXpE/ZBserW4eAvab5swjyQ=";
version = "3.13.3";
hash = "sha256-N7y0+WeP0zgWRBD2LqLR++dQty9wbaqA+vWQYsaGo2k=";
};
meta = {
pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
+2 -8
View File
@@ -10,16 +10,10 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "sourcery";
publisher = "sourcery";
version = "1.28.0";
hash = "sha256-wQt2T7RhQ5qU4P7J0vQwzc9mL40pDY5tS0HILhy4twg=";
version = "1.35.0";
hash = "sha256-3+8kzQ+DZVysv0wYc3uM+8Z6jACgxCKNcZVJ2LOlodo=";
};
postPatch = ''
pushd sourcery_binaries/install
rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"}
popd
'';
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
buildInputs = [
pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-french/default.nix
+18
View File
@@ -0,0 +1,18 @@
{ lib, vscode-utils }:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "code-spell-checker-french";
publisher = "streetsidesoftware";
version = "0.4.3";
hash = "sha256-FPnS/gU7+Kz3ZgbwiNIs/Rr1uiz5qIWsvpKB5lZGz+s=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-french/changelog";
description = "French dictionary extension for VS Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker-french";
homepage = "https://github.com/streetsidesoftware/vscode-cspell-dict-extensions#readme";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ aduh95 ];
};
}
pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix
+6 -3
View File
@@ -8,13 +8,16 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "lua";
publisher = "sumneko";
version = "3.7.3";
hash = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM=";
version = "3.14.0";
hash = "sha256-auXQudzWRbq/cXMpFkheqHhJMu7XwacdsaZYAkv1pQs=";
};
# Running chmod in runtime will lock up extension
# indefinitely if the binary is in nix store.
patches = [ ./remove-chmod.patch ];
postPatch = ''
substituteInPlace client/out/src/languageserver.js \
--replace-fail 'await fs.promises.chmod(command, "777");' ""
'';
postInstall = ''
ln -sf ${lua-language-server}/bin/lua-language-server \
pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch
-14
View File
@@ -1,14 +0,0 @@
--- a/client/out/languageserver.js
+++ b/client/out/languageserver.js
@@ -164,11 +164,9 @@ class LuaClient extends vscode_1.Disposable {
break;
case "linux":
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-Linux", "lua-language-server"));
- yield fs.promises.chmod(command, "777");
break;
case "darwin":
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-macOS", "lua-language-server"));
- yield fs.promises.chmod(command, "777");
break;
default:
throw new Error(`Unsupported operating system "${platform}"!`);
pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+5 -5
View File
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-Sno0UnWnuOogT9DMEF+8dMZLqxAoHSsKORkHpre40dE=";
hash = "sha256-70IC1Df7FxIbh9iFPqC7ej+NpAW8BKD30qYlhtC0QLo=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-GaqBiAs0G9h1p2itDITPFBkFD1uOmM0fEp4tKmYFCXY=";
hash = "sha256-NA6QjtqtEWRHjs4s1F3tVnd+qwk3T7KAhZdNsCv2WXo=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-uDRhsAGw7mEI2ztC8QWDtrHAeMwk9IzU5Sln7HQl+1Y=";
hash = "sha256-BIop7QBbJCRO5u81NMuRHcKtAHpPAWZFIApv7g/3pI8=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-/5VEFXlGORo9t5ehDmLcqb0cYvJ6Gb1yIootyqpMZM8=";
hash = "sha256-mghcU1iyxlU1uY9tb4j5/qdy5TM+MFXN2ci95erzihg=";
};
};
in
{
name = "visualjj";
publisher = "visualjj";
version = "0.14.4";
version = "0.14.5";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-pce-fast";
version = "0-unstable-2025-03-28";
version = "0-unstable-2025-04-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-pce-fast-libretro";
rev = "4ee33ff536f14295c178a037f9b5d5a960ce3c6f";
hash = "sha256-ZL+aV469RHp5SSBFmK0q+1h2MdcM1q+TZu5Rrv/N0DU=";
rev = "baa35513545b011faa8b0b5db334d24ba15539ed";
hash = "sha256-jEvbHCK9AB4u3raWbAivscHqBiH9s+RkgExTVW1yvnk=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2025-04-11";
version = "0-unstable-2025-04-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
rev = "5d2137e5f15db3b52583e8246bcf2669cebb147b";
hash = "sha256-Gu5rubuNsMWOCNaNrqRR/hoErmhYdGC+9o/xDXuaWuM=";
rev = "4e0cb4ddf0c52ef802cd4f7f2b7d3a187ab9962d";
hash = "sha256-XjJf/EPgJmbxGPJl2SEoVA47iRzjSKISt/3rmW5Wysg=";
};
extraBuildInputs = lib.optionals withHw [
pkgs/applications/emulators/libretro/cores/gambatte.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2025-04-04";
version = "0-unstable-2025-04-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "2910240a4100ccad68f935082b8bbce194673cb5";
hash = "sha256-segz2SocZaNNgToNQOIEVIOD3CidyZIS81dStcdAsTs=";
rev = "b285b0823ac867371e72c54d5275a554c7be312c";
hash = "sha256-/PFSMcx+iBpiMHSqAhGVjbXDkMk9En0UZPChPROaLck=";
};
meta = {
pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "genesis-plus-gx";
version = "0-unstable-2025-04-04";
version = "0-unstable-2025-04-25";
src = fetchFromGitHub {
owner = "libretro";
repo = "Genesis-Plus-GX";
rev = "32a4853c5fd352cc3054e83ed375476cf023aa5f";
hash = "sha256-3r562/3WWWkibEKzPrA+lASY5Wpz8kuX5EQKqFKJdAA=";
rev = "99678a0ef3cfcca500ed01c24bbb1020d8af4c12";
hash = "sha256-iijYZ4+TM61EkJynDaPYBi/bYrypouFRmhaG63cxgJo=";
};
meta = {
pkgs/applications/emulators/libretro/cores/nestopia.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "nestopia";
version = "0-unstable-2025-03-22";
version = "0-unstable-2025-04-24";
src = fetchFromGitHub {
owner = "libretro";
repo = "nestopia";
rev = "b3eb368603cd519d54bb4886d2934ee4fd188081";
hash = "sha256-gaMZEP+8vCb/b9lhrXcUK4N7v9uxX/FVgnzK48rxyHQ=";
rev = "d2eefab298b0b9152d2934d6f0227b6803c877b3";
hash = "sha256-lmfyNi+E2SoCOAtXuJ3F5S3mm1OCta9FHtoqPpLgYk8=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/puae.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "puae";
version = "0-unstable-2025-04-15";
version = "0-unstable-2025-04-22";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-uae";
rev = "0faf39cfd84e114d985e020562e75c22b4bc1569";
hash = "sha256-eJnCHei0/SdJD33SGsRgUL1+IapcvX/FcxHDlYmkob0=";
rev = "7dd724eaa48f05f02d9d2f1bfa131c34b6ab5351";
hash = "sha256-i046+gZa8u/nmGGlF/uA2Lz5VZJTgwXz9aK2C/2l470=";
};
makefile = "Makefile";
pkgs/applications/graphics/seamly2d/default.nix
+2 -2
View File
@@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation rec {
pname = "seamly2d";
version = "2025.3.25.1924";
version = "2025.4.14.211";
src = fetchFromGitHub {
owner = "FashionFreedom";
repo = "Seamly2D";
tag = "v${version}";
hash = "sha256-hBXdf/r3hXSjy6Vp5SjfOcefxj/aP0La4LTiyOESzmQ=";
hash = "sha256-Zs1zinWWbodF340fo18HbRD//JIm/fhEgapAcR0JnzA=";
};
buildInputs = [
pkgs/applications/misc/pe-bear/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "pe-bear";
version = "0.7.0";
version = "0.7.0.4";
src = fetchFromGitHub {
owner = "hasherezade";
repo = "pe-bear";
rev = "v${version}";
hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk=";
hash = "sha256-W8Sa7MKTf7mbdzAEL6tNDpmXIFWAC/8qSXBqqsZ4WFk=";
fetchSubmodules = true;
};
pkgs/applications/misc/survex/default.nix
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "survex";
version = "1.4.16";
version = "1.4.17";
src = fetchurl {
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
hash = "sha256-kiRXld0FwXU2zPgMPSR/KQSdoZFLTvd9Y/n97/YJlcA=";
hash = "sha256-r24vcOV1pjNxnLRfy2tSG7bDG/HLChwEvlc83YMeOEc=";
};
nativeBuildInputs = [
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+619 -619
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+619 -619
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "137.0.1-1",
"packageVersion": "137.0.2-1",
"source": {
"rev": "137.0.1-1",
"hash": "sha256-4C9RcdkNOYX215uom94yOi9ZQM0zEVgETNFFTsgkPns="
"rev": "137.0.2-1",
"hash": "sha256-PZapXnpVGdQrTXWjlNuFj3idqelTKTpwapuwx+XuwW8="
},
"firefox": {
"version": "137.0.1",
"hash": "sha512-zCy+PdZWloScGxl7kIiHwREIP6i1CJqk6ubzPuQE2ynFZmGcSLd/tJWtf53JSi2dkQ5bKq+GRNsdADaAkfnctg=="
"version": "137.0.2",
"hash": "sha512-ghQMQyUjPqLi9XkIjOu5jA6NuISLQBjP+V1O1Cv4RwSe1lIPwFHZMO4melrLAIkIFwgl04FYnaDRCcoEph4cJA=="
}
}
pkgs/applications/networking/cluster/cni/default.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cni";
version = "1.2.3";
version = "1.3.0";
src = fetchFromGitHub {
owner = "containernetworking";
repo = pname;
rev = "v${version}";
hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE=";
hash = "sha256-xeajsM8ZIlI6Otv9CQhPfYaVQwmJ5QcFEn1xt6e/ivQ=";
};
vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE=";
vendorHash = "sha256-uo3ZwFdD6aJ0WDGmt51l3hs9agUnv1cIQY/KMlNe5nI=";
subPackages = [
"./cnitool"
pkgs/applications/networking/cluster/terraform-providers/providers.json
+8 -8
View File
@@ -1,10 +1,10 @@
{
"aci": {
"hash": "sha256-f4hgHFJgRUG+mhRgD7GMtkXoYkzAbkxxMIzvGLS0ums=",
"hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
"rev": "v2.15.0",
"rev": "v2.16.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -498,13 +498,13 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-1TN37PZR2skkmKhRbv1Z1Kv45G9b8WQz9yDK14fs1TI=",
"hash": "sha256-tZJuXYRD6+E6Bhrn+cjeSCRAePgj/g+E8YTStwjZiSM=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v17.10.0",
"rev": "v17.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-1KTU8nMYUfC+LJHFeIpK6m4RUPWvSHNSXGVJgcnsVl8="
"vendorHash": "sha256-3URc3A1kkcVQ/riB2/THuIEiCq9MrifxgRL73cjsbDA="
},
"google": {
"hash": "sha256-GuwIiAyZwa66Vl6dIKdmzHYhWdNrfISy3YKLJQva92U=",
@@ -922,13 +922,13 @@
"vendorHash": null
},
"okta": {
"hash": "sha256-M2F84q7ZBzrGUpUv5vTWeeb3jG4RcinFxiQxooWkrhs=",
"hash": "sha256-1/GKJWRy+epeEwReieN6aVNP4/oPT3FTkHeHtticL8k=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
"rev": "v4.16.0",
"rev": "v4.17.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-fYCisoPEON8F11HauVONyqS56RS/1+bebnLeCCXTrsw="
"vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE="
},
"oktaasa": {
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
pkgs/applications/networking/instant-messengers/discord/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@ let
{
stable = "0.0.91";
ptb = "0.0.136";
canary = "0.0.621";
canary = "0.0.649";
development = "0.0.73";
}
else
@@ -34,7 +34,7 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-Jz7YIH107n89N/wQfhs9QfEqWCYO+BtjHrgSvk7xG+o=";
hash = "sha256-FXwnE3knSD6U6CxkewplwZJr3F8vUBDAztMDHjtV1Jw=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
pkgs/applications/networking/sniffers/wireshark/default.nix
+2 -2
View File
@@ -56,7 +56,7 @@ assert withQt -> qt6 != null;
stdenv.mkDerivation rec {
pname = "wireshark-${if withQt then "qt" else "cli"}";
version = "4.4.5";
version = "4.4.6";
outputs = [
"out"
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E=";
hash = "sha256-dzVlHxrXVCSMP4ZfyUq4N9UvL941C50Zto6Mb78LnfQ=";
};
patches = [
pkgs/applications/science/chemistry/jmol/default.nix
+2 -2
View File
@@ -31,7 +31,7 @@ let
};
in
stdenv.mkDerivation rec {
version = "16.3.13";
version = "16.3.17";
pname = "jmol";
src =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
in
fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-ehJZSMhUsE0iO3sDD5Q0UMfcjNmTgPzMNgWG5nIeBFo=";
hash = "sha256-5L9+JGVHKwgW9bOX/Xm/fQUOisO7aivWhhBdQaNpzyk=";
};
patchPhase = ''
pkgs/applications/science/logic/easycrypt/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "easycrypt";
version = "2025.02";
version = "2025.03";
src = fetchFromGitHub {
owner = pname;
repo = pname;
tag = "r${version}";
hash = "sha256-XkfFCPmc8vd6gGFiz/Lxzk7BtcCQBzPNVPGFdiylZmc=";
hash = "sha256-Z6JaqR0BocEhDuof929HOvzWu6C77CAqeuYYY2PXvrs=";
};
nativeBuildInputs =
pkgs/applications/science/misc/boinc/default.nix
+2 -2
View File
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "boinc";
version = "8.0.4";
version = "8.2.1";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "BOINC";
repo = "boinc";
rev = "client_release/${lib.versions.majorMinor version}/${version}";
hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c=";
hash = "sha256-kBCoDB0+STKIOVFnQ1FWKulJ0qNwNfvxB3QwaGnl7sM=";
};
nativeBuildInputs = [
pkgs/applications/video/kodi/addons/jurialmunkey/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildKodiAddon rec {
pname = "jurialmunkey";
namespace = "script.module.jurialmunkey";
version = "0.2.21";
version = "0.2.28";
src = fetchFromGitHub {
owner = "jurialmunkey";
repo = namespace;
rev = "v${version}";
hash = "sha256-vcYydVrcVJ7jaeFXCad7pgxvoZy63QLlRS3HO9GsmtU=";
hash = "sha256-3bT1mFzY28r3tzb5zrLKwLs83uotfKezI020SetJuso=";
};
propagatedBuildInputs = [
pkgs/applications/video/mpv/scripts/eisa01.nix
+24
View File
@@ -54,6 +54,22 @@ lib.recurseIntoAttrs (
};
};
simplebookmark = {
scriptPath = "scripts/SimpleBookmark.lua";
meta = {
description = "Simple bookmarks script based on assigning keys";
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
};
};
simplehistory = {
scriptPath = "scripts/SimpleHistory.lua";
meta = {
description = "Store videos in a history file, continue watching your last played or resume previously played videos, manage and play from your history, and more";
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
};
};
smartskip = {
scriptPath = "scripts/SmartSkip.lua";
meta = {
@@ -61,5 +77,13 @@ lib.recurseIntoAttrs (
maintainers = with lib.maintainers; [ iynaix ];
};
};
undoredo = {
scriptPath = "scripts/UndoRedo.lua";
meta = {
description = "Undo / redo any accidental time jumps";
maintainers = with lib.maintainers; [ iynaix ];
};
};
}
)
pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "obs-livesplit-one";
version = "0.3.4";
version = "0.4.1";
src = fetchFromGitHub {
owner = "LiveSplit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0=";
sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-JHocpqDeF24Qn9lUr+YCnZqgckLhGRpWQD7WGCxVmd8=";
cargoHash = "sha256-e0FDa72vzRb5AMVmtkvAkiQ5GUXsq0LekqF+wDYDsr8=";
nativeBuildInputs = [
cmake
pkgs/by-name/aa/aaaaxy/package.nix
+3 -3
View File
@@ -22,17 +22,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.6.176";
version = "1.6.194";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-LukI+FgM2gtKp2/3ySJ0FT6lTlBYTh400GFC5NK7S8I=";
hash = "sha256-4iL3+GeyOZoZN8IXo0jjSq3hYHKBTpytk8owXMdfACo=";
fetchSubmodules = true;
};
vendorHash = "sha256-bw2Zk4vHzVaXdKwYJF+DkfJefxJlZKlFlh5LGcgkZBY=";
vendorHash = "sha256-XBcrs6G3Kq9WsODegy2KxqSp+qwr+NpdLJLa3qmW9kA=";
buildInputs = [
alsa-lib
pkgs/by-name/ai/airwindows/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation {
pname = "airwindows";
version = "0-unstable-2025-04-06";
version = "0-unstable-2025-04-19";
src = fetchFromGitHub {
owner = "airwindows";
repo = "airwindows";
rev = "d109d6b9948449a883a9694d3f5aa8702a57f56b";
hash = "sha256-4yXcPedz5wYqAiLyF5Cgc/DH4jjfJGSLv4qDyIJW4x0=";
rev = "9e38c7af2c4b74e4a1f138ebaccc07e5800c73b8";
hash = "sha256-/6Z+CTrUeH3wNlwlP3aS5scYjhC0NwC0QXe+IMvphkc=";
};
# we patch helpers because honestly im spooked out by where those variables
pkgs/by-name/al/alsa-tools/package.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-tools";
version = "1.2.11";
version = "1.2.14";
src = fetchurl {
url = "mirror://alsa/tools/alsa-tools-${finalAttrs.version}.tar.bz2";
hash = "sha256-CRXJY0pQL9NlXKnFdNJZvJ55mD2R1Frqz/bzwA+K4+k=";
hash = "sha256-+u9v3TnsecmlRz3GOqG2Mxv3ZkqdRSoKgZjOxwFsvG8=";
};
nativeBuildInputs = [
pkgs/by-name/am/amazon-ssm-agent/package.nix
+2 -2
View File
@@ -42,13 +42,13 @@ let
in
buildGoModule rec {
pname = "amazon-ssm-agent";
version = "3.3.1957.0";
version = "3.3.2299.0";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-ssm-agent";
tag = version;
hash = "sha256-lOfeGkImwRxua3dSmefb1WcgnviHhOYtYK1VaRW9C6A=";
hash = "sha256-8jqsAGnfn6+a+Zs9XfIyHzG/+jPO+UoSVsm0GHthq3E=";
};
vendorHash = null;
pkgs/by-name/an/anchor/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "anchor";
version = "0.31.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "coral-xyz";
repo = "anchor";
rev = "v${version}";
hash = "sha256-rwf2PWHoUl8Rkmktb2u7veRrIcLT3syi7M2OZxdxjG4=";
hash = "sha256-pvD0v4y7DilqCrhT8iQnAj5kBxGQVqNvObJUBzFLqzA=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-ack2/WFrycfYHYVnZt0Q94WJdQrvLU/VZYm1KeqOjIQ=";
cargoHash = "sha256-fjhLA+utQdgR75wg+/N4VwASW6+YBHglRPj14sPHmGA=";
checkFlags = [
# the following test cases try to access network, skip them
pkgs/by-name/au/autobrr/package.nix
+4 -4
View File
@@ -13,12 +13,12 @@
let
pname = "autobrr";
version = "1.60.0";
version = "1.61.0";
src = fetchFromGitHub {
owner = "autobrr";
repo = "autobrr";
tag = "v${version}";
hash = "sha256-HaNaVxOtlzquKvWmUzUELtv0ZQZ+C/G5ni9/QbOlAh4=";
hash = "sha256-qFLHszkdpnOZj7dalwSPX/NSlAtLcVpIcEXxbtE8lLU=";
};
autobrr-web = stdenvNoCC.mkDerivation {
@@ -40,7 +40,7 @@ let
src
sourceRoot
;
hash = "sha256-FzYgJvPk2RYC55LON9Wk6q6Fm2RpVeNKm/EH+KZF1hM=";
hash = "sha256-ifzkLoXTdySr3uTy4Mc4WvDA6yd0RBVXbTtozHequsA=";
};
postBuild = ''
@@ -60,7 +60,7 @@ buildGoModule rec {
src
;
vendorHash = "sha256-fX2bXF2buXt/T1tfkybq8r9t5MWLGa3Wa+qVMx7z1Jc=";
vendorHash = "sha256-bbIoNW32b6N6t/MvCfSN/BdoHN0rZIMqWsJHL2amKPE=";
preBuild = ''
cp -r ${autobrr-web}/* web/dist
pkgs/by-name/av/avisynthplus/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "avisynthplus";
version = "3.7.4";
version = "3.7.5";
src = fetchFromGitHub {
owner = "AviSynth";
repo = "AviSynthPlus";
tag = "v${finalAttrs.version}";
hash = "sha256-M+F7bUSlH6kAyQLCq0RxmaE19RqHPPleTMyRuz5zqPg=";
hash = "sha256-RkEZWsAKZABtl+SbRLCjMqyQoi9ainbaI9hWlpO6Fwo=";
};
patchPhase = ''
pkgs/by-name/aw/aws-lc/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aws-lc";
version = "1.49.1";
version = "1.50.0";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-lc";
rev = "v${finalAttrs.version}";
hash = "sha256-gnYtzXHaS7QLcVmIcQsQDy6wNesQJ2ruE9W32HqiA5A=";
hash = "sha256-aYill04Fs/mJFCmzP/tlwUcPRHJz6R9knQWKGEOMwfQ=";
};
outputs = [
pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix
+4 -1
View File
@@ -65,8 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
"lomiri"
];
};
tests = {
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-bluetooth;
};
updateScript = gitUpdater { };
tests.vm = nixosTests.ayatana-indicators;
};
meta = {
pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
+2 -1
View File
@@ -137,7 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
];
};
tests = {
inherit (nixosTests) ayatana-indicators;
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-datetime;
};
updateScript = gitUpdater { };
};
pkgs/by-name/ay/ayatana-indicator-display/package.nix
+4 -1
View File
@@ -114,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
"lomiri"
];
};
tests.vm = nixosTests.ayatana-indicators;
tests = {
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-display;
};
updateScript = gitUpdater { };
};
pkgs/by-name/ay/ayatana-indicator-power/package.nix
+4 -1
View File
@@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
"lomiri"
];
};
tests.vm = nixosTests.ayatana-indicators;
tests = {
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-power;
};
updateScript = gitUpdater { };
};
pkgs/by-name/ay/ayatana-indicator-session/package.nix
+4 -1
View File
@@ -84,7 +84,10 @@ stdenv.mkDerivation (finalAttrs: {
"lomiri"
];
};
tests.vm = nixosTests.ayatana-indicators;
tests = {
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-session;
};
updateScript = gitUpdater { };
};
pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+4 -1
View File
@@ -115,7 +115,10 @@ stdenv.mkDerivation (finalAttrs: {
"lomiri"
];
};
tests.vm = nixosTests.ayatana-indicators;
tests = {
startup = nixosTests.ayatana-indicators;
lomiri = nixosTests.lomiri.desktop-ayatana-indicator-sound;
};
updateScript = gitUpdater { };
};
pkgs/by-name/az/azure-cli/extensions-manual.nix
+2 -2
View File
@@ -140,9 +140,9 @@
vm-repair = mkAzExtension rec {
pname = "vm-repair";
version = "2.1.1";
version = "2.1.2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
hash = "sha256-3Pgwppp4IssNYhJ+USQNwMEp91XdZDwNlnNWzVWrHFM=";
hash = "sha256-DOuH7BG4WrhP7SQH3GInFh7DHT0qN3JhSG76EXmNn24=";
description = "Support for repairing Azure Virtual Machines";
propagatedBuildInputs = with python3Packages; [ opencensus ];
meta.maintainers = with lib.maintainers; [ ];
pkgs/by-name/b3/b3sum/package.nix
+3 -3
View File
@@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "1.8.0";
version = "1.8.2";
src = fetchCrate {
inherit version pname;
hash = "sha256-FWblGKr/ZQsLZkPOax20FYEyoLiPREf7UjfOtFCljZU=";
hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-vSxAG0CKtTHZ/3fSDtZqmqvfY+swDBBPZ8YZP1Vlj0w=";
cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM=";
meta = {
description = "BLAKE3 cryptographic hash function";
pkgs/by-name/bc/bcc/package.nix
+2 -2
View File
@@ -22,7 +22,7 @@
python3Packages.buildPythonApplication rec {
pname = "bcc";
version = "0.33.0";
version = "0.34.0";
disabled = !stdenv.hostPlatform.isLinux;
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
owner = "iovisor";
repo = "bcc";
tag = "v${version}";
hash = "sha256-6dT3seLuEVQNKWiYGLK1ajXzW7pb62S/GQ0Lp4JdGjc=";
hash = "sha256-sSHEsvTtqPpfxSevmjciQ+xFj+4G4GE4ExWoIYc+DQI=";
};
format = "other";
pkgs/by-name/bf/bftpd/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "bftpd";
version = "6.2";
version = "6.3";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI=";
sha256 = "sha256-f7XZCSrGwmQqyf5C4xtJ46Q4SDHxbr15rDzcAK1PvB4=";
};
# utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard):
pkgs/by-name/br/broot/package.nix
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.46.0";
version = "1.46.3";
src = fetchFromGitHub {
owner = "Canop";
repo = "broot";
rev = "v${version}";
hash = "sha256-m7TG3Bxqp87g9GPijy+daP4nYgCJkTmC95U+DgUcWGM=";
hash = "sha256-MfBlJ7SokBKkAkmBSj4NsE2hKVqYeGN3z/xiq2VK3vU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-elpzGgF9o7iV2YaQFFqQ9jafEuYVPImC808MWWFZ4gw=";
cargoHash = "sha256-QJJxZDRJZkg/A1NjTBj7KpcfO8VUnXXcJT9knguAf/g=";
nativeBuildInputs = [
installShellFiles
pkgs/misc/calaos/installer/default.nix → pkgs/by-name/ca/calaos_installer/package.nix
+14 -15
View File
@@ -1,31 +1,29 @@
{
mkDerivation,
lib,
stdenv,
fetchFromGitHub,
qmake,
qttools,
qtbase,
libsForQt5,
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "calaos_installer";
version = "3.11";
src = fetchFromGitHub {
owner = "calaos";
repo = "calaos_installer";
rev = "v${version}";
sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
tag = "v${finalAttrs.version}";
hash = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
};
nativeBuildInputs = [
buildInputs = [ libsForQt5.qtbase ];
nativeBuildInputs = with libsForQt5; [
qmake
wrapQtAppsHook
qttools
];
buildInputs = [ qtbase ];
qmakeFlags = [ "REVISION=${version}" ];
qmakeFlags = [ "REVISION=${finalAttrs.version}" ];
installPhase =
if stdenv.hostPlatform.isDarwin then
@@ -39,12 +37,13 @@ mkDerivation rec {
cp -a calaos_installer $out/bin
'';
meta = with lib; {
meta = {
description = "Calaos Installer, a tool to create calaos configuration";
mainProgram = "calaos_installer";
homepage = "https://www.calaos.fr/";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ tiramiseb ];
downloadPage = "https://github.com/calaos/calaos_installer/";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ tiramiseb ];
};
}
})
pkgs/by-name/ca/cargo-zigbuild/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
version = "0.19.8";
version = "0.20.0";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE=";
hash = "sha256-sUoEKLaUBxKKtCwgw/CcLrVRA4OMhto7d0PR+TMU5xk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-L9SoaXGzYHY6vOWESvovHNzSehOWD4RGAC/3K6qT6Ks=";
cargoHash = "sha256-jvSOYWydnCFgJx1LTzQ1kHEVpzsdPLo19NVMBaLJEeQ=";
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/cd/cdo/package.nix
+12 -12
View File
@@ -15,9 +15,14 @@
enable_cxx ? false,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cdo";
version = "2.4.2";
version = "2.5.1";
src = fetchurl {
url = "https://code.mpimet.mpg.de/attachments/download/29864/cdo-${finalAttrs.version}.tar.gz";
hash = "sha256-QYv5HoZMv+VHw8jhUNMUGc+nFefTRVCMVZGxq9pUV9E=";
};
# Dependencies
buildInputs = [
@@ -27,11 +32,6 @@ stdenv.mkDerivation rec {
python3
];
src = fetchurl {
url = "https://code.mpimet.mpg.de/attachments/download/29481/${pname}-${version}.tar.gz";
sha256 = "sha256-TfH+K4+S9Uwn6585nt+rQNkyIAWmcyyhUk71wWJ6xOc=";
};
configureFlags =
[
"--with-netcdf=${netcdf}"
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
++ lib.optional enable_all_static "--enable-all-static"
++ lib.optional enable_cxx "--enable-cxx";
meta = with lib; {
meta = {
description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
mainProgram = "cdo";
longDescription = ''
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
There are more than 600 operators available.
'';
homepage = "https://code.mpimet.mpg.de/projects/cdo/";
license = licenses.bsd3;
maintainers = [ maintainers.ltavard ];
platforms = with platforms; linux ++ darwin;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.ltavard ];
platforms = with lib.platforms; linux ++ darwin;
};
}
})
pkgs/by-name/ce/ceph-csi/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ceph-csi";
version = "3.13.1";
version = "3.14.0";
src = fetchFromGitHub {
owner = "ceph";
repo = "ceph-csi";
rev = "v${version}";
hash = "sha256-Wa5elZbQotgeb4pH9DIZd48CQyBJ0O5y1SidIb/iyGY=";
hash = "sha256-c6OaWDR38S0yl3pVN+DYjfg9oHqmVXljstmvBDmfOi8=";
};
preConfigure = ''
pkgs/by-name/ch/chez/package.nix
+3 -5
View File
@@ -16,11 +16,9 @@
let
# x64 darwin fails with invalid memory reference with clang-18 & 19.
# https://github.com/cisco/ChezScheme/issues/896
stdenv =
if args.stdenv.hostPlatform.isDarwin && args.stdenv.hostPlatform.isx86_64 then
llvmPackages_17.stdenv
else
args.stdenv;
# aarch64 darwin fails to execute `system` calls with clang-18 & 19.
# https://github.com/cisco/ChezScheme/issues/928
stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "chez-scheme";
pkgs/by-name/co/code-cursor/package.nix
+11 -11
View File
@@ -48,26 +48,26 @@
}:
let
pname = "cursor";
version = "0.48.9";
version = "0.49.6";
inherit (stdenvNoCC) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/linux/x64/Cursor-0.48.9-x86_64.AppImage";
hash = "sha256-Rw96CIN+vL1bIj5o68gWkHeiqgxExzbjwcW4ad10M2I=";
url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/x64/Cursor-0.49.6-x86_64.AppImage";
hash = "sha256-WH4/Zw0VJmRGyRzMlkThkhZ4fGysMKBUSIPCTsyGS4w=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/linux/arm64/Cursor-0.48.9-aarch64.AppImage";
hash = "sha256-RMDYoQSIO0jukhC5j1TjpwCcK0tEnvoVpXbFOxp/K8o=";
url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/arm64/Cursor-0.49.6-aarch64.AppImage";
hash = "sha256-cpNoff6mDRkT2RicaDlxzqVP9BNe6UEGgJVHr1xMiv0=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/darwin/x64/Cursor-darwin-x64.dmg";
hash = "sha256-172BGNNVvpZhk99rQN19tTsxvRADjmtEzgkZazke/v4=";
url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/x64/Cursor-darwin-x64.dmg";
hash = "sha256-fAaLY9YTIuNThFl5OsIMHavy2xwDgYooL4xTSp4Cwzw=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/darwin/arm64/Cursor-darwin-arm64.dmg";
hash = "sha256-IQ4UZwEBVGMaGUrNVHWxSRjbw8qhLjOJ2KYc9Y26LZU=";
url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/arm64/Cursor-darwin-arm64.dmg";
hash = "sha256-DNN2+gfs9u0tZmh75J258d2TL6ErIYludMgPJZcgfb8=";
};
};
@@ -113,7 +113,6 @@ stdenvNoCC.mkDerivation {
libdrm
libgbm
libGL
libGL
libva-minimal
libxkbcommon
libxkbfile
@@ -162,7 +161,8 @@ stdenvNoCC.mkDerivation {
substituteInPlace $out/share/applications/cursor.desktop --replace-fail "/usr/share/cursor/cursor" "$out/bin/cursor"
wrapProgram $out/bin/cursor \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update"
--add-flags "--update=false" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update"
''}
${lib.optionalString hostPlatform.isDarwin ''
pkgs/by-name/cr/crawley/package.nix
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "crawley";
version = "1.7.10";
version = "1.7.11";
src = fetchFromGitHub {
owner = "s0rg";
repo = "crawley";
rev = "v${version}";
hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8=";
hash = "sha256-P+BsfVYqUDZ+wqIwziWLI3V0nUnypenHFfmw6EkPigo=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-jj8FNZs/bkFQxveOkqmGVO3MNPPv5O9ebodoi7hhzIs=";
vendorHash = "sha256-lcCcfn83WGBegQzUKEF8kpu7DdcLyVbS+PGX0mYrr40=";
ldflags = [
"-w"
pkgs/by-name/cu/cutentr/package.nix
+66
View File
@@ -0,0 +1,66 @@
{
stdenv,
libsForQt5,
fetchFromGitLab,
makeDesktopItem,
lib,
copyDesktopItems,
}:
let
version = "0.3.3";
in
stdenv.mkDerivation {
pname = "cutentr";
inherit version;
src = fetchFromGitLab {
owner = "BoltsJ";
repo = "cuteNTR";
tag = version;
hash = "sha256-KfnC9R38qSMhQDeaMBWm1HoO3Wzs5kyfPFwdMZCWw4E=";
};
desktopItems = lib.singleton (makeDesktopItem {
name = "cuteNTR";
desktopName = "cuteNTR";
icon = "cutentr";
exec = "cutentr";
categories = [ "Game" ];
});
nativeBuildInputs = [
libsForQt5.wrapQtAppsHook
copyDesktopItems
];
buildInputs = [
libsForQt5.qtbase
];
buildPhase = ''
runHook preBuild
qmake
make
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r cutentr $out/bin
install -m 444 -D setup/gui/com.gitlab.BoltsJ.cuteNTR.svg $out/share/icons/hicolor/scalable/apps/cutentr.svg
runHook postInstall
'';
meta = {
description = "A 3DS streaming client for Linux";
homepage = "https://gitlab.com/BoltsJ/cuteNTR";
license = lib.licenses.gpl3Plus;
mainProgram = "cutentr";
platforms = [ "x86_64-linux" ];
maintainers = [ lib.maintainers.EarthGman ];
};
}
pkgs/by-name/de/dell-command-configure/package.nix
+19 -13
View File
@@ -1,6 +1,6 @@
{
stdenv,
lib,
stdenv,
fetchurl,
dpkg,
autoPatchelfHook,
@@ -17,20 +17,20 @@
# the dependencies from other pkgs.
let
version = "4.11.0-6";
version = "5.1.0-6";
unpacked = stdenv.mkDerivation rec {
unpacked = stdenv.mkDerivation (finalAttrs: {
inherit version;
pname = "dell-command-configure-unpacked";
src = fetchurl {
urls = [
"https://dl.dell.com/FOLDER10469726M/1/command-configure_${version}.ubuntu22_amd64.tar.gz"
"https://web.archive.org/web/20240228233129/https://dl.dell.com/FOLDER10469726M/1/command-configure_4.11.0-6.ubuntu22_amd64.tar.gz"
"https://dl.dell.com/FOLDER12705845M/1/command-configure_${version}.ubuntu24_amd64.tar.gz"
"https://web.archive.org/web/20250421172156/https://dl.dell.com/FOLDER12705845M/1/command-configure_5.1.0-6.ubuntu24_amd64.tar.gz"
];
# The CDN blocks the Curl user-agent, so set to blank instead.
curlOpts = ''-A=""'';
hash = "sha256-Bwa4sYguYwEBKEJSP3wzHhzjuDeaGQN8fKeooWHX18E=";
hash = "sha256-MM6Djkz/VuVCLHGEji88Xq0vIV+AfqQkjNXz4zqFOtw=";
};
dontBuild = true;
@@ -38,8 +38,8 @@ let
nativeBuildInputs = [ dpkg ];
unpackPhase = ''
tar -xzf ${src}
dpkg-deb -x command-configure_${version}.ubuntu22_amd64.deb command-configure
tar -xzf ${finalAttrs.src}
dpkg-deb -x command-configure_${version}.ubuntu24_amd64.deb command-configure
dpkg-deb -x srvadmin-hapi_9.5.0_amd64.deb srvadmin-hapi
'';
@@ -47,7 +47,7 @@ let
mkdir $out
cp -r . $out
'';
};
});
# Contains a fopen() wrapper for finding the firmware package
wrapperLibName = "wrapper-lib.so";
@@ -74,16 +74,20 @@ stdenv.mkDerivation {
inherit version;
pname = "dell-command-configure";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
openssl
(lib.getLib stdenv.cc.cc)
];
nativeBuildInputs = [ autoPatchelfHook ];
dontConfigure = true;
src = unpacked;
installPhase = ''
runHook preInstall
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libhapiintf.so
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libsmbios_c.so.2
install -D -t $out/bin -m755 -v command-configure/opt/dell/dcc/cctk
@@ -91,6 +95,8 @@ stdenv.mkDerivation {
for lib in $(find srvadmin-hapi/opt/dell/srvadmin/lib64 -type l); do
install -D -t $out/lib -m644 -v $lib
done
runHook postInstall
'';
postFixup = ''
@@ -104,11 +110,11 @@ stdenv.mkDerivation {
$out/lib/*
'';
meta = with lib; {
meta = {
description = "Configure BIOS settings on Dell laptops";
homepage = "https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure";
license = licenses.unfree;
maintainers = with maintainers; [ ryangibb ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ ryangibb ];
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
pkgs/by-name/di/distrobuilder/nixos-generator.patch
+73 -43
View File
@@ -1,16 +1,16 @@
diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
index dc5b506..0265da8 100644
--- a/distrobuilder/lxc.generator
+++ b/distrobuilder/lxc.generator
@@ -21,16 +21,6 @@ is_incus_vm() {
[ -e /dev/virtio-ports/org.linuxcontainers.incus ]
diff --git c/distrobuilder/lxc.generator w/distrobuilder/lxc.generator
index 5f854d3..927f2df 100644
--- c/distrobuilder/lxc.generator
+++ w/distrobuilder/lxc.generator
@@ -16,16 +16,6 @@ is_lxc_privileged_container() {
grep -qw 4294967295$ /proc/self/uid_map
}
-# is_in_path succeeds if the given file exists in on of the paths
-is_in_path() {
- # Don't use $PATH as that may not include all relevant paths
- for path in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin; do
- [ -e "${path}/$1" ] && return 0
- [ -e "${path}/${1}" ] && return 0
- done
-
- return 1
@@ -19,21 +19,23 @@ index dc5b506..0265da8 100644
## Fix functions
# fix_ro_paths avoids udevd issues with /sys and /proc being writable
fix_ro_paths() {
@@ -42,38 +32,6 @@ fix_ro_paths() {
@@ -47,41 +37,6 @@ fix_ro_run() {
EOF
}
-# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up
-fix_nm_link_state() {
- [ -e "/sys/class/net/$1" ] || return 0
- ip_path=
- if [ -f /sbin/ip ]; then
- ip_path=/sbin/ip
- elif [ -f /bin/ip ]; then
- ip_path=/bin/ip
- [ -e "/sys/class/net/${1}" ] || return 0
-
- ip=
- if [ -f "/sbin/ip" ]; then
- ip="/sbin/ip"
- elif [ -f "/bin/ip" ]; then
- ip="/bin/ip"
- else
- return 0
- fi
-
- cat <<-EOF > /run/systemd/system/network-device-down.service
- # This file was created by distrobuilder
- [Unit]
@@ -44,13 +46,14 @@ index dc5b506..0265da8 100644
- [Service]
- # do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic
- ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route'
- ExecStart=-${ip_path} link set $1 down
- ExecStart=-${ip} link set ${1} down
- Type=oneshot
- RemainAfterExit=true
-
- [Install]
- WantedBy=default.target
- EOF
-
- mkdir -p /run/systemd/system/default.target.wants
- ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service
-}
@@ -58,78 +61,105 @@ index dc5b506..0265da8 100644
# fix_systemd_override_unit generates a unit specific override
fix_systemd_override_unit() {
dropin_dir="/run/systemd/${1}.d"
@@ -113,16 +71,7 @@ fix_systemd_mask() {
@@ -122,16 +77,7 @@ fix_systemd_mask() {
# fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version
# of the file which uses "ExecStart=-" instead of "ExecStart=".
fix_systemd_udev_trigger() {
- cmd=
- udev=
- if [ -f /usr/bin/udevadm ]; then
- cmd=/usr/bin/udevadm
- udev=/usr/bin/udevadm
- elif [ -f /sbin/udevadm ]; then
- cmd=/sbin/udevadm
- udev=/sbin/udevadm
- elif [ -f /bin/udevadm ]; then
- cmd=/bin/udevadm
- udev=/bin/udevadm
- else
- return 0
- fi
+ cmd=udevadm
+ udev=/run/current-system/sw/bin/udevadm
mkdir -p /run/systemd/system/systemd-udev-trigger.service.d
cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf
@@ -134,38 +83,13 @@ fix_systemd_udev_trigger() {
@@ -143,52 +89,40 @@ fix_systemd_udev_trigger() {
EOF
}
-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=".
-fix_systemd_sysctl() {
- cmd=/usr/lib/systemd/systemd-sysctl
- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl
- sysctl=/usr/lib/systemd/systemd-sysctl
- [ ! -e "${sysctl}" ] && sysctl=/lib/systemd/systemd-sysctl
-
- mkdir -p /run/systemd/system/systemd-sysctl.service.d
- cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf
- # This file was created by distrobuilder
- [Service]
- ExecStart=
- ExecStart=-${cmd}
- ExecStart=-${sysctl}
- EOF
-}
-
## Main logic
-# Nothing to do in Incus VM but deployed in case it is later converted to a container
-is_incus_vm && exit 0
# Exit immediately if not an Incus/LXC container
is_lxc_container || exit 0
-# Check for NetworkManager
-nm_exists=0
-
-is_in_path NetworkManager && nm_exists=1
-
# Determine systemd version
-SYSTEMD=""
-for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do
- [ -x "${path}" ] || continue
-
- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
+SYSTEMD="$(/run/current-system/sw/lib/systemd/systemd --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
- SYSTEMD="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
- break
-done
+systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)"
# Determine distro name and release
ID=""
@@ -196,7 +120,6 @@ fi
-# Apply systemd overrides
-if [ "${SYSTEMD}" -ge 244 ]; then
- fix_systemd_override_unit system/service
-else
- # Setup per-unit overrides
- find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
- fix_systemd_override_unit "${service_file}"
- done
-fi
-# Workarounds for unprivileged containers.
-if ! is_lxc_privileged_container; then
- fix_ro_paths systemd-networkd.service
- fix_ro_paths systemd-resolved.service
+
+# Overriding some systemd features is only needed if security.nesting=false
+# in which case, /dev/.lxc will be missing
+# Adding this conditional back for NixOS as we do not have the reported
+# problems, and the overrides could reduce potential service hardening
+if [ ! -d /dev/.lxc ]; then
+ # Apply systemd overrides
+ if [ "${SYSTEMD}" -ge 244 ]; then
+ fix_systemd_override_unit system/service
+ else
+ # Setup per-unit overrides
+ find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
+ fix_systemd_override_unit "${service_file}"
+ done
+ fi
+
+ # Workarounds for unprivileged containers.
+ if ! is_lxc_privileged_container; then
+ fix_ro_paths systemd-networkd.service
+ fix_ro_paths systemd-resolved.service
+ fi
fi
# Ignore failures on some units.
fix_systemd_udev_trigger
-fix_systemd_sysctl
# Mask some units.
fix_systemd_mask dev-hugepages.mount
@@ -226,11 +149,6 @@ if [ -d /etc/udev ]; then
# Fix issues with /run not being writable.
fix_ro_run systemd-nsresourced.service
@@ -221,11 +155,6 @@ if [ -d /etc/udev ]; then
EOF
fi
-# Workarounds for NetworkManager in containers
-if [ "${nm_exists}" -eq 1 ]; then
-if is_in_path NetworkManager; then
- fix_nm_link_state eth0
-fi
-
pkgs/by-name/di/distrobuilder/package.nix
+7 -5
View File
@@ -10,6 +10,7 @@
gnutar,
hivex,
makeWrapper,
nix-update-script,
nixosTests,
pkg-config,
squashfsTools,
@@ -35,16 +36,15 @@ let
in
buildGoModule rec {
pname = "distrobuilder";
version = "3.1";
version = "3.2";
vendorHash = "sha256-3oHLvOdHbOdaL2FTo+a5HmayNi/i3zoAsU/du9h1N30=";
vendorHash = "sha256-nlqapWxuSZlbt22F3Y9X1uXFxJHvEoUBZDl078x8ZnA=";
src = fetchFromGitHub {
owner = "lxc";
repo = "distrobuilder";
rev = "refs/tags/distrobuilder-${version}";
sha256 = "sha256-cIzIoLQmg1kgI1QRAmFh/ca88PJBW2yIY92BKHKwTMk=";
fetchSubmodules = false;
tag = "distrobuilder-${version}";
sha256 = "sha256-aDCx2WGAKdTNf0uMzwxG0AUmbuuWBFPYzNyycKklYOY=";
};
buildInputs = bins;
@@ -67,6 +67,8 @@ buildGoModule rec {
};
generator = callPackage ./generator.nix { inherit src version; };
updateScript = nix-update-script { };
};
meta = {
pkgs/by-name/dp/dprint/plugins/default.nix
+17
View File
@@ -2,6 +2,8 @@
lib,
fetchurl,
stdenv,
dprint,
writableTmpDirAsHomeHook,
}:
let
mkDprintPlugin =
@@ -34,6 +36,21 @@ let
mkdir -p $out
cp $src $out/plugin.wasm
'';
doInstallCheck = true;
nativeInstallCheckInputs = [
dprint
writableTmpDirAsHomeHook
];
# Prevent schema unmatching errors
# See https://github.com/NixOS/nixpkgs/pull/369415#issuecomment-2566112144 for detail
installCheckPhase = ''
runHook preInstallCheck
mkdir empty && cd empty
dprint check --allow-no-files --plugins "$out/plugin.wasm"
runHook postInstallCheck
'';
passthru = {
updateScript = ./update-plugins.py;
inherit initConfig updateUrl;
pkgs/by-name/dw/dwarfs/package.nix
+2 -2
View File
@@ -33,14 +33,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dwarfs";
version = "0.11.2";
version = "0.12.2";
src = fetchFromGitHub {
owner = "mhx";
repo = "dwarfs";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-6dsBWQFYjxg1oxcbc7pzK69plbCIaOW2QFzhmYrm0ck=";
hash = "sha256-ZQ93OQ0HQ/6UP8vNe2okRMqkLX96o5+ruoWoZ52zsl0=";
};
cmakeFlags = [
pkgs/by-name/ec/ecs-agent/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.91.2";
version = "1.92.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo=";
hash = "sha256-g0yIJ0W71UGgPZ5m/BaeTCOTAfQ6589wAvYZ15Izt8o=";
};
vendorHash = null;
pkgs/by-name/el/elektroid/package.nix
+2 -2
View File
@@ -15,7 +15,7 @@
}:
let
version = "3.1";
version = "3.2";
in
stdenv.mkDerivation {
inherit version;
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
owner = "dagargo";
repo = "elektroid";
rev = version;
hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0=";
hash = "sha256-8tKs0i1dkoLlk1a33n7+6eIXqjNu3PHUTznrEC/HPIM=";
};
nativeBuildInputs = [
pkgs/by-name/em/emptty/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "emptty";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "tvrzna";
repo = pname;
rev = "v${version}";
hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A=";
hash = "sha256-AsIt7EI5RkSchhaMGKofOsfPNROhX8f5gDaqZ7Q2394=";
};
buildInputs = [
pkgs/by-name/ev/evcc/package.nix
+3 -3
View File
@@ -17,16 +17,16 @@
}:
let
version = "0.203.3";
version = "0.203.4";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-kbTaSmSfgXDyT3Zw0jxnUu+95lleWigs0l80Q68bAyU=";
hash = "sha256-b171SajnGf9WZ7EID+cAWvmr9cKGclIW1cvjG8pyrgs=";
};
vendorHash = "sha256-oC6aX8hAQfLpEEkpsPYm6ALxFqReKgDiAFse2WJGt60=";
vendorHash = "sha256-nD4585oOE8QCz+EulvJsy5VHqqQShc+BS9ravUGZPGU=";
commonMeta = with lib; {
license = licenses.mit;
pkgs/by-name/fi/fiji/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "fiji";
version = "20241114-1317";
version = "20250408-1717";
src = fetchurl {
url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip";
sha256 = "sha256-dNpscgZiiE2cuuo11YLs+mgoBRZ/MpUXDaAX3x+E/w8=";
sha256 = "sha256-bqVrTBKII58E7WSlQfRPE0Dxd4h/oJALFvIOdAAFZoI=";
};
dontBuild = true;
pkgs/by-name/fl/flat-remix-gnome/package.nix
+4 -4
View File
@@ -8,18 +8,18 @@
let
# make install will use dconf to find desktop background file uri.
# consider adding an args to allow specify pictures manually.
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L38
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38
fake-dconf = writeScriptBin "dconf" "echo -n";
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20250330";
version = "20250413";
src = fetchFromGitHub {
owner = "daniruiz";
repo = "flat-remix-gnome";
rev = version;
hash = "sha256-Ho2tqJgitSdk/i2jH5jhD3XLyy6BXUhyhb6UV7g1waM=";
hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L56
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56
preInstall = ''
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
pkgs/by-name/fl/fluidd/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
buildNpmPackage rec {
pname = "fluidd";
version = "1.33.0";
version = "1.34.1";
src = fetchFromGitHub {
owner = "fluidd-core";
repo = "fluidd";
tag = "v${version}";
hash = "sha256-z1qb3n+BlvQhw6fKvfZ6s/uSdWbXAJ8xqvQRdLPnD+M=";
hash = "sha256-7LnpGmZKY6zROaKxyZJiWuNuax5rsehL2feCgRhRhUg=";
};
patches = [
@@ -23,7 +23,7 @@ buildNpmPackage rec {
})
];
npmDepsHash = "sha256-RpnZLJzxMmwo/XsXOWshw8xCpXG6GuhsaTb4rnXt/D0=";
npmDepsHash = "sha256-5hIj9rqioMYx3BgrRHfEqSqw+cTFg6MKjjSNy7zg/Jg=";
installPhase = ''
mkdir -p $out/share/fluidd
pkgs/by-name/gg/gg-jj/native-tls.patch
-351
View File
@@ -1,351 +0,0 @@
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 37a1a2d..45640a1 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -778,9 +778,9 @@ dependencies = [
"bitflags 2.6.0",
"block",
"cocoa-foundation",
- "core-foundation",
+ "core-foundation 0.10.0",
"core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
"libc",
"objc",
]
@@ -793,7 +793,7 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
dependencies = [
"bitflags 2.6.0",
"block",
- "core-foundation",
+ "core-foundation 0.10.0",
"core-graphics-types",
"libc",
"objc",
@@ -873,6 +873,16 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "core-foundation"
version = "0.10.0"
@@ -896,9 +906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
"bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.10.0",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
"libc",
]
@@ -909,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
"bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.10.0",
"libc",
]
@@ -1435,6 +1445,15 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
[[package]]
name = "foreign-types"
version = "0.5.0"
@@ -1442,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
dependencies = [
"foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
]
[[package]]
@@ -1456,6 +1475,12 @@ dependencies = [
"syn 2.0.87",
]
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
[[package]]
name = "foreign-types-shared"
version = "0.3.1"
@@ -2779,6 +2804,22 @@ dependencies = [
"want",
]
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
[[package]]
name = "hyper-util"
version = "0.1.10"
@@ -3418,9 +3459,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.163"
+version = "0.2.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
[[package]]
name = "libgit2-sys"
@@ -3453,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -3688,6 +3729,23 @@ dependencies = [
"windows-sys 0.59.0",
]
+[[package]]
+name = "native-tls"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
[[package]]
name = "ndk"
version = "0.9.0"
@@ -4065,6 +4123,32 @@ dependencies = [
"pathdiff",
]
+[[package]]
+name = "openssl"
+version = "0.10.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "openssl-probe"
version = "0.1.5"
@@ -4854,19 +4938,23 @@ dependencies = [
"http-body",
"http-body-util",
"hyper",
+ "hyper-tls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
+ "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "rustls-pemfile",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"tokio",
+ "tokio-native-tls",
"tokio-util 0.7.12",
"tower-service",
"url",
@@ -5000,6 +5088,21 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+
[[package]]
name = "rustversion"
version = "1.0.18"
@@ -5027,6 +5130,15 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db"
+[[package]]
+name = "schannel"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "schemars"
version = "0.8.21"
@@ -5089,6 +5201,29 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "selectors"
version = "0.22.0"
@@ -5436,7 +5571,7 @@ dependencies = [
"bytemuck",
"cfg_aliases",
"core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
"js-sys",
"log",
"objc2",
@@ -5631,7 +5766,7 @@ checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da"
dependencies = [
"bitflags 2.6.0",
"cocoa",
- "core-foundation",
+ "core-foundation 0.10.0",
"core-graphics",
"crossbeam-channel",
"dispatch",
@@ -6208,6 +6343,16 @@ dependencies = [
"syn 2.0.87",
]
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
[[package]]
name = "tokio-util"
version = "0.6.10"
@@ -7006,7 +7151,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
]
[[package]]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 550b0cf..9b711a4 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -14,7 +14,7 @@ zip = "0.6"
assert_matches = "1.5"
[dependencies]
-tauri = { version = "2.0.0", features = [] }
+tauri = { version = "2.0.0", features = ["native-tls"] }
tauri-codegen = "2.0.0"
tauri-macros = "2.0.0"
tauri-plugin = "2.0.0"
pkgs/by-name/gg/gg-jj/package.nix
+18 -37
View File
@@ -1,71 +1,52 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
fetchNpmDeps,
yq,
cargo-tauri,
cargo,
rustc,
nodejs,
npmHooks,
pkg-config,
wrapGAppsHook3,
openssl,
webkitgtk_4_1,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gg";
version = "0.23.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "gulbanana";
repo = "gg";
tag = "v${finalAttrs.version}";
hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw=";
hash = "sha256-vmzALX1x7VfdnwN05bCwbnTL+HfFVyNiKFoT74tFuu8=";
};
patches = [ ./native-tls.patch ];
cargoRoot = "src-tauri";
buildAndTestSubdir = "src-tauri";
# FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
patches
;
# Tries to apply patches inside cargoRoot.
prePatch = "pushd ..";
postPatch = "popd";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM=";
};
cargoHash = "sha256-esStQ55+T4uLbHbg7P7hqS6kIpXIMxouRSFkTo6dvAU=";
npmDeps = fetchNpmDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-SMz1ohPSF5tvf2d3is4PXhnjHG9hHuS5NYmHbe46HaU=";
hash = "sha256-yFDGH33maCndH4vgyMfNg0+c5jCOeoIAWUJgAPHXwsM=";
};
nativeBuildInputs = [
cargo-tauri.hook
rustPlatform.cargoSetupHook
cargo
rustc
nodejs
npmHooks.npmConfigHook
pkg-config
wrapGAppsHook3
];
nativeBuildInputs =
[
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook3
];
buildInputs =
[ openssl ]
@@ -89,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "GUI for the version control system Jujutsu";
homepage = "https://github.com/gulbanana/gg";
changelog = "https://github.com/gulbanana/gg/blob/${finalAttrs.src.rev}/CHANGELOG.md";
changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md";
license = with lib.licenses; [ asl20 ];
inherit (cargo-tauri.hook.meta) platforms;
maintainers = with lib.maintainers; [ pluiedev ];
pkgs/by-name/gi/gitlab-runner/package.nix
+10 -6
View File
@@ -34,8 +34,9 @@ buildGoModule (finalAttrs: {
# Remove some tests that can't work during a nix build
# Needs the build directory to be a git repo
sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go
sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go
substituteInPlace commands/helpers/file_archiver_test.go \
--replace-fail "func TestCacheArchiverAddingUntrackedFiles" "func OFF_TestCacheArchiverAddingUntrackedFiles" \
--replace-fail "func TestCacheArchiverAddingUntrackedUnicodeFiles" "func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles"
rm shells/abstract_test.go
# No writable developer environment
@@ -56,11 +57,14 @@ buildGoModule (finalAttrs: {
''
+ lib.optionalString stdenv.buildPlatform.isDarwin ''
# Invalid bind arguments break Unix socket tests
sed -i "s/func TestRunnerWrapperCommand_createListener/func OFF_TestRunnerWrapperCommand_createListener/" commands/wrapper_test.go
substituteInPlace commands/wrapper_test.go \
--replace-fail "func TestRunnerWrapperCommand_createListener" "func OFF_TestRunnerWrapperCommand_createListener"
# No keychain access during build breaks X.509 certificate tests
sed -i "s/func TestCertificate/func OFF_TestCertificate/" helpers/certificate/x509_test.go
sed -i "s/func TestClientInvalidSSL/func OFF_TestClientInvalidSSL/" network/client_test.go
substituteInPlace helpers/certificate/x509_test.go \
--replace-fail "func TestCertificate" "func OFF_TestCertificate"
substituteInPlace network/client_test.go \
--replace-fail "func TestClientInvalidSSL" "func OFF_TestClientInvalidSSL"
'';
excludedPackages = [
@@ -79,7 +83,7 @@ buildGoModule (finalAttrs: {
[
"-X ${ldflagsPackageVariablePrefix}.NAME=gitlab-runner"
"-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}"
"-X ${ldflagsPackageVariablePrefix}.REVISION=${finalAttrs.src.tag}"
"-X ${ldflagsPackageVariablePrefix}.REVISION=v${finalAttrs.version}"
];
preCheck = ''
pkgs/by-name/go/go-blueprint/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "go-blueprint";
version = "0.10.6";
version = "0.10.8";
src = fetchFromGitHub {
owner = "Melkeydev";
repo = "go-blueprint";
rev = "v${version}";
hash = "sha256-xWv/4/7+eqSBLmyuF+vLLZzMn8A8sE6vkldER145FQQ=";
hash = "sha256-oEp+qMWN2SIW9MBVbfk72Ogu9nbuR++YsTeRpbbQ2LY=";
};
ldflags = [
pkgs/by-name/gs/gscreenshot/package.nix
+2 -2
View File
@@ -19,13 +19,13 @@
python3Packages.buildPythonApplication rec {
pname = "gscreenshot";
version = "3.8.0";
version = "3.9.2";
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "${pname}";
tag = "v${version}";
sha256 = "sha256-erNP5Joz4j08jN2c0wUX/h3sJmr/wXYFghBA+7RX4Aw=";
sha256 = "sha256-u60wxtWE7VaAE/xKlcY9vE7Chs5TPd0BTe5zy1D7ZAQ=";
};
# needed for wrapGAppsHook3 to function
pkgs/by-name/ha/handheld-daemon/package.nix
+2 -2
View File
@@ -16,14 +16,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "handheld-daemon";
version = "3.13.7";
version = "3.15.3";
pyproject = true;
src = fetchFromGitHub {
owner = "hhd-dev";
repo = "hhd";
tag = "v${version}";
hash = "sha256-ISUu87Y1Ti6DepDAIMZREz1TkZlGlhkmUWm2zMzvlrM=";
hash = "sha256-O3Pgrb3k891IAmYtYWulosAOxtnIvLd+voEsyYtm/0U=";
};
# Handheld-daemon runs some selinux-related utils which are not in nixpkgs.
pkgs/by-name/he/heptabase/package.nix
+2 -2
View File
@@ -5,10 +5,10 @@
}:
let
pname = "heptabase";
version = "1.55.1";
version = "1.55.6";
src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
hash = "sha256-m18EUpcxUW5hyhFYLhHZqIEStqzsyss7T4TelAjw/eQ=";
hash = "sha256-Gb+jjujv/mjHCpk5p5UG6pO9rh7Dswou8h51FpsqLek=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
pkgs/by-name/ht/httm/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.46.8";
version = "0.46.10";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = "httm";
rev = version;
hash = "sha256-IGhEKtu4RMhI7VYn6I4M9eFY6MdcWxiHsu90rY0l8sw=";
hash = "sha256-O1WIoHN0R78lJaPFCEYm4NTNTKwfNGdwi0POQRiuGKk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-LmQ3+yqSO7vhnV6XshUSSe6QkYVcradVsmIcLrdNE94=";
cargoHash = "sha256-uOT8naOnimA9Xt2uA8aCAy0w/5WXZajacN1d5Q27uSY=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/in/intel-cmt-cat/package.nix
+2 -2
View File
@@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
version = "24.05";
version = "25.04";
pname = "intel-cmt-cat";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-cmt-cat";
rev = "v${version}";
sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ=";
sha256 = "sha256-Sbxfa9F+TSv2A8nilrB0PD312v1qN++k8Pezd7wd0PA=";
};
enableParallelBuilding = true;
pkgs/by-name/je/jellyfin-rpc/package.nix
+8 -7
View File
@@ -8,22 +8,23 @@
rustPlatform.buildRustPackage rec {
pname = "jellyfin-rpc";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "Radiicall";
repo = "jellyfin-rpc";
tag = version;
hash = "sha256-cEHJJXMfXKDPKah2wDAdcO0SXO4ZPL/SqFbxONmI57M=";
hash = "sha256-RZ4G8/gMD2HsNdCJyr1PTKySGcv45a57KAEqAvLBtjQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-CWl/hVtwv2Q4/GwJJGTHCxnMxj8ZR9wPmLTlai0MyBA=";
cargoHash = "sha256-olg36uXAXVe3BuAqMAlLyokoeDm9wVLfE45tKuGlWF8=";
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
# TODO: Re-enable when upstream bumps the version number internally
# nativeInstallCheckInputs = [
# versionCheckHook
# ];
# doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/ji/jicofo/package.nix
+2 -2
View File
@@ -9,10 +9,10 @@
let
pname = "jicofo";
version = "1.0-1124";
version = "1.0-1128";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "pnSp9naOGC4V8MlrBVZ9e4Qk4GZSQdepS2xocQSfw30=";
sha256 = "pWTOAvsvWGWgt4q9jNyp0faZrbRx0De3R5U5j+GNTDA=";
};
in
stdenv.mkDerivation {

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