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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-11-10 08:40:58 +00:00
committed by GitHub
parent 502df93656 dc1a53da85
commit 7942d8b073
171 changed files with 2300 additions and 3851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2511.section.md
+2
View File
@@ -96,6 +96,8 @@
- `spidermonkey_91` has been removed, as it has been EOL since September 2022.
- `ddccontrol` service now enables `hardware.i2c` by default, and adds `ddcci_backlight` to the kernel modules, based on [experiences reported on discourse](https://discourse.nixos.org/t/brightness-control-of-external-monitors-with-ddcci-backlight/8639/).
- The license of duckstation has changed from `gpl3Only` to `cc-by-nc-nd-40` making it unfree in newer releases. The `duckstation` package has been overhauled to support the new releases and `duckstation-bin` has been aliased to `duckstation` to support darwin binary builds.
- `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues.
nixos/default.nix
+4 -1
View File
@@ -1,12 +1,15 @@
{
configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>,
system ? builtins.currentSystem,
# This should only be used for special arguments that need to be evaluated when resolving module structure (like in imports).
# For everything else, there's _module.args.
specialArgs ? { },
}:
let
eval = import ./lib/eval-config.nix {
inherit system;
inherit system specialArgs;
modules = [ configuration ];
};
nixos/lib/utils.nix
+137 -38
View File
@@ -229,7 +229,7 @@ let
listToAttrs (flatten (recurse "." item));
/*
Takes an attrset and a file path and generates a bash snippet that
Takes some options, an attrset and a file path and generates a bash snippet that
outputs a JSON file at the file path with all instances of
{ _secret = "/path/to/secret" }
@@ -237,6 +237,28 @@ let
in the attrset replaced with the contents of the file
"/path/to/secret" in the output JSON.
The first argument exposes the following options:
- attr: The name of the secret attribute that will be processed, defaults to "_secret"
- loadCredential: A boolean determining whether the script should load secrets directly (false)
or load them from $CREDENTIALS_DIRECTORY (true). In the latter case the output attribute set
will contain a .credentials attribute with the necessary credential list that can be passed
to systemd's `LoadCredential=` option.
The output of this utility is an attribute set containing the main script and optionally
a list of credentials:
{
# The main script
script = "...";
# If the loadCredential option was set:
credentials = [
"secret1:/path/to/secret1"
#...
];
}
When a configuration option accepts an attrset that is finally
converted to JSON, this makes it possible to let the user define
arbitrary secret values.
@@ -245,7 +267,7 @@ let
If the file "/path/to/secret" contains the string
"topsecretpassword1234",
genJqSecretsReplacementSnippet {
genJqSecretsReplacement { } {
example = [
{
irrelevant = "not interesting";
@@ -293,7 +315,7 @@ let
{ "b": "topsecretpassword5678" }
]
genJqSecretsReplacementSnippet {
genJqSecretsReplacement { } {
example = [
{
irrelevant = "not interesting";
@@ -330,12 +352,12 @@ let
]
}
*/
genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret";
# Like genJqSecretsReplacementSnippet, but allows the name of the
# attr which identifies the secret to be changed.
genJqSecretsReplacementSnippet' =
attr: set: output:
genJqSecretsReplacement =
{
attr ? "_secret",
loadCredential ? false,
}:
set: output:
let
secretsRaw = recursiveGetAttrsetWithJqPrefix set attr;
# Set default option values
@@ -347,38 +369,115 @@ let
// set
) secretsRaw;
stringOrDefault = str: def: if str == "" then def else str;
in
''
if [[ -h '${output}' ]]; then
rm '${output}'
fi
inherit_errexit_enabled=0
shopt -pq inherit_errexit && inherit_errexit_enabled=1
shopt -s inherit_errexit
''
+ concatStringsSep "\n" (
imap1 (index: name: ''
secret${toString index}=$(<'${secrets.${name}.${attr}}')
export secret${toString index}
'') (attrNames secrets)
)
+ "\n"
+ "${pkgs.jq}/bin/jq >'${output}' "
+ escapeShellArg (
stringOrDefault (concatStringsSep " | " (
# Sanitize path to create a valid credential tag (same as in genLoadCredentialForJqSecretsReplacementSnippet)
sanitizePath =
path: lib.stringAsChars (c: if builtins.match "[a-zA-Z0-9_.#=!-]" c != null then c else "_") path;
# Generate credential tag for a given index and path
credentialTag = index: path: "${toString index}_${sanitizePath (secrets.${path}.${attr})}";
credentialPath =
index: name:
if loadCredential then
''"$CREDENTIALS_DIRECTORY/${credentialTag index name}"''
else
"'${secrets.${name}.${attr}}'";
in
{
script = ''
if [[ -h '${output}' ]]; then
rm '${output}'
fi
inherit_errexit_enabled=0
shopt -pq inherit_errexit && inherit_errexit_enabled=1
shopt -s inherit_errexit
''
+ concatStringsSep "\n" (
imap1 (
index: name:
''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})''
) (attrNames secrets)
)) "."
)
+ ''
<<'EOF'
${toJSON set}
EOF
(( ! inherit_errexit_enabled )) && shopt -u inherit_errexit
'';
# We keep variable assignment and export separated to avoid masking the return code of the file access.
# With `set -e` this will now fail if a file doesn't exist.
''
secret${toString index}=$(<${credentialPath index name})
export secret${toString index}
'') (attrNames secrets)
)
+ "\n"
+ "${pkgs.jq}/bin/jq >'${output}' "
+ escapeShellArg (
stringOrDefault (concatStringsSep " | " (
imap1 (
index: name:
''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})''
) (attrNames secrets)
)) "."
)
+ ''
<<'EOF'
${toJSON set}
EOF
(( ! inherit_errexit_enabled )) && shopt -u inherit_errexit
'';
/*
Generates a list of systemd LoadCredential entries if loadCredential was set,
otherwise returns null.
The tag is sanitized to only contain characters a-zA-Z0-9_-.#=! and prefixed
with an index to ensure uniqueness.
Example:
genLoadCredentialForJqSecretsReplacementSnippet { } {
example = {
secret1 = { _secret = "/path/to/secret"; };
secret2 = { _secret = "/another/secret"; };
};
}
-> [ "0_path_to_secret:/path/to/secret" "1_another_secret:/another/secret" ]
*/
credentials =
if loadCredential then
imap1 (
index: path:
"${toString index}_${sanitizePath (secretsRaw.${path}.${attr})}:${secretsRaw.${path}.${attr}}"
) (attrNames secretsRaw)
else
null;
};
/*
A convenience function around `genJqSecretsReplacement` without any additional
settings that returns just the script that does the secret replacing. Make sure
to have a look at `genJqSecretsReplacement` first to decide whether you need
the additional functionality.
Example:
If the file "/path/to/secret" contains the string
"topsecretpassword1234",
genJqSecretsReplacementSnippet {
example = [
{
irrelevant = "not interesting";
}
{
ignored = "ignored attr";
relevant = {
secret = {
_secret = "/path/to/secret";
};
};
}
];
} "/path/to/output.json"
will return a set of bash commands that replaces the secret values
in the given attrset with values from the respective files and saves the result
as a JSON file.
*/
genJqSecretsReplacementSnippet = set: output: (genJqSecretsReplacement { } set output).script;
/*
Remove packages of packagesToRemove from packages, based on their names.
nixos/modules/image/repart.nix
+2 -2
View File
@@ -384,8 +384,8 @@ in
you're at version 9, you cannot increment this to 10.
''
++ lib.optional (partitionConfig.stripNixStorePrefix != "_mkMergedOptionModule") ''
The option definition `image.repart.paritions.${fileName}.stripNixStorePrefix`
has changed to `image.repart.paritions.${fileName}.nixStorePrefix` and now
The option definition `image.repart.partitions.${fileName}.stripNixStorePrefix`
has changed to `image.repart.partitions.${fileName}.nixStorePrefix` and now
accepts the path to use as prefix directly. Use `nixStorePrefix = "/"` to
achieve the same effect as setting `stripNixStorePrefix = true`.
''
nixos/modules/services/hardware/ddccontrol.nix
+24 -6
View File
@@ -10,31 +10,49 @@ let
in
{
meta.maintainers = with lib.maintainers; [ doronbehar ];
###### interface
options = {
services.ddccontrol = {
enable = lib.mkEnableOption "ddccontrol for controlling displays";
enable = lib.mkEnableOption ''
ddccontrol for controlling displays.
This [enables `hardware.i2c`](#opt-hardware.i2c.enable), so note to add
yourself to [`hardware.i2c.group`](#opt-hardware.i2c.group).
'';
package =
lib.mkPackageOption pkgs
"package with which to control brightness; added also to [services.dbus.packages](#opt-services.dbus.packages)."
{
default = [ "ddccontrol" ];
example = [ "ddcutil-service" ];
};
};
};
###### implementation
config = lib.mkIf cfg.enable {
boot.kernelModules = [
"ddcci_backlight"
];
# Load the i2c-dev module
boot.kernelModules = [ "i2c_dev" ];
hardware.i2c = {
enable = true;
};
# Give users access to the "gddccontrol" tool
environment.systemPackages = [
pkgs.ddccontrol
cfg.package
];
services.dbus.packages = [
pkgs.ddccontrol
cfg.package
];
systemd.packages = [
pkgs.ddccontrol
cfg.package
];
};
}
nixos/modules/services/mail/postfix.nix
+1
View File
@@ -522,6 +522,7 @@ in
nullOr (oneOf [
bool
int
path
str
(listOf str)
])
nixos/modules/services/misc/klipper.nix
+1 -1
View File
@@ -217,7 +217,7 @@ in
}
]
++ lib.mapAttrsToList (mcu: firmware: {
assertion = firmware.enable -> firmware.serial != null;
assertion = firmware.enableKlipperFlash -> firmware.serial != null;
message = ''
Unable to determine the serial connection for services.klipper.firmwares."${mcu}". Please set one of the following:
nixos/modules/services/search/meilisearch.nix
-2
View File
@@ -182,8 +182,6 @@ in
no_analytics = lib.mkDefault true;
};
services.meilisearch.package = lib.mkDefault pkgs.meilisearch;
# used to restore dumps
environment.systemPackages = [ cfg.package ];
nixos/modules/services/web-apps/immich.nix
+23 -41
View File
@@ -2,6 +2,7 @@
config,
lib,
pkgs,
utils,
...
}:
let
@@ -9,10 +10,9 @@ let
format = pkgs.formats.json { };
isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host;
isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host;
# convert a Nix attribute path to jq object identifier-index:
# https://jqlang.org/manual/#object-identifier-index
attrPathToIndex = attrPath: "." + lib.concatStringsSep "." attrPath;
secretsReplacement = utils.genJqSecretsReplacement {
loadCredential = true;
} cfg.settings "/run/immich/config.json";
commonServiceConfig = {
Type = "simple";
@@ -55,6 +55,22 @@ let
if cfg.database.enable then config.services.postgresql.package else pkgs.postgresql;
in
{
imports = [
(lib.mkRemovedOptionModule
[
"services"
"immich"
"secretSettings"
]
''
`secretSettings` has been deprecated as secrets can now be specified
directly in `settings`. To do so, set `_secret` of the desired
attribute to a file path, for example:
`services.immich.settings.oauth.clientSecret._secret = "/path/to/secret/file";`
''
)
];
options.services.immich = {
enable = mkEnableOption "Immich";
package = lib.mkPackageOption pkgs "immich" { };
@@ -128,6 +144,7 @@ in
<https://my.immich.app/admin/system-settings> for
options and defaults.
Setting it to `null` allows configuring Immich in the web interface.
You can load secret values from a file in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly.
'';
type = types.nullOr (
types.submodule {
@@ -151,27 +168,6 @@ in
);
};
secretSettings = mkOption {
default = { };
description = ''
Secrets to to be added to the JSON file generated from {option}`settings`, read from files.
'';
example = lib.literalExpression ''
{
notifications.smtp.transport.password = "/path/to/secret";
oauth.clientSecret = "/path/to/other/secret";
}
'';
type =
let
inherit (types) attrsOf either path;
recursiveType = either (attrsOf recursiveType) path // {
description = "nested " + (attrsOf path).description;
};
in
recursiveType;
};
machine-learning = {
enable =
mkEnableOption "immich's machine-learning functionality to detect faces and search for objects"
@@ -424,24 +420,10 @@ in
postgresqlPackage
];
preStart = mkIf (cfg.settings != null) (
''
cat '${format.generate "immich-config.json" cfg.settings}' > /run/immich/config.json
''
+ lib.concatStrings (
lib.mapAttrsToListRecursive (attrPath: _: ''
tmp="$(mktemp)"
${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \
'${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp"
mv "$tmp" /run/immich/config.json
'') cfg.secretSettings
)
);
preStart = mkIf (cfg.settings != null) secretsReplacement.script;
serviceConfig = commonServiceConfig // {
LoadCredential = lib.mapAttrsToListRecursive (
attrPath: file: "${attrPathToIndex attrPath}:${file}"
) cfg.secretSettings;
LoadCredential = secretsReplacement.credentials;
ExecStart = lib.getExe cfg.package;
EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile;
Slice = "system-immich.slice";
nixos/tests/web-apps/immich.nix
+7 -7
View File
@@ -17,14 +17,14 @@
services.immich = {
enable = true;
environment.IMMICH_LOG_LEVEL = "verbose";
settings.backup.database = {
enabled = true;
cronExpression = "invalid";
};
secretSettings = {
backup.database.cronExpression = "${pkgs.writeText "cron" "0 02 * * *"}";
settings = {
backup.database = {
enabled = true;
# Test loading secrets from files:
cronExpression._secret = "${pkgs.writeText "cron" "0 02 * * *"}";
};
# thanks to LoadCredential files only readable by root should work
notifications.smtp.transport.password = "/etc/shadow";
notifications.smtp.transport.password._secret = "/etc/shadow";
};
};
pkgs/applications/editors/vim/plugins/cocPlugins.nix
+7
View File
@@ -2,6 +2,7 @@
lib,
buildVimPlugin,
pkgs,
coc-nginx,
}:
final: prev:
let
@@ -60,3 +61,9 @@ lib.genAttrs cocPackages (
src = "${cocPkg}/lib/node_modules/${cocPkg.pname}";
}
)
// {
coc-nginx = buildVimPlugin {
inherit (coc-nginx) pname version meta;
src = "${coc-nginx}/lib/node_modules/@yaegassy/coc-nginx";
};
}
pkgs/applications/editors/vim/plugins/generated.nix
+13
View File
@@ -5307,6 +5307,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
floaterm = buildVimPlugin {
pname = "floaterm";
version = "2025-09-23";
src = fetchFromGitHub {
owner = "nvzone";
repo = "floaterm";
rev = "34e14f0b5e2687fd31a93fe75982ec84e5145856";
sha256 = "0g0wf1f049sayj9d11xjjz37ssvp7g9q39b5dwimf3i6fn80b42k";
};
meta.homepage = "https://github.com/nvzone/floaterm/";
meta.hydraPlatforms = [ ];
};
floating-input-nvim = buildVimPlugin {
pname = "floating-input.nvim";
version = "2025-05-28";
pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+2 -9
View File
@@ -10,20 +10,13 @@ let
"coc-ltex"
"coc-tsserver"
"coc-ultisnips"
"coc-nginx"
];
packageNameOverrides = {
"coc-nginx" = "@yaegassy/coc-nginx";
};
getPackageName = name: packageNameOverrides.${name} or name;
in
lib.genAttrs nodePackageNames (
name:
buildVimPlugin {
pname = name;
inherit (nodePackages.${getPackageName name}) version meta;
src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}";
inherit (nodePackages.${name}) version meta;
src = "${nodePackages.${name}}/lib/node_modules/${name}";
}
)
pkgs/applications/editors/vim/plugins/overrides.nix
+4
View File
@@ -1215,6 +1215,10 @@ assertNoAdditions {
dependencies = [ self.leap-nvim ];
};
floaterm = super.floaterm.overrideAttrs {
dependencies = [ self.nvzone-volt ];
};
flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
# Optional dap integration
checkInputs = [ self.nvim-dap ];
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -406,6 +406,7 @@ https://github.com/willothy/flatten.nvim/,HEAD,
https://github.com/felipeagc/fleet-theme-nvim/,,
https://github.com/ggandor/flit.nvim/,HEAD,
https://github.com/ncm2/float-preview.nvim/,,
https://github.com/nvzone/floaterm/,HEAD,
https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
https://github.com/floobits/floobits-neovim/,,
https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD,
pkgs/applications/emulators/libretro/cores/bluemsx.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
version = "0-unstable-2025-11-01";
version = "0-unstable-2025-11-04";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
rev = "1f8aeb9ac3f3a4202736ac22e1785f01a834b975";
hash = "sha256-VnTL7MLhB/WEHm9930OvM84I5Vp4AaAI6qh7I4QRkVw=";
rev = "036376d6679c9e153712dbbb3fdca774afc49706";
hash = "sha256-0oT+m30bay/3BQgKBxX397a8o+QP1/IHIo0jGmSWGGg=";
};
meta = {
pkgs/applications/emulators/libretro/cores/fbneo.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-11-02";
version = "0-unstable-2025-11-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "442a0e901c3d7d60c94f21caf46c0535233086f6";
hash = "sha256-ewwF7btf5EEBmGzAVuH4LavrDpmVzEBD/BE1/T/p6bM=";
rev = "7759881be43b5f1711c95a2a80aa8987a98fbb99";
hash = "sha256-vYHWJV5xRACjdllmeg/3tr2WgI4QcWtuhKJhEwGIGD0=";
};
makefile = "Makefile";
pkgs/applications/networking/cluster/terraform-providers/providers.json
+10 -10
View File
@@ -1,12 +1,12 @@
{
"1password_onepassword": {
"hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=",
"hash": "sha256-4wEKPTBt9F8N9jPk/PUu+ewrCJ8IztU9CblfJxA7h1k=",
"homepage": "https://registry.terraform.io/providers/1Password/onepassword",
"owner": "1Password",
"repo": "terraform-provider-onepassword",
"rev": "v2.1.2",
"rev": "v2.2.0",
"spdx": "MIT",
"vendorHash": null
"vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc="
},
"a10networks_thunder": {
"hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",
@@ -805,11 +805,11 @@
"vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw="
},
"kislerdm_neon": {
"hash": "sha256-O7VYLD1qyH5oXv02OxrhQW+J1VysiHwbwW+Fzq4VKkE=",
"hash": "sha256-4icz/nGHIP2nzGbP4iGuPVbn8OC+u13qBSwYbyFLCto=",
"homepage": "https://registry.terraform.io/providers/kislerdm/neon",
"owner": "kislerdm",
"repo": "terraform-provider-neon",
"rev": "v0.11.0",
"rev": "v0.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
},
@@ -985,13 +985,13 @@
"vendorHash": null
},
"nutanix_nutanix": {
"hash": "sha256-nk5wdbAzgBJ6gyYSXZAiNdjx/XQ6XldAMsjb8yv+y7w=",
"hash": "sha256-NhVgZCscSyM6O/d4BYokGz9FQ2fSuN2/kw8iZhzzBQY=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v2.3.1",
"rev": "v2.3.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY="
"vendorHash": "sha256-CZo/GLUwmq/TxRDQr2h49rqENB24Zt4M7k5t7epXHuE="
},
"oboukili_argocd": {
"hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=",
@@ -1048,11 +1048,11 @@
"vendorHash": null
},
"oracle_oci": {
"hash": "sha256-R+Khf/BCDaFf1ExD3+zUIEoL/egRw0ube83cP3opO/I=",
"hash": "sha256-Pp2eOcz1LQv2Ft2oiwW+7dypDO1PuRE0I7Wcr2E/G4w=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v7.24.0",
"rev": "v7.25.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
pkgs/applications/window-managers/wayfire/default.nix
+18 -5
View File
@@ -17,27 +17,37 @@
libinput,
libjpeg,
libxkbcommon,
libxml2,
vulkan-headers,
wayland,
wayland-protocols,
wayland-scanner,
wlroots,
wlroots_0_19,
pango,
nlohmann_json,
xorg,
yyjson,
}:
let
wlroots = wlroots_0_19;
in
stdenv.mkDerivation (finalAttrs: {
pname = "wayfire";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "WayfireWM";
repo = "wayfire";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-xQZ4/UE66IISZQLl702OQXAAr8XmEsA4hJwB7aXua+E=";
hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY=";
};
postPatch = ''
substituteInPlace plugins/common/wayfire/plugins/common/cairo-util.hpp \
--replace "<drm_fourcc.h>" "<libdrm/drm_fourcc.h>"
'';
nativeBuildInputs = [
meson
ninja
@@ -53,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
libinput
libjpeg
libxkbcommon
libxml2
vulkan-headers
wayland-protocols
xorg.xcbutilwm
nlohmann_json
yyjson
];
propagatedBuildInputs = [
@@ -92,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "3D Wayland compositor";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
teatwig
wucke13
wineee
];
pkgs/applications/window-managers/wayfire/focus-request.nix
-59
View File
@@ -1,59 +0,0 @@
{
stdenv,
lib,
fetchFromGitLab,
meson,
ninja,
pkg-config,
wayfire,
wf-config,
wayland,
pango,
libinput,
libxkbcommon,
librsvg,
libGL,
xcbutilwm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "focus-request";
version = "0.8.0.2";
src = fetchFromGitLab {
owner = "wayfireplugins";
repo = "focus-request";
rev = "v${finalAttrs.version}";
hash = "sha256-kUYvLC28IPrvnMT/wKFRlOVkc2ohF3k0T/Qrm/zVkpE=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
wayfire
wf-config
wayland
pango
libinput
libxkbcommon
librsvg
libGL
xcbutilwm
];
env = {
PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata";
};
meta = {
homepage = "https://gitlab.com/wayfireplugins/focus-request";
description = "Wayfire plugin provides a mechanism to grant focus to views that make a focus self-request";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wineee ];
inherit (wayfire.meta) platforms;
};
})
pkgs/applications/window-managers/wayfire/plugins.nix
+4 -4
View File
@@ -10,15 +10,15 @@ lib.makeScope pkgs.newScope (
inherit (self) callPackage;
in
{
focus-request = callPackage ./focus-request.nix { };
wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { };
wayfire-shadows = callPackage ./wayfire-shadows.nix { };
wcm = callPackage ./wcm.nix { };
wf-shell = callPackage ./wf-shell.nix { };
windecor = callPackage ./windecor.nix { };
wwp-switcher = callPackage ./wwp-switcher.nix { };
}
)
// lib.optionalAttrs config.allowAliases {
firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03
focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra";
wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra";
windecor = throw "wayfirePlugins.windecor has been removed as it is unmaintained";
wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained";
}
pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
+17 -8
View File
@@ -8,23 +8,30 @@
wayfire,
wayland-scanner,
wf-config,
boost,
libdrm,
libevdev,
libinput,
libxkbcommon,
nlohmann_json,
vulkan-headers,
xcbutilwm,
gtkmm3,
withFiltersPlugin ? true,
withFocusRequestPlugin ? true,
withPixdecorPlugin ? true,
withWayfireShadowsPlugin ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wayfire-plugins-extra";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "WayfireWM";
repo = "wayfire-plugins-extra";
rev = "v${finalAttrs.version}";
hash = "sha256-TukDomxqfrM45+C7azfO8jVaqk3E5irdphH8U5IYItg=";
hash = "sha256-C5dgs81R4XuPjIm7sj1Mtu4IMIRBEYU6izg2olymeVI=";
fetchSubmodules = true;
};
nativeBuildInputs = [
@@ -37,19 +44,21 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
wayfire
wf-config
boost
libdrm
libevdev
libinput
libxkbcommon
nlohmann_json
vulkan-headers
xcbutilwm
gtkmm3
];
mesonFlags = [
# plugins in submodule, packaged individually
(lib.mesonBool "enable_windecor" false)
(lib.mesonBool "enable_wayfire_shadows" false)
(lib.mesonBool "enable_focus_request" false)
(lib.mesonBool "enable_filters" withFiltersPlugin)
(lib.mesonBool "enable_focus_request" withFocusRequestPlugin)
(lib.mesonBool "enable_pixdecor" withPixdecorPlugin)
(lib.mesonBool "enable_wayfire_shadows" withWayfireShadowsPlugin)
];
env = {
pkgs/applications/window-managers/wayfire/wayfire-shadows.nix
-54
View File
@@ -1,54 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
unstableGitUpdater,
meson,
ninja,
pkg-config,
wayfire,
libxkbcommon,
libGL,
libinput,
xcbutilwm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wayfire-shadows";
version = "0-unstable-2025-03-04";
src = fetchFromGitHub {
owner = "timgott";
repo = "wayfire-shadows";
rev = "8257a4f04670d8baf29e2d9cee0d78f978f0233f";
hash = "sha256-cRayvjbolVxWtr1PbLSjxtIpZogTJaoAMxPOcZ+zBT8=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
wayfire
libxkbcommon
libGL
libinput
xcbutilwm
];
env = {
PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata";
};
passthru.updateScript = unstableGitUpdater { };
meta = {
homepage = "https://github.com/timgott/wayfire-shadows";
description = "Wayfire plugin that adds window shadows";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wineee ];
inherit (wayfire.meta) platforms;
};
})
pkgs/applications/window-managers/wayfire/wcm.nix
+3 -6
View File
@@ -19,14 +19,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wcm";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "WayfireWM";
repo = "wcm";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-oaaEtyu/9XVhFTkmD7WjScMycpKf+M7oPyQatbY23Vo=";
hash = "sha256-O4BYwb+GOMZIn3I2B/WMJ5tUZlaegvwBuyNK9l/gxvQ=";
};
nativeBuildInputs = [
@@ -48,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
];
mesonFlags = [
"-Denable_wdisplays=false"
];
meta = {
homepage = "https://github.com/WayfireWM/wcm";
description = "Wayfire Config Manager";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
teatwig
wucke13
wineee
];
pkgs/applications/window-managers/wayfire/wf-config.nix
+3 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wf-config";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "WayfireWM";
repo = "wf-config";
rev = "v${finalAttrs.version}";
hash = "sha256-5HejuluCTsRsnHuaMCTnCPkbFvT/IcLkfNGjnXnZjJ0=";
hash = "sha256-WcGt6yl2LpLnAOVtiCyMyWsoMAUMG1MYhvW/m2DDMX4=";
};
nativeBuildInputs = [
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Library for managing configuration files, written for Wayfire";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
teatwig
wucke13
wineee
];
pkgs/applications/window-managers/wayfire/windecor.nix
-58
View File
@@ -1,58 +0,0 @@
{
stdenv,
lib,
fetchFromGitLab,
meson,
ninja,
pkg-config,
wayfire,
eudev,
libinput,
libxkbcommon,
librsvg,
libGL,
xcbutilwm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "windecor";
version = "0.8.0";
src = fetchFromGitLab {
owner = "wayfireplugins";
repo = "windecor";
rev = "v${finalAttrs.version}";
hash = "sha256-v0kGT+KrtfFJ/hp1Dr8izKVj6UHhuW6udHFjWt1y9TY=";
};
postPatch = ''
substituteInPlace meson.build \
--replace "wayfire.get_variable( pkgconfig: 'metadatadir' )" "join_paths(get_option('prefix'), 'share/wayfire/metadata')"
'';
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
wayfire
eudev
libinput
libxkbcommon
librsvg
libGL
xcbutilwm
];
mesonFlags = [ "--sysconfdir=/etc" ];
meta = {
homepage = "https://gitlab.com/wayfireplugins/windecor";
description = "Window decoration plugin for wayfire";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wineee ];
inherit (wayfire.meta) platforms;
};
})
pkgs/applications/window-managers/wayfire/wwp-switcher.nix
-58
View File
@@ -1,58 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
unstableGitUpdater,
meson,
ninja,
pkg-config,
wayfire,
libxkbcommon,
libGL,
libinput,
gtk3,
glibmm,
xcbutilwm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wwp-switcher";
version = "0-unstable-2024-07-23";
src = fetchFromGitHub {
owner = "wb9688";
repo = "wwp-switcher";
rev = "d0cd97534a2a6355697efecb7bcf8f85f5dc4b5b";
hash = "sha256-cU8INUb+JXlSCM7cAOUBU7z7W0IM6pAGN0izGdFYntc=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
wayfire
libxkbcommon
libGL
libinput
gtk3
glibmm
xcbutilwm
];
env = {
PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata";
};
passthru.updateScript = unstableGitUpdater { };
meta = {
homepage = "https://github.com/wb9688/wwp-switcher";
description = "Plugin to switch active window";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wineee ];
inherit (wayfire.meta) platforms;
};
})
pkgs/by-name/an/anvil-editor/package.nix
+15 -20
View File
@@ -12,29 +12,36 @@
vulkan-headers,
libGL,
xorg,
buildPackages,
}:
buildGoModule (finalAttrs: {
pname = "anvil-editor";
version = "0.6";
version = "0.6.3";
# has to update vendorHash of extra package manually
# nixpkgs-update: no auto update
src = fetchzip {
url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz";
hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8=";
hash = "sha256-GPzd1oKkf160ya0sxUd72wego0BvwCerZ5SiY2q0EDE=";
};
modRoot = "anvil/src/anvil";
modRoot = "anvil/editor";
vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk=";
vendorHash = "sha256-Q2iVB5pvP2/VXjdSwWVkdqrVUj/nIiC/VHyD5nP9ilE=";
anvilExtras = buildGoModule {
pname = "anvil-editor-extras";
inherit (finalAttrs) version src meta;
vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo=";
modRoot = "anvil-extras";
vendorHash = "sha256-q/PunSBe+gWTWyf8rjfikK56rP2PeZqpuiFG9HIVMTk=";
modRoot = "anvil/extras";
# Include dependency on anvil api
postPatch = ''
pushd anvil/extras
cp -r ${finalAttrs.src}/anvil/api/go/anvil ./_anvil_api
echo "replace github.com/jeffwilliams/anvil/api/go/anvil => ./_anvil_api" >> go.mod
go mod edit -require=github.com/jeffwilliams/anvil/api/go/anvil@v0.0.0
popd
'';
};
nativeBuildInputs = [
@@ -75,15 +82,7 @@ buildGoModule (finalAttrs: {
];
postInstall = ''
pushd ../../img
# cannot add to nativeBuildInputs
# will be conflict with icnsutils in desktopToDarwinBundle
${lib.getExe' buildPackages.libicns "icns2png"} -x anvil.icns
for width in 32 48 128 256; do
square=''${width}x''${width}
install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png
done
popd
install -Dm644 misc/icon/anvil-icon.svg $out/share/icons/hicolor/scalable/apps/anvil.svg
cp ${finalAttrs.anvilExtras}/bin/* $out/bin
'';
@@ -94,9 +93,5 @@ buildGoModule (finalAttrs: {
mainProgram = "anvil";
maintainers = with lib.maintainers; [ aleksana ];
platforms = with lib.platforms; unix ++ windows;
# Doesn't build with >buildGo123Module.
# Multiple errors like the following:
# '> vendor/gioui.org/internal/vk/vulkan.go:1916:9: cannot define new methods on non-local type SurfaceCapabilities'
broken = true;
};
})
pkgs/by-name/ar/arch-install-scripts/package.nix
+22 -9
View File
@@ -19,18 +19,19 @@
"/usr/bin/vendor_perl"
"/usr/bin/core_perl"
],
chrootSetprivPath ? "/usr/bin/setpriv",
}:
resholve.mkDerivation rec {
pname = "arch-install-scripts";
version = "29";
version = "31";
src = fetchFromGitLab {
domain = "gitlab.archlinux.org";
owner = "archlinux";
repo = "arch-install-scripts";
tag = "v${version}";
hash = "sha256-XWcZZ+ET3J4dB6M9CdXESf0iQh+2vYxlxoJ6TZ3vFUk=";
hash = "sha256-Oh1nC/gPJDDy8cXiZPbEfpwOuO+RFRcxVCZuTtB2MV8=";
};
nativeBuildInputs = [
@@ -40,12 +41,16 @@ resholve.mkDerivation rec {
postPatch = ''
substituteInPlace ./Makefile \
--replace "PREFIX = /usr/local" "PREFIX ?= /usr/local"
--replace-fail "PREFIX = /usr/local" "PREFIX ?= /usr/local"
substituteInPlace ./pacstrap.in \
--replace "cp -a" "cp -LR --no-preserve=mode" \
--replace "unshare pacman" "unshare ${pacman}/bin/pacman" \
--replace 'gnupg "$newroot/etc/pacman.d/"' 'gnupg "$newroot/etc/pacman.d/" && chmod 700 "$newroot/etc/pacman.d/gnupg"'
--replace-fail "cp -a" "cp -LR --no-preserve=mode" \
--replace-fail "unshare pacman" "unshare ${pacman}/bin/pacman" \
--replace-fail '"$gpg_dir" "$newroot/$gpg_dir"' '"$gpg_dir" "$newroot/$gpg_dir" && chmod 700 "$newroot/etc/pacman.d/gnupg"'
echo "export PATH=${lib.strings.makeSearchPath "" chrootPath}:\$PATH" >> ./common
substituteInPlace ./arch-chroot.in \
--replace-fail "sd_args+=(setpriv" "sd_args+=(${chrootSetprivPath}"
'';
installFlags = [ "PREFIX=$(out)" ];
@@ -80,10 +85,17 @@ resholve.mkDerivation rec {
util-linux
];
execer = [ "cannot:${pacman}/bin/pacman-key" ];
execer = [
"cannot:${pacman}/bin/pacman-conf"
"cannot:${pacman}/bin/pacman-key"
];
# TODO: no good way to resolve mount/umount in Nix builds for now
# see https://github.com/abathur/resholve/issues/29
fake.external = [
"systemd-escape"
"systemd-run"
];
# Avoid using setuid wrappers
fix = {
mount = true;
umount = true;
@@ -93,6 +105,7 @@ resholve.mkDerivation rec {
"$setup"
"$pid_unshare"
"$mount_unshare"
"$sd_args"
"${pacman}/bin/pacman"
];
};
pkgs/tools/admin/aws-mfa/default.nix → pkgs/by-name/aw/aws-mfa/package.nix
+4 -6
View File
@@ -1,13 +1,11 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
fetchpatch,
setuptools,
boto3,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "aws-mfa";
version = "0.0.12";
pyproject = true;
@@ -28,11 +26,11 @@ buildPythonApplication rec {
})
];
build-system = [
build-system = with python3Packages; [
setuptools
];
dependencies = [
dependencies = with python3Packages; [
boto3
];
pkgs/by-name/bl/blender/package.nix
+50 -55
View File
@@ -116,12 +116,12 @@ in
stdenv'.mkDerivation (finalAttrs: {
pname = "blender";
version = "4.5.3";
version = "4.5.4";
src = fetchzip {
name = "source";
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
hash = "sha256-DNVZUZpysCyB/Xt8yB352gO+UK8Cd4aDFGYuUDKyIrs=";
hash = "sha256-/cYMCWgojkO1mqzJ4BZwbwXPuBmg66T+gzpEuLiOskY=";
};
postPatch =
@@ -146,68 +146,63 @@ stdenv'.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
cmakeFlags = [
"-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX"
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
"-DPYTHON_LIBPATH=${python3}/lib"
"-DPYTHON_LIBRARY=${python3.libPrefix}"
"-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"
"-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"
"-DPYTHON_VERSION=${python3.pythonVersion}"
"-DWITH_ALEMBIC=ON"
"-DWITH_ASSERT_ABORT=OFF"
"-DWITH_BUILDINFO=OFF"
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_CPU_CHECK=OFF"
"-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}"
"-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"
"-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"
"-DWITH_CYCLES_OSL=OFF"
"-DWITH_FFTW3=ON"
"-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}"
"-DWITH_IMAGE_OPENJPEG=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}"
"-DWITH_LIBS_PRECOMPILED=OFF"
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"
"-DWITH_OPENCOLORIO=ON"
"-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"
"-DWITH_OPENSUBDIV=ON"
"-DWITH_OPENVDB=ON"
"-DWITH_PIPEWIRE=OFF"
"-DWITH_PULSEAUDIO=OFF"
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_PYTHON_INSTALL_NUMPY=OFF"
"-DWITH_PYTHON_INSTALL_REQUESTS=OFF"
"-DWITH_SDL=OFF"
"-DWITH_STRICT_BUILD_OPTIONS=ON"
"-DWITH_TBB=ON"
"-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}"
"-C../build_files/cmake/config/blender_release.cmake"
(lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
(lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
(lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
(lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
(lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")
(lib.cmakeBool "WITH_BUILDINFO" false)
(lib.cmakeBool "WITH_CPU_CHECK" false)
(lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" cudaSupport)
(lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" hipSupport)
(lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false)
(lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport)
(lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport)
(lib.cmakeBool "WITH_CYCLES_OSL" false)
(lib.cmakeBool "WITH_HYDRA" openUsdSupport)
(lib.cmakeBool "WITH_INSTALL_PORTABLE" false)
(lib.cmakeBool "WITH_JACK" jackaudioSupport)
(lib.cmakeBool "WITH_LIBS_PRECOMPILED" false)
(lib.cmakeBool "WITH_OPENCOLLADA" colladaSupport)
(lib.cmakeBool "WITH_OPENIMAGEDENOISE" openImageDenoiseSupport)
(lib.cmakeBool "WITH_PIPEWIRE" false)
(lib.cmakeBool "WITH_PULSEAUDIO" false)
(lib.cmakeBool "WITH_PYTHON_INSTALL" false)
(lib.cmakeBool "WITH_PYTHON_INSTALL_NUMPY" false)
(lib.cmakeBool "WITH_PYTHON_INSTALL_REQUESTS" false)
(lib.cmakeBool "WITH_STRICT_BUILD_OPTIONS" true)
(lib.cmakeBool "WITH_USD" openUsdSupport)
# Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)
"-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include"
"-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}"
(lib.cmakeFeature "ALEMBIC_INCLUDE_DIR" "${lib.getDev alembic}/include")
(lib.cmakeFeature "ALEMBIC_LIBRARY" "${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}")
]
++ lib.optionals cudaSupport [
"-DOPTIX_ROOT_DIR=${optix}"
"-DWITH_CYCLES_CUDA_BINARIES=ON"
(lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}")
(lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true)
]
++ lib.optionals hipSupport [
"-DHIPRT_INCLUDE_DIR=${rocmPackages.hiprt}/include"
"-DWITH_CYCLES_DEVICE_HIPRT=ON"
"-DWITH_CYCLES_HIP_BINARIES=ON"
(lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include")
(lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true)
(lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true)
]
++ lib.optionals waylandSupport [
"-DWITH_GHOST_WAYLAND=ON"
"-DWITH_GHOST_WAYLAND_DBUS=ON"
"-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"
"-DWITH_GHOST_WAYLAND_LIBDECOR=ON"
(lib.cmakeBool "WITH_GHOST_WAYLAND" true)
(lib.cmakeBool "WITH_GHOST_WAYLAND_DBUS" true)
(lib.cmakeBool "WITH_GHOST_WAYLAND_DYNLOAD" false)
(lib.cmakeBool "WITH_GHOST_WAYLAND_LIBDECOR" true)
]
++ lib.optionals stdenv.cc.isClang [
(lib.cmakeFeature "PYTHON_LINKFLAGS" "") # Clang doesn't support "-export-dynamic"
]
++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DLIBDIR=/does-not-exist"
"-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include"
(lib.cmakeFeature "LIBDIR" "/does-not-exist")
(lib.cmakeFeature "SSE2NEON_INCLUDE_DIR" "${sse2neon}/include")
];
preConfigure = ''
@@ -263,11 +258,11 @@ stdenv'.mkDerivation (finalAttrs: {
openpgl
(opensubdiv.override { inherit cudaSupport; })
openvdb
onetbb
potrace
pugixml
python3
python3Packages.materialx
onetbb
zlib
zstd
]
pkgs/by-name/bl/blockbench/package.nix
+23 -24
View File
@@ -12,13 +12,13 @@
buildNpmPackage rec {
pname = "blockbench";
version = "4.12.6";
version = "5.0.3";
src = fetchFromGitHub {
owner = "JannisX11";
repo = "blockbench";
tag = "v${version}";
hash = "sha256-iV8qpUsUnL1n6hKADegNTmrW/AUWNiiNLxrTU4WPR30=";
hash = "sha256-kUPzAmxTEnUA+2o/IfBLE6hCChQ9YoTUfKKYfPGV0jg=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ buildNpmPackage rec {
copyDesktopItems
];
npmDepsHash = "sha256-ZLFmcK91SrUM+ouBENzc+MdNvQCRDh0ej4tf2TneUtQ=";
npmDepsHash = "sha256-Do5IJvd5ZXDgByKK1Elg0W2SZxeDH8OORloDuT9mIN4=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -39,7 +39,7 @@ buildNpmPackage rec {
sed -i "/afterSign/d" package.json
'';
npmBuildScript = "bundle";
npmBuildScript = "build-electron";
postBuild = ''
# electronDist needs to be modifiable on Darwin
@@ -54,28 +54,27 @@ buildNpmPackage rec {
installPhase = ''
runHook preInstall
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r dist-electron/mac*/Blockbench.app $out/Applications
makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
mkdir -p $out/share/blockbench
cp -r dist-electron/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench
${lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r dist/mac*/Blockbench.app $out/Applications
makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench
''}
${lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
mkdir -p $out/share/blockbench
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench
for size in 16 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
done
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
--add-flags $out/share/blockbench/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--inherit-argv0
''}
for size in 16 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
done
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
--add-flags $out/share/blockbench/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--inherit-argv0
''
+ ''
runHook postInstall
'';
pkgs/by-name/bo/boxflat/package.nix
+6 -6
View File
@@ -45,12 +45,12 @@ python3Packages.buildPythonPackage rec {
udevCheckHook
];
postPatch = ''
substituteInPlace requirements.txt \
--replace-fail "psutil==6.1.0" "psutil" \
--replace-fail "evdev==1.7.1" "evdev" \
--replace-fail "pycairo==1.27.0" "pycairo"
'';
pythonRelaxDeps = [
"psutil"
"evdev"
"pycairo"
"PyYAML"
];
preBuild = ''
cat > setup.py << EOF
pkgs/by-name/br/bruno/package.nix
+3 -3
View File
@@ -20,20 +20,20 @@
buildNpmPackage rec {
pname = "bruno";
version = "2.13.2";
version = "2.14.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
tag = "v${version}";
hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI=";
hash = "sha256-fmT+KA8v/fdVQu7KUkZNOkNtcl5uPxzHVKplml2HbSM=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI=";
npmDepsHash = "sha256-H2v9dm4VCRQrhs9g/D1QOu1L5AeN+Vqhez4qrBdd9Gs=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs = [
pkgs/by-name/bt/btcd/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "btcd";
version = "0.24.2";
version = "0.25.0";
src = fetchFromGitHub {
owner = "btcsuite";
repo = "btcd";
rev = "v${version}";
hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A=";
hash = "sha256-redoqqbiVdwgNLxDzBccqRBZGwhRTIY5nE9Gx6+4POc=";
};
vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4=";
vendorHash = "sha256-qXfZKVoTvq7gNm0G4KKSL8anB8FUt/TxoxbOtH240cc=";
subPackages = [
"."
pkgs/by-name/bu/bun/package.nix
+5 -5
View File
@@ -17,7 +17,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "1.3.1";
version = "1.3.2";
pname = "bun";
src =
@@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-ronylWETMwdRWqPdpdXv3R6dJod+yFtPGAABNDGqmO0=";
hash = "sha256-2FhHmC21dFGBMKRVgrzxTY4r6WELZstQRsIDSFeLD+I=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-ZWZqGEOeiR5XUbZmED/lkahRnxG2bsS9hlTFUV1P/4o=";
hash = "sha256-/jjBO2trRQr05PD7jgSyLspT+c1xBo0dHuv09KRPAvs=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
hash = "sha256-pILjoY8BpW13NvpuQXjbNdoeVr3cgjJa10jhXKAdigs=";
hash = "sha256-LW3aLD9Xp6m7qFJdUcQAbj2M7MS2rTP/ae4HZgbBN7w=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-QAgkyCv8wIVDZbytoRz1PXOE7LHiw9oOLAosalJ9Vik=";
hash = "sha256-DLVqRIS9d2Sj7vm55nq0V4QJgSh7RnlJdNHmYSy/Zwk=";
};
};
updateScript = writeShellScript "update-bun" ''
pkgs/by-name/ca/carapace/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "carapace";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "carapace-sh";
repo = "carapace-bin";
tag = "v${finalAttrs.version}";
hash = "sha256-KeIaA+v0jJzyEo6ZE+mwzMM8wjsbtdYipAhzkotRR+o=";
hash = "sha256-QTY2GH2aKTMowNXVVNUDJdHAFVhCPFBh2p+Mgon88EI=";
};
vendorHash = "sha256-bDPCLAkX9AofyzZMz8rV9RgbFlF0GwzVlal2N7you08=";
vendorHash = "sha256-Lswmq4j4nz7k+CRpyZhAubEZD59lNKpT/w3mQ4JlMys=";
ldflags = [
"-s"
pkgs/by-name/ca/cargo-binstall/package.nix
+1 -1
View File
@@ -68,6 +68,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/cargo-bins/cargo-binstall";
changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
maintainers = [ ];
maintainers = with lib.maintainers; [ mdaniels5757 ];
};
}
pkgs/by-name/ca/cargo-nextest/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
version = "0.9.110";
version = "0.9.111";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
hash = "sha256-ipxPE3nugBJt/gLUdy/LQOTqat1Li2ovVPq3i81Yd/w=";
hash = "sha256-5ri4KI0dvWAkReUznRkibI45ZeZV5DMyq5VAr+az+b4=";
};
# FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
./no-dtrace-macos.patch
];
cargoHash = "sha256-9IvBgn+2taygTU+RjUWoiS3yI1LzejvzrYJ7VoiHpJI=";
cargoHash = "sha256-/YvzJO+GWo/B5AMXFYvFKfCS72QjOo8aZg+trKm+etI=";
cargoBuildFlags = [
"-p"
pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch
-137
View File
@@ -1,137 +0,0 @@
From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 25 Mar 2025 15:26:07 +0300
Subject: [PATCH] Fix thread arg type for pthread_setname_np
- change `thread` arg type to `cen64_thread` instead of `cen64_thread *`
(`pthread_t` instead of `pthread_t *`) according to definition of
`pthread_setname_np` from `<pthread.h>`:
`int pthread_setname_np(pthread_t thread, const char *name);`
fixes gcc14 errors:
```
/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion]
475 | cen64_thread_setname(thread, "device");
| ^~~~~~
| |
| cen64_thread {aka long unsigned int}
In file included from /build/source/device/device.h:26,
from /build/source/cen64.c:15:
/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo>
59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
| ~~~~~~~~~~~~~~^
```
- add cast to `cen64_thread` from NULL where `cen64_thread` is called
with it, fixes gcc14 errors:
```
/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion]
82 | cen64_thread_setname(NULL, "gdb");
| ^~~~
| |
| void *
/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *'
59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) {
| ~~~~~~~~~~~~~^
```
---
cen64.c | 2 +-
device/device.c | 4 ++--
gdb/gdb.c | 4 ++--
os/posix/thread.h | 6 +++---
os/winapi/thread.h | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cen64.c b/cen64.c
index 51014a4..ca6bda1 100644
--- a/cen64.c
+++ b/cen64.c
@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) {
}
CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) {
- cen64_thread_setname(NULL, "device");
+ cen64_thread_setname((cen64_thread)NULL, "device");
struct cen64_device *device = (struct cen64_device *) opaque;
device_run(device);
diff --git a/device/device.c b/device/device.c
index cd5a046..c915846 100644
--- a/device/device.c
+++ b/device/device.c
@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) {
}
CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) {
- cen64_thread_setname(NULL, "vr4300");
+ cen64_thread_setname((cen64_thread)NULL, "vr4300");
struct cen64_device *device = (struct cen64_device *) opaque;
while (likely(device->running)) {
@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) {
cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) {
vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler);
-}
\ No newline at end of file
+}
diff --git a/gdb/gdb.c b/gdb/gdb.c
index 021784d..0e8d188 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co
}
CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) {
- cen64_thread_setname(NULL, "gdb");
+ cen64_thread_setname((cen64_thread)NULL, "gdb");
struct gdb *gdb = (struct gdb *) opaque;
cen64_mutex_lock(&gdb->client_mutex);
@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) {
gdb->device = NULL;
free(gdb);
-}
\ No newline at end of file
+}
diff --git a/os/posix/thread.h b/os/posix/thread.h
index 2a261c6..e8e6144 100644
--- a/os/posix/thread.h
+++ b/os/posix/thread.h
@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) {
#ifdef __APPLE__
int pthread_setname_np(const char*);
#elif __NETBSD__
-int pthread_setname_np(cen64_thread*, const char*, const char*);
+int pthread_setname_np(cen64_thread, const char*, const char*);
#else
-int pthread_setname_np(cen64_thread*, const char*);
+int pthread_setname_np(cen64_thread, const char*);
#endif
// Sets the name of the thread to a specific value
@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*);
// If you call it at the wrong time or your OS doesn't support custom thread names
// the return value will be non-zero.
// If cen64_thread is not set the name of the current thread will be changed.
-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
+static inline int cen64_thread_setname(cen64_thread t, const char *name) {
#ifdef __APPLE__
if (t == NULL)
return pthread_setname_np(name);
diff --git a/os/winapi/thread.h b/os/winapi/thread.h
index d7c162a..128d935 100644
--- a/os/winapi/thread.h
+++ b/os/winapi/thread.h
@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) {
//
// Windows isn't supported for the moment.
//
-static inline int cen64_thread_setname(cen64_thread *t, const char *name) {
+static inline int cen64_thread_setname(cen64_thread t, const char *name) {
return ENOSYS;
}
--
2.48.1
pkgs/by-name/ce/cen64/package.nix
+22 -19
View File
@@ -1,53 +1,56 @@
{
lib,
cmake,
stdenv,
fetchFromGitHub,
cmake,
libGL,
libiconv,
libX11,
openal,
stdenv,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cen64";
version = "0-unstable-2023-05-29";
version = "0.3-unstable-2025-10-24";
src = fetchFromGitHub {
owner = "n64dev";
repo = "cen64";
rev = "1c1118462bd9d9b8ceb4c556a647718072477aab";
sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w=";
rev = "e0641c8452a3ae8edcd2bf4e46794bb4eaafc076";
hash = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64=";
};
patches = [
# fix build with gcc14:
# https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96
./cast-mi_regs-callbacks.patch
# https://github.com/n64dev/cen64/pull/237
./fix-thread-arg-type-for-pthread_setname_np.patch
];
# fix build with gcc14:
# https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96
patches = [ ./cast-mi_regs-callbacks.patch ];
strictDeps = true;
nativeBuildInputs = [ cmake ];
buildInputs = [
libGL
libiconv
openal
libX11
openal
];
installPhase = ''
runHook preInstall
install -D {,$out/bin/}${pname}
install -D ${finalAttrs.meta.mainProgram} \
--target-directory=$out/bin
runHook postInstall
'';
meta = with lib; {
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Cycle-Accurate Nintendo 64 Emulator";
license = licenses.bsd3;
license = lib.licenses.bsd3;
homepage = "https://github.com/n64dev/cen64";
maintainers = [ maintainers._414owen ];
maintainers = with lib.maintainers; [ _414owen ];
platforms = [ "x86_64-linux" ];
mainProgram = "cen64";
};
}
})
pkgs/by-name/ch/chafa/package.nix
+2 -2
View File
@@ -19,14 +19,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "1.16.2";
version = "1.18.0";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
tag = finalAttrs.version;
hash = "sha256-bIFPnbciaog9piqBMSpe9zLwH7irp5CW1WG5frAMqpI=";
hash = "sha256-SKwrc0bOaSdxENUWMtErSCug7of9s/ZGLeKhTtUCbWY=";
};
outputs = [
pkgs/by-name/ch/chirp/package.nix
+3 -3
View File
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "chirp";
version = "0.4.0-unstable-2025-10-30";
version = "0.4.0-unstable-2025-11-05";
pyproject = true;
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "a3b973cceb46e431423b3599fb365668958963d5";
hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M=";
rev = "0d2703ecad8b055a33220de592dc11bcbc153a20";
hash = "sha256-5O0bmxVpmAkonRInl3L2MplYnZSkkFVLRd4bz59HFv4=";
};
nativeBuildInputs = [
pkgs/by-name/co/coc-nginx/package.nix
+71
View File
@@ -0,0 +1,71 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
fetchYarnDeps,
yarnConfigHook,
yarnBuildHook,
yarnInstallHook,
nodejs,
nix-update-script,
esbuild,
buildGoModule,
}:
let
esbuild' =
let
version = "0.16.17";
in
esbuild.override {
buildGoModule =
args:
buildGoModule (
args
// {
inherit version;
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
);
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "coc-nginx";
version = "0.5.0";
src = fetchFromGitHub {
owner = "yaegassy";
repo = "coc-nginx";
tag = "v${finalAttrs.version}";
hash = "sha256-9dca1YUQZCbzmGe+9qVJABCWZCGUUZDvtznMQEP/CCQ=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-CBw2E93EWmBOCppj1gxYuAynHBZDJBPh58X099TP5mE=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
yarnInstallHook
nodejs
esbuild'
];
env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
passthru.updateScript = nix-update-script { };
meta = {
description = "nginx-language-server extension for coc.nvim";
homepage = "https://github.com/yaegassy/coc-nginx";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
};
})
pkgs/by-name/co/code-theme-converter/package.nix
+43
View File
@@ -0,0 +1,43 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
fetchYarnDeps,
yarnConfigHook,
yarnBuildHook,
yarnInstallHook,
nodejs,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "code-theme-converter";
version = "1.2.1";
src = fetchFromGitHub {
owner = "tobiastimm";
repo = "code-theme-converter";
tag = "v${finalAttrs.version}";
hash = "sha256-b6b0s6FXyHwoAJnPTaLu9fMQJVpBSqfGBk/KqDbaK9U=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-M8zLr/BPQfS50ZsTwN/YdJAlYUtS9edE/jh+l1wBqR8=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
yarnInstallHook
nodejs
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Convert any Visual Studio Code Theme to Sublime Text 3 or IntelliJ IDEA";
homepage = "https://github.com/tobiastimm/code-theme-converter";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
};
})
pkgs/by-name/co/commitlint/package.nix
+68
View File
@@ -0,0 +1,68 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchYarnDeps,
yarnConfigHook,
nodejs,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "commitlint";
version = "20.1.0";
src = fetchFromGitHub {
owner = "conventional-changelog";
repo = "commitlint";
rev = "v${finalAttrs.version}";
hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-Kg19sEgstrWj+JLzdZFnMeb0F5lFX3Z0VPNyiYPi6nY=";
};
nativeBuildInputs = [
yarnConfigHook
nodejs
];
buildPhase = ''
runHook preBuild
pkgs=("config-validator" "rules" "parse" "is-ignored" "lint"
"resolve-extends" "execute-rule" "load" "read" "types" "cli")
for p in "''${pkgs[@]}" ; do
cd @commitlint/$p/
yarn run tsc --build --force
cd ../..
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
yarn install --offline --production --ignore-scripts
mkdir -p $out/bin
mkdir -p $out/lib/node_modules/@commitlint/root
mv * $out/lib/node_modules/@commitlint/root/
ln -s $out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js $out/bin/commitlint
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/v${finalAttrs.version}";
description = "Lint your commit messages";
homepage = "https://commitlint.js.org/";
license = lib.licenses.mit;
mainProgram = "commitlint";
maintainers = with lib.maintainers; [ pyrox0 ];
};
})
pkgs/by-name/co/conventional-changelog-cli/package.nix
+68
View File
@@ -0,0 +1,68 @@
{
lib,
stdenv,
fetchFromGitHub,
nodejs,
pnpm,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "conventional-changelog-cli";
version = "7.1.1";
src = fetchFromGitHub {
owner = "conventional-changelog";
repo = "conventional-changelog";
tag = "conventional-changelog-v${finalAttrs.version}";
hash = "sha256-Pgx5gM4SdSL6WCkStByA7AP2O96MjAjyeMOI+Lo2mt0=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-ZfG3F0J1hIhZlF2OadhVdbxhQrFcMYDG9gEXR04DgEI=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
];
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/node_modules/conventional-changelog/
mkdir $out/bin
mv * $out/lib/node_modules/conventional-changelog/
chmod +x $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js
ln -s $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js $out/bin/conventional-changelog
patchShebangs $out/bin/conventional-changelog
runHook postInstall
'';
postInstall = ''
substituteInPlace $out/lib/node_modules/conventional-changelog/packages/*/package.json \
--replace-warn '"exports": "./src/index.ts"' '"exports": "./dist/index.js"'
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/conventional-changelog/conventional-changelog/releases/tag/conventional-changelog-v${finalAttrs.version}";
description = "Generate a CHANGELOG from git metadata";
homepage = "https://github.com/conventional-changelog/conventional-changelog";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.pyrox0 ];
mainProgram = "conventional-changelog";
};
})
pkgs/by-name/cp/cpuinfo/package.nix
+4 -4
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo";
version = "0-unstable-2025-09-05";
version = "0-unstable-2025-11-06";
src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "877328f188a3c7d1fa855871a278eb48d530c4c0";
hash = "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=";
rev = "f01ce870215f9e5d4c32006796994469c5334fd7";
hash = "sha256-v6U+Z5YHHSP0WUPxQ0G2zpP4a2D4I+BfhdY6q5BylBo=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "cpu-info";
maintainers = with lib.maintainers; [ pawelchcki ];
pkgConfigModules = [ "libcpuinfo" ];
# https://github.com/pytorch/cpuinfo/blob/877328f188a3c7d1fa855871a278eb48d530c4c0/CMakeLists.txt#L98
# https://github.com/pytorch/cpuinfo/blob/f01ce870215f9e5d4c32006796994469c5334fd7/CMakeLists.txt#L98
platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
};
})
pkgs/by-name/cr/cryptomator/package.nix
+5 -5
View File
@@ -3,7 +3,7 @@
fetchFromGitHub,
fuse3,
glib,
jdk25,
zulu25,
lib,
libayatana-appindicator,
makeShellWrapper,
@@ -13,22 +13,22 @@
}:
let
jdk = jdk25.override { enableJavaFX = true; };
jdk = zulu25.override { enableJavaFX = true; };
in
maven.buildMavenPackage rec {
pname = "cryptomator";
version = "1.16.2";
version = "1.17.1";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
tag = version;
hash = "sha256-U/I18OtinWlk8d9OLLAzZHoN5d8KHx9CUoZsv2mrQtw=";
hash = "sha256-2iWeF2su55yQjiFe8nyqTgqNDZuj2+JpzAx5tQJE1Z0=";
};
mvnJdk = jdk;
mvnParameters = "-Dmaven.test.skip=true -Plinux";
mvnHash = "sha256-uQz70epBFKTyX/PpOyWBtxHOiX0OQT3aTX6KWKwLc1I=";
mvnHash = "sha256-lbyNCuZOYIoznOV+DHuhNFk9ALNQbMMXBrF7y246ktE=";
preBuild = ''
VERSION=${version}
pkgs/by-name/da/databricks-cli/package.nix
+4 -3
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "databricks-cli";
version = "0.270.0";
version = "0.276.0";
src = fetchFromGitHub {
owner = "databricks";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk=";
hash = "sha256-iD8fB/sMHBGSL6pCEN3TPxlgcBd7+ckPXd7Gq3CLPEM=";
};
# Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,12 +25,13 @@ buildGoModule (finalAttrs: {
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
'';
vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc=";
vendorHash = "sha256-mFM5i1ec+eB4IhxoZipMgXK3IZm9KcSmifE2kJRV9BY=";
excludedPackages = [
"bundle/internal"
"acceptance"
"integration"
"tools/testrunner"
];
ldflags = [
pkgs/by-name/dd/ddccontrol-db/package.nix
+10 -7
View File
@@ -8,14 +8,14 @@
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ddccontrol-db";
version = "20251102";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
rev = version;
tag = finalAttrs.version;
sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU=";
};
@@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
meta = with lib; {
meta = {
description = "Monitor database for DDCcontrol";
homepage = "https://github.com/ddccontrol/ddccontrol-db";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ lib.maintainers.pakhfn ];
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
pakhfn
doronbehar
];
};
}
})
pkgs/by-name/dd/ddccontrol/package.nix
+10 -7
View File
@@ -11,14 +11,14 @@
ddccontrol-db,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ddccontrol";
version = "1.0.3";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol";
rev = version;
tag = finalAttrs.version;
sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c=";
};
@@ -53,11 +53,14 @@ stdenv.mkDerivation rec {
intltoolize --force
'';
meta = with lib; {
meta = {
description = "Program used to control monitor parameters by software";
homepage = "https://github.com/ddccontrol/ddccontrol";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with lib.maintainers; [ pakhfn ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
pakhfn
doronbehar
];
};
}
})
pkgs/by-name/dd/ddcutil-service/package.nix
+46
View File
@@ -0,0 +1,46 @@
{
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
pkg-config,
# buildInputs
glib,
ddcutil,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ddcutil-service";
version = "1.0.14";
src = fetchFromGitHub {
owner = "digitaltrails";
repo = "ddcutil-service";
rev = "v${finalAttrs.version}";
hash = "sha256-IZ6s9z0zxMZT7qd+yuQJGLnKc1WISIvhJlIGsM/Dw3w=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
glib
ddcutil
];
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = {
description = "A Dbus ddcutil server for control of DDC Monitors/VDUs";
homepage = "https://github.com/digitaltrails/ddcutil-service";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "ddcutil-service";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/de/deck/package.nix
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "deck";
version = "1.52.1";
version = "1.53.1";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${version}";
hash = "sha256-nxb7iuAf1hGHdjomgxFZuYwZSUuRrd5J3iVtFgEINY4=";
hash = "sha256-uLT/VTO3+KVfAvnFnsyFo9oRwkxA0wgUDmRgQwhXLfY=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec {
];
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-K6BOZ0LAy107UMQ0ZjkSnI4Q0lSqfHqvIG+EhCaal9A=";
vendorHash = "sha256-EygCZy0IXvqr2874nKFQTi+Pm56J75cpQUrPo7JGUNc=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
pkgs/by-name/di/diff2html-cli/package.nix
+47
View File
@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchYarnDeps,
yarnConfigHook,
yarnBuildHook,
yarnInstallHook,
nodejs,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "diff2html-cli";
version = "5.2.15";
src = fetchFromGitHub {
owner = "rtfpessoa";
repo = "diff2html-cli";
rev = finalAttrs.version;
hash = "sha256-aQoWn5n+xpYjhDQjw9v5HzWf/Hhmm6AK22OG4Ugq6Gk=";
};
postPatch = ''
substituteInPlace package.json \
--replace-fail "4.2.1" "${finalAttrs.version}";
'';
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-9JkzWhsXUrjnMcDDJfqm+tZ+WV5j3CHJbpn9j7v/KLg=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
yarnInstallHook
nodejs
];
meta = {
description = "Generate pretty HTML diffs from unified and git diff output in your terminal";
homepage = "https://diff2html.xyz#cli";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
mainProgram = "diff2html";
};
})
pkgs/by-name/em/empty-epsilon/package.nix
+13 -13
View File
@@ -7,14 +7,14 @@
libX11,
glew,
python3,
glm,
glm_1_0_1,
meshoptimizer,
SDL2,
ninja,
}:
let
version = {
versions = {
seriousproton = "2024.12.08";
emptyepsilon = "2024.12.08";
basis-universal = "1.15_final";
@@ -23,18 +23,18 @@ let
basis-universal = fetchFromGitHub {
owner = "BinomialLLC";
repo = "basis_universal";
tag = version.basis-universal;
tag = versions.basis-universal;
hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY=";
};
serious-proton = stdenv.mkDerivation {
pname = "serious-proton";
version = version.seriousproton;
version = versions.seriousproton;
src = fetchFromGitHub {
owner = "daid";
repo = "SeriousProton";
tag = "EE-${version.seriousproton}";
tag = "EE-${versions.seriousproton}";
hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90=";
};
@@ -42,7 +42,7 @@ let
buildInputs = [
sfml
libX11
glm
glm_1_0_1
SDL2
];
@@ -64,12 +64,12 @@ in
stdenv.mkDerivation {
pname = "empty-epsilon";
version = version.emptyepsilon;
version = versions.emptyepsilon;
src = fetchFromGitHub {
owner = "daid";
repo = "EmptyEpsilon";
tag = "EE-${version.emptyepsilon}";
tag = "EE-${versions.emptyepsilon}";
hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48=";
};
@@ -80,17 +80,17 @@ stdenv.mkDerivation {
glew
libX11
python3
glm
glm_1_0_1
SDL2
ninja
];
cmakeFlags = [
(lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major version.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor version.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch version.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${versions.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major versions.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor versions.emptyepsilon}")
(lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch versions.emptyepsilon}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}")
(lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar")
pkgs/by-name/fi/firebase-tools/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "14.20.0";
version = "14.24.1";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M=";
hash = "sha256-eXADtJFQWC5Qf013fkJ4AdukyaKlc5Rorys/jNG9f+E=";
};
npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc=";
npmDepsHash = "sha256-m5Rz2JH9e/rJ4tKwNiiZb7wnOmeMDxYuUrVx6QZy25w=";
# No more package-lock.json in upstream src
postPatch = ''
pkgs/by-name/fr/framework-tool-tui/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "framework-tool-tui";
version = "0.5.1";
version = "0.5.8";
src = fetchFromGitHub {
owner = "grouzen";
repo = "framework-tool-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI=";
hash = "sha256-6rphmprOTg+Zk3HbE6mdszmQsCQ8mUbs59rvLeKQkps=";
};
cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M=";
cargoHash = "sha256-0/6b0C+uUNz03r5IEBvAGzagSyjzXFVbE74rgfGJoyM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
pkgs/by-name/fr/frei0r/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "frei0r-plugins";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "dyne";
repo = "frei0r";
rev = "v${version}";
hash = "sha256-95d1aXfCq4mPccY8VKmO7jkX57li6OVSwtfIf9459n4=";
hash = "sha256-JEQndfQOcSARGIPtMwteUqWqTLPEMcpF2F/xD1PsDEU=";
};
nativeBuildInputs = [
pkgs/tools/package-management/fusesoc/default.nix → pkgs/by-name/fu/fusesoc/package.nix
+4 -11
View File
@@ -1,19 +1,12 @@
{
buildPythonPackage,
python3Packages,
fetchPypi,
lib,
iverilog,
verilator,
gnumake,
edalize,
fastjsonschema,
pyparsing,
pyyaml,
simplesat,
ipyxact,
setuptools-scm,
}:
buildPythonPackage rec {
python3Packages.buildPythonPackage rec {
pname = "fusesoc";
version = "2.2.1";
format = "setuptools";
@@ -23,9 +16,9 @@ buildPythonPackage rec {
hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w=";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = with python3Packages; [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = with python3Packages; [
edalize
fastjsonschema
pyparsing
pkgs/by-name/ga/gatus/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gatus";
version = "5.30.0";
version = "5.31.0";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${version}";
hash = "sha256-iQp/oIEuyD+lVf20BH3fMScUtRxvEVrbu1zoJE5YkVI=";
hash = "sha256-thLS6pAlnu7XcQHritr28CnzmpIOgIcEPIch2IwhZfQ=";
};
vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8=";
vendorHash = "sha256-VaD/cTf9D00gr6+9gKadK4aTwqhmJN/+cohwNvckxyw=";
subPackages = [ "." ];
pkgs/by-name/gd/gdevelop/darwin.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o=";
hash = "sha256-F7yYZgCBMmRX1yYWC60RRtIw/ObDcbUcwY0yF4Ikagg=";
};
sourceRoot = ".";
pkgs/by-name/gd/gdevelop/linux.nix
+1 -1
View File
@@ -13,7 +13,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA=";
hash = "sha256-LwFialu3vQehcGVleuCSmDrrsw7b0uTxuAFhSwdE9jQ=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
pkgs/by-name/gd/gdevelop/package.nix
+1 -1
View File
@@ -4,7 +4,7 @@
callPackage,
}:
let
version = "5.5.244";
version = "5.5.245";
pname = "gdevelop";
meta = {
description = "Graphical Game Development Studio";
pkgs/applications/version-management/git-annex-remote-googledrive/default.nix → pkgs/by-name/gi/git-annex-remote-googledrive/package.nix
+4 -11
View File
@@ -1,17 +1,10 @@
{
lib,
annexremote,
buildPythonApplication,
drivelib,
python3Packages,
fetchPypi,
gitpython,
humanfriendly,
tenacity,
setuptools,
distutils,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "git-annex-remote-googledrive";
version = "1.3.2";
pyproject = true;
@@ -21,9 +14,9 @@ buildPythonApplication rec {
sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1";
};
build-system = [ setuptools ];
build-system = with python3Packages; [ setuptools ];
propagatedBuildInputs = [
dependencies = with python3Packages; [
annexremote
drivelib
gitpython
pkgs/applications/version-management/gita/default.nix → pkgs/by-name/gi/gita/package.nix
+3 -5
View File
@@ -1,13 +1,11 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
pyyaml,
setuptools,
installShellFiles,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
version = "0.16.6.1";
format = "setuptools";
pname = "gita";
@@ -19,7 +17,7 @@ buildPythonApplication rec {
owner = "nosarthur";
};
propagatedBuildInputs = [
dependencies = with python3Packages; [
pyyaml
setuptools
];
pkgs/by-name/gi/github-copilot-cli/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "github-copilot-cli";
version = "0.0.353";
version = "0.0.354";
src = fetchzip {
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
hash = "sha256-OWlEz75vVEvbtDNobLJ/a1iUuepYewCTWoqTbDG+4wg=";
hash = "sha256-W0KiqTThHv/G69X35Sma0KBGH0JAdZhC4/goosSZUDs=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
pkgs/by-name/gl/glm/1_0_1.nix
+15
View File
@@ -0,0 +1,15 @@
{
callPackage,
fetchFromGitHub,
}:
callPackage ./generic.nix rec {
version = "1.0.1";
src = fetchFromGitHub {
owner = "g-truc";
repo = "glm";
rev = version;
sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
};
}
pkgs/by-name/gl/glm/generic.nix
+72
View File
@@ -0,0 +1,72 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
version,
src,
}:
stdenv.mkDerivation rec {
pname = "glm";
inherit version src;
outputs = [
"out"
"doc"
];
patches = lib.optionals stdenv.hostPlatform.isLinux [
# Remove when https://github.com/g-truc/glm/pull/1001 merged & in release.
# Relies on <endian.h>, Linux-specific
./1001-glm-Fix-packing-on-BE.patch
];
nativeBuildInputs = [ cmake ];
env.NIX_CFLAGS_COMPILE =
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then
"-fno-ipa-modref"
# Fix compilation errors on darwin
else if (stdenv.cc.isClang) then
"-Wno-error"
else
"";
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" false)
(lib.cmakeBool "BUILD_STATIC_LIBS" false)
(lib.cmakeBool "GLM_TEST_ENABLE" doCheck)
];
doCheck = true;
postInstall = ''
# Install pkg-config file
mkdir -p $out/lib/pkgconfig
substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc
# Install docs
mkdir -p $doc/share/doc/glm
cp -rv ../doc/api $doc/share/doc/glm/html
cp -v ../doc/manual.pdf $doc/share/doc/glm
'';
meta = with lib; {
description = "OpenGL Mathematics library for C++";
longDescription = ''
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
graphics software based on the OpenGL Shading Language (GLSL)
specification and released under the MIT license.
'';
homepage = "https://github.com/g-truc/glm";
license = licenses.mit;
platforms = platforms.unix;
# https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE.
# Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header.
broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux;
maintainers = with maintainers; [ smancill ];
};
}
pkgs/by-name/gl/glm/package.nix
+2 -63
View File
@@ -1,13 +1,10 @@
{
lib,
stdenv,
callPackage,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec {
callPackage ./generic.nix rec {
version = "1.0.2";
pname = "glm";
src = fetchFromGitHub {
owner = "g-truc";
@@ -15,62 +12,4 @@ stdenv.mkDerivation rec {
rev = version;
sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0=";
};
outputs = [
"out"
"doc"
];
patches = lib.optionals stdenv.hostPlatform.isLinux [
# Remove when https://github.com/g-truc/glm/pull/1001 merged & in release.
# Relies on <endian.h>, Linux-specific
./1001-glm-Fix-packing-on-BE.patch
];
nativeBuildInputs = [ cmake ];
env.NIX_CFLAGS_COMPILE =
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then
"-fno-ipa-modref"
# Fix compilation errors on darwin
else if (stdenv.cc.isClang) then
"-Wno-error"
else
"";
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" false)
(lib.cmakeBool "BUILD_STATIC_LIBS" false)
(lib.cmakeBool "GLM_TEST_ENABLE" doCheck)
];
doCheck = true;
postInstall = ''
# Install pkg-config file
mkdir -p $out/lib/pkgconfig
substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc
# Install docs
mkdir -p $doc/share/doc/glm
cp -rv ../doc/api $doc/share/doc/glm/html
cp -v ../doc/manual.pdf $doc/share/doc/glm
'';
meta = with lib; {
description = "OpenGL Mathematics library for C++";
longDescription = ''
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
graphics software based on the OpenGL Shading Language (GLSL)
specification and released under the MIT license.
'';
homepage = "https://github.com/g-truc/glm";
license = licenses.mit;
platforms = platforms.unix;
# https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE.
# Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header.
broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux;
maintainers = with maintainers; [ smancill ];
};
}
pkgs/by-name/hy/hyprland/package.nix
+6
View File
@@ -108,6 +108,12 @@ customStdenv.mkDerivation (finalAttrs: {
url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch";
hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s=";
})
# NOTE: fixes regression for layer-shell-qt. should be removed with the next release.
(fetchpatch {
url = "https://github.com/hyprwm/Hyprland/commit/0bd11d5eb941b8038f0723135768d84aa5512b4a.patch";
hash = "sha256-yY5OsihAzm5cVLg8smGc4i/RIimUDwuZ1RUGqOlfV+Q=";
})
];
postPatch = ''
pkgs/by-name/it/itsycal/package.nix
+6 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "itsycal";
version = "0.15.7";
version = "0.15.8";
src = fetchzip {
url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw=";
hash = "sha256-zo77yCfIzb2ZmExJslQ64GPQqakXtiRmm0UYEgj+3eM=";
};
installPhase = ''
@@ -22,6 +22,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru = {
updateScript = ./update.sh;
};
meta = {
changelog = "https://www.mowglii.com/itsycal/versionhistory.html";
description = "Tiny menu bar calendar";
pkgs/by-name/it/itsycal/update.sh
Executable
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl xq-xml common-updater-scripts
set -eu
ROOT="$(dirname "$(readlink -f "$0")")"
NIX_DRV="$ROOT/package.nix"
if [ ! -f "$NIX_DRV" ]; then
echo "ERROR: cannot find package.nix in $ROOT"
exit 1
fi
LATEST_VERSION="$(curl -Ls https://www.mowglii.com/itsycal/versionhistory.html | xq -m -q 'h4' -a 'id' | head -n1)"
if [ -z "$LATEST_VERSION" ]; then
echo "ERROR: Failed to scrape the latest version."
exit 1
fi
update-source-version itsycal "$LATEST_VERSION" --file="$NIX_DRV"
pkgs/by-name/ja/jackass/package.nix
+6 -2
View File
@@ -5,6 +5,7 @@
pkg-config,
vst2-sdk,
wine64,
nix-update-script,
enableJackAssWine64 ? false,
}:
@@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
enableParallelBuilding = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "VST plugin that provides JACK-MIDI support for VST hosts";
@@ -51,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
applications. Set enableJackAssWine64 to true to enable this output.
'';
homepage = "https://github.com/falkTX/JackAss";
maintainers = with lib.maintainers; [ PowerUser64 ];
maintainers = with lib.maintainers; [
PowerUser64
l1npengtul
];
license = [ lib.licenses.mit ];
platforms = lib.platforms.linux;
};
pkgs/by-name/js/json-diff/package.nix
+32
View File
@@ -0,0 +1,32 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
nix-update-script,
}:
buildNpmPackage (finalAttrs: {
pname = "json-diff";
version = "1.0.6";
src = fetchFromGitHub {
owner = "andreyvit";
repo = "json-diff";
tag = "v${finalAttrs.version}";
hash = "sha256-b8CtttEmPUIuFba6yn0DhVsSM1RA8Jsl4+zGvk3EZ2s=";
};
npmDepsHash = "sha256-hpnmBD9fyudjc3dzxZ5L5mhkCfRbw7BaAHKGf76qVDU=";
npmBuildScript = "test";
passthru.updateScript = nix-update-script { };
meta = {
description = "Structural diff for JSON files";
homepage = "https://github.com/andreyvit/json-diff";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
mainProgram = "json-diff";
};
})
pkgs/by-name/ka/katex/package.nix
+67
View File
@@ -0,0 +1,67 @@
{
lib,
stdenv,
fetchFromGitHub,
yarn-berry,
nodejs,
makeBinaryWrapper,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "katex";
version = "0.16.25";
src = fetchFromGitHub {
owner = "katex";
repo = "katex";
rev = "v${finalAttrs.version}";
hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw=";
};
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src;
hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0=";
};
nativeBuildInputs = [
yarn-berry.yarnBerryConfigHook
yarn-berry
nodejs
makeBinaryWrapper
];
buildPhase = ''
runHook preBuild
yarn build
runHook postBuild
'';
installPhase = ''
runHook preInstall
yarn config set nodeLinker "node-modules"
yarn install --mode=skip-build --inline-builds
mkdir -p $out/lib/node_modules/katex/
mkdir $out/bin
mv * $out/lib/node_modules/katex/
makeWrapper ${lib.getExe nodejs} $out/bin/katex \
--add-flags "$out/lib/node_modules/katex/cli.js" \
--set NODE_PATH "$out/lib/node_modules/katex/node_modules"
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/KaTeX/KaTeX/releases/tag/v${finalAttrs.version}";
description = "Render TeX to HTML";
homepage = "https://katex.org/";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.pyrox0 ];
mainProgram = "katex";
};
})
pkgs/by-name/kr/krane/package.nix
+1 -1
View File
@@ -16,6 +16,6 @@ bundlerApp {
homepage = "https://github.com/Shopify/krane";
changelog = "https://github.com/Shopify/krane/blob/main/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kira-bruneau ];
maintainers = [ ];
};
}
pkgs/by-name/li/lilex/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "lilex";
version = "2.620";
version = "2.621";
src = fetchurl {
url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
hash = "sha256-h2Xt1HIOlh4wwHK3bg5hxyWxi/W8GWMiRkaWF7fhngU=";
hash = "sha256-TsLJ96SZpokW3354/yt0Re4ZtFXqYK/46iyZXdPKhoE=";
};
nativeBuildInputs = [ unzip ];
pkgs/by-name/lo/localtunnel/package.nix
+44
View File
@@ -0,0 +1,44 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchYarnDeps,
yarnConfigHook,
yarnInstallHook,
nodejs,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "localtunnel";
version = "2.0.2";
src = fetchFromGitHub {
owner = "localtunnel";
repo = "localtunnel";
rev = "v${finalAttrs.version}";
hash = "sha256-6gEK1VjF25Kbe2drxbxUKDNJGqZ+OXgkulPkAkMR2+k=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-zq9ygsKDU4lIsNxc6ovW+IXVztQoEaJAekzBrwCK7ik=";
};
nativeBuildInputs = [
yarnConfigHook
yarnInstallHook
nodejs
];
updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/localtunnel/localtunnel/blob/v${finalAttrs.version}/CHANGELOG.md";
description = "CLI for localtunnel";
homepage = "https://localtunnel.me";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
mainProgram = "lt";
};
})
pkgs/by-name/lo/logrotate/package.nix
+6 -2
View File
@@ -33,8 +33,12 @@ stdenv.mkDerivation rec {
preCheck = ''
sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh
# Skip this test because it depends on a working root user, which we don't have in the sandbox
# Exiting with 77 signals that the test is skipped, and we only place it on line 2 because the shebang is on line 1
# Exiting with 77 signals that a test is skipped, and we only place it on line 2 because the shebang is on line 1
# Does not work on certain filesystems due to incorrect sparse file detection.
# Upstream issue: https://github.com/logrotate/logrotate/issues/682
sed -i '2iexit 77' test/test-0062.sh
sed -i '2iexit 77' test/test-0063.sh
# Depends on a working root user, which we don't have in the sandbox
sed -i '2iexit 77' test/test-0110.sh
'';
doCheck = true;
pkgs/by-name/ma/mathmod/package.nix
+4 -3
View File
@@ -7,19 +7,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mathmod";
version = "12.1";
version = "13.0";
src = fetchFromGitHub {
owner = "parisolab";
repo = "mathmod";
tag = finalAttrs.version;
hash = "sha256-gDIYDXI9X24JAM1HP10EhJXkHZV2X8QngD5KPCUqdyI=";
hash = "sha256-+UR8Tk20StplyNqPDNxR0HfjAzAru4r+WtVsW81LR9c=";
};
patches = [ ./fix-paths.patch ];
postPatch = ''
substituteInPlace MathMod.pro --subst-var out
substituteInPlace MathMod.pro \
--replace-fail "@out@" "$out"
'';
nativeBuildInputs = with libsForQt5; [
pkgs/by-name/mc/mcp-k8s-go/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "mcp-k8s-go";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "strowk";
repo = "mcp-k8s-go";
tag = "v${finalAttrs.version}";
hash = "sha256-4pS0X1G/wGemBkLC9UFLHxaRLtCDALIRPnOCzAf/6JA=";
hash = "sha256-/5tmKngZTp5n8jDZwKAaG4ad+MPRFEJfgV/A5TMVLlM=";
};
vendorHash = "sha256-BPmocRaqqV7p5Yjto3UEbzc2vdlyRSGkdPye3EWXEe4=";
vendorHash = "sha256-WULy61Ntra9Jz4fhSVOzftzWyQxvPFyBfjuKlKTORqI=";
doCheck = false;
pkgs/by-name/mo/mongoose/package.nix
+3 -4
View File
@@ -8,11 +8,11 @@
}:
let
suitesparseVersion = "7.11.0";
suitesparseVersion = "7.12.1";
in
stdenv.mkDerivation {
pname = "mongoose";
version = "3.3.5";
version = "3.3.6";
outputs = [
"bin"
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "DrTimothyAldenDavis";
repo = "SuiteSparse";
tag = "v${suitesparseVersion}";
hash = "sha256-8CnN2P/W15GpK0nCNoRQongOrzcz5E8l9SgKksqLxd0=";
hash = "sha256-6EMPEH5dcNT1qtuSlzR26RhpfN7MbYJdSKcrsQ0Pzow=";
};
nativeBuildInputs = [
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
dontUseCmakeConfigure = true;
cmakeFlags = [
"-DBLAS_LIBRARIES=${blas}"
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
];
pkgs/tools/misc/mpy-utils/default.nix → pkgs/by-name/mp/mpy-utils/package.nix
+3 -5
View File
@@ -1,13 +1,11 @@
{
stdenv,
lib,
buildPythonApplication,
python3Packages,
fetchPypi,
fusepy,
pyserial,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "mpy-utils";
version = "0.1.13";
format = "setuptools";
@@ -17,7 +15,7 @@ buildPythonApplication rec {
hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4=";
};
propagatedBuildInputs = [
propagatedBuildInputs = with python3Packages; [
fusepy
pyserial
];
pkgs/by-name/my/mympd/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "22.1.2";
version = "23.0.0";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-jgRzfVwVf6QOBGAsKNm9f8YqWBWd0KMJj0FTFcnu4NM=";
sha256 = "sha256-tD7ywqZJEix+ET26z3yJmgHXBACBOrSAlR9U1Uff/v8=";
};
nativeBuildInputs = [
pkgs/tools/networking/networkd-notify/default.nix → pkgs/by-name/ne/networkd-notify/package.nix
+3 -5
View File
@@ -1,15 +1,13 @@
{
lib,
fetchFromGitLab,
buildPythonApplication,
dbus-python,
pygobject3,
python3Packages,
systemd,
wirelesstools,
wrapGAppsNoGuiHook,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "networkd-notify";
version = "unstable-2022-11-29";
# There is no setup.py, just a single Python script.
@@ -26,7 +24,7 @@ buildPythonApplication rec {
wrapGAppsNoGuiHook
];
propagatedBuildInputs = [
dependencies = with python3Packages; [
dbus-python
pygobject3
];
pkgs/by-name/nr/nrm/package.nix
+65
View File
@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
nodejs,
pnpm,
makeBinaryWrapper,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nrm";
version = "2.1.0";
src = fetchFromGitHub {
owner = "pana";
repo = "nrm";
tag = "v${finalAttrs.version}";
hash = "sha256-2P0dSZa17A3NslNatCx1edLnrcDtGGpOlk6srcvjL1Y=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
makeBinaryWrapper
];
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-PENYS5xO2LwT3+TGl/wU2r0ALEj/JQfbkpf/0MJs0uw=";
};
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/node_modules/nrm
mkdir $out/bin
mv * $out/lib/node_modules/nrm/
makeWrapper ${lib.getExe nodejs} $out/bin/nrm \
--add-flags "$out/lib/node_modules/nrm/dist/index.js" \
--set "NODE_PATH" "$out/lib/node_modules/nrm/node_modules"
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/Pana/nrm/releases/tag/v${finalAttrs.version}";
description = "Helps you switch between npm registries easily";
homepage = "https://github.com/Pana/nrm";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
mainProgram = "nrm";
};
})
pkgs/by-name/on/oneDNN/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation (finalAttrs: {
pname = "oneDNN";
version = "3.9.1";
version = "3.10";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${finalAttrs.version}";
hash = "sha256-DbLW22LgG8wrBNMsxoUGlacHLcfIBwqyiv+HOmFDtxc=";
hash = "sha256-EII2EFCxU+ZnmfnRM8dfHa+sEi2z+7k2ikBbfpZafko=";
};
outputs = [
pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch
+45
View File
@@ -0,0 +1,45 @@
diff --git a/onnxruntime/core/common/cpuid_info.cc b/onnxruntime/core/common/cpuid_info.cc
--- a/onnxruntime/core/common/cpuid_info.cc
+++ b/onnxruntime/core/common/cpuid_info.cc
@@ -3,6 +3,7 @@
#include "core/common/cpuid_info.h"
#include "core/common/logging/logging.h"
#include "core/common/logging/severity.h"
+#include <iostream>
#ifdef __linux__
@@ -364,8 +365,14 @@
#if defined(CPUINFO_SUPPORTED)
pytorch_cpuinfo_init_ = cpuinfo_initialize();
if (!pytorch_cpuinfo_init_) {
- LOGS_DEFAULT(WARNING) << "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation "
- "due to undetected CPU features.";
+ constexpr const char* message =
+ "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation due to undetected CPU "
+ "features.";
+ if (logging::LoggingManager::HasDefaultLogger()) {
+ LOGS_DEFAULT(WARNING) << message;
+ } else {
+ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl;
+ }
}
#endif // defined(CPUINFO_SUPPORTED)
#if defined(__linux__)
diff --git a/onnxruntime/core/platform/posix/env.cc b/onnxruntime/core/platform/posix/env.cc
--- a/onnxruntime/core/platform/posix/env.cc
+++ b/onnxruntime/core/platform/posix/env.cc
@@ -605,7 +605,12 @@
PosixEnv() {
cpuinfo_available_ = cpuinfo_initialize();
if (!cpuinfo_available_) {
- LOGS_DEFAULT(INFO) << "cpuinfo_initialize failed";
+ constexpr const char* message = "cpuinfo_initialize failed";
+ if (logging::LoggingManager::HasDefaultLogger()) {
+ LOGS_DEFAULT(INFO) << message;
+ } else {
+ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl;
+ }
}
}
bool cpuinfo_available_{false};
pkgs/by-name/on/onnxruntime/package.nix
+6
View File
@@ -97,6 +97,12 @@ effectiveStdenv.mkDerivation rec {
url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch";
hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0=";
})
# Handle missing default logger when cpuinfo initialization fails in the build sandbox
# TODO: Remove on next release
# https://github.com/microsoft/onnxruntime/issues/10038
# https://github.com/microsoft/onnxruntime/pull/15661
# https://github.com/microsoft/onnxruntime/pull/20509
./cpuinfo-logging.patch
]
++ lib.optionals cudaSupport [
# We apply the referenced 1064.patch ourselves to our nix dependency.
pkgs/by-name/op/open-webui/package.nix
+3 -4
View File
@@ -9,13 +9,13 @@
}:
let
pname = "open-webui";
version = "0.6.34";
version = "0.6.36";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-crjBVR0ZXUYck4pyLNb1IO9IoQ6MFBnCKEBsi0/JXCI=";
hash = "sha256-7+KFMmiJZB14kUtkKxTLZrZ2bA2MR1qA/cx7GX+FnUw=";
};
frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-ofw/leDcfrc+Bp93s9BkB3WFs8qQgiWUag7gvdPJdlo=";
npmDepsHash = "sha256-CEjWmDcHHr0PeltETi5uIdoQ2C2Twmg+gDBZT5myo/E=";
# See https://github.com/open-webui/open-webui/issues/15880
npmFlags = [
@@ -212,7 +212,6 @@ python3Packages.buildPythonApplication rec {
pymilvus
pymongo
qdrant-client
tencentcloud-sdk-python
]
++ moto.optional-dependencies.s3
++ postgres;
pkgs/by-name/op/opencode/package.nix
+6
View File
@@ -87,6 +87,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
./skip-npm-pack.patch
];
postPatch = ''
# don't require a specifc bun version
substituteInPlace packages/script/src/index.ts \
--replace-fail "if (process.versions.bun !== expectedBunVersion)" "if (false)"
'';
configurePhase = ''
runHook preConfigure
pkgs/applications/version-management/pass-git-helper/default.nix → pkgs/by-name/pa/pass-git-helper/package.nix
+5 -10
View File
@@ -1,15 +1,10 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
pyxdg,
pytestCheckHook,
pytest-cov-stub,
pytest-mock,
setuptools,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "pass-git-helper";
version = "4.0.0";
pyproject = true;
@@ -21,15 +16,15 @@ buildPythonApplication rec {
sha256 = "sha256-SAMndgcxBa7wymXbOwRGcoogFfzpFFIZ0tF4NSCXpjw=";
};
build-system = [ setuptools ];
build-system = with python3Packages; [ setuptools ];
dependencies = [ pyxdg ];
dependencies = with python3Packages; [ pyxdg ];
env.HOME = "$TMPDIR";
pythonImportsCheck = [ "passgithelper" ];
nativeCheckInputs = [
nativeCheckInputs = with python3Packages; [
pytestCheckHook
pytest-cov-stub
pytest-mock
pkgs/by-name/pi/pingu/package.nix
+20 -8
View File
@@ -6,25 +6,37 @@
buildGoModule rec {
pname = "pingu";
version = "0.0.5";
version = "0.0.6";
src = fetchFromGitHub {
owner = "sheepla";
owner = "CactiChameleon9";
repo = "pingu";
rev = "v${version}";
sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE=";
sha256 = "sha256-pXC/y+piLhSWIcJ1/+UaC3sjHPKG3XvTuHzWENsXME0=";
# Get values that require us to use git, then delete .git
leaveDotGit = true;
postFetch = ''
cd $out
git rev-parse --short HEAD > ldflags_revision
find . -type d -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU=";
vendorHash = "sha256-8d0pKweumnJH49HSBCfEF8cwEXLGMAk2WbhS10T/Cmc=";
ldflags = [
"-w"
"-s"
"-X main.appVersion=${version}"
];
preBuild = ''
ldflags+=" -X main.appRevision=$(cat ldflags_revision)"
'';
meta = with lib; {
description = "Ping command implementation in Go but with colorful output and pingu ascii art";
homepage = "https://github.com/sheepla/pingu/";
homepage = "https://github.com/CactiChameleon9/pingu/";
license = licenses.mit;
maintainers = with maintainers; [ CactiChameleon9 ];
mainProgram = "pingu";
# Doesn't build with Go toolchain >1.22, build error:
# 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'.
broken = true;
};
}
pkgs/by-name/pr/procfd/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "procfd";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "deshaw";
repo = "procfd";
tag = "v${finalAttrs.version}";
hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0=";
hash = "sha256-Z18DUXT26ZRFbD25pCKqPlEnxboQKhyhKysXeOsebcE=";
};
cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8=";
cargoHash = "sha256-QsdHNZnh86qQTE6ZtycrzqU+L72EBmRlRNqJ2CRU4MI=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/py/pyhanko-cli/package.nix
+66
View File
@@ -0,0 +1,66 @@
{
lib,
fetchFromGitHub,
python3Packages,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "pyhanko-cli";
version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "MatthiasValvekens";
repo = "pyhanko";
tag = "pyhanko-cli/v${version}";
hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE=";
};
sourceRoot = "${src.name}/pkgs/pyhanko-cli";
postPatch = ''
substituteInPlace src/pyhanko/cli/version.py \
--replace-fail "0.0.0.dev1" "${version}" \
--replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))"
substituteInPlace pyproject.toml \
--replace-fail "0.0.0.dev1" "${version}"
'';
build-system = [ python3Packages.setuptools ];
dependencies =
with python3Packages;
[
asn1crypto
tzlocal
pyhanko
pyhanko-certvalidator
click
platformdirs
]
++ lib.flatten (lib.attrValues pyhanko.optional-dependencies);
nativeCheckInputs = with python3Packages; [
pytestCheckHook
pyhanko.testData
requests-mock
freezegun
certomancer
aiohttp
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex=pyhanko-cli/v(.*)"
];
};
meta = {
description = "Sign and stamp PDF files";
mainProgram = "pyhanko";
homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-cli";
changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/pyhanko-cli/${src.tag}/docs/changelog.rst#pyhanko-cli";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.antonmosich ];
};
}
pkgs/by-name/rc/rcon-cli/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
}:
buildGoModule (finalAttrs: {
pname = "rcon-cli";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = "itzg";
repo = "rcon-cli";
tag = finalAttrs.version;
hash = "sha256-wog4nnXITV5p2lzfuO9tB//B87nh8KGpsCfSalt8WvE=";
hash = "sha256-v9f367XTPKAocGdwwPe/dXsFK30THbqpQwuvSV/lWN4=";
};
vendorHash = "sha256-vD+i3vMInErO0MpIRgsVe0Fl6HuFIwUS8xKHdZ7lxVM=";
vendorHash = "sha256-TogEdy0rtOzywBCtJ9dw8jO25dzxygqDGFDCbCNwhz8=";
subPackages = [ "." ];
passthru.updateScript = nix-update-script { };
pkgs/by-name/re/re-isearch/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation {
pname = "re-Isearch";
version = "2.20220925.4.0a-unstable-2025-11-02";
version = "2.20220925.4.0a-unstable-2025-11-05";
src = fetchFromGitHub {
owner = "re-Isearch";
repo = "re-Isearch";
rev = "47e9a874d1343f68b67be16e8dd15661171c9270";
hash = "sha256-cwH4W6+7JwohP2sx5PjvZtu63GDTfmt6nWd7cSqZkBQ=";
rev = "4c1afb365ded2fc181d11f67a9aa4a6984990afd";
hash = "sha256-4sL5+V37MHnxNivl6sJBvp4NjtqOHmiftIsBCsz4tv8=";
};
patches = [
pkgs/by-name/re/restinio/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null;
stdenv.mkDerivation (finalAttrs: {
pname = "restinio";
version = "0.7.7";
version = "0.7.8";
src = fetchFromGitHub {
owner = "Stiffstream";
repo = "restinio";
tag = "v${finalAttrs.version}";
hash = "sha256-bbiBz/WkQc3HiS7+x/qsRdHoravPX8LBKb+a2WeC81s=";
hash = "sha256-PXm9s586V1aZ7D5GwYzBc/Fljif/Iq3VChDe2NHWKSU=";
};
# https://www.github.com/Stiffstream/restinio/issues/230
pkgs/by-name/ri/rime-moegirl/package.nix
+2 -2
View File
@@ -5,10 +5,10 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rime-moegirl";
version = "20251009";
version = "20251109";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
hash = "sha256-8WmfnkfTg8zdMKvn3I+Ag5KYjdbUpeWhgeSEEc/WUss=";
hash = "sha256-GBevsjo6KRd6Uicy2LpMwgZJkluN5n2ID/DAiaKJV74=";
};
dontUnpack = true;

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