mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge master into staging-next
This commit is contained in:
commit
167c482ea6
193 changed files with 1128 additions and 1616 deletions
|
|
@ -511,9 +511,11 @@ Changes can include workarounds or bug fixes to existing PNPM issues.
|
|||
|
||||
##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
|
||||
|
||||
- 1: Initial version, nothing special. **Deprecated: Scheduled for removal in the 26.11 release.**. New packages must not use this value.
|
||||
Version 3 is the recommended value for new packages. Versions 1 and 2 are deprecated and scheduled for removal in the 26.11 release; existing packages must migrate.
|
||||
|
||||
- 1: Initial version, nothing special.
|
||||
- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
|
||||
- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950). **Recommended**
|
||||
- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)
|
||||
|
||||
### Yarn {#javascript-yarn}
|
||||
|
||||
|
|
|
|||
|
|
@ -334,11 +334,12 @@
|
|||
|
||||
- `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
|
||||
|
||||
- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal
|
||||
in the 26.11 release. A deprecation warning has been added. Packages still on
|
||||
`fetcherVersion = 1` should migrate to `fetcherVersion = 3` and regenerate
|
||||
their hashes. See the [pnpm `fetcherVersion`
|
||||
section](#javascript-pnpm-fetcherVersion) of the manual for details.
|
||||
- `fetchPnpmDeps`' `fetcherVersion = 1` and `fetcherVersion = 2` are deprecated
|
||||
and scheduled for removal in the 26.11 release. A deprecation warning has
|
||||
been added. Packages still on `fetcherVersion = 1` or `fetcherVersion = 2`
|
||||
should migrate to `fetcherVersion = 3` and regenerate their hashes. See the
|
||||
[pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the
|
||||
manual for details.
|
||||
|
||||
- `buildNpmPackage` now supports `npmDepsFetcherVersion` (and `fetchNpmDeps` now supports `fetcherVersion`). Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces.
|
||||
|
||||
|
|
|
|||
|
|
@ -16864,6 +16864,13 @@
|
|||
githubId = 20665331;
|
||||
name = "Mark";
|
||||
};
|
||||
Marker06 = {
|
||||
email = "linuxenjoyerfi@proton.me";
|
||||
github = "Marker06";
|
||||
githubId = 148945811;
|
||||
name = "Marcus";
|
||||
matrix = "@marker06:matrix.org";
|
||||
};
|
||||
markus1189 = {
|
||||
email = "markus1189@gmail.com";
|
||||
github = "markus1189";
|
||||
|
|
@ -19823,6 +19830,12 @@
|
|||
name = "nixbitcoindev";
|
||||
keys = [ { fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; } ];
|
||||
};
|
||||
nixosclaw = {
|
||||
email = "github@nixclaw.io";
|
||||
github = "nixosclaw";
|
||||
githubId = 283803283;
|
||||
name = "NixClaw";
|
||||
};
|
||||
nixy = {
|
||||
email = "nixy@nixy.moe";
|
||||
github = "nixy";
|
||||
|
|
@ -29258,7 +29271,7 @@
|
|||
name = "Johannes Mayrhofer";
|
||||
};
|
||||
vuks = {
|
||||
email = "vuks@allthingslinux.org";
|
||||
email = "vuks@vuks.dev";
|
||||
github = "Vuks69";
|
||||
githubId = 51289041;
|
||||
name = "Vuks";
|
||||
|
|
|
|||
|
|
@ -158,6 +158,8 @@
|
|||
|
||||
- [porxie](https://codeberg.org/Blooym/porxie), a correct and efficient ATProto blob proxy for secure content delivery. Available as [services.porxie](#opt-services.porxie.enable).
|
||||
|
||||
- [LogiOps](https://github.com/PixlOne/logiops), a unofficial userspace driver for HID++ Logitech devices. Available as [services.logiops](#opt-services.logiops.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-26.05-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -688,6 +688,7 @@
|
|||
./services/hardware/lcd.nix
|
||||
./services/hardware/libinput.nix
|
||||
./services/hardware/lirc.nix
|
||||
./services/hardware/logiops.nix
|
||||
./services/hardware/monado.nix
|
||||
./services/hardware/nvidia-container-toolkit
|
||||
./services/hardware/nvidia-optimus.nix
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ in
|
|||
// {
|
||||
crossmacro = {
|
||||
isSystemUser = true;
|
||||
group = "input";
|
||||
group = "crossmacro";
|
||||
extraGroups = [
|
||||
"crossmacro"
|
||||
"input"
|
||||
"uinput"
|
||||
];
|
||||
description = "CrossMacro Input Daemon User";
|
||||
|
|
@ -93,12 +93,12 @@ in
|
|||
serviceConfig = {
|
||||
Type = "notify";
|
||||
User = "crossmacro";
|
||||
Group = "input";
|
||||
Group = "crossmacro";
|
||||
ExecStart = lib.getExe cfg.daemonPackage;
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
RuntimeDirectory = "crossmacro";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_SYS_ADMIN"
|
||||
"CAP_SETUID"
|
||||
|
|
|
|||
|
|
@ -5,62 +5,67 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) types;
|
||||
inherit (lib.attrsets) mapAttrs' mapAttrsToList nameValuePair;
|
||||
inherit (lib.generators) toINI;
|
||||
inherit (lib.modules) mkDefault mkIf mkRemovedOptionModule;
|
||||
inherit (lib.options) literalExpression mkEnableOption mkOption;
|
||||
inherit (lib.strings) concatStringsSep;
|
||||
|
||||
cfg = config.services.keyd;
|
||||
|
||||
keyboardOptions =
|
||||
{ ... }:
|
||||
{
|
||||
options = {
|
||||
ids = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ "*" ];
|
||||
example = [
|
||||
"*"
|
||||
"-0123:0456"
|
||||
];
|
||||
description = ''
|
||||
Device identifiers, as shown by {manpage}`keyd(1)`.
|
||||
'';
|
||||
};
|
||||
keyboardOptions = {
|
||||
options = {
|
||||
ids = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ "*" ];
|
||||
example = [
|
||||
"*"
|
||||
"-0123:0456"
|
||||
];
|
||||
description = ''
|
||||
Device identifiers, as shown by {manpage}`keyd(1)`.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = (pkgs.formats.ini { }).type;
|
||||
default = { };
|
||||
example = {
|
||||
main = {
|
||||
capslock = "overload(control, esc)";
|
||||
rightalt = "layer(rightalt)";
|
||||
};
|
||||
|
||||
rightalt = {
|
||||
j = "down";
|
||||
k = "up";
|
||||
h = "left";
|
||||
l = "right";
|
||||
};
|
||||
settings = mkOption {
|
||||
inherit (pkgs.formats.ini { }) type;
|
||||
default = { };
|
||||
example = {
|
||||
main = {
|
||||
capslock = "overload(control, esc)";
|
||||
rightalt = "layer(rightalt)";
|
||||
};
|
||||
description = ''
|
||||
Configuration, except `ids` section, that is written to {file}`/etc/keyd/<keyboard>.conf`.
|
||||
Appropriate names can be used to write non-alpha keys, for example "equal" instead of "=" sign (see <https://github.com/NixOS/nixpkgs/issues/236622>).
|
||||
See <https://github.com/rvaiya/keyd> how to configure.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
[control+shift]
|
||||
h = left
|
||||
'';
|
||||
description = ''
|
||||
Extra configuration that is appended to the end of the file.
|
||||
**Do not** write `ids` section here, use a separate option for it.
|
||||
You can use this option to define compound layers that must always be defined after the layer they are comprised.
|
||||
'';
|
||||
rightalt = {
|
||||
j = "down";
|
||||
k = "up";
|
||||
h = "left";
|
||||
l = "right";
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
Configuration, except `ids` section, that is written to {file}`/etc/keyd/<keyboard>.conf`.
|
||||
Appropriate names can be used to write non-alpha keys, for example "equal" instead of "=" sign (see <https://github.com/NixOS/nixpkgs/issues/236622>).
|
||||
See <https://github.com/rvaiya/keyd> how to configure.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
[control+shift]
|
||||
h = left
|
||||
'';
|
||||
description = ''
|
||||
Extra configuration that is appended to the end of the file.
|
||||
**Do not** write `ids` section here, use a separate option for it.
|
||||
You can use this option to define compound layers that must always be defined after the layer they are comprised.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -73,14 +78,14 @@ in
|
|||
];
|
||||
|
||||
options.services.keyd = {
|
||||
enable = lib.mkEnableOption "keyd, a key remapping daemon";
|
||||
enable = mkEnableOption "keyd, a key remapping daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "keyd" { };
|
||||
|
||||
keyboards = lib.mkOption {
|
||||
type = lib.types.attrsOf (lib.types.submodule keyboardOptions);
|
||||
keyboards = mkOption {
|
||||
type = with types; attrsOf (submodule keyboardOptions);
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
example = literalExpression ''
|
||||
{
|
||||
default = {
|
||||
ids = [ "*" ];
|
||||
|
|
@ -106,22 +111,22 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
# Creates separate files in the `/etc/keyd/` directory for each key in the dictionary
|
||||
environment.etc = lib.mapAttrs' (
|
||||
environment.etc = mapAttrs' (
|
||||
name: options:
|
||||
lib.nameValuePair "keyd/${name}.conf" {
|
||||
nameValuePair "keyd/${name}.conf" {
|
||||
text = ''
|
||||
[ids]
|
||||
${lib.concatStringsSep "\n" options.ids}
|
||||
${concatStringsSep "\n" options.ids}
|
||||
|
||||
${lib.generators.toINI { } options.settings}
|
||||
${toINI { } options.settings}
|
||||
${options.extraConfig}
|
||||
'';
|
||||
}
|
||||
) cfg.keyboards;
|
||||
|
||||
hardware.uinput.enable = lib.mkDefault true;
|
||||
hardware.uinput.enable = mkDefault true;
|
||||
|
||||
systemd.services.keyd = {
|
||||
description = "Keyd remapping daemon";
|
||||
|
|
@ -129,18 +134,12 @@ in
|
|||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
restartTriggers = lib.mapAttrsToList (
|
||||
name: options: config.environment.etc."keyd/${name}.conf".source
|
||||
restartTriggers = mapAttrsToList (
|
||||
name: _options: config.environment.etc."keyd/${name}.conf".source
|
||||
) cfg.keyboards;
|
||||
|
||||
# this is configurable in 2.4.2, later versions seem to remove this option.
|
||||
# post-2.4.2 may need to set makeFlags in the derivation:
|
||||
#
|
||||
# makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ];
|
||||
environment.KEYD_SOCKET = "/run/keyd/keyd.sock";
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = lib.getExe' cfg.package "keyd";
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
Restart = "always";
|
||||
|
||||
# TODO investigate why it doesn't work propeprly with DynamicUser
|
||||
|
|
|
|||
61
nixos/modules/services/hardware/logiops.nix
Normal file
61
nixos/modules/services/hardware/logiops.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.logiops;
|
||||
configFormat = pkgs.formats.libconfig { };
|
||||
configFile = configFormat.generate "logid.cfg" cfg.config;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.logiops = {
|
||||
enable = lib.mkEnableOption "LogiOps, a unofficial userspace driver for HID++ Logitech devices";
|
||||
|
||||
package = lib.mkPackageOption pkgs "logiops" { };
|
||||
|
||||
config = lib.mkOption {
|
||||
type = configFormat.type;
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
devices = [
|
||||
{
|
||||
name = "Wireless Mouse MX Master";
|
||||
dpi = 1000;
|
||||
smartshift =
|
||||
{
|
||||
on = true;
|
||||
threshold = 30;
|
||||
torque = 50;
|
||||
};
|
||||
}
|
||||
];
|
||||
'';
|
||||
description = ''
|
||||
The standard libconfig-style config for LogiOps.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
|
||||
systemd = {
|
||||
packages = [ cfg.package ];
|
||||
services.logid = {
|
||||
wantedBy = [ "graphical.target" ];
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${lib.getExe cfg.package} -c ${configFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ bokicoder ];
|
||||
}
|
||||
|
|
@ -43,7 +43,8 @@ in
|
|||
--debug \
|
||||
--read-only-dir / \
|
||||
--hidden-dir /home \
|
||||
'${test}' \
|
||||
--no-container \
|
||||
-- '${test}' \
|
||||
'''')
|
||||
benchexec.succeed("grep -s '${echo}' ${wd}/output.log")
|
||||
benchexec.succeed("test \"$(grep -Ec '((start|wall|cpu)time|memory)=' ${stdout})\" = 4")
|
||||
|
|
|
|||
|
|
@ -53,14 +53,18 @@
|
|||
}
|
||||
''
|
||||
import os
|
||||
import shutil
|
||||
import time
|
||||
|
||||
from selenium.webdriver import Firefox
|
||||
from selenium.webdriver.firefox.options import Options
|
||||
from selenium.webdriver.firefox.service import Service
|
||||
|
||||
service = Service(shutil.which("geckodriver"))
|
||||
|
||||
options = Options()
|
||||
options.add_argument('--headless')
|
||||
driver = Firefox(options=options)
|
||||
driver = Firefox(options=options, service=service)
|
||||
|
||||
driver.implicitly_wait(20)
|
||||
driver.get('http://server/')
|
||||
|
|
|
|||
|
|
@ -365,8 +365,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "nix-env-selector";
|
||||
publisher = "arrterian";
|
||||
version = "1.2.0";
|
||||
hash = "sha256-dvJmBoljMNS7I7c1DicIWW0t4GQvBFF9jAz2Z2v4lXw=";
|
||||
version = "1.3.1";
|
||||
hash = "sha256-dV1FkAOZkWgqlk6j6ppQSUz5N3AoGTPgPkep60gGeP8=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -1007,8 +1007,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "coder-remote";
|
||||
publisher = "coder";
|
||||
version = "1.14.3";
|
||||
hash = "sha256-W4VciZMvVtRcCibJP5UGTlHCrdF/AF167xlLvZs5BB4=";
|
||||
version = "1.14.5";
|
||||
hash = "sha256-08GsGOtgLhq5vLpQ9VDdVk/q5VSW6d7cXXflNQOpB50=";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
|
||||
|
|
@ -1204,8 +1204,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "dart-code";
|
||||
publisher = "dart-code";
|
||||
version = "3.132.0";
|
||||
hash = "sha256-AWzHCg6N//+RmQ1I3Qq4c8Kk+e3gZpeqK9yWB8kfl6w=";
|
||||
version = "3.134.0";
|
||||
hash = "sha256-/tWH2uGfOuyvF8mfga2YdGK1ok2UYQchaOeCC2n+IHk=";
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
|
|
@ -1215,8 +1215,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "flutter";
|
||||
publisher = "dart-code";
|
||||
version = "3.132.0";
|
||||
hash = "sha256-2R9SwNaJBKv39JLRy0IFm6/0J8Izj2DlEAat+yigIFk=";
|
||||
version = "3.134.0";
|
||||
hash = "sha256-wWANxBh9Tg3VkfbcrR0NgOIC8cpeZJCNfOevT7E4zKY=";
|
||||
};
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
|
|
@ -1260,8 +1260,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "languagetool-linter";
|
||||
publisher = "davidlday";
|
||||
version = "0.25.7";
|
||||
hash = "sha256-XLW49YkgDuojNEzqWRztK8mKWKbVU5OeGOjHl0heH/w=";
|
||||
version = "0.25.8";
|
||||
hash = "sha256-ddDxe0ZJgQjDUAKAQyboHEi0ZeVBeGE4Zx2peRbBGFA=";
|
||||
};
|
||||
meta = {
|
||||
description = "LanguageTool integration for VS Code";
|
||||
|
|
@ -1346,8 +1346,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "discloud";
|
||||
name = "discloud";
|
||||
version = "2.29.5";
|
||||
hash = "sha256-oWrGDJHVQ8Gwjrh6vlQPKoFlBx3wxzLbMkH0gDFa5jg=";
|
||||
version = "2.29.6";
|
||||
hash = "sha256-CHpRetKZnGzShIePnbVUdR06/1AAO2I1RX7NiZ7GBNs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
|
||||
|
|
@ -3861,8 +3861,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "ansible";
|
||||
publisher = "redhat";
|
||||
version = "26.4.6";
|
||||
hash = "sha256-ckirgCt6+mdnWkvmLwpH7YwqOxQ+JEeRE0/NJGCi7rU=";
|
||||
version = "26.5.0";
|
||||
hash = "sha256-gKe+LC0OOZi5I1Tei64JtQUR1gpWyTex9MoLGT6jgWU=";
|
||||
};
|
||||
meta = {
|
||||
description = "Ansible language support";
|
||||
|
|
@ -4357,8 +4357,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "sonarsource";
|
||||
name = "sonarlint-vscode";
|
||||
version = "5.2.0";
|
||||
hash = "sha256-Q9wP+PqjWVyqVh0FK8lx+k4bxacyQO7aLtZX98fRl7g=";
|
||||
version = "5.2.1";
|
||||
hash = "sha256-GVuFP0n2Su6YAh/KwtkEFvZK9hAyVDIWfoBjaPQyUFM=";
|
||||
};
|
||||
meta.license = lib.licenses.lgpl3Only;
|
||||
};
|
||||
|
|
@ -4807,8 +4807,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.110.7";
|
||||
hash = "sha256-9w78/6W/aqJxzoTBqSV7sek2zUf9gKlWFJ/0/XS9124=";
|
||||
version = "0.110.9";
|
||||
hash = "sha256-xHu8GvBoZKMag7BdHddXyjm2IReMujs9cggOn4h32t8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
publisher = "ms-python";
|
||||
name = "mypy-type-checker";
|
||||
version = "2025.2.0";
|
||||
hash = "sha256-VJ/XSC4cbIjgxKLsXxUxwko+HR0U59c8OrhYnKPJu4g=";
|
||||
version = "2026.4.0";
|
||||
hash = "sha256-N0zml16XSBwjGHzCR1L0W9WiSgqD/375VIQGpGfCkFE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coreaction";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "coreaction";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-R/pzudaxs85etbI4hh2NwHNtO7EqI+vgJALY/4rIvrs=";
|
||||
hash = "sha256-93/1emCLXP3hHDGdzjF5horWkpG51yM5p68RUs1yoVg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corearchiver";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corearchiver";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+XaBe1fNpAQf3cqXV+A1cZ1tPck3bCpgEDmFeF536q4=";
|
||||
hash = "sha256-r2iXvc9KtRsB5IHvJxs/DxQIf7IiNWoM4h2wDgsXvZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coregarage";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "coregarage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-boe7z8KPnMaoWekBFS4g/Ay98rpREeLMAsHOr2olYws=";
|
||||
hash = "sha256-aPBqlt/bL1cx6mLaf/gEFQB+NEvGQJioBJZ4QAxTwzw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corehunt";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corehunt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QJJ+e+5UKka1Hbrtyn+agpJ7FLADHupZt41K8Mq8H4c=";
|
||||
hash = "sha256-D3O1RnhXZmIGlk75OxfYvQI+8sytXTho2MvccI5Xyvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coreimage";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "coreimage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sgOxDKACb9D/TvjjHz09JwBpFoE8eXA4HixcbN+0FoE=";
|
||||
hash = "sha256-1P6dD0aHsv79s1jCghRhhxi5rZ6MmpyIrks9QnqFoaU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coreinfo";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "coreinfo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/L69lrkJZh+SJRoNxvogdJ5KRIorwcBzm7WGxrNpexM=";
|
||||
hash = "sha256-Ct/vAxtdFcXIxleaePhWD5L42d88go/3arYKSrw/c2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corekeyboard";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corekeyboard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n7QbvRPZFMeUl/P4XiGYZDglZCA8Ftf08s5uzPmSyIQ=";
|
||||
hash = "sha256-HAkIhmQzicnOAws8M+Z8J7lCuGUqYkJeQl0H8P0EE3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corepad";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corepad";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oGF2N0bUuvc/ixmh2nefEJKh0kDipvcL/dwaXNxwo84=";
|
||||
hash = "sha256-TA/gwI7ukuwChBRp2xsDbNbTblkzYgQ5YHwuI53cxc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corepaint";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corepaint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ARFyBtkGYFMKnUD1h93GcQiKV6mFXxJvLEVeSXlaHZI=";
|
||||
hash = "sha256-qk2Fm/IhUU/0y+ErMK/qQKxnD/en14ZKoiIJoJwBnMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corepdf";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corepdf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fhEuMk15yCA6IUasD9rJPR8sB+h0tz8niOQtXFIe7Uc=";
|
||||
hash = "sha256-6VLjOf/VZpBH8kIvdvObiyu10yiTYk26eKHFKIUMwN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corepins";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corepins";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-noMdI2qk3cYc1FfRWd4rwpZBbeHiD557Z1T0ZxIhaTw=";
|
||||
hash = "sha256-+cWhlqIK2Oqx4Zt1sRd7xvGwmbYOZbMMU+k5uNnkogk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corerenamer";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corerenamer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9e8Gm7h0zWVQeb7eFcUmp8uTdSboenLa7baZpKc3HEQ=";
|
||||
hash = "sha256-94luETLmugQZuSI+q84DC9WyH5LtCqpjH6LYtv9R93Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corestats";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = "corestats";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0d03y3AYWxXh9DZrbPWqk34yq7iy5xUn/oMmJBu5GqQ=";
|
||||
hash = "sha256-4wVBC/NeexJIFsDOjqHFC/u3Rapd/22fjH5yMVafWPY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -828,7 +828,7 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "148.0.7778.96",
|
||||
"version": "148.0.7778.167",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "41c40cfaec7ee3bf0423c59925d8b23982a601f1",
|
||||
|
|
@ -840,16 +840,16 @@
|
|||
"hash": "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "148.0.7778.96-1",
|
||||
"hash": "sha256-yuc51ursl3pNyqSuTT9391AAlytoTzEMeronxjsNM7g="
|
||||
"rev": "148.0.7778.167-1",
|
||||
"hash": "sha256-07mzJHDgWiEQm/8pPDDzT8r+6/bh95yBrZMm2jDqCus="
|
||||
},
|
||||
"npmHash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "8625e066febc721e015ea99842da12901eb7ed73",
|
||||
"hash": "sha256-coeBYfNPtiRRPuqoBRaxkTQI/a2pYNLI1slUdU1dZAc=",
|
||||
"rev": "65db666ac2cf205fcc36db8bb5b9cd87f94808ac",
|
||||
"hash": "sha256-Vda6y35lHYP3xK9FT5FdsnfTtL0MiY2m/auSq6NyL0U=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
@ -919,8 +919,8 @@
|
|||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "cc0e3572e8789f4a184dd9714a04b3d98ae81015",
|
||||
"hash": "sha256-3KVTEBcnQTn99ccdKzylzUvua2jlS4g8/nfIDdLk6ug="
|
||||
"rev": "6c71c70ec7e838c5f1712974086c8bc33d07de14",
|
||||
"hash": "sha256-35Zu8jSopO47pH1rNLtSq5I8QRsOkMMvTgtmD13Yw/Y="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
|
|
@ -1169,8 +1169,8 @@
|
|||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "4fc96139259ebc35f40118e0382ac8037d928e5c",
|
||||
"hash": "sha256-/RT2OPWFiVwFqmNS4o+gE0JrcVO1cQDkCkgrSEe7BzE="
|
||||
"rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
|
||||
"hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
|
|
@ -1489,8 +1489,8 @@
|
|||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "afe8b760ada5128164f9826866b4381a3463df41",
|
||||
"hash": "sha256-HsKHffZWTls362kjokxzdhaxb/xJD1g70VHGk9l6GVM="
|
||||
"rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
|
||||
"hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
|
|
@ -1624,8 +1624,8 @@
|
|||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "9600e77d854090669817d22aa2fc941ee92aaacd",
|
||||
"hash": "sha256-jTJv53qt971Va5q6MaULysYiChBVmsFYxG9fzkcE0ak="
|
||||
"rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
|
||||
"hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
|
@ -1649,8 +1649,8 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ddc9a95905de5268332a8f0216dc2bc67d26e829",
|
||||
"hash": "sha256-x2FGL3J+JaWO1m6jBrcayR7Vlz90fYEAuufm4PULYyM="
|
||||
"rev": "e38030f4228c8d1405fe105fc5feaa5173559e25",
|
||||
"hash": "sha256-VsJpsCfDGF6rlfYQXccgF+F/pBhY/ybUa9N5HnHJ2lU="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1499,12 +1499,12 @@
|
|||
"vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
|
||||
},
|
||||
"yandex-cloud_yandex": {
|
||||
"hash": "sha256-EtY2Z/dBtyNvOk8T+iEXduEPiB5IqW/eYA4u7llTYAc=",
|
||||
"hash": "sha256-Jjrwvz1DG2+ypbqlzneHt7Ws6nu68ZqhO+8jXAeDQTE=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.201.0",
|
||||
"rev": "v0.202.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Mdyu8GSENgU1+8Lc2iAizZ1tJq2t9Zdh7qRPtwV94XY="
|
||||
"vendorHash": "sha256-QZUm9RDA47b3v84ePqUnSIFAFgMIcuRMJZzBs7JR6ng="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -438,14 +438,14 @@ in
|
|||
|
||||
docker_29 =
|
||||
let
|
||||
version = "29.4.2";
|
||||
version = "29.4.3";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-jGD+Z3koM0a2Te7cq2HdKFizZj39djvTQUmn815Mn4o=";
|
||||
mobyRev = "docker-v${version}";
|
||||
mobyHash = "sha256-jPmFYGOxvMof32fQeI4iHLG12ElwysYLSTkIrlluEXM=";
|
||||
mobyHash = "sha256-YWmxJZwjxh0gwqjHHJDpzZy1K1jS82Twmzb+uWtnejk=";
|
||||
runcRev = "v1.3.5";
|
||||
runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
|
||||
containerdRev = "v2.2.3";
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ in
|
|||
"fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
) true;
|
||||
|
||||
lib.warnIf (fetcherVersion == 1)
|
||||
"fetchPnpmDeps: `fetcherVersion = 1` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
lib.warnIf (fetcherVersion < 3)
|
||||
"fetchPnpmDeps: `fetcherVersion = ${toString fetcherVersion}` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
|
||||
|
||||
stdenvNoCC.mkDerivation
|
||||
(
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage {
|
||||
python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "acltoolkit";
|
||||
version = "0-unstable-2023-02-03";
|
||||
version = "0.2.2-unstable-2023-02-03";
|
||||
pyproject = true;
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zblurx";
|
||||
repo = "acltoolkit";
|
||||
# https://github.com/zblurx/acltoolkit/issues/6
|
||||
rev = "a5219946aa445c0a3b4a406baea67b33f78bca7c";
|
||||
hash = "sha256-97cbkGyIkq2Pk1hydMcViXWoh+Ipi3m0YvEYiaV4zcM=";
|
||||
};
|
||||
|
|
@ -23,7 +22,9 @@ python3.pkgs.buildPythonPackage {
|
|||
sed -i -e "s/==[0-9.]*//" setup.py
|
||||
'';
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
asn1crypto
|
||||
dnspython
|
||||
impacket
|
||||
|
|
@ -35,15 +36,13 @@ python3.pkgs.buildPythonPackage {
|
|||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"acltoolkit"
|
||||
];
|
||||
pythonImportsCheck = [ "acltoolkit" ];
|
||||
|
||||
meta = {
|
||||
description = "ACL abuse swiss-knife";
|
||||
mainProgram = "acltoolkit";
|
||||
homepage = "https://github.com/zblurx/acltoolkit";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "acltoolkit";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -24,16 +24,16 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "age-plugin-fido2-hmac";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olastor";
|
||||
repo = "age-plugin-fido2-hmac";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8DO62uISwleJB/NFH7U8xhfT5bcda+d+7U6LXvySsD0=";
|
||||
hash = "sha256-3lhGGw7QI1aij6IU7AeoxwgcVsCNKyrmsKBockb0kRw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3r/eTaa4kYRXqq7sUZzzGkgcF8lZbPZguoHb6W6t1T0=";
|
||||
vendorHash = "sha256-kHv5epwaiBE69rcblICofGoVULuLQT1h0sK4jWwtX9w=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "1.8.2";
|
||||
version = "1.8.4";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "algolia-cli";
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule {
|
|||
owner = "algolia";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i1x6/Ksiz8t8ho1SmcrypzQjERQ0e0Xxvnd5uIlQRoE=";
|
||||
hash = "sha256-ltr31AnZPTtnfMWaUtsswUnIOXfR76X8pjM9D0uiLJo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WdNuwUz64IZq3gfvFhXX536/tZ/67Ki0xiqIj7sLSEM=";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ansible-doctor";
|
||||
version = "8.3.0";
|
||||
version = "8.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lwN6pMKysycMOqVRNrK8+dgGfrsRF2B2EW1Kby0l/0I=";
|
||||
hash = "sha256-wv5iSY5p/PZUwgxwknoZgB4f5ERvsvA3hrUbdSAYwxQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "arti";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
|
|
@ -21,10 +21,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
owner = "core";
|
||||
repo = "arti";
|
||||
tag = "arti-v${finalAttrs.version}";
|
||||
hash = "sha256-yV+8P6V9QDDmIekJsa3kUt8Qv2Y/Zfeq2aqcQIGNubg=";
|
||||
hash = "sha256-OEGKjYJ3p4g0ZfeK6k8IJJPjgSBMrSlKlxsCw1OwyaI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bqJ9beO+AZlz9GZkO5cAk45B4bxyfYq+pLMFWj8pWwg=";
|
||||
# Working around a bug in cargo that appears with cargo-auditable, see
|
||||
# https://github.com/rust-secure-code/cargo-auditable/issues/124.
|
||||
postPatch = ''
|
||||
substituteInPlace crates/arti/Cargo.toml \
|
||||
--replace-fail '"tor-rpcbase"' '"dep:tor-rpcbase"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-OJgrIXL185W9rcQd7XZsgiqN4in74Oc2jDT1ZmcCC6E=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
|
@ -68,7 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit (nixosTests) tor;
|
||||
tests = { inherit (nixosTests) tor; };
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "assh";
|
||||
version = "2.17.1";
|
||||
version = "2.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "advanced-ssh-config";
|
||||
owner = "moul";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rHe0ynjj/7LXUKoS4iO+PJjh4SVBqh+kChuYzSFocfs=";
|
||||
hash = "sha256-/w4RluA7py6d75S04czNsgHpmR5rmAUZx8OnZfu9oNg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EA39KqAN9SHPU362j6/j6okvT+eZb2R4unMA0bB+bVg=";
|
||||
|
|
|
|||
|
|
@ -3,33 +3,39 @@
|
|||
electrum,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
rocksdb_8_3,
|
||||
rocksdb,
|
||||
rust-jemalloc-sys,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "blockstream-electrs";
|
||||
version = "0.4.1-unstable-2024-11-25";
|
||||
version = "0.4.1-unstable-2026-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blockstream";
|
||||
repo = "electrs";
|
||||
rev = "680eacaa8360d5f46eaae9611a3097ba183795c6";
|
||||
hash = "sha256-oDM4arH3aplgcS49t/hy5Rqt36glrVufd3F4tw3j1zo=";
|
||||
rev = "503b740cce2133fd07f451cbe93249a4e092b300";
|
||||
hash = "sha256-jFOEQwFDRVghCDFu0mybSLeTk9zWJSQW9clWFMkCa5A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-X2C69ui3XiYP1cg9FgfBbJlLLMq1SCw+oAL20B1Fs30=";
|
||||
cargoHash = "sha256-P8slOt07Fu6NNzYLEso3UQtfx7Yj+C4w98lq/Wr8oTk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
# Needed for librocksdb-sys
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# tikv-jemalloc-sys's vendored jemalloc configure breaks under gcc 15.
|
||||
rust-jemalloc-sys
|
||||
];
|
||||
|
||||
env = {
|
||||
# Dynamically link rocksdb
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb_8_3}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb_8_3}/lib";
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
|
||||
|
||||
# External binaries for integration tests are provided via nixpkgs. Skip
|
||||
# trying to download them.
|
||||
|
|
@ -52,6 +58,13 @@ rustPlatform.buildRustPackage rec {
|
|||
# Build tests in debug mode to reduce build time
|
||||
checkType = "debug";
|
||||
|
||||
# flaky: wait_for_sync roundtrip races the wallet daemon startup
|
||||
checkFlags = [
|
||||
"--skip=test_electrum_balance"
|
||||
"--skip=test_electrum_history"
|
||||
"--skip=test_electrum_payment"
|
||||
];
|
||||
|
||||
# Integration tests require us to pass in some external deps via env.
|
||||
preCheck = lib.optionalString doCheck ''
|
||||
export BITCOIND_EXE=${bitcoind}/bin/bitcoind
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wayland-scanner,
|
||||
scdoc,
|
||||
makeWrapper,
|
||||
wlroots_0_19,
|
||||
wlroots_0_20,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
pixman,
|
||||
|
|
@ -23,25 +22,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cage";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cage-kiosk";
|
||||
repo = "cage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-P9MhIl2YIE2hwT5Yr0Cpes5S12evb0aj9oOPLeehkw0=";
|
||||
hash = "sha256-NLoz11bfeZwesmwLmyytuB6/vSwIsnDWKzyAXFe+YZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport of https://github.com/cage-kiosk/cage/pull/461
|
||||
# to fix https://github.com/cage-kiosk/cage/issues/456
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cage-kiosk/cage/commit/832e88b0c964a324bb09c7af02ed0650b73dfb9b.patch";
|
||||
hash = "sha256-8dyJL46xXGkw3pF9uskX8H72s0hUO1BhU2UMaoEwz4U=";
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
|
@ -56,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
wlroots_0_19
|
||||
wlroots_0_20
|
||||
wayland
|
||||
wayland-protocols
|
||||
pixman
|
||||
|
|
@ -66,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libx11
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString wlroots_0_19.enableXWayland ''
|
||||
postFixup = lib.optionalString wlroots_0_20.enableXWayland ''
|
||||
wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -12,18 +12,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk8s-cli";
|
||||
version = "2.206.10";
|
||||
version = "2.207.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk8s-team";
|
||||
repo = "cdk8s-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fSv5TQ+b7ZG7GBkXzeYytuHUqLZCiWHPVPTyLbzB57k=";
|
||||
hash = "sha256-Sw6BcUWnFS1/BOsLLm1Pi+z6kqEveZbGmY9UAWA6bJc=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-CJ/GKWS4HMINKCo2lNdbVahaGnpNXVV9uNExF6kXeI0=";
|
||||
hash = "sha256-LY4rk9JQkoDW3YXlofuTepcGd1D4zuWnxHeSzlXL+wM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "chirpstack-rest-api";
|
||||
version = "4.16.1";
|
||||
version = "4.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-rest-api";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-utXayqQGlBYzmf7xW+s1Fh4oRhpBdfnV5g73X2ILKko=";
|
||||
hash = "sha256-d8DoU5iqBtWLu8I0xzM8+ny16iylAbjRku7EC1m0o50=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JnQaClgU+Yyz07lELoEyLYHLJwcmET5SLci2XQoFGKc=";
|
||||
vendorHash = "sha256-b0m3a0U/XgRFR1lvfOUB1yQFZZ9j558WBiymnysjuGg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cog";
|
||||
version = "0.1.11";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "cog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ruJxlpem++V7Q39QenvGG7LUuyn3Oqlb3v10H8rdAxA=";
|
||||
hash = "sha256-6W8b3hgBASpizFoQqP0zw3TqdPmhJ6gZFXxaPfnIiS0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WR/dfwNBduRokPGAljnXNgA2ZKoYRGtZ3+tKBzCuXI4=";
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot";
|
||||
version = "1.19.7";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eMN0n+kXN49o7oCjWAa3kPDAEksvGroRLrfFEVdPORE=";
|
||||
hash = "sha256-c+O0nV9b1hSKP+/atJpUihr8ZkMNCwIok4Ldmm+ivmA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A=";
|
||||
vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/front";
|
||||
hash = "sha256-5N4dmtKdZgwulqxFHYKhnHOYAg0gnb/rzVVcmzjYFUg=";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "couchbase-shell";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbaselabs";
|
||||
repo = "couchbase-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sxKf0AdUpV3SgGkXYQSJn5q+l2NrxvWxrFQvzAt1PVo=";
|
||||
hash = "sha256-t4y0VxjRaJ5G/vpqq3/oLE/pIXSDAk+l+9fCcr9n6I4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o9bfbmtPROU9XD1R6pLrH4UK5OE92RWu2fpekWcrexY=";
|
||||
cargoHash = "sha256-f2WYczO2kr5BloXGLjjlnmyaKlr9+IH7i8cqGFUEcVA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cpm-cmake";
|
||||
version = "0.42.1";
|
||||
version = "0.42.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpm-cmake";
|
||||
repo = "cpm.cmake";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IVlONpApZJOcm6ooC+mguBEgAevzqiynrabSYdq+SDA=";
|
||||
hash = "sha256-zNjcUbgz9ZQMbddTOis7BLeJqHmWqvEYTko4Z5PiHn8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildDotnetModule,
|
||||
dotnetCorePackages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
fontconfig,
|
||||
freetype,
|
||||
|
|
@ -14,8 +15,6 @@
|
|||
libxcursor,
|
||||
libxext,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
libxfixes,
|
||||
libxtst,
|
||||
libglvnd,
|
||||
mesa,
|
||||
|
|
@ -66,8 +65,6 @@ buildDotnetModule rec {
|
|||
libxcursor
|
||||
libxext
|
||||
libxrandr
|
||||
libxrender
|
||||
libxfixes
|
||||
libxtst
|
||||
glib
|
||||
libglvnd
|
||||
|
|
@ -76,7 +73,11 @@ buildDotnetModule rec {
|
|||
libxkbcommon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/man/crossmacro.1
|
||||
|
||||
install -Dm644 scripts/assets/CrossMacro.desktop $out/share/applications/crossmacro.desktop
|
||||
|
||||
for size in 16 32 48 64 128 256 512; do
|
||||
|
|
@ -97,7 +98,7 @@ buildDotnetModule rec {
|
|||
description = "Cross-platform mouse and keyboard macro recorder and player";
|
||||
homepage = "https://github.com/alper-han/CrossMacro";
|
||||
changelog = "https://github.com/alper-han/CrossMacro/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "crossmacro";
|
||||
maintainers = with lib.maintainers; [ alper-han ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dasel";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DbVeO59k1LUSVZvcCon6vWBoaCoZRpo5xIdTHfCsB0I=";
|
||||
hash = "sha256-/rQItj+nCr/IriT4Lgbxe+d9XfAyyZM+Q0nM0F3s//M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";
|
||||
vendorHash = "sha256-oqGUHPnfCxgUTueB1zEJ8/h0L+2oxoVQHI+oJm3HcPo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "7.1.180";
|
||||
version = "7.1.190";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-HH8IpdZ8qL0TZ1NWV6+yrcUYB0JRSkmnmjSTei+xVSE=";
|
||||
hash = "sha256-XoZRlFMiN5VVp3vkTwGDMekhW1KzmvuN9oYTXZFn6B4=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-lu3suopnNbLwzDSqSOUS/6QRHz8QCRzuAdG4oXtF+LI=";
|
||||
hash = "sha256-ChPuz8wd3SOxRmxM5bEbz3paBw7pfIVfSY23nasRI4A=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,18 +16,18 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "devcontainer";
|
||||
version = "0.86.0";
|
||||
version = "0.87.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devcontainers";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LVvd6BirKwGUWqTG50U7tnXjPwyUVgxVkAoAdCyiQfk=";
|
||||
hash = "sha256-bTJoMQnjmiFzUuaz+dukZ5NP9RznCNvvjmkTTY/Frwc=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-h13YptkTbORwB8XRDGmmcnFSjZO7icwlqRC3U4qlJ2g=";
|
||||
hash = "sha256-AgwXCWogxVDaeiv8dUBvbsLLxLDrkYqb0HPFORd3ieQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
devenvNixVersion = "2.34";
|
||||
devenvNixRev = "42d4b7de21c15f28c568410f4383fa06a8458a40";
|
||||
|
||||
|
|
@ -49,11 +49,11 @@ rustPlatform.buildRustPackage {
|
|||
src = fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "devenv";
|
||||
tag = "v2.1.1";
|
||||
hash = "sha256-j+Vh1tQx+JQc6psaykHUX8rFpnHHvJdwHo4bVUswTxg=";
|
||||
tag = "v2.1.2";
|
||||
hash = "sha256-EQnZCy7r4VMO6KDoytxHBa0mFbM1D9g1kaDfs/s0YZA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rfZ4HAEDiEcNceZ0Pge7s7eOMBvqJkc4HB5vzRSCOWU=";
|
||||
cargoHash = "sha256-uEwxqnLqCFpyV2NbnfuUyVqKrMeVeQzoGQmElaVeGU8=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "--cfg tracing_unstable";
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2026-04-30";
|
||||
version = "0-unstable-2026-05-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = "discordo";
|
||||
rev = "be527a152b209b302d506d9cafbf2870f0145d58";
|
||||
hash = "sha256-v3u46r6BlpP0rkahTkaT0h+hCKDe2VaV029Apqt8Zws=";
|
||||
rev = "af65e21854ccb4cb39cafebfd6afbd5f4858a9f0";
|
||||
hash = "sha256-0Eiil0gaLlgQRcLIa2XbBF95+pGNGzAIiFRJ7X0r/W0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-URBaO9wjCWIoOtux1xYCX/y/6+hKPS6ZEm9HDznKqHs=";
|
||||
vendorHash = "sha256-g/kGDK0QKZZAGczrXtVskqpsbES+MZGiuqycJ8YO6DA=";
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,18 +7,18 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dolt";
|
||||
version = "1.86.2";
|
||||
version = "1.86.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CXhdt9uIhdSEW3M21pL2WeT+zKPUxyYrU4fGTgMgun4=";
|
||||
hash = "sha256-OVoREOeVTuRMot6nfpxAfnxRFcTLpZWsIRcg/yk/rMg=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-JdpPKao8LOGzKzzLtfiYh3rUn1OLLcA7YIrztHwTLmU=";
|
||||
vendorHash = "sha256-8Ls+ANNiE1yBgZuAnDp+FcU4rCiWwSKGo2jTjXVbWFo=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drumkv1";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/drumkv1-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-w9/bdK/qjSeBD5hfHQnGFUGDnUqPgdkM8GQ18Ps+nzM=";
|
||||
hash = "sha256-jTOTOziCrycFyMe6wIfUnw7d6p+gNZfO7Q9BcZOyOME=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "errcheck";
|
||||
version = "1.10.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kisielk";
|
||||
repo = "errcheck";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aiZAFNTaXSzVOBhcMGc6Mxj208V7WxCbDYKqItBg3lc=";
|
||||
hash = "sha256-bXt0GuXV4Amg8dE261KC8f6C5sOclOzhFj1D4/kaBYs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-znkT0S13wCB47InP2QBCZqeWxDdEeIwQPoVWoxiAosQ=";
|
||||
vendorHash = "sha256-mhpKZ47jaX3pp/5TOXADip0iPosIDl5FzpaID98rpHQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
33
pkgs/by-name/ex/extract-xiso/package.nix
Normal file
33
pkgs/by-name/ex/extract-xiso/package.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "extract-xiso";
|
||||
version = "202505152050";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XboxDev";
|
||||
repo = "extract-xiso";
|
||||
tag = "build-${finalAttrs.version}";
|
||||
hash = "sha256-KZxnS63MhpmzwxCPFi+op5l/vM6P9GYc+SXmNFmEyc8=";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Command line utility created by in to allow the creation, modification, and extraction of XISOs (Xbox ISOs)";
|
||||
homepage = "https://github.com/XboxDev/extract-xiso";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
Marker06
|
||||
];
|
||||
};
|
||||
|
||||
})
|
||||
|
|
@ -28,25 +28,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "faustlive";
|
||||
version = "2.5.17";
|
||||
version = "2.5.19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faustlive";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog=";
|
||||
hash = "sha256-IBMgesMkT+0Oh1TjHa+bcSp6YziLNBtNPoUCzbyhMFI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# move mutex initialization outside assert call
|
||||
# https://github.com/grame-cncm/faustlive/pull/59
|
||||
(fetchpatch {
|
||||
name = "initalize-mutexes.patch";
|
||||
url = "https://github.com/grame-cncm/faustlive/commit/fdd46b12202def9731b9ed2f6363287af16be892.patch";
|
||||
hash = "sha256-yH95Y4Jbqgs8siE9rtutmu5C2sNZwQMJzCgDYqNBDj4=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "frescobaldi";
|
||||
version = "4.0.4";
|
||||
version = "4.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbsoft";
|
||||
repo = "frescobaldi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J0QC+VwNdA24vAW5Fx+cz5IFajkB8GmR4Rae0Q+2zw8=";
|
||||
hash = "sha256-IgvjKj0+8oNbuZ91n4O16kGXBS7rS63HQUNQnJcOis8=";
|
||||
};
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
fixDarwinDylibNames,
|
||||
gmp,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -16,6 +16,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-LndLfORnypLqFgNMPEJ8jc2Fa2xWWgYS9rZ7gGFbwwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||
index 7ad350d..6f962ce 100644
|
||||
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||
@@ -43,6 +43,9 @@ static const int losslylosslessarray[][3] = {
|
||||
{ 1, 0, 1 }, // MPEG2MainProfileHighLevel
|
||||
{ 1, 0, 1 }, // MPEG4AVCH264HighProfileLevel4_1
|
||||
{ 1, 0, 1 }, // MPEG4AVCH264BDcompatibleHighProfileLevel4_1
|
||||
+ { 0, 1, 1 }, // HTJ2KLossless
|
||||
+ { 0, 1, 1 }, // HTJ2KRPCLLossless
|
||||
+ { 1, 0, 1 }, // HTJ2K
|
||||
};
|
||||
|
||||
static int TestTransferSyntaxAll()
|
||||
|
|
@ -1,184 +0,0 @@
|
|||
diff --git a/Utilities/VTK/Applications/gdcm2vtk.cxx b/Utilities/VTK/Applications/gdcm2vtk.cxx
|
||||
index 344aec0df..c1cd4b43d 100644
|
||||
--- a/Utilities/VTK/Applications/gdcm2vtk.cxx
|
||||
+++ b/Utilities/VTK/Applications/gdcm2vtk.cxx
|
||||
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
imgreader->SetFileLowerLeft( lowerleft );
|
||||
if( names->GetNumberOfValues() == 1 )
|
||||
- imgreader->SetFileName( names->GetValue(0) );
|
||||
+ imgreader->SetFileName( names->GetValue(0).c_str() );
|
||||
else
|
||||
imgreader->SetFileNames(names);
|
||||
imgreader->Update();
|
||||
diff --git a/Utilities/VTK/Applications/gdcmviewer.cxx b/Utilities/VTK/Applications/gdcmviewer.cxx
|
||||
index 3ed4778f8..58236a6a5 100644
|
||||
--- a/Utilities/VTK/Applications/gdcmviewer.cxx
|
||||
+++ b/Utilities/VTK/Applications/gdcmviewer.cxx
|
||||
@@ -321,7 +321,7 @@ void ExecuteViewer(TViewer *viewer, vtkStringArray *filenames)
|
||||
vtkGDCMImageReader *reader = vtkGDCMImageReader::New();
|
||||
if( filenames->GetSize() == 1 ) // Backward compatible...
|
||||
{
|
||||
- reader->SetFileName( filenames->GetValue(0) );
|
||||
+ reader->SetFileName( filenames->GetValue(0).c_str() );
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx
|
||||
index fa1d7d895..00d9f3845 100644
|
||||
--- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx
|
||||
+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx
|
||||
@@ -113,7 +113,7 @@ int TestvtkGDCMImageWrite2(const char *filename, bool verbose = false)
|
||||
// Need to check we can still read those files back:
|
||||
for(int file=0; file<filenames->GetNumberOfValues(); ++file)
|
||||
{
|
||||
- const char *fname = filenames->GetValue(file);
|
||||
+ const char *fname = filenames->GetValue(file).c_str();
|
||||
gdcm::ImageReader r;
|
||||
//r.SetFileName( gdcmfile.c_str() );
|
||||
r.SetFileName( fname );
|
||||
diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx
|
||||
index 8b253ec83..1c83ed417 100644
|
||||
--- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx
|
||||
+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx
|
||||
@@ -170,7 +170,7 @@ int TestvtkGDCMThreadedImageRead(const char *filename, bool verbose = false)
|
||||
assert( sarray->GetNumberOfValues() == (int)nfiles );
|
||||
reader->SetFileNames( sarray );
|
||||
sarray->Delete();
|
||||
- refimage = sarray->GetValue( 0 ); // Ok since sarray is ref count
|
||||
+ refimage = sarray->GetValue( 0 ).c_str(); // Ok since sarray is ref count
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx
|
||||
index 5151893e8..22dd4fd57 100644
|
||||
--- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx
|
||||
+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx
|
||||
@@ -160,7 +160,7 @@ int TestvtkGDCMThreadedImageRead2(const char *filename, bool verbose = false)
|
||||
assert( sarray->GetNumberOfValues() == (int)nfiles );
|
||||
reader->SetFileNames( sarray );
|
||||
sarray->Delete();
|
||||
- refimage = sarray->GetValue( 0 ); // Ok since sarray is ref count
|
||||
+ refimage = sarray->GetValue( 0 ).c_str(); // Ok since sarray is ref count
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/Utilities/VTK/vtkGDCMImageReader.cxx b/Utilities/VTK/vtkGDCMImageReader.cxx
|
||||
index c62034300..463c3879b 100644
|
||||
--- a/Utilities/VTK/vtkGDCMImageReader.cxx
|
||||
+++ b/Utilities/VTK/vtkGDCMImageReader.cxx
|
||||
@@ -608,7 +608,7 @@ ComputePixelTypeFromFiles(const char *inputfilename, vtkStringArray *filenames,
|
||||
// FIXME a gdcm::Scanner would be much faster here:
|
||||
for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
|
||||
{
|
||||
- const char *filename = filenames->GetValue( i );
|
||||
+ const char *filename = filenames->GetValue( i ).c_str();
|
||||
gdcm::ImageReader reader;
|
||||
reader.SetFileName( filename );
|
||||
if( !reader.Read() )
|
||||
@@ -703,7 +703,7 @@ int vtkGDCMImageReader::RequestInformationCompat()
|
||||
}
|
||||
else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
|
||||
{
|
||||
- filename = this->FileNames->GetValue( 0 );
|
||||
+ filename = this->FileNames->GetValue( 0 ).c_str();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1459,7 +1459,7 @@ int vtkGDCMImageReader::RequestDataCompat()
|
||||
for(int j = dext[4]; !this->AbortExecute && j <= dext[5]; ++j)
|
||||
{
|
||||
assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
|
||||
- const char *filename = this->FileNames->GetValue( j );
|
||||
+ const char *filename = this->FileNames->GetValue( j ).c_str();
|
||||
int load = this->LoadSingleFile( filename, pointer, len );
|
||||
if( !load )
|
||||
{
|
||||
diff --git a/Utilities/VTK/vtkGDCMImageReader2.cxx b/Utilities/VTK/vtkGDCMImageReader2.cxx
|
||||
index 266c1270a..4976f0190 100644
|
||||
--- a/Utilities/VTK/vtkGDCMImageReader2.cxx
|
||||
+++ b/Utilities/VTK/vtkGDCMImageReader2.cxx
|
||||
@@ -388,7 +388,7 @@ ComputePixelTypeFromFiles(const char *inputfilename, vtkStringArray *filenames,
|
||||
// FIXME a gdcm::Scanner would be much faster here:
|
||||
for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
|
||||
{
|
||||
- const char *filename = filenames->GetValue( i );
|
||||
+ const char *filename = filenames->GetValue( i ).c_str();
|
||||
gdcm::ImageReader reader;
|
||||
reader.SetFileName( filename );
|
||||
if( !reader.Read() )
|
||||
@@ -480,7 +480,7 @@ int vtkGDCMImageReader2::RequestInformationCompat()
|
||||
}
|
||||
else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
|
||||
{
|
||||
- filename = this->FileNames->GetValue( 0 );
|
||||
+ filename = this->FileNames->GetValue( 0 ).c_str();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1177,7 +1177,7 @@ int vtkGDCMImageReader2::RequestDataCompat()
|
||||
for(int j = outExt[4]; !this->AbortExecute && j <= outExt[5]; ++j)
|
||||
{
|
||||
assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
|
||||
- const char *filename = this->FileNames->GetValue( j );
|
||||
+ const char *filename = this->FileNames->GetValue( j ).c_str();
|
||||
int load = this->LoadSingleFile( filename, pointer, len );
|
||||
vtkDebugMacro( "LoadSingleFile: " << filename );
|
||||
if( !load )
|
||||
diff --git a/Utilities/VTK/vtkGDCMImageWriter.cxx b/Utilities/VTK/vtkGDCMImageWriter.cxx
|
||||
index 37e1245a5..e723d15b7 100644
|
||||
--- a/Utilities/VTK/vtkGDCMImageWriter.cxx
|
||||
+++ b/Utilities/VTK/vtkGDCMImageWriter.cxx
|
||||
@@ -255,7 +255,7 @@ int vtkGDCMImageWriter::RequestData(
|
||||
{
|
||||
if( this->FileNames->GetNumberOfValues() )
|
||||
{
|
||||
- const char *filename = this->FileNames->GetValue(0);
|
||||
+ const char *filename = this->FileNames->GetValue(0).c_str();
|
||||
return const_cast<char*>(filename);
|
||||
}
|
||||
return this->Superclass::GetFileName();
|
||||
@@ -1148,7 +1148,7 @@ int vtkGDCMImageWriter::WriteGDCMData(vtkImageData *data, int timeStep)
|
||||
if( this->FileNames->GetNumberOfValues() )
|
||||
{
|
||||
//int n = this->FileNames->GetNumberOfValues();
|
||||
- filename = this->FileNames->GetValue(k);
|
||||
+ filename = this->FileNames->GetValue(k).c_str();
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx
|
||||
index d50a3fee2..c531b8854 100644
|
||||
--- a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx
|
||||
+++ b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx
|
||||
@@ -592,7 +592,7 @@ void vtkGDCMThreadedImageReader::RequestDataCompat()
|
||||
const char **filenames = new const char* [ nfiles ];
|
||||
for(unsigned int i = 0; i < nfiles; ++i)
|
||||
{
|
||||
- filenames[i] = this->FileNames->GetValue( i );
|
||||
+ filenames[i] = this->FileNames->GetValue( i ).c_str();
|
||||
//std::cerr << filenames[i] << std::endl;
|
||||
}
|
||||
ReadFiles((unsigned int)nfiles, filenames);
|
||||
diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx
|
||||
index 2e6a2e932..72ce6453c 100644
|
||||
--- a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx
|
||||
+++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx
|
||||
@@ -71,7 +71,7 @@ vtkGDCMThreadedImageReader2::~vtkGDCMThreadedImageReader2()
|
||||
//----------------------------------------------------------------------------
|
||||
const char *vtkGDCMThreadedImageReader2::GetFileName(int i)
|
||||
{
|
||||
- return this->FileNames->GetValue( i );
|
||||
+ return this->FileNames->GetValue( i ).c_str();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
@@ -106,7 +106,7 @@ void vtkGDCMThreadedImageReader2Execute(vtkGDCMThreadedImageReader2 *self,
|
||||
for( int i = outExt[4]; i <= outExt[5] && i < maxfiles; ++i )
|
||||
{
|
||||
assert( i < maxfiles );
|
||||
- const char *filename = self->GetFileNames()->GetValue( i );
|
||||
+ const char *filename = self->GetFileNames()->GetValue( i ).c_str();
|
||||
//ReadOneFile( filename );
|
||||
//outData->GetPointData()->GetScalars()->SetName("GDCMImage");
|
||||
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
enableVTK ? true,
|
||||
vtk,
|
||||
|
|
@ -20,22 +19,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if enablePython then "python-gdcm" else "gdcm";
|
||||
version = "3.2.2";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iUJrXcVHdCmL5atm6in4KvgPXbYmAYFxM6TGoZeY9EE=";
|
||||
hash = "sha256-8ZNq89a369mm/hPe0tywo4Tqzt65Xhb0pbEguy8CSsA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-missing-losslylosslessarray-in-TestTransferSyntax.patch
|
||||
# Fix vtk deprecated api, See https://docs.vtk.org/en/latest/release_details/9.3.html#id13.
|
||||
# Upstream mailing list: https://sourceforge.net/p/gdcm/mailman/message/59197515.
|
||||
./fix-vtk-deprecated-api.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGDCM_BUILD_APPLICATIONS=ON"
|
||||
"-DGDCM_BUILD_SHARED_LIBS=ON"
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "git-pkgs";
|
||||
version = "0.15.4";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-pkgs";
|
||||
repo = "git-pkgs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/egkYzrRtYy94fRDDEsFFTj+c0yorm8REaqedQSJyEw=";
|
||||
hash = "sha256-5fo4Zvh5ho8WefDv3bV5sVi9j3RwHWP4+ShigqDOUl8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eVa2tNLy2Oul1Uqq5Bf1arvjvH9ic24rc6NBDPu1gvk=";
|
||||
vendorHash = "sha256-GPtw+iCUH5/V13WNSvmktchXOz0PGW5ckhCqpiRhHLQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "githooks";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabyx";
|
||||
repo = "githooks";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aVrMM7gZF7o6WR2/8SEsfLFsqTSbXpr7UtcSB+eO/oQ=";
|
||||
hash = "sha256-aRv8zSTnpoQfhajagMKT0rpOmNWt0X4jiKv0kS6cQUE=";
|
||||
};
|
||||
|
||||
modRoot = "./githooks";
|
||||
vendorHash = "sha256-ZcDD4Z/thtyCvXg6GzzKC/FSbh700QEaqXU8FaZaZc4=";
|
||||
vendorHash = "sha256-ULPbM/6DqyVPwq68MnpVesS3w1uxKBbVIZ7i5Kng+1Y=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
apple-sdk,
|
||||
fftwSinglePrec,
|
||||
netcdf,
|
||||
pcre,
|
||||
pcre2,
|
||||
gdal,
|
||||
blas,
|
||||
lapack,
|
||||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
curl
|
||||
gdal
|
||||
netcdf
|
||||
pcre
|
||||
pcre2
|
||||
dcw-gmt
|
||||
gshhg-gmt
|
||||
]
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt")
|
||||
(lib.cmakeFeature "GDAL_ROOT" "${gdal.out}")
|
||||
(lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}")
|
||||
(lib.cmakeFeature "PCRE_ROOT" "${pcre.out}")
|
||||
(lib.cmakeFeature "PCRE2_ROOT" "${pcre2.out}")
|
||||
(lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false)
|
||||
(lib.cmakeBool "GMT_ENABLE_OPENMP" true)
|
||||
(lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hidden-bar";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dwarvesf/hidden/releases/download/v${version}/Hidden.Bar.${version}.dmg";
|
||||
hash = "sha256-P1SwJPXBxAvBiuvjkBRxAom0fhR+cVYfriKmYcqybQI=";
|
||||
url = "https://github.com/dwarvesf/hidden/releases/download/v${version}/Hidden-Bar-v${version}-macos.zip";
|
||||
hash = "sha256-qKX1KZ/fq1K9/7L1cop21MumkHVOmzsS8nvTjy52wLw=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
meta = {
|
||||
description = "Ultra-light MacOS utility that helps hide menu bar icons";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "honeycomb-refinery";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "honeycombio";
|
||||
repo = "refinery";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8UzFoIxi9Vvf5/67rFsED/XTOz1pGeyxyuvLlTO7mVc=";
|
||||
hash = "sha256-2avpxXlphqCNLeuTwskZKML/Dp5igm/qexq44lk8ne8=";
|
||||
};
|
||||
|
||||
env.NO_REDIS_TEST = true;
|
||||
|
|
@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
|
|||
"-X main.BuildID=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-nzz4SdJnISM6/yCgwelg2w7wlPBInQU1YizT5Ds2z5Y=";
|
||||
vendorHash = "sha256-PBNL6oL3X+zaom2vbPJ0WuH9syZqWw4WXWbUqu/mtH0=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "infrastructure-agent";
|
||||
version = "1.74.2";
|
||||
version = "1.74.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newrelic";
|
||||
repo = "infrastructure-agent";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8viB1wHkoPF1WSEcfay3KHGgakW6coCP4jHtJTGFAAs=";
|
||||
hash = "sha256-T7DXHbI2aK6/nx6bYJEEcr2GRBo9+NnB9yami1SN528=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xkoNVXRm8OkVd2f3cSFE1QIF6EHhh8AQh/YZYt22+MU=";
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ set -eu -o pipefail
|
|||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; iterm2.version or (lib.getVersion iterm2)" | tr -d '"')
|
||||
|
||||
downloadUrl=$(
|
||||
downloadUrls=$(
|
||||
curl -sL "https://iterm2.com/downloads.html" |
|
||||
grep -o -E 'href="[^"]*iTerm2[^"]*\.zip"' |
|
||||
sed 's/href="//;s/"//' |
|
||||
head -1
|
||||
sed 's/href="//;s/"//'
|
||||
)
|
||||
downloadUrl=$(echo "$downloadUrls" | head -1)
|
||||
|
||||
if [[ -z "$downloadUrl" ]]; then
|
||||
echo >&2 "Failed to extract download url from iTerm2 downloads page"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k8sgpt";
|
||||
version = "0.4.32";
|
||||
version = "0.4.33";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
|
|||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qBo5Yi16c9oyZQObaP7Y1AM7MXcgvfz4wE0VJqyVfxE=";
|
||||
hash = "sha256-nr/Cl416ENwrbVGYaAxuOQsYkRWpx/CCM2gIZ2z/I9c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rTHy/z2fGT6S4FX4StatxiD2Nbtqbgsqn3N0MA+oscA=";
|
||||
vendorHash = "sha256-7Kvj1BaiR4wrGjzR54f+Qe+PdOrLjD2noaRPaX/Yuos=";
|
||||
|
||||
# https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
|
||||
env.CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kaniko";
|
||||
version = "1.25.14";
|
||||
version = "1.25.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "kaniko";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-V6kIEuHYHV3XfuW7Jd/XmPy0XQX449rMH5YxbTtCvZo=";
|
||||
hash = "sha256-0d0QdNmR7FaybJJEq6bb9WshTg6dX3HtO9oESg1e4S4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kent";
|
||||
version = "492";
|
||||
version = "497";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ucscGenomeBrowser";
|
||||
repo = "kent";
|
||||
tag = "v${finalAttrs.version}_base";
|
||||
hash = "sha256-heeEv7zRG3DTQ1dER7f+OjeS+KHVOUq0Z7MAf7Vsw7s=";
|
||||
hash = "sha256-VXm/JwudwNqZhwp7iC/BjQ/grc+9kOFn/t43ceayC4c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
systemd,
|
||||
runtimeShell,
|
||||
python3,
|
||||
python3Packages,
|
||||
nixosTests,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.6.0";
|
||||
|
||||
|
|
@ -18,28 +17,26 @@ let
|
|||
hash = "sha256-l7yjGpicX1ly4UwF7gcOTaaHPRnxVUMwZkH70NDLL5M=";
|
||||
};
|
||||
|
||||
pypkgs = python3.pkgs;
|
||||
|
||||
appMap = pypkgs.buildPythonApplication rec {
|
||||
appMap = python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "keyd-application-mapper";
|
||||
inherit version src;
|
||||
pyproject = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/${pname} \
|
||||
substituteInPlace scripts/${finalAttrs.pname} \
|
||||
--replace-fail /bin/sh ${runtimeShell}
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with pypkgs; [ xlib ];
|
||||
propagatedBuildInputs = with python3Packages; [ xlib ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm555 -t $out/bin scripts/${pname}
|
||||
install -Dm555 -t $out/bin scripts/${finalAttrs.pname}
|
||||
'';
|
||||
|
||||
meta.mainProgram = "keyd-application-mapper";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -56,13 +53,11 @@ stdenv.mkDerivation {
|
|||
|
||||
installFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
buildInputs = [ systemd ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# post-2.4.2 may need this to unbreak the test
|
||||
# makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -sf ${lib.getExe appMap} $out/bin/${appMap.pname}
|
||||
rm -rf $out/etc
|
||||
|
|
@ -74,6 +69,7 @@ stdenv.mkDerivation {
|
|||
description = "Key remapping daemon for Linux";
|
||||
homepage = "https://github.com/rvaiya/keyd";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "keyd";
|
||||
maintainers = with lib.maintainers; [ alfarel ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
};
|
||||
"kicad-testing" = {
|
||||
kicadVersion = {
|
||||
version = "10.0-2026-05-09";
|
||||
version = "10.0-2026-05-12";
|
||||
src = {
|
||||
rev = "58a1e6556bf606cbc8da10733db8a9801cdfade3";
|
||||
sha256 = "1myln0iyl3z4s9h8867rr4zjka9xw04gdl29pqgj8ivjpm8gxw95";
|
||||
rev = "5a1300d8f11d154edd892a444d3dd0cc7c60fe5a";
|
||||
sha256 = "0vhp63jd2j9pns3sdfi4i9220gs29nf068z202dnikv4dqn7wz4h";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "10.0-2026-05-09";
|
||||
version = "10.0-2026-05-12";
|
||||
libSources = {
|
||||
symbols.rev = "f31042c9759771f10754f02e54344dee750692b1";
|
||||
symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kn";
|
||||
version = "1.20.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
tag = "knative-v${finalAttrs.version}";
|
||||
hash = "sha256-rElNlb3NfbOZjCMWT2efknWM9B0+BFa5CCNmcA6afPY=";
|
||||
hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rZEkwiCy2kpeKOi4lhLoW1o+cws/p++c9Dz8fKhgNKQ=";
|
||||
vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI=";
|
||||
|
||||
env.GOWORK = "off";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kokkos";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kokkos";
|
||||
repo = "kokkos";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-yo+E8U06o7eu2U4AbXkHpo9uwjiIDE6NoP8TgUTkmuU=";
|
||||
hash = "sha256-F/UNDIsEjRvM9RkTPg0wJtRdoTPpNPqyJYbgtvkntNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubeone";
|
||||
version = "1.13.4";
|
||||
version = "1.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PEGhLqBLDHLxa23+llB0LdaS/mGINyMzoCyPAsBU+vw=";
|
||||
hash = "sha256-uh724TvrxAGt6NpArot5PL49yyJF+EUeh2JVoMfR+uw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qXIlU1ZrJvJ0u8wSoBeESEfOMEGHkVg8kLMp/zlyfno=";
|
||||
vendorHash = "sha256-kJ4ypt0jNWA/BFiuur/pa/qd87csSdRMcV/IplQRA3I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.4.4";
|
||||
version = "3.5.0";
|
||||
pname = "laszip";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LASzip";
|
||||
repo = "LASzip";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v/oLU69zqDW1o1HTlay7GDh1Kbmv1rarII2Fz5HWCqg=";
|
||||
hash = "sha256-xZ8IFnqrGt47lN+C6/ibgbIWqpObDf4RHPaGMXw0WZ4=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ]; # -Werror=format-security
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://laszip.org";
|
||||
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lazysql";
|
||||
version = "0.4.9";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgerojas26";
|
||||
repo = "lazysql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KRyR4MZK9/gXj3EaAN/JGtzcou8SR+JJ8ZMWGKBu9mU=";
|
||||
hash = "sha256-fQGojLJdMnzWXetE2AL2i0q16ZRebPsGx9UsWm1CmAs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -16,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-tr9r0X+iHz3LZFgIxi3JMQUnSlyTRtAIhtjwI+DIhpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "lichess-bot";
|
||||
version = "2026.4.20.1";
|
||||
version = "2026.5.12.2";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lichess-bot-devs";
|
||||
repo = "lichess-bot";
|
||||
rev = "98c2147b02af1482feb83174a623942f2c333e30";
|
||||
hash = "sha256-ebHW96J6qAtgsVKtqmCNYP1XelYgIkBbl+GlU7ItZcY=";
|
||||
rev = "c67bbfe57e0d406fd774958bd571f82f0ae5580a";
|
||||
hash = "sha256-oIw6UmKOP6Ut+CtvdPXPF6LrHyQQndEN0YlWvJ/hZ/I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
shaderc,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
spirv-headers,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
|
|
@ -78,7 +79,7 @@ let
|
|||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "8983";
|
||||
version = "9080";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -89,7 +90,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-v73SfPbzzLBNWyan1dsAnDc2dfSem36zyeGLen5t4KI=";
|
||||
hash = "sha256-IF2Whu9VLxUbL+oLkQeYERfp8s3RdQBUyqsAsruv60M=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
|
@ -106,6 +107,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
pkg-config
|
||||
spirv-headers
|
||||
]
|
||||
++ optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
|
|
@ -121,7 +123,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
++ [ openssl ];
|
||||
|
||||
npmRoot = "tools/server/webui";
|
||||
npmDepsHash = "sha256-iYJB0z2YHG8OzEA9EwHUZrDa5obr5m2sbnIH+of28o0=";
|
||||
npmDepsHash = "sha256-cV3noOyKmst9vfxyvkCNhihPgwfVGhmPPT4UMloeWZM=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src patches;
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.300";
|
||||
version = "1.301";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-n5b5sYmn3X/Eo4jwwt4G/6N17iVBPucW0KTlP/M+Xcc=";
|
||||
hash = "sha256-C/M5Dl94L83vB7TzREdx6dBms9aHPQfgdWEyjvtvS00=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "meilisearch";
|
||||
version = "1.43.0";
|
||||
version = "1.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m2c0LI5/SCdBC3rZwXhDpsmIpa013LJjc8AHjGXUYBc=";
|
||||
hash = "sha256-f8iz8qSIj5dJMPstUm0CbYOkPpZ2IIpIYbkVm+4F8V8=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=meilisearch" ];
|
||||
|
||||
cargoHash = "sha256-ha+mvUfK1yCCUvuW4Lb1PKd6giieE2gaywyVZ3NPgXk=";
|
||||
cargoHash = "sha256-NB25eziZQCzVgtD+uCqJM3wTVrPGnhm58R0S2zfqqAE=";
|
||||
|
||||
# Default features include mini dashboard which downloads something from the internet.
|
||||
buildNoDefaultFeatures = true;
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minizinc-ide";
|
||||
version = "2.9.5";
|
||||
version = "2.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MiniZinc";
|
||||
repo = "MiniZincIDE";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-VqVcByPBS7UBU/h5NIUltIKA0POAX1dUVgMsn5b9C4w=";
|
||||
hash = "sha256-uOWV+mMIczszFg4BuLADRKoOeTQEYecwMKFwH6v6zl8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mise";
|
||||
version = "2026.4.20";
|
||||
version = "2026.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6WGYjXx1AuUDbYIAHh0PdSUC+zDXq4mC5LY+r1vLiKc=";
|
||||
hash = "sha256-ac7pK9LYwm//y4TVa1XtlIxJGkloItJxUcGOVCAxzPk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8JAxt9m8StOSNbUKZBNwQWoXwX+gXLGdNZYlRSH0SLM=";
|
||||
cargoHash = "sha256-ZvICWDUpemtsbz9rDqxlNWpRRzEfZEdefJsbXwL4A0E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
nodejs,
|
||||
openssl,
|
||||
pkg-config,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
replaceVars,
|
||||
|
|
@ -31,13 +31,13 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "modrinth-app-unwrapped";
|
||||
version = "0.13.6";
|
||||
version = "0.13.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modrinth";
|
||||
repo = "code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-47uokwYsEg5D0lyHdpqfvKlsuXZK0sm5YIWwNjVGsKQ=";
|
||||
hash = "sha256-Qn4IlqJagLoIcP9p9QdKzu2wdcBDLvfq/2sgVwIjbm4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -61,20 +61,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
./remove-spotless.patch
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
# Cidre 0.11.3 currently fails to build on darwin. Updating it to the latest version
|
||||
# resolves this issue.
|
||||
# Upstream PR is https://github.com/modrinth/code/pull/5862
|
||||
./update-cidre.patch
|
||||
];
|
||||
|
||||
# Let the app know about our actual version number
|
||||
postPatch = ''
|
||||
substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
|
||||
--replace-fail '1.0.0-local' '${finalAttrs.version}'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-GwangszzKTEYvflibPgkIyUkHlpfMgenD/mq3my5LIY=";
|
||||
cargoHash = "sha256-iI1AjFApd9fzss3hSVJLofHLZ6SJqUccHJ7PHqtBk+k=";
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
inherit (finalAttrs) pname;
|
||||
|
|
@ -83,9 +76,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Hk32LBD20F2LRgqNs8f1j3VdUxKoTPWs3yJvOghsEbI=";
|
||||
hash = "sha256-oPZt68SosRgzl50VR/xWozcc0weQKiY6T1UcvgMRq1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -96,7 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
nodejs
|
||||
pkg-config
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin [
|
||||
makeBinaryWrapper
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ee2157d44..db41b81a3 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1572,18 +1572,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cidre"
|
||||
-version = "0.11.3"
|
||||
+version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "0cc0eb4d7faf9f94493eaf7e7c0534dee2dfa9642353382039572abb4e0e56e9"
|
||||
+checksum = "0c903ff1729987d29e07295d2c5841993db25ff86cca43bee04505878d3ec1a7"
|
||||
dependencies = [
|
||||
+ "cc",
|
||||
"cidre-macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cidre-macros"
|
||||
-version = "0.3.0"
|
||||
+version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "82bc2f84c0baaa09299da3a03864491549685912c1e338a54211e00589dc1e4c"
|
||||
+checksum = "6facfeffa8b9792dc014bb4e65e364d13518b74e06783d56249810a3e48cfad7"
|
||||
|
||||
[[package]]
|
||||
name = "cityhash-rs"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 54865d6d3..a09ad3089 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -51,7 +51,7 @@ bytes = "1.10.1"
|
||||
censor = "0.3.0"
|
||||
chardetng = "0.1.17"
|
||||
chrono = "0.4.42"
|
||||
-cidre = { version = "0.11.3", default-features = false, features = [
|
||||
+cidre = { version = "0.15.0", default-features = false, features = [
|
||||
"macos_15_0"
|
||||
] }
|
||||
clap = "4.5.48"
|
||||
|
|
@ -2,20 +2,30 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
bison,
|
||||
check,
|
||||
flex,
|
||||
gitUpdater,
|
||||
gmp,
|
||||
gtk3,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
|
||||
withGUI ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpsolve";
|
||||
version = "3.2.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robol";
|
||||
repo = "MPSolve";
|
||||
|
|
@ -23,20 +33,47 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-BGXvNxWUbto0yMIpEIxZ9wOYv9w0ev4OgVcniNYIKoU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "include-cmath-in-c++-before-defining-isnan-macro.patch";
|
||||
url = "https://github.com/robol/MPSolve/commit/260432c9d1002261f60159d0520af7862d4471ed.patch";
|
||||
hash = "sha256-ODWpp966S1SsSN8hf7yuYgJR44GgbLwSxui280WWGmM=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withGUI [
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
]
|
||||
++ lib.optionals withGUI [
|
||||
gtk3
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature withGUI "graphical-debugger")
|
||||
(lib.enableFeature withGUI "ui")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [ check ];
|
||||
|
||||
checkTarget = "check";
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
|
|
@ -45,6 +82,5 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ kilianar ];
|
||||
mainProgram = "mpsolve";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mtail";
|
||||
version = "3.2.48";
|
||||
version = "3.2.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dZ0fjBpQ1hS1AxuD5A3gSTmimhP6PbiyxGs8XaYdo64=";
|
||||
hash = "sha256-RdDZgmnA9wDN7uEUGle85jLFRmgBNBaRGTu+MthCsfw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-ZZcVtZBG0Erh/NmYbw0aOVCg2AGZeHMFRfRbwNFTCks=";
|
||||
vendorHash = "sha256-37IbtXK4A8mIWmYR2a9XSgfOAHGpl5BxWGZiJG3okzY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gotools # goyacc
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nightdiamond-cursors";
|
||||
version = "0-unstable-2025-09-23";
|
||||
version = "0-unstable-2026-05-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimlinuz";
|
||||
repo = "NightDiamond-cursors";
|
||||
rev = "3ff3c0486430a4901b4d5cbbee87a370aa2b8ce9";
|
||||
hash = "sha256-huruHo5w7Qrte1+nIiz+P1xPNDGrv5/eByHwaSlZYwQ=";
|
||||
rev = "49650765c3396ccee9ffb796608845d4660d5692";
|
||||
hash = "sha256-Ue6dDvNMq1pGfzudt1O8h0pawfKj4FskTGLnpyEp0CM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "nwg-hello";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-hello";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XJVUEuSu24NozFjted4pujo4A83cpF7KmfDSpc8/JzY=";
|
||||
hash = "sha256-8SSNW/we3TPVEqiC6ts3MR/rJrv857L+U/IAfkdK2RU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
99
pkgs/by-name/ob/ob-xf/package.nix
Normal file
99
pkgs/by-name/ob/ob-xf/package.nix
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
freetype,
|
||||
fontconfig,
|
||||
libjack2,
|
||||
libGL,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ob-xf";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surge-synthesizer";
|
||||
repo = "OB-Xf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-MeknY3jiUTcnX29AtdYNci4dAF1uFCZRpwrxEH3YEEM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# The build calls git at configure time to determine version info.
|
||||
# Provide a static BUILD_VERSION file so git is not required.
|
||||
cat > BUILD_VERSION <<EOF
|
||||
SST_VERSION_INFO
|
||||
5044e2e3
|
||||
v${finalAttrs.version}
|
||||
main
|
||||
${finalAttrs.version}
|
||||
EOF
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
freetype
|
||||
fontconfig
|
||||
libjack2
|
||||
libGL
|
||||
libx11
|
||||
libxcursor
|
||||
libxext
|
||||
libxinerama
|
||||
libxrandr
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# JUCE dlopen's x11 at runtime, crashes without it
|
||||
env.NIX_LDFLAGS = "-lX11";
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# Factory data (patches, themes) — provided by upstream's install() rule
|
||||
cmake --install .
|
||||
|
||||
mkdir -p $out/lib/{vst3,lv2,clap}
|
||||
|
||||
cp -r OB-Xf_artefacts/Release/VST3/OB-Xf.vst3 $out/lib/vst3/
|
||||
cp -r OB-Xf_artefacts/Release/LV2/OB-Xf.lv2 $out/lib/lv2/
|
||||
cp -r OB-Xf_artefacts/Release/CLAP/OB-Xf.clap $out/lib/clap/
|
||||
|
||||
install -Dm755 OB-Xf_artefacts/Release/Standalone/OB-Xf $out/bin/OB-Xf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Virtual analog synthesizer plug-in inspired by the Oberheim OB-X";
|
||||
homepage = "https://surge-synth-team.org/ob-xf/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ magnetophon ];
|
||||
mainProgram = "OB-Xf";
|
||||
};
|
||||
})
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue