Merge 9fcf76718e into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2026-04-20 00:36:48 +00:00
committed by GitHub
514 changed files with 6478 additions and 5325 deletions
+4 -1
View File
@@ -268,7 +268,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/applications/editors/jetbrains @leona-ya @theCapypara
# Licenses
/lib/licenses.nix @alyssais @emilazy @jopejoe1
/lib/licenses @alyssais @emilazy @jopejoe1
# Qt
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
@@ -376,6 +376,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# VimPlugins
/pkgs/applications/editors/vim/plugins @NixOS/neovim
## nvim-treesitter
/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @figsoda
/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter @figsoda
# VsCode Extensions
/pkgs/applications/editors/vscode/extensions
+1 -1
View File
@@ -73,7 +73,7 @@ let
types = callLibs ./types.nix;
# constants
licenses = callLibs ./licenses.nix;
licenses = callLibs ./licenses;
sourceTypes = callLibs ./source-types.nix;
systems = callLibs ./systems;
+7
View File
@@ -0,0 +1,7 @@
{ lib }:
let
licenses = import ./licenses.nix { inherit lib; };
operators = import ./operators.nix;
helpers = import ./helpers.nix { inherit lib; };
in
licenses // operators // helpers
+152
View File
@@ -0,0 +1,152 @@
{ lib }:
rec {
/**
Evaluate a license expression for a given predicate.
# Example
```nix
evaluateProperty (x: x.free) true (with lib.licenses; AND [ ncsa (WITH asl20 llvm-exception) ])
```
# Type
```
evaluateProperty :: Function -> Bool -> AttrSet -> Bool
```
# Arguments
- [predicate] checks for each license included in the license expression
- [permissive] whether to apply checks permissive or reciprocal
- [license] license expression to check
*/
evaluateProperty =
predicate: permissive: license:
let
OR = if permissive then lib.any else lib.all;
AND = if permissive then lib.all else lib.any;
in
if license.licenseType == "simple" then
predicate license
else if license.licenseType == "compound" then
if license.operator == "OR" then
OR (x: evaluateProperty predicate permissive x) license.licenses
else if license.operator == "AND" then
AND (x: evaluateProperty predicate permissive x) license.licenses
else
throw "Unknown license operator"
else if license.licenseType == "exception" then
AND (x: evaluateProperty predicate permissive x) [
license.license
license.exception
]
else if license.licenseType == "plus" then
evaluateProperty predicate permissive license.license
else
throw "Unknown license type or legacy license";
/**
Check whether a license expression is free.
# Example
```nix
isFree (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ]))
=> true
```
# Type
```
isFree :: AttrSet -> Bool
```
# Arguments
- [license] License expression to check if free
*/
isFree = evaluateProperty (x: x.free) true;
/**
Check whether a license expression is redistributable.
# Example
```nix
isRedistributable (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ]))
=> true
```
# Type
```
isRedistributable :: AttrSet -> Bool
```
# Arguments
- [license] License expression to check if redistributable
*/
isRedistributable = evaluateProperty (x: x.redistributable) true;
/**
Check whether any of the given licenses is required in the license expression.
# Example
```nix
containsLicenses [ lib.licenses.asl20 ] (with lib.licenses; (AND [ ncsa (WITH asl20 llvm-exception) ]))
=> true
```
# Type
```
containsLicenses :: List -> AttrSet -> Bool
```
# Arguments
- [licenses] List of licenses to look
- [license] License expression to check
*/
containsLicenses = licenses: evaluateProperty (x: lib.lists.elem x licenses) false;
/**
Convert a license expression to an SPDX license expression string.
# Example
```nix
toSPDX (with lib.licenses; AND [ ncsa (WITH asl20 llvm-exception) ])
=> "NCSA AND (Apache-2.0 WITH LLVM-exception)"
```
# Type
```
toSPDX :: AttrSet -> String
```
# Arguments
- [license] License expression which to convert to spdx expression
*/
toSPDX =
license:
let
mkBracket =
x:
if x.licenseType == "compound" || x.licenseType == "exception" then "(${toSPDX x})" else toSPDX x;
in
if license.licenseType == "simple" then
license.spdxId or "LicenseRef-nixos-${license.shortName}"
else if license.licenseType == "compound" then
lib.concatMapStringsSep " ${license.operator} " (x: mkBracket x) license.licenses
else if license.licenseType == "exception" then
"${mkBracket license.license} ${license.operator} ${mkBracket license.exception}"
else if license.licenseType == "plus" then
"${mkBracket license.license}${license.operator}"
else
throw "Unknown license type";
}
@@ -21,6 +21,7 @@ let
deprecated
redistributable
;
licenseType = "simple";
}
// optionalAttrs (attrs ? spdxId) {
inherit spdxId;
+110
View File
@@ -0,0 +1,110 @@
{
/**
This should be used when there is a choice of which license expression to use.
This is a disjunctive binary "OR" operator.
# Example
```nix
OR [ lib.licenses.mit lib.licenses.asl20 ]
=> { licenseType = "compound"; operator = "OR"; licenses = [ lib.licenses.mit lib.licenses.asl20 ] };
```
# Type
```
OR :: List -> AttrSet
```
# Arguments
- [licenses] Possible licenses to choose from
*/
OR = licenses: {
licenseType = "compound";
operator = "OR";
inherit licenses;
};
/**
Create a compound licenses where the user needs to follow both licenses,
eqivialent of spdx `and` modifier.
# Example
```nix
AND [ lib.licenses.mit lib.licenses.asl20 ]
=> { licenseType = "compound"; operator = "AND"; licenses = [ lib.licenses.mit lib.licenses.asl20 ] };
```
# Type
```
AND :: List -> AttrSet
```
# Arguments
- [licenses] Licenses required to use
*/
AND = licenses: {
licenseType = "compound";
operator = "AND";
inherit licenses;
};
/**
Create a licenses exception where a license has a license exception,
eqivialent of spdx `with` modifier.
# Example
```nix
WITH lib.licenses.lgpl21Only lib.licenses.ocamlLgplLinkingException
=> { licenseType = "exception"; operator = "WITH"; license = lib.licenses.lgpl21Only; exception = lib.licenses.ocamlLgplLinkingException; };
```
# Type
```
WITH :: AttrSet -> AttrSet -> AttrSet
```
# Arguments
- [license] License to which the exception applies
- [exception] Exception to apply
*/
WITH = license: exception: {
licenseType = "exception";
operator = "WITH";
inherit license exception;
};
/**
Create a licenses which can be upgraded to any later version of itself,
eqivialent of spdx `+` modifier
# Example
```nix
PLUS lib.licenses.eupl11
=> { licenseType = "plus"; operator = "+"; license = lib.licenses.eupl11; };
```
# Type
```
PLUS :: AttrSet -> AttrSet
```
# Arguments
- [license] License to wich apply an exception
*/
PLUS = license: {
licenseType = "plus";
operator = "+";
inherit license;
};
}
+5 -3
View File
@@ -589,6 +589,8 @@ let
in
modulesPath: initialModules: args: {
modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
# Intentionally not shared with `modules` above: this allows `collected`
# to be garbage collected after `filterModules` returns.
graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args);
};
@@ -783,7 +785,7 @@ let
prefix: modules: configs:
let
# an attrset 'name' => list of submodules that declare name.
declsByName = zipAttrsWith (n: v: v) (
declsByName = zipAttrs (
map (
module:
let
@@ -838,7 +840,7 @@ let
) checkedConfigs
);
# extract the definitions for each loc
rawDefinitionsByName = zipAttrsWith (n: v: v) (
rawDefinitionsByName = zipAttrs (
map (
module:
mapAttrs (n: value: {
@@ -1439,7 +1441,7 @@ let
def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
in
{
values = concatMap (def: if getPrio def == highestPrio then [ (strip def) ] else [ ]) defs;
values = map strip (filter (def: getPrio def == highestPrio) defs);
inherit highestPrio;
};
+4 -12
View File
@@ -455,19 +455,17 @@ rec {
(b == armv5tel && isCompatible a armv6l)
# ARMv6
(b == armv6l && isCompatible a armv6m)
(b == armv6m && isCompatible a armv7l)
(b == armv6m && isCompatible a armv6l)
(b == armv6l && isCompatible a armv7l)
# ARMv7
(b == armv7l && isCompatible a armv7a)
(b == armv7l && isCompatible a armv7r)
(b == armv7l && isCompatible a armv7m)
(b == armv7m && isCompatible a armv7a)
(b == armv7m && isCompatible a armv7r)
# ARMv8
(b == aarch64 && a == armv8a)
(b == armv8a && isCompatible a aarch64)
(b == armv8r && isCompatible a armv8a)
(b == armv8m && isCompatible a armv8a)
# PowerPC
(b == powerpc && isCompatible a powerpc64)
@@ -477,15 +475,9 @@ rec {
(b == mips && isCompatible a mips64)
(b == mipsel && isCompatible a mips64el)
# RISCV
(b == riscv32 && isCompatible a riscv64)
# SPARC
(b == sparc && isCompatible a sparc64)
# WASM
(b == wasm32 && isCompatible a wasm64)
# identity
(b == a)
];
+99
View File
@@ -5012,4 +5012,103 @@ runTests {
testReplaceElemAtOutOfRange = testingThrow (lib.replaceElemAt [ 1 2 3 ] 5 "a");
testReplaceElemAtNegative = testingThrow (lib.replaceElemAt [ 1 2 3 ] (-1) "a");
testIsFree = {
expr = lib.licenses.isFree (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [
lib.licenses.free
lib.licenses.unfree
])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = true;
};
testIsUnfree = {
expr = lib.licenses.isFree (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [ lib.licenses.unfree ])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = false;
};
testIsRedistributable = {
expr = lib.licenses.isRedistributable (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [
lib.licenses.free
lib.licenses.unfree
])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = true;
};
testIsUnredistributable = {
expr = lib.licenses.isRedistributable (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [ lib.licenses.unfree ])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = false;
};
testContainsLicenses = {
expr = lib.licenses.containsLicenses [ lib.licenses.mit ] (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [
lib.licenses.free
lib.licenses.unfree
])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = true;
};
testToSPDX = {
expr = lib.licenses.toSPDX (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [
lib.licenses.free
lib.licenses.unfree
])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = "MIT AND (LicenseRef-nixos-free OR LicenseRef-nixos-unfree) AND (Apache-2.0 WITH LLVM-exception) AND EUPL-1.1+";
};
testEvaluateProperty = {
expr = lib.licenses.evaluateProperty (x: x.deprecated) true (
lib.licenses.AND [
(lib.licenses.mit)
(lib.licenses.OR [
lib.licenses.free
lib.licenses.unfree
])
(lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception)
(lib.licenses.PLUS lib.licenses.eupl11)
]
);
expected = false;
};
}
+6
View File
@@ -26761,6 +26761,12 @@
githubId = 156964;
name = "Thomas Boerger";
};
tbutter = {
email = "tbutter@gmail.com";
github = "tbutter";
githubId = 1336537;
name = "Thomas Butter";
};
tc-kaluza = {
github = "tc-kaluza";
githubId = 101565936;
+7
View File
@@ -2636,6 +2636,13 @@ in
(lib.concatMap lib.attrValues)
(lib.concatMap lib.attrValues)
(lib.filter (rule: rule.enable))
(lib.filter (
rule:
!builtins.elem rule.control [
"include"
"substack"
]
))
(lib.catAttrs "modulePath")
(map (
modulePath:
+2 -2
View File
@@ -256,8 +256,8 @@ in
upload_max_filesize = ${cfg.maxAttachmentSize}
'';
settings = lib.mapAttrs (name: lib.mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0660";
"pm" = "dynamic";
"pm.max_children" = 75;
+2 -2
View File
@@ -57,8 +57,8 @@ in
"BAIKAL_PATH_SPECIFIC" = "/var/lib/baikal/specific/";
};
settings = lib.mapAttrs (name: lib.mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0600";
"pm" = "dynamic";
"pm.max_children" = 75;
+15 -1
View File
@@ -44,7 +44,7 @@ in
"pm" = "dynamic";
"php_admin_value[error_log]" = "stderr";
"php_admin_flag[log_errors]" = true;
"listen.owner" = "nginx";
"listen.owner" = config.services.nginx.user;
"catch_workers_output" = true;
"pm.max_children" = "32";
"pm.start_servers" = "2";
@@ -52,6 +52,20 @@ in
"pm.max_spare_servers" = "4";
"pm.max_requests" = "500";
};
defaultText = lib.literalExpression ''
{
"pm" = "dynamic";
"php_admin_value[error_log]" = "stderr";
"php_admin_flag[log_errors]" = true;
"listen.owner" = config.services.nginx.user;
"catch_workers_output" = true;
"pm.max_children" = "32";
"pm.start_servers" = "2";
"pm.min_spare_servers" = "2";
"pm.max_spare_servers" = "4";
"pm.max_requests" = "500";
}
'';
description = ''
Options for grocy's PHPFPM pool.
@@ -200,8 +200,8 @@ in
date.timezone = "${cfg.timezone}"
'';
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0600";
"pm" = "dynamic";
"pm.max_children" = 75;
+1 -1
View File
@@ -123,7 +123,7 @@ in
"pm" = "dynamic";
"php_admin_value[error_log]" = "stderr";
"php_admin_flag[log_errors]" = true;
"listen.owner" = "nginx";
"listen.owner" = config.services.nginx.user;
"catch_workers_output" = true;
"pm.max_children" = "32";
"pm.start_servers" = "2";
+5 -4
View File
@@ -37,7 +37,8 @@ in
user = mkOption {
type = types.str;
default = "nginx";
default = config.services.nginx.user;
defaultText = lib.literalExpression "config.services.nginx.user";
description = ''
User account under which both the service and the web-application run.
'';
@@ -122,10 +123,10 @@ in
config = mkIf cfg.enable {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
${poolName} = {
user = "nginx";
user = config.services.nginx.user;
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0600";
"pm" = "dynamic";
"pm.max_children" = 75;
@@ -39,8 +39,8 @@ in
configFile = lib.mkOption {
type = lib.types.path;
default = "${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";
defaultText = lib.literalExpression "\${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";
default = "${cfg.package}/lib/node_modules/sillytavern/config.yaml";
defaultText = lib.literalExpression "\${cfg.package}/lib/node_modules/sillytavern/config.yaml";
description = ''
Path to the SillyTavern configuration file.
'';
@@ -109,7 +109,7 @@ in
in
lib.concatStringsSep " " (
[
"${lib.getExe pkgs.sillytavern}"
"${lib.getExe cfg.package}"
]
++ f cfg.port "port"
++ f cfg.listen "listen"
@@ -122,7 +122,7 @@ in
Restart = "always";
StateDirectory = "SillyTavern";
BindPaths = [
"%S/SillyTavern/extensions:${pkgs.sillytavern}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"
"%S/SillyTavern/extensions:${cfg.package}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"
];
# Security hardening
+2 -2
View File
@@ -594,8 +594,8 @@ in
inherit (cfg) user;
inherit phpPackage;
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
"listen.group" = "nginx";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
"listen.mode" = "0600";
"pm" = "dynamic";
"pm.max_children" = 75;
+1
View File
@@ -152,6 +152,7 @@ in
ssh-backdoor = runTestOn [ "x86_64-linux" ] ./nixos-test-driver/ssh-backdoor.nix;
console-log = runTest ./nixos-test-driver/console-log.nix;
containers = runTest ./nixos-test-driver/containers.nix;
skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
driver-timeout =
pkgs.runCommand "ensure-timeout-induced-failure"
{
+2 -2
View File
@@ -663,7 +663,7 @@ let
let
commonConfig = {
# builds stuff in the VM, needs more juice
virtualisation.diskSize = 8 * 1024;
virtualisation.diskSize = 12 * 1024;
virtualisation.cores = 8;
virtualisation.memorySize = 2048;
@@ -700,7 +700,7 @@ let
# Use a small /dev/vdb as the root disk for the
# installer. This ensures the target disk (/dev/vda) is
# the same during and after installation.
virtualisation.emptyDiskImages = [ 512 ];
virtualisation.emptyDiskImages = [ 1024 ];
virtualisation.rootDevice = "/dev/vdb";
nix.package = selectNixPackage pkgs;
@@ -0,0 +1,21 @@
/**
nixosTests.simple, but with skipTypeCheck.
This catches regressions in the wiring, e.g.
https://github.com/NixOS/nixpkgs/pull/511225
*/
{
name = "skip-typecheck";
meta = {
maintainers = [ ];
};
skipTypeCheck = true;
nodes.machine = { };
testScript = ''
start_all()
machine.wait_for_unit("multi-user.target")
machine.shutdown()
'';
}
@@ -40,6 +40,7 @@ let
submodules = value.src.fetchSubmodules or false;
sha256 = value.src.outputHash;
rev = value.src.rev;
tag = value.src.tag or null;
}}
else
null;
File diff suppressed because it is too large Load Diff
@@ -1385,6 +1385,8 @@ assertNoAdditions {
nvimSkipModules = [
# lua module '.init' not found
"fzy.fzy-lua-native"
# Requires removed Neovim internal module vim.treesitter._highlight
"guihua.ts_obsolete.highlight"
];
};
@@ -1832,6 +1834,16 @@ assertNoAdditions {
};
});
live-share-nvim = super.live-share-nvim.overrideAttrs (old: {
nvimSkipModules = (old.nvimSkipModules or [ ]) ++ [
# These modules unconditionally load OpenSSL via LuaJIT FFI and abort in
# the headless require check on Darwin.
"live-share.host"
"live-share.guest"
"live-share.collab.crypto"
];
});
lsp-format-modifications-nvim = super.lsp-format-modifications-nvim.overrideAttrs {
dependencies = [ self.plenary-nvim ];
};
@@ -3138,14 +3150,29 @@ assertNoAdditions {
];
};
python-mode = super.python-mode.overrideAttrs {
postPatch = ''
python-mode = super.python-mode.overrideAttrs (old: {
postPatch = (old.postPatch or "") + ''
# NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
# https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360
rm -f pymode/libs/pytoolconfig
ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig
# The current source tarball only ships a subset of the historical
# submodules, so drop the now-dangling vendored linter symlinks.
rm -f \
pymode/libs/appdirs.py \
pymode/libs/astroid \
pymode/libs/mccabe.py \
pymode/libs/pycodestyle.py \
pymode/libs/pydocstyle \
pymode/libs/pyflakes \
pymode/libs/pylama \
pymode/libs/pylint \
pymode/libs/snowballstemmer \
pymode/libs/toml \
pymode/autopep8.py
'';
};
});
pywal-nvim = super.pywal-nvim.overrideAttrs {
# Optional feline integration
@@ -23,6 +23,7 @@ let
submodules = value.src.fetchSubmodules or false;
sha256 = value.src.outputHash;
inherit (value.src) rev;
tag = value.src.tag or null;
}
else
null;
@@ -50,9 +50,9 @@ class VimEditor(nixpkgs_plugin_update.Editor):
self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
):
log.info("Generating nix code")
log.debug("Loading nvim-treesitter revision from nix...")
nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr(
"(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
log.debug("Loading nvim-treesitter source reference from nix...")
nvim_treesitter_ref = nixpkgs_plugin_update.run_nix_expr(
"(let src = (import <localpkgs> { }).vimPlugins.nvim-treesitter.src; in if src.tag != null then src.tag else src.rev)",
self.nixpkgs,
timeout=10,
)
@@ -93,10 +93,7 @@ class VimEditor(nixpkgs_plugin_update.Editor):
for pdesc, plugin in plugins:
content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
f.write(content)
if (
plugin.name == "nvim-treesitter"
and plugin.commit != nvim_treesitter_rev
):
if plugin.name == "nvim-treesitter" and (plugin.tag or plugin.commit) != nvim_treesitter_ref:
self.nvim_treesitter_updated = True
f.write("}\n")
print(f"updated {outfile}")
File diff suppressed because it is too large Load Diff
@@ -121,6 +121,7 @@ buildVscode {
jefflabonte
wetrustinprize
oenu
yuannan
];
platforms = [
"x86_64-linux"
@@ -45,13 +45,13 @@
"vendorHash": "sha256-qjtyg+b3CfF24us0Fqw1KqKEbuoqL4eLe4QCuIAp4SE="
},
"aliyun_alicloud": {
"hash": "sha256-xdWoc0unJDM7WL3t1AoDBzwPgByij9g9hEoNSOxJtxs=",
"hash": "sha256-pOoFxaAB1x2G89AsnCK7D2q6hTgfMiwE+zfdKZh3bgE=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.275.0",
"rev": "v1.276.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE="
"vendorHash": "sha256-Y/r9gdvPhN27nve+IZyqypZkvCXHE7Ox31JLDQd9l4k="
},
"aminueza_minio": {
"hash": "sha256-rAdHPVw/G5uO/67yLOohHvO3/KxjyQkIpagKPd0vMOQ=",
@@ -436,13 +436,13 @@
"vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
},
"gitlabhq_gitlab": {
"hash": "sha256-BDgNtPtK43O9PlQVmGqWj3Vtv18p9KlIfl+zky1pYlw=",
"hash": "sha256-0zU1HXGs+4qJ/IYePgX3uE7/i7vV85nXD1jiwKasgxA=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v18.10.0",
"rev": "v18.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3A8nlFIdxUVUUnW8D//7FR3/ic3iAPiH1xRIMC1IUhY="
"vendorHash": "sha256-a82yKFb82R6mlts5X2igussJTBldNAtwaz35QIe/hSk="
},
"go-gandi_gandi": {
"hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=",
@@ -1229,13 +1229,13 @@
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
},
"spacelift-io_spacelift": {
"hash": "sha256-j9D4rUjnBQqobAu5yXo5fCJSwkVSovmrroowBTuLIVQ=",
"hash": "sha256-oS3Ikmi5wUlVbQos16x1BXoqhgOMIGyJcpl7sIXmDtk=",
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
"owner": "spacelift-io",
"repo": "terraform-provider-spacelift",
"rev": "v1.47.1",
"rev": "v1.48.0",
"spdx": "MIT",
"vendorHash": "sha256-Ub0lqMdCu44UX3LkcjErsxfWdL9C6CxhVKPOn1AAdEc="
"vendorHash": "sha256-/4v25xY/fmfSAEALRbXu/a+x3nC1Ly/IJPOEKmYjgmw="
},
"splunk-terraform_signalfx": {
"hash": "sha256-m+qD71tTqQycD+9xju5T83IaYCgJhkfh+byn6yrdfO4=",
@@ -1409,11 +1409,11 @@
"vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8="
},
"ucloud_ucloud": {
"hash": "sha256-lDLYp0ApFCV6XYCxCunkpFwEXpACoChQWLx2bHTjeQs=",
"hash": "sha256-rS9OdlxP9sGUK94hrYbPrNJn5Netov/bToQM6W73+ac=",
"homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
"owner": "ucloud",
"repo": "terraform-provider-ucloud",
"rev": "v1.39.3",
"rev": "v1.39.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -15,12 +15,12 @@
pkgs,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "openpaperwork-core";
inherit (callPackage ./src.nix { }) version src;
pyproject = true;
sourceRoot = "${src.name}/openpaperwork-core";
sourceRoot = "${finalAttrs.src.name}/openpaperwork-core";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
@@ -61,4 +61,4 @@ buildPythonPackage rec {
];
platforms = lib.platforms.linux;
};
}
})
@@ -15,12 +15,12 @@
pkgs,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "openpaperwork-gtk";
inherit (callPackage ./src.nix { }) version src;
pyproject = true;
sourceRoot = "${src.name}/openpaperwork-gtk";
sourceRoot = "${finalAttrs.src.name}/openpaperwork-gtk";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
@@ -61,4 +61,4 @@ buildPythonPackage rec {
];
platforms = lib.platforms.linux;
};
}
})
@@ -26,12 +26,12 @@
setuptools-scm,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "paperwork-backend";
inherit (callPackage ./src.nix { }) version src;
pyproject = true;
sourceRoot = "${src.name}/paperwork-backend";
sourceRoot = "${finalAttrs.src.name}/paperwork-backend";
patches = [
# disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700
@@ -93,4 +93,4 @@ buildPythonPackage rec {
symphorien
];
};
}
})
@@ -19,12 +19,12 @@
pkgs,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "paperwork-shell";
inherit (callPackage ./src.nix { }) version src;
pyproject = true;
sourceRoot = "${src.name}/paperwork-shell";
sourceRoot = "${finalAttrs.src.name}/paperwork-shell";
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
@@ -71,4 +71,4 @@ buildPythonPackage rec {
symphorien
];
};
}
})
@@ -9,7 +9,7 @@
makeWrapper,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "hyprshade";
version = "4.0.1";
pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "loqusion";
repo = "hyprshade";
tag = version;
tag = finalAttrs.version;
hash = "sha256-zK8i2TePJ4cEtGXe/dssHWg+ioCTo1NyqzInQhMaB8w=";
};
@@ -45,4 +45,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ willswats ];
platforms = lib.platforms.linux;
};
}
})
@@ -5,13 +5,13 @@
i3ipc,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "i3-balance-workspace";
version = "1.8.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
inherit (finalAttrs) pname version;
hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0=";
};
@@ -27,4 +27,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ euxane ];
mainProgram = "i3_balance_workspace";
};
}
})
+1
View File
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.acpica.org/";
description = "ACPICA Tools";
changelog = "https://github.com/acpica/acpica/releases/tag/${finalAttrs.version}";
license = with lib.licenses; [
iasl
gpl2Only
+5 -4
View File
@@ -15,11 +15,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "algol68g";
version = "3.5.14";
version = "3.11.3";
src = fetchurl {
url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz";
hash = "sha256-uIy8rIhUjohiQJ/K5EprsIISXMAx1w27I3cGo/9H9Wk=";
# Uses archive.org because the original site removes older versions.
url = "https://web.archive.org/web/20260419212716/https://jmvdveer.home.xs4all.nl/algol68g-3.11.3.tar.gz";
hash = "sha256-P8hKm5lFG3P8+OigX2mFPzL1bN30bblAvijajJzTcxA=";
};
outputs = [
@@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.gpl3Plus;
mainProgram = "a68g";
maintainers = [ ];
maintainers = with lib.maintainers; [ tbutter ];
platforms = lib.platforms.unix;
};
})
+4 -4
View File
@@ -14,9 +14,9 @@
# buildInputs
fmt,
mimalloc,
# propagatedBuildInputs
suitesparse,
crocoddyl,
pinocchio,
@@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aligator";
version = "0.16.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "Simple-Robotics";
repo = "aligator";
tag = "v${finalAttrs.version}";
hash = "sha256-OyCJa2iTkCxVLooSKdVgBd0y7rHObo4vFcc56t48TSY=";
hash = "sha256-qdXZo7IvgcUFEJARwxpSaHJVRlZ6HdgRADPOiY3oCpk=";
};
outputs = [
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
fmt
mimalloc
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
llvmPackages.openmp
@@ -60,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
crocoddyl
pinocchio
suitesparse
];
checkInputs = [
+3 -3
View File
@@ -8,12 +8,12 @@
stdenv.mkDerivation {
pname = "althttpd";
version = "0-unstable-2026-01-27";
version = "0-unstable-2026-03-20";
src = fetchfossil {
url = "https://sqlite.org/althttpd/";
rev = "7758535a137da507";
hash = "sha256-9yszcoYpbM9/KDn7zpWgDINZF6azkQVxwlOw7BvRo+4=";
rev = "a8fac0faaab1f43f";
hash = "sha256-Z4kZgCvqY7Kroc6A98s5UH4N8CEUzF+xmdXDRw2Lxtw=";
};
buildInputs = [ openssl ];
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "atftp";
version = "0.8.0";
version = "0.8.1";
src = fetchurl {
url = "mirror://sourceforge/atftp/atftp-${finalAttrs.version}.tar.gz";
hash = "sha256-3yqgicdnD56rQOVZjl0stqWC3FGCkm6lC01pDk438xY=";
hash = "sha256-lsvb0vFmFcicnbNr6bMG3hdtmhwD3LjLd3Ylv+BovCs=";
};
# fix test script
+7 -5
View File
@@ -5,14 +5,15 @@
pkg-config,
fuse,
xz,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "avfs";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "mirror://sourceforge/avf/${finalAttrs.version}/avfs-${finalAttrs.version}.tar.bz2";
sha256 = "sha256-olqOxDwe4XJiThpMec5mobkwhBzbVFtyXx7GS8q+iJw=";
sha256 = "sha256-B81p1MDH7QgOgP8EDZgChkBa04pEP9xS3Dle/vEcRLE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -20,19 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
fuse
xz
zlib
];
configureFlags = [
"--enable-library"
"--enable-fuse"
];
]
++ lib.optional stdenv.hostPlatform.isDarwin "--with-system-zlib";
meta = {
homepage = "https://avf.sourceforge.net/";
description = "Virtual filesystem that allows browsing of compressed files";
platforms = lib.platforms.unix;
license = lib.licenses.gpl2Only;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [ tbutter ];
};
})
+2 -10
View File
@@ -61,7 +61,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "azahar";
version = "2125.0.1";
version = "2125.1";
src = fetchFromGitHub {
owner = "azahar-emu";
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
echo "${finalAttrs.version}" > "$out/GIT-TAG"
git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT"
'';
hash = "sha256-KzM2FWJPxZtkpwvK4DSdfNuxE8yy1OVaioVegQbBSWk=";
hash = "sha256-F5v52axQ4+vH6ZqEEuuMtV5PVahWmnS3PixZHqywhtM=";
};
strictDeps = true;
@@ -138,14 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
(darwinMinVersionHook "13.4")
];
patches = [
(fetchpatch {
name = "cmake-Add-option-to-use-system-oaknut.patch";
url = "https://github.com/azahar-emu/azahar/commit/6201256e15ee4d4fc053933545abf50fc46be178.patch";
hash = "sha256-03eIubAJ65W9clI9iaLcLNAAMbkX4E507nYNV8DVwZc=";
})
];
postPatch = ''
# We already know the submodules are present
substituteInPlace CMakeLists.txt \
+30 -7
View File
@@ -10,6 +10,12 @@
openssh,
sshfs-fuse,
encfs,
gocryptfs,
which,
ps,
gnugrep,
man,
asciidoctor,
}:
let
@@ -28,24 +34,30 @@ let
rsync
sshfs-fuse
encfs
gocryptfs
];
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "backintime-common";
version = "1.5.6";
version = "1.6.1";
src = fetchFromGitHub {
owner = "bit-team";
repo = "backintime";
rev = "v${version}";
sha256 = "sha256-y9uo/6R9OXK9hqUD0pCLJXF2B80lr2gXf6v8+Ca6u5M=";
tag = "v${finalAttrs.version}";
hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE=";
};
nativeBuildInputs = [
makeWrapper
gettext
];
buildInputs = [ python' ];
buildInputs = [
python'
man
asciidoctor
];
installFlags = [ "DEST=$(out)" ];
@@ -53,12 +65,23 @@ stdenv.mkDerivation rec {
preConfigure = ''
patchShebangs --build updateversion.sh
patchShebangs --build doc/manpages/build_manpages.sh
cd common
substituteInPlace configure \
--replace-fail "/.." "" \
--replace-fail "/../etc" "/etc" \
--replace-fail "share/backintime" "${python'.sitePackages}/backintime"
substituteInPlace "backintime" "backintime-askpass" \
--replace-fail "share" "${python'.sitePackages}"
substituteInPlace "schedule.py" \
--replace-fail "'crontab'" "'${cron}/bin/crontab'" \
--replace-fail "'which'" "'${lib.getExe which}'" \
--replace-fail "'ps'" "'${lib.getExe ps}'" \
--replace-fail "'grep'" "'${lib.getExe gnugrep}'" \
substituteInPlace "bitlicense.py" \
--replace-fail "/usr/share/doc" "$out/share/doc" \
'';
dontAddPrefix = true;
@@ -81,4 +104,4 @@ stdenv.mkDerivation rec {
done by taking snapshots of a specified set of directories.
'';
};
}
})
+31 -3
View File
@@ -4,21 +4,45 @@
backintime-common,
python3,
polkit,
meld ? null,
meldSupport ? true,
kdePackages ? null,
kompareSupport ? false,
which,
su,
coreutils,
util-linux,
qt6,
man,
asciidoctor,
keyringBackends ?
ps: with ps; [
secretstorage
keyrings-alt
keyring-pass
],
}:
let
python' = python3.withPackages (
ps: with ps; [
ps:
with ps;
[
pyqt6
backintime-common
dbus-python
keyring
packaging
]
++ (keyringBackends ps)
);
diffProgram =
if meldSupport then
"${lib.getBin meld}/bin"
else if kompareSupport then
"${lib.getBin kdePackages.kompare}/bin"
else
"";
in
stdenv.mkDerivation {
inherit (backintime-common)
@@ -36,6 +60,8 @@ stdenv.mkDerivation {
backintime-common
qt6.qtbase
qt6.qtwayland
man
asciidoctor
];
nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [
@@ -46,14 +72,16 @@ stdenv.mkDerivation {
preConfigure = ''
patchShebangs --build updateversion.sh
patchShebangs --build doc/manpages/build_manpages.sh
cd qt
substituteInPlace qttools_path.py \
--replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"'
--replace-fail "Path(__file__).parent.parent" '"${backintime-common}/${python'.sitePackages}/backintime"'
'';
preFixup = ''
wrapQtApp "$out/bin/backintime-qt" \
--prefix PATH : "${lib.getBin backintime-common}/bin:$PATH"
--prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" \
--prefix PATH : "${diffProgram}:$PATH"
substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \
--replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
+4 -4
View File
@@ -8,13 +8,13 @@
}:
buildGo126Module (finalAttrs: {
pname = "beszel";
version = "0.18.6";
version = "0.18.7";
src = fetchFromGitHub {
owner = "henrygd";
repo = "beszel";
tag = "v${finalAttrs.version}";
hash = "sha256-CRO0Y3o3hwdE55D027fo0tvt9o7vsA1ooEBFlXuw2So=";
hash = "sha256-pVZ1ru9++BypZ3EwoE8clqJowXj1/CMiJxKaC+UY9VE=";
};
webui = buildNpmPackage {
@@ -48,10 +48,10 @@ buildGo126Module (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/internal/site";
npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o=";
npmDepsHash = "sha256-mYAD8FrQwa+F/VgGxFpe8vqucfZaM0PmY+gJJqw1IKk=";
};
vendorHash = "sha256-g+UmoxBoCL3oGXNTY67Wz7y6FC/nkcS8020jhTq4JQE=";
vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k=";
tags = [ "testing" ];
+5 -5
View File
@@ -12,7 +12,7 @@
udevCheckHook,
}:
python3Packages.buildPythonPackage rec {
python3Packages.buildPythonPackage (finalAttrs: {
pname = "boxflat";
version = "1.35.5";
pyproject = true;
@@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Lawstorant";
repo = "boxflat";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-R03mQIsa6T1ApV8SMWvilBfiCGcAWvyZ5hDDgAuGd6s=";
};
@@ -66,7 +66,7 @@ python3Packages.buildPythonPackage rec {
setup(
name='boxflat',
packages=['boxflat', 'boxflat.panels', 'boxflat.widgets'],
version='${version}',
version='${finalAttrs.version}',
install_requires=install_requires,
entry_points={
'console_scripts': ['boxflat=boxflat.entrypoint:main']
@@ -117,11 +117,11 @@ python3Packages.buildPythonPackage rec {
meta = {
homepage = "https://github.com/Lawstorant/boxflat";
changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${version}";
changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${finalAttrs.version}";
description = "Control your Moza gear settings";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ racci ];
platforms = lib.platforms.linux;
mainProgram = "boxflat";
};
}
})
+5 -5
View File
@@ -3,24 +3,24 @@
let
pname = "brave";
version = "1.89.132";
version = "1.89.137";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-mYY8eyMWcwx6RuMNP5ucf6xd1NXfYO4nqXEkiTUtX0o=";
hash = "sha256-JeYoRM6ClQ7iqu+wvwaTUmdDuIS+2AXoTIU+VxAbgRg=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-/SmzRSgmXM567D1YQdD/IfDaIe3RPLtgJMYvcOCwvZo=";
hash = "sha256-BFbx/Ex4HdaFpfY2AKc3yAaMp6PiYwC/kmEIF0WdcwU=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-3f29ehqJNQjYJ+vh15ZI2UJEB1VdBfLL3VWv8CRasCw=";
hash = "sha256-Ffc9se0j9ULZsZQktWzrUgBiLyC5QR1jAPg6IcHoOTI=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-KIod2FbWck1OUATr/vKK+vgwIih3Lha48MAdt5qNIAk=";
hash = "sha256-SOOf35CONFydjSK47xgQLHxX7weQFPl2Fh33H5qeqXo=";
};
};
+9 -18
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
qt6,
libsForQt5,
qt6Packages,
fetchFromGitHub,
gst_all_1,
cmake,
@@ -11,18 +11,15 @@
ninja,
pkg-config,
}:
let
inherit (libsForQt5) qcoro;
in
stdenv.mkDerivation (finalAttrs: {
pname = "brickstore";
version = "2024.12.3";
version = "2026.3.2";
src = fetchFromGitHub {
owner = "rgriebl";
repo = "brickstore";
tag = "v${finalAttrs.version}";
hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
hash = "sha256-UIVzvzsterKkL8/JPx5S0wly6mLxflAqX0gMFX3rOes=";
fetchSubmodules = true;
};
@@ -31,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
libglvnd
ninja
pkg-config
qcoro
qt6.qtdoc
qt6.qtdeclarative
qt6.qtimageformats
@@ -42,20 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
qt6.qtwayland
qt6.wrapQtAppsHook
qt6Packages.qcoro
onetbb
];
patches = [
./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs
./qjsonvalue-include.patch # Add a required '#include <QtCore/QJsonValue>'
];
# Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory
preConfigure = ''
substituteInPlace cmake/BuildQCoro.cmake \
--replace-fail \
'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \
'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'
# Use nix-provided qcoro instead of fetching from GitHub
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'include(BuildQCoro)' \
'find_package(QCoro6 CONFIG REQUIRED COMPONENTS Core Network Qml)'
'';
qtWrapperArgs = [
@@ -1,20 +0,0 @@
diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake
index 941e813..41c88c6 100644
--- a/cmake/BuildQCoro.cmake
+++ b/cmake/BuildQCoro.cmake
@@ -14,14 +14,6 @@ if (BACKEND_ONLY)
set(QCORO_WITH_QML OFF)
endif()
-FetchContent_Declare(
- qcoro
- GIT_REPOSITORY https://github.com/danvratil/qcoro.git
- GIT_TAG v${QCORO_VERSION}
- SOURCE_SUBDIR "NeedManualAddSubDir" # make it possible to add_subdirectory below
-)
-
-FetchContent_MakeAvailable(qcoro)
set(mll ${CMAKE_MESSAGE_LOG_LEVEL})
if (NOT VERBOSE_FETCH)
@@ -1,12 +0,0 @@
diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
index 14426e5b..59856f0c 100755
--- a/src/bricklink/order.cpp
+++ b/src/bricklink/order.cpp
@@ -16,6 +16,7 @@
#include <QtSql/QSqlError>
#include <QtSql/QSqlQueryModel>
#include <QtCore/QLoggingCategory>
+#include <QtCore/QJsonValue>
#include "bricklink/core.h"
#include "bricklink/io.h"
+34 -11
View File
@@ -1,28 +1,52 @@
{
lib,
stdenvNoCC,
fetchurl,
undmg,
stdenv,
fetchFromGitHub,
apple-sdk,
darwin,
xcbuildHook,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "caffeine";
version = "1.1.4";
src = fetchurl {
url = "https://github.com/IntelliScape/caffeine/releases/download/${finalAttrs.version}/Caffeine.dmg";
hash = "sha256-GtNMMpmgyGaHPE/rQyw+ERhjda229DxfSBrp1G0G1yM=";
src = fetchFromGitHub {
owner = "IntelliScape";
repo = "caffeine";
tag = finalAttrs.version;
hash = "sha256-AmBPY5ZVWBq2ZesNvvJ/Do5XgPjb5R1ESNJm7tx0M6k=";
};
sourceRoot = ".";
# xcbuild routes image.png resources through CopyPNGFile, which requires the
# Apple-only copypng tool that is unavailable in the nixpkgs toolchain.
# Treat these PNGs as generic files so xcbuild copies them directly.
postPatch = ''
substituteInPlace Caffeine.xcodeproj/project.pbxproj \
--replace-fail \
"lastKnownFileType = image.png;" \
"lastKnownFileType = file;"
'';
nativeBuildInputs = [ undmg ];
nativeBuildInputs = [
xcbuildHook
darwin.autoSignDarwinBinariesHook
];
buildInputs = [
apple-sdk
];
xcbuildFlags = [
"-target Caffeine"
"-configuration Release"
];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r *.app $out/Applications
cp -r Products/Release/Caffeine.app $out/Applications
runHook postInstall
'';
@@ -36,6 +60,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
"x86_64-darwin"
"aarch64-darwin"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})
+6 -3
View File
@@ -12,14 +12,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "canaille";
version = "0.2.4";
version = "0.2.7";
pyproject = true;
src = fetchFromGitLab {
owner = "yaal";
repo = "canaille";
tag = version;
hash = "sha256-iCiQvB+wYpm/Cns63kjo2wVGnSbcQHWo3UJvi0xJf50=";
hash = "sha256-hreEjMrD6mRapgrSDPRWcmqfLxfsOpK7dC8lHJkAY7Y=";
};
build-system = with python.pkgs; [
@@ -107,7 +107,10 @@ python.pkgs.buildPythonApplication rec {
scim2-client
scim2-models
];
ldap = [ python-ldap ];
ldap = [
ldappool
python-ldap
];
sentry = [ sentry-sdk ];
postgresql = [
flask-alembic
+1 -6
View File
@@ -22,16 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
# canfigger has asan and ubsan enabled by default, disable it here
mesonFlags = [
"-Dcanfigger:b_sanitize=none"
];
meta = {
description = "Lightweight library designed to parse configuration files";
homepage = "https://github.com/andy5995/canfigger";
changelog = "https://github.com/andy5995/canfigger/blob/${finalAttrs.src.rev}/ChangeLog.txt";
license = lib.licenses.gpl3Only;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ iynaix ];
mainProgram = "canfigger";
platforms = lib.platforms.all;
+2 -2
View File
@@ -11,12 +11,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cannelloni";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "mguentner";
repo = "cannelloni";
tag = "v${finalAttrs.version}";
hash = "sha256-b3pBC2XFK+pyONvnkPw/0YUXAG2cRD1OaN7k2ONzFV8=";
hash = "sha256-lHZmsgtIL7edODXV8lWfVwMhnS40n9wD8iVyAzJycbA=";
};
nativeBuildInputs = [
@@ -27,12 +27,12 @@ index ab8d111..d7165e2 100644
message(STATUS "Building solvers with cadical")
download_project(PROJ cadical
- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz
+ SOURCE_DIR @srccadical@
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch
COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/scripts/cadical_CMakeLists.txt CMakeLists.txt
COMMAND ./configure
- URL_MD5 9fc2a66196b86adceb822a583318cc35
- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf
)
add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
@@ -40,11 +40,11 @@ index ab8d111..d7165e2 100644
message(STATUS "Building with IPASIR solver linking against: CaDiCaL")
download_project(PROJ cadical
- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz
+ SOURCE_DIR @srccadical@
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch
PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch
COMMAND ./configure
- URL_MD5 9fc2a66196b86adceb822a583318cc35
- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf
)
message(STATUS "Building CaDiCaL")
+3 -3
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cbmc";
version = "6.8.0";
version = "6.9.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = "cbmc";
tag = "cbmc-${finalAttrs.version}";
hash = "sha256-PT6AYiwkplCeyMREZnGZA0BKl4ZESRC02/9ibKg7mYU=";
hash = "sha256-SMJBnzoyTwcwJa9L2X1iX2W4Z/Mwoirf8EXfoyG0dRI=";
};
srcglucose = fetchFromGitHub {
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
srccadical =
(cadical.override {
version = "2.0.0";
version = "3.0.0";
}).src;
nativeBuildInputs = [
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cloudflare-cli";
version = "5.1.2";
version = "5.1.4";
src = fetchFromGitHub {
owner = "danielpigott";
repo = "cloudflare-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-KDL9UGsBVH+BxeMwpcwqH0P0Y8QbFMSqNT5FrTZxDog=";
hash = "sha256-UGXouKsFA4GCFgjsf5smQ1xsibPFiBqkdsqNDLAy2GM=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-30zvP1sYENfTh8o/RiSrYPZR3to3GF2m036q/+mrcSU=";
hash = "sha256-2NgmL04czIj/uj/KzdEDc4PdzUVVRty3MSZ9IwqRMOk=";
};
nativeBuildInputs = [
@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-caffeine";
version = "0-unstable-2026-01-11";
version = "0-unstable-2026-04-18";
src = fetchFromGitHub {
owner = "tropicbliss";
repo = "cosmic-ext-applet-caffeine";
rev = "f101f568c5e6bd5c1acbd1f32a09026898cd5a4c";
hash = "sha256-tnuNOuTUdwGnS3mIHs5K4ByA6C9uymDTqYDwevJVNFw=";
rev = "96f7be5de71a460b9c26ec024bb8089208ad991f";
hash = "sha256-wdsm6snDY61+sJfzKkLDGVbAm5mC0lWDCTlDdImTwO8=";
};
cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ=";
+18 -3
View File
@@ -6,6 +6,9 @@
git,
testers,
d2,
libgbm,
makeWrapper,
playwright-driver,
}:
buildGoModule (finalAttrs: {
@@ -29,13 +32,25 @@ buildGoModule (finalAttrs: {
"-X oss.terrastruct.com/d2/lib/version.Version=v${finalAttrs.version}"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
makeWrapper
];
buildInputs = [
libgbm
playwright-driver.browsers
];
nativeCheckInputs = [ git ];
postInstall = ''
installManPage ci/release/template/man/d2.1
'';
nativeCheckInputs = [ git ];
# Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
wrapProgram $out/bin/d2 \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
'';
preCheck = ''
# See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests.
+8 -6
View File
@@ -12,24 +12,26 @@
nodejs_20,
nodejs-slim_20,
remarshal_0_17,
nix-update-script,
settings ? { },
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dashy-ui";
version = "3.1.1-unstable-2025-09-12";
version = "3.3.0";
src = fetchFromGitHub {
owner = "lissy93";
repo = "dashy";
rev = "e70ade555fdccf4e723a90f8a2d46fcf83645c4f";
hash = "sha256-edsGHc6Hi306aq+TA2g5FL/ZYNfExbcgHS5PWF9O0+0=";
tag = finalAttrs.version;
hash = "sha256-Xc6zwnR0J+0DuTKNW3eHyJRvUgJgEeL3jA26wzNTMN0=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-r36w3Cz/V7E/xPYYpvfQsdk2QXfCVDYE9OxiFNyKP2s=";
hash = "sha256-EMns5J8rM4qOfrACoX6lttOXh/RUtZjaKtd+BpsS6Xs=";
};
passthru.tests = {
dashy = nixosTests.dashy;
passthru = {
tests.dashy = nixosTests.dashy;
updateScript = nix-update-script { };
};
# - If no settings are passed, use the default config provided by upstream
+8 -2
View File
@@ -8,12 +8,18 @@
stdenv,
}:
# nixpkgs-update: no auto update
# NOTE: Do not update to interim patch versions. The download URL will get shut
# down after a while. Dbvisualizer discontinues download
# URLs for all but the last patch version per minor version.
# Example: v25.3.2 gets shut down after v25.3.3 gets released.
let
pname = "dbvisualizer";
in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "25.2.6";
version = "25.3.3";
src =
let
@@ -21,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
in
fetchurl {
url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz";
hash = "sha256-yiL0FFkSntwLy/oOkiDQKTvTOUrtbv/9kV+1nLZtMB0=";
hash = "sha256-rvS2NczwmT1+/JIfpLI518I0/2AaIJEQAOwmKUK2FQs=";
};
strictDeps = true;
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "deps.fnl";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitLab {
owner = "andreyorst";
repo = "deps.fnl";
tag = version;
hash = "sha256-gUqi0g7myWTbjILN4RQqbeeaSYcg0oVJYNO0Gv9XzNY=";
hash = "sha256-FrFeRbfK4sHd3pjiVDMrE8IpDKptZuwkTLMQ9hppVRY=";
};
dontBuild = true;
+8 -6
View File
@@ -8,7 +8,6 @@
cdrkit,
dvdauthor,
gtk3,
gettext,
wrapGAppsHook3,
gdk-pixbuf,
gobject-introspection,
@@ -22,23 +21,25 @@ let
pygobject3
urllib3
setuptools
setuptools-gettext
importlib-metadata
;
in
buildPythonApplication (finalAttrs: {
pname = "devede";
version = "4.21.0";
format = "setuptools";
version = "4.21.3.1";
format = "pyproject";
namePrefix = "";
src = fetchFromGitLab {
owner = "rastersoft";
repo = "devedeng";
rev = finalAttrs.version;
hash = "sha256-sLJkIKw0ciX6spugbdO0eZ1dIkoHfuu5e/f2XwA70a0=";
hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg=";
};
nativeBuildInputs = [
gettext
setuptools-gettext
wrapGAppsHook3
gobject-introspection
];
@@ -59,6 +60,7 @@ buildPythonApplication (finalAttrs: {
cdrkit
urllib3
setuptools
importlib-metadata
];
postPatch = ''
@@ -68,7 +70,7 @@ buildPythonApplication (finalAttrs: {
--replace "/usr/local/share" "$out/share"
'';
passthru.updateScript = nix-update-script { };
passthru.updateScript = ./update.sh;
meta = {
description = "DVD Creator for Linux";
+7
View File
@@ -0,0 +1,7 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p curl nix-update xmlstarlet
set -euo pipefail
latest_tag=$(curl -s "https://gitlab.com/rastersoft/devedeng/-/tags?format=atom" | xmlstarlet sel -t -v "(//*[local-name()='entry']/*[local-name()='title'])[1]")
nix-update devede --version $latest_tag
@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "directx-shader-compiler";
version = "1.8.2505.1";
version = "1.9.2602";
# Put headers in dev, there are lot of them which aren't necessary for
# using the compiler binary.
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "microsoft";
repo = "DirectXShaderCompiler";
rev = "v${finalAttrs.version}";
hash = "sha256-d8qJ9crS5CStbsGOe/OSHtUEV4vr3sLCQp+6KsEq/A4=";
hash = "sha256-S3ar1LTV/9fYU2B5y8x0ESB20lMnAx8XQw9n3G4z0nk=";
fetchSubmodules = true;
};
@@ -34,7 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
python3
];
cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ];
cmakeFlags = [
"-C../cmake/caches/PredefinedParams.cmake"
# Tries to download prebuilt dxcs
(lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
(lib.cmakeBool "HLSL_INCLUDE_TESTS" false)
];
# The default install target installs heaps of LLVM stuff.
#
+2 -2
View File
@@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "distgen";
version = "2.2";
version = "2.3";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-w+/aiLv5NCQFD0ItlC+Wy9BuvA/ndDQcLf6Iyb9trF4=";
hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ=";
};
build-system = with python3.pkgs; [
@@ -1,28 +0,0 @@
---
src/dmitry.c | 1 +
src/file.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/dmitry.c b/src/dmitry.c
index d47f231..567482d 100644
--- a/src/dmitry.c
+++ b/src/dmitry.c
@@ -9,6 +9,7 @@
#include <ctype.h>
#include <string.h>
#include <signal.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/src/file.c b/src/file.c
index f4ad48b..3714786 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,4 +1,6 @@
#include "includes/file.h"
+#include <string.h>
+#include <stdlib.h>
int file_prep()
{
outputfile[strlen(outputfile)] = '\0';
+3 -7
View File
@@ -7,21 +7,17 @@
stdenv.mkDerivation {
pname = "dmitry";
version = "1.3a-unstable-2020-06-22";
version = "1.3a-unstable-2026-03-26";
src = fetchFromGitHub {
owner = "jaygreig86";
repo = "dmitry";
rev = "f3ae08d4242e3e178271c827b86ff0d655972280";
hash = "sha256-cYFeBM8xFMaLXYk6Rg+5JvfbbIJI9F3mefzCX3+XbB0=";
rev = "f2b8961dabbd55486a5649a9803446b860ad28e7";
hash = "sha256-ZEfRaJ4ds1yWxN9VTFoBiUI5ZzK//aD7o9ry6vmA1YM=";
};
patches = [ ./implicit-function-declaration.patch ];
nativeBuildInputs = [ autoreconfHook ];
env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ];
meta = {
description = "Deepmagic Information Gathering Tool";
mainProgram = "dmitry";
+2 -3
View File
@@ -3,6 +3,7 @@
source 'https://rubygems.org'
gem 'addressable'
gem 'arabic-letter-connector', require: false
gem 'aws-sdk-s3', require: false
gem 'aws-sdk-secretsmanager', require: false
@@ -27,12 +28,10 @@ gem 'oj'
gem 'onnxruntime', require: false
gem 'pagy'
gem 'pg', require: false
gem 'premailer-rails'
gem 'pretender'
gem 'puma', require: false
gem 'rack'
gem 'rails'
gem 'rails_autolink'
gem 'rails-i18n'
gem 'rotp'
gem 'rouge', require: false
@@ -43,7 +42,7 @@ gem 'shakapacker'
gem 'sidekiq'
gem 'sqlite3', require: false
gem 'strip_attributes'
gem 'trilogy', github: 'trilogy-libraries/trilogy', glob: 'contrib/ruby/*.gemspec', require: false
gem 'trilogy', require: false
gem 'turbo-rails'
gem 'twitter_cldr', require: false
gem 'tzinfo-data'
+146 -166
View File
@@ -1,39 +1,31 @@
GIT
remote: https://github.com/trilogy-libraries/trilogy.git
revision: 3963d490459df7a2b5bedb42424c3285f25eab22
glob: contrib/ruby/*.gemspec
specs:
trilogy (2.10.0)
bigdecimal
GEM
remote: https://rubygems.org/
specs:
action_text-trix (2.1.16)
action_text-trix (2.1.18)
railties
actioncable (8.1.2)
actionpack (= 8.1.2)
activesupport (= 8.1.2)
actioncable (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (8.1.2)
actionpack (= 8.1.2)
activejob (= 8.1.2)
activerecord (= 8.1.2)
activestorage (= 8.1.2)
activesupport (= 8.1.2)
actionmailbox (8.1.3)
actionpack (= 8.1.3)
activejob (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
mail (>= 2.8.0)
actionmailer (8.1.2)
actionpack (= 8.1.2)
actionview (= 8.1.2)
activejob (= 8.1.2)
activesupport (= 8.1.2)
actionmailer (8.1.3)
actionpack (= 8.1.3)
actionview (= 8.1.3)
activejob (= 8.1.3)
activesupport (= 8.1.3)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (8.1.2)
actionview (= 8.1.2)
activesupport (= 8.1.2)
actionpack (8.1.3)
actionview (= 8.1.3)
activesupport (= 8.1.3)
nokogiri (>= 1.8.5)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
@@ -41,36 +33,36 @@ GEM
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (8.1.2)
actiontext (8.1.3)
action_text-trix (~> 2.1.15)
actionpack (= 8.1.2)
activerecord (= 8.1.2)
activestorage (= 8.1.2)
activesupport (= 8.1.2)
actionpack (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (8.1.2)
activesupport (= 8.1.2)
actionview (8.1.3)
activesupport (= 8.1.3)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (8.1.2)
activesupport (= 8.1.2)
activejob (8.1.3)
activesupport (= 8.1.3)
globalid (>= 0.3.6)
activemodel (8.1.2)
activesupport (= 8.1.2)
activerecord (8.1.2)
activemodel (= 8.1.2)
activesupport (= 8.1.2)
activemodel (8.1.3)
activesupport (= 8.1.3)
activerecord (8.1.3)
activemodel (= 8.1.3)
activesupport (= 8.1.3)
timeout (>= 0.4.0)
activestorage (8.1.2)
actionpack (= 8.1.2)
activejob (= 8.1.2)
activerecord (= 8.1.2)
activesupport (= 8.1.2)
activestorage (8.1.3)
actionpack (= 8.1.3)
activejob (= 8.1.3)
activerecord (= 8.1.3)
activesupport (= 8.1.3)
marcel (~> 1.0)
activesupport (8.1.2)
activesupport (8.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -83,16 +75,16 @@ GEM
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.8)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
annotaterb (4.20.0)
annotaterb (4.22.0)
activerecord (>= 6.0.0)
activesupport (>= 6.0.0)
arabic-letter-connector (0.1.1)
ast (2.4.3)
aws-eventstream (1.4.0)
aws-partitions (1.1209.0)
aws-sdk-core (3.241.4)
aws-partitions (1.1233.0)
aws-sdk-core (3.244.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
@@ -100,15 +92,15 @@ GEM
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.121.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sdk-kms (1.123.0)
aws-sdk-core (~> 3, >= 3.244.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.212.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sdk-s3 (1.218.0)
aws-sdk-core (~> 3, >= 3.244.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sdk-secretsmanager (1.128.0)
aws-sdk-core (~> 3, >= 3.241.4)
aws-sdk-secretsmanager (1.129.0)
aws-sdk-core (~> 3, >= 3.244.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
@@ -116,7 +108,7 @@ GEM
cgi
rexml
base64 (0.3.0)
bcrypt (3.1.21)
bcrypt (3.1.22)
better_html (2.2.0)
actionview (>= 7.0)
activesupport (>= 7.0)
@@ -124,11 +116,11 @@ GEM
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (4.0.1)
bigdecimal (4.1.0)
bindex (0.8.1)
bootsnap (1.21.1)
bootsnap (1.23.0)
msgpack (~> 1.2)
brakeman (7.1.2)
brakeman (8.0.4)
racc
builder (3.3.0)
bullet (8.1.0)
@@ -158,8 +150,6 @@ GEM
bigdecimal
rexml
crass (1.0.6)
css_parser (1.21.1)
addressable
csv (3.3.5)
csv-safe (3.3.1)
csv (~> 3.0)
@@ -171,16 +161,16 @@ GEM
irb (~> 1.10)
reline (>= 0.3.8)
declarative (0.0.20)
devise (4.9.4)
devise (5.0.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
railties (>= 7.0)
responders
warden (~> 1.2.3)
devise-two-factor (6.3.1)
activesupport (>= 7.0, < 8.2)
devise (>= 4.0, < 5.0)
railties (>= 7.0, < 8.2)
devise-two-factor (6.4.0)
activesupport (>= 7.2, < 8.2)
devise (>= 4.0, < 6.0)
railties (>= 7.2, < 8.2)
rotp (~> 6.0)
diff-lcs (1.6.2)
digest-crc (0.7.0)
@@ -189,7 +179,7 @@ GEM
dotenv (3.2.0)
drb (2.2.3)
email_typo (0.2.3)
erb (6.0.1)
erb (6.0.2)
erb_lint (0.9.0)
activesupport
better_html (>= 2.0.1)
@@ -203,7 +193,7 @@ GEM
factory_bot_rails (6.5.1)
factory_bot (~> 6.5)
railties (>= 6.1.0)
faker (3.6.0)
faker (3.6.1)
i18n (>= 1.8.11, < 2)
faraday (2.14.1)
faraday-net_http (>= 2.0, < 3.5)
@@ -213,16 +203,16 @@ GEM
faraday (>= 1, < 3)
faraday-net_http (3.4.2)
net-http (~> 0.5)
ferrum (0.17.1)
ferrum (0.17.2)
addressable (~> 2.5)
base64 (~> 0.2)
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (~> 0.7)
ffi (1.17.3)
ffi (1.17.3-aarch64-linux-musl)
ffi (1.17.3-arm64-darwin)
ffi (1.17.3-x86_64-linux-musl)
ffi (1.17.4)
ffi (1.17.4-aarch64-linux-musl)
ffi (1.17.4-arm64-darwin)
ffi (1.17.4-x86_64-linux-musl)
foreman (0.90.0)
thor (~> 1.4)
geom2d (0.4.1)
@@ -238,7 +228,7 @@ GEM
retriable (~> 3.1)
google-apis-iamcredentials_v1 (0.26.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.59.0)
google-apis-storage_v1 (0.61.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
@@ -246,8 +236,8 @@ GEM
google-cloud-env (2.3.1)
base64 (~> 0.2)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.5.0)
google-cloud-storage (1.58.0)
google-cloud-errors (1.6.0)
google-cloud-storage (1.59.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
@@ -257,7 +247,7 @@ GEM
googleauth (~> 1.9)
mini_mime (~> 1.0)
google-logging-utils (0.2.0)
googleauth (1.16.1)
googleauth (1.16.2)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
@@ -266,24 +256,24 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
hashdiff (1.2.1)
hexapdf (1.5.0)
hexapdf (1.6.0)
cmdparse (~> 3.0, >= 3.0.3)
geom2d (~> 0.4, >= 0.4.1)
openssl (>= 2.2.1)
strscan (>= 3.1.2)
htmlentities (4.4.2)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
image_processing (1.14.0)
mini_magick (>= 4.9.5, < 6)
ruby-vips (>= 2.0.17, < 3)
io-console (0.8.2)
irb (1.16.0)
irb (1.17.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.18.1)
json (2.19.3)
jwt (3.1.2)
base64
language_server-protocol (3.17.0.5)
@@ -305,7 +295,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.25.0)
loofah (2.25.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.9.0)
@@ -321,13 +311,14 @@ GEM
logger
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (6.0.1)
minitest (6.0.3)
drb (~> 2.0)
prism (~> 1.5)
msgpack (1.8.0)
multi_json (1.19.1)
net-http (0.9.1)
uri (>= 0.11.1)
net-imap (0.6.2)
net-imap (0.6.3)
date
net-protocol
net-pop (0.1.2)
@@ -337,17 +328,17 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.5)
nokogiri (1.19.0)
nokogiri (1.19.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.19.0-aarch64-linux-musl)
nokogiri (1.19.2-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.19.0-arm64-darwin)
nokogiri (1.19.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.19.0-x86_64-linux-musl)
nokogiri (1.19.2-x86_64-linux-musl)
racc (~> 1.4)
numo-narray-alt (0.9.13)
oj (3.16.13)
numo-narray-alt (0.10.3)
oj (3.16.16)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
onnxruntime (0.10.1)
@@ -358,16 +349,17 @@ GEM
ffi
onnxruntime (0.10.1-x86_64-linux)
ffi
openssl (4.0.0)
openssl (4.0.1)
orm_adapter (0.5.0)
os (1.1.4)
ostruct (0.6.3)
package_json (0.2.0)
pagy (43.2.8)
pagy (43.4.4)
json
uri
yaml
parallel (1.27.0)
parser (3.3.10.1)
parallel (1.28.0)
parser (3.3.11.1)
ast (~> 2.4.1)
racc
pg (1.6.3)
@@ -376,18 +368,10 @@ GEM
pg (1.6.3-x86_64-linux-musl)
pp (0.6.3)
prettyprint
premailer (1.27.0)
addressable
css_parser (>= 1.19.0)
htmlentities (>= 4.0.0)
premailer-rails (1.12.0)
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
pretender (0.6.0)
actionpack (>= 7.1)
pretender (1.0.0)
actionpack (>= 7.2)
prettyprint (0.2.0)
prism (1.8.0)
prism (1.9.0)
pry (0.16.0)
coderay (~> 1.1)
method_source (~> 1.0)
@@ -397,51 +381,47 @@ GEM
psych (5.3.1)
date
stringio
public_suffix (7.0.2)
public_suffix (7.0.5)
puma (7.2.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.2.4)
rack (3.2.6)
rack-proxy (0.7.7)
rack
rack-session (2.1.1)
rack-session (2.1.2)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (2.3.1)
rack (>= 3)
rails (8.1.2)
actioncable (= 8.1.2)
actionmailbox (= 8.1.2)
actionmailer (= 8.1.2)
actionpack (= 8.1.2)
actiontext (= 8.1.2)
actionview (= 8.1.2)
activejob (= 8.1.2)
activemodel (= 8.1.2)
activerecord (= 8.1.2)
activestorage (= 8.1.2)
activesupport (= 8.1.2)
rails (8.1.3)
actioncable (= 8.1.3)
actionmailbox (= 8.1.3)
actionmailer (= 8.1.3)
actionpack (= 8.1.3)
actiontext (= 8.1.3)
actionview (= 8.1.3)
activejob (= 8.1.3)
activemodel (= 8.1.3)
activerecord (= 8.1.3)
activestorage (= 8.1.3)
activesupport (= 8.1.3)
bundler (>= 1.15.0)
railties (= 8.1.2)
railties (= 8.1.3)
rails-dom-testing (2.3.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
rails-html-sanitizer (1.7.0)
loofah (~> 2.25)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (8.1.0)
i18n (>= 0.7, < 2)
railties (>= 8.0.0, < 9)
rails_autolink (1.1.8)
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (8.1.2)
actionpack (= 8.1.2)
activesupport (= 8.1.2)
railties (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
@@ -450,11 +430,11 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.3.1)
rdoc (7.1.0)
rdoc (7.2.0)
erb
psych (>= 4.0.0)
tsort
redis-client (0.26.4)
redis-client (0.28.0)
connection_pool
regexp_parser (2.11.3)
reline (0.6.3)
@@ -468,7 +448,7 @@ GEM
responders (3.2.0)
actionpack (>= 7.0)
railties (>= 7.0)
retriable (3.1.2)
retriable (3.4.1)
rexml (3.4.4)
rotp (6.3.0)
rouge (4.7.0)
@@ -481,19 +461,19 @@ GEM
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.7)
rspec-mocks (3.13.8)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (8.0.2)
rspec-rails (8.0.4)
actionpack (>= 7.2)
activesupport (>= 7.2)
railties (>= 7.2)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.6)
rubocop (1.82.1)
rspec-core (>= 3.13.0, < 5.0.0)
rspec-expectations (>= 3.13.0, < 5.0.0)
rspec-mocks (>= 3.13.0, < 5.0.0)
rspec-support (>= 3.13.0, < 5.0.0)
rspec-support (3.13.7)
rubocop (1.86.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -501,10 +481,10 @@ GEM
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.48.0, < 2.0)
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.49.0)
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-performance (1.26.1)
@@ -529,14 +509,14 @@ GEM
rubyzip (>= 3.2.2)
rubyzip (3.2.2)
securerandom (0.4.1)
semantic_range (3.1.0)
shakapacker (9.5.0)
semantic_range (3.1.1)
shakapacker (9.7.0)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
sidekiq (8.1.0)
sidekiq (8.1.2)
connection_pool (>= 3.0.0)
json (>= 2.16.0)
logger (>= 1.7.0)
@@ -554,20 +534,22 @@ GEM
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.4)
smart_properties (1.17.0)
sqlite3 (2.9.0)
sqlite3 (2.9.2)
mini_portile2 (~> 2.8.0)
sqlite3 (2.9.0-aarch64-linux-musl)
sqlite3 (2.9.0-arm64-darwin)
sqlite3 (2.9.0-x86_64-linux-musl)
sqlite3 (2.9.2-aarch64-linux-musl)
sqlite3 (2.9.2-arm64-darwin)
sqlite3 (2.9.2-x86_64-linux-musl)
stringio (3.2.0)
strip_attributes (2.0.1)
activemodel (>= 3.0, < 9.0)
strscan (3.1.7)
strscan (3.1.8)
thor (1.5.0)
timeout (0.6.0)
timeout (0.6.1)
trailblazer-option (0.1.2)
trilogy (2.12.2)
bigdecimal
tsort (0.2.0)
turbo-rails (2.0.21)
turbo-rails (2.0.23)
actionpack (>= 7.1.0)
railties (>= 7.1.0)
twitter_cldr (6.14.0)
@@ -577,7 +559,7 @@ GEM
tzinfo
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2025.3)
tzinfo-data (1.2026.1)
tzinfo (>= 1.0.0)
uber (0.1.0)
unicode-display_width (3.2.0)
@@ -588,12 +570,11 @@ GEM
useragent (0.16.11)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
web-console (4.3.0)
actionview (>= 8.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webmock (3.26.1)
railties (>= 8.0.0)
webmock (3.26.2)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -605,7 +586,7 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
yaml (0.4.0)
zeitwerk (2.7.4)
zeitwerk (2.7.5)
PLATFORMS
aarch64-linux-musl
@@ -614,6 +595,7 @@ PLATFORMS
x86_64-linux-musl
DEPENDENCIES
addressable
annotaterb
arabic-letter-connector
aws-sdk-s3
@@ -650,14 +632,12 @@ DEPENDENCIES
onnxruntime
pagy
pg
premailer-rails
pretender
pry-rails
puma
rack
rails
rails-i18n
rails_autolink
rotp
rouge
rqrcode
@@ -673,7 +653,7 @@ DEPENDENCIES
simplecov
sqlite3
strip_attributes
trilogy!
trilogy
turbo-rails
twitter_cldr
tzinfo-data
@@ -681,4 +661,4 @@ DEPENDENCIES
webmock
BUNDLED WITH
2.6.9
2.7.2
File diff suppressed because it is too large Load Diff
+3 -9
View File
@@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "docuseal";
version = "2.3.4";
version = "2.4.4";
bundler = bundler.override { ruby = ruby_3_4; };
@@ -24,17 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
owner = "docusealco";
repo = "docuseal";
tag = finalAttrs.version;
hash = "sha256-JKV0xAtEbGETprC5zYEcmCVcUFrW4h/+lbYayzWefKs=";
hash = "sha256-GjWR0jxVRTs5KNbFDEcgCbG/HTJlJGYpbKf8+0YBSmk=";
# https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333
postFetch = "rm $out/db/schema.rb";
};
patches = [
# Drop setxid calls in non-root mode (fails under strict seccomp).
# https://github.com/docusealco/docuseal/pull/593
./only-switch-uid-when-root.patch
];
rubyEnv = bundlerEnv {
name = "docuseal-gems";
ruby = ruby_3_4;
@@ -52,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-AvdaSIXO31t15wWysTvFISqmKCAi1Q8CJgO0J2DqM6M=";
hash = "sha256-62nI/QUzlpI1VyZ6PWPz2kSp4S2GUIQDaf4jUwzyj24=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -1,6 +1,6 @@
{
"version": "1.5.1",
"rev": "7dbb2e646fea939a89f10a55aa98c474cbb0c098",
"hash": "sha256-FygBpfhvezvUbI969Dta+vZOPt6BnSW2d5gO4I4oB2A=",
"python_hash": "sha256-ZB+Zcxg5VjBzfTkQk7TxoP9pw+hvOXpB2qqnqqmjhxM="
"version": "1.5.2",
"rev": "8a5851971fae891f292c2714d86046ee018e9737",
"hash": "sha256-FWoVF7s/n28NN1HtnO0Cr3YyoIDgJcWBtBiO7vWiSOU=",
"python_hash": "sha256-B14dXW5pPnToiKbSD9ACzNksIhBG+ui1P9l67Qyke8o="
}
+560 -815
View File
File diff suppressed because it is too large Load Diff
+11 -9
View File
@@ -14,9 +14,9 @@
let
# for update.sh easy to handle
ngclientVersion = "0.0.192";
ngclientRev = "5237ca55b42e58896da2919ad8a76c034517e98a";
ngclientHash = "sha256-06LMFg0kRmG4c5s60/+NU8gugkfgWAyTGoLo0+UHRUI=";
ngclientVersion = "0.0.207";
ngclientRev = "42d711a541ca1ee2ff43f95cce89e8eeb224afc8";
ngclientHash = "sha256-VS6kb/2YGn/TBDXt62UifD7BHCWE2xiUkLcGBXzV+ww=";
# from Duplicati/Server/webroot/ngclient/package.json
ngclient = buildNpmPackage {
@@ -30,7 +30,7 @@ let
hash = ngclientHash;
};
npmDepsHash = "sha256-i9lW+JDB2TZGfhW1fzrZA36qgkYeMmHbJkeEYxga2ko=";
npmDepsHash = "sha256-wkzSUEqoB013yNbC1sX4qRz8DuGWRB20/M+ue/thbOQ=";
nativeBuildInputs = [ bun ];
@@ -58,22 +58,22 @@ let
in
buildDotnetModule rec {
pname = "duplicati";
version = "2.2.0.3";
version = "2.3.0.0";
channel = "stable";
buildDate = "2026-01-06";
buildDate = "2026-04-14";
src = fetchFromGitHub {
owner = "duplicati";
repo = "duplicati";
tag = "v${version}_${channel}_${buildDate}";
hash = "sha256-p2hl1S/XsKsbAfWBAgvNMl6z5zGm/FBH3EYSqDvkKy8=";
hash = "sha256-X9SaH83p2RJWeJK8MfNwPgI2c3AfBHhbxOaFz4c26qU=";
stripRoot = true;
};
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
enableParallelBuilding = false;
@@ -111,6 +111,8 @@ buildDotnetModule rec {
];
postPatch = ''
sed -i '/Duplicati.ShellExtension.csproj/d' Duplicati.slnx
rm -rf Duplicati/Server/webroot/ngclient
ln -s ${ngclient}/browser Duplicati/Server/webroot/ngclient
'';
+4 -4
View File
@@ -11,7 +11,7 @@
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "esphome-dashboard";
version = "20260210.0";
pyproject = true;
@@ -19,12 +19,12 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "esphome";
repo = "dashboard";
tag = version;
tag = finalAttrs.version;
hash = "sha256-Edd2ZOSBAZSrGVjbncyPhhjFjE0CxBHz16ZHXyzx9LI=";
};
npmDeps = fetchNpmDeps {
inherit src;
inherit (finalAttrs) src;
hash = "sha256-L6tKhijTFAvQwhBBl5Wk6xzI2dtDI6IYfCkiKX75Pvc=";
};
@@ -57,4 +57,4 @@ buildPythonPackage rec {
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ hexa ];
};
}
})
+3 -3
View File
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2026-04-08";
version = "0-unstable-2026-04-17";
src = fetchFromGitLab {
owner = "aiyahm";
repo = "FairyWren-Icons";
rev = "428ee2eef9f607021406376f55bfc6cf4054caf1";
hash = "sha256-XEuchaxh9h7hNpS2wjmytutcgroohdgsh7f1x5hrDKg=";
rev = "c55f846436b13fcc0c5ee745eead9bf8e3bcb0bf";
hash = "sha256-ESh/3PNprmD0ecSoH9JVw1r0VsWoQDw4ujpmSaoyhoM=";
};
propagatedBuildInputs = [
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "firecracker";
version = "1.14.2";
version = "1.15.1";
src = fetchFromGitHub {
owner = "firecracker-microvm";
repo = "firecracker";
rev = "v${finalAttrs.version}";
hash = "sha256-29ZI8RmHH3fz/nUb7EeD51qGUKEKj0UKURxbpmiwwzs=";
hash = "sha256-H3dj11Q0MgLST1TWJ5rmfPePxjXrXOYI2Xf/3uUdICU=";
};
cargoHash = "sha256-GtHIZJMLdMZNCXzVw6w3KjhzlxCJhC9eaKRDeVWwklY=";
cargoHash = "sha256-N2WYnFTlz4NUAU/tjy18SPvxdDVDIIaqgu44e6unOHs=";
# For aws-lc-sys@0.22.0: use external bindgen.
env.AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
@@ -16,13 +16,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii-data-importer";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "data-importer";
tag = "v${finalAttrs.version}";
hash = "sha256-lHofvjw4wK14tferHt59uSIYPVa5KwNQUB+GgmyUoJc=";
hash = "sha256-2/zfxBggXK9mJDpuofQyMZ+WWV0OHyUWTUU+4CRNOUQ=";
};
buildInputs = [ php ];
@@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-eiQpGtqjix2HmMU5sarysxm7dGgQx40/kZKPemrHBHU=";
vendorHash = "sha256-0p0xPBX4nKFYlpIvGVZU7ay+btjpxBO2s73wzysSzUU=";
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-BQglXnIlocZDTtAmSuga5dbB/m8AI5z1F/+VQ1kLzQc=";
hash = "sha256-baPsbZwGu1tx6bMH2tWcZVlkZuIpSflwj9JyX9vQW/U=";
};
composerRepository = php.mkComposerRepository {
+13 -10
View File
@@ -5,45 +5,48 @@
nodejs-slim,
fetchNpmDeps,
buildPackages,
php84,
php85,
nixosTests,
nix-update-script,
dataDir ? "/var/lib/firefly-iii",
}:
let
php = php85;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii";
version = "6.4.22";
version = "6.5.9";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
tag = "v${finalAttrs.version}";
hash = "sha256-i20D0/z6GA7pZYrWvRJ8tUlptNI5Cl/e9UY0hKg9SP8=";
hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ=";
};
buildInputs = [ php84 ];
buildInputs = [ php ];
nativeBuildInputs = [
nodejs-slim
nodejs-slim.npm
nodejs-slim.python
buildPackages.npmHooks.npmConfigHook
php84.packages.composer
php84.composerHooks2.composerInstallHook
php.packages.composer
php.composerHooks2.composerInstallHook
];
composerVendor = php84.mkComposerVendor {
composerVendor = php.mkComposerVendor {
inherit (finalAttrs) pname src version;
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-m+esW/yQs/GSwnw2iqVfSMXCf6/5M4634GUbt4Nnvbg=";
vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-pu8dxL0NRB1cyqlQEf2zT2wdVp2fbe+Vp85qMs7f6s0=";
hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk=";
};
preInstall = ''
@@ -52,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
passthru = {
phpPackage = php84;
phpPackage = php;
tests = nixosTests.firefly-iii;
updateScript = nix-update-script {
extraArgs = [
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "flexget";
version = "3.19.10";
version = "3.19.12";
pyproject = true;
src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
tag = "v${finalAttrs.version}";
hash = "sha256-G0Scv6XHjpxp5V0Ep+4itu+SmO/8jhR6LHvG/9scIPY=";
hash = "sha256-BSXIC85iRVtSx1TB8yB2EassXfnlEqDpTX17+c1VauQ=";
};
pythonRelaxDeps = true;
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "fq";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "wader";
repo = "fq";
rev = "v${finalAttrs.version}";
hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18=";
hash = "sha256-rGuUvuq9hZrqt3Uy1s1he8O+c+iF83RU6PsUlatrPcQ=";
};
vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8=";
vendorHash = "sha256-Iga9g9VMTxtdselFn+8udjtInXWW9sNUfSzIc7OgvbY=";
ldflags = [
"-s"
+17 -1
View File
@@ -35,7 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = lib.optionalString stdenv.cc.isClang ''
# This test assumes that our implementation of sort behaves identically to the
# one used during development, which is not necessarily the case; update the
# expected result to be sorted using our copy of sort.
postPatch = ''
sort testsuite/0008PolynomialSetUnion/output -o testsuite/0008PolynomialSetUnion/output
sort testsuite/0008PolynomialSetUnion/outputNew -o testsuite/0008PolynomialSetUnion/outputNew
''
+ lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
for f in $(find -name "*.h" -or -name "*.cpp"); do
@@ -53,6 +60,15 @@ stdenv.mkDerivation (finalAttrs: {
mpir
cddlib
];
hardeningDisable = [ "libcxxhardeningfast" ];
doCheck = true;
# The test runner still exits successfully when there are failed tests, so check
# stdout to see if anything failed.
checkPhase = ''
make check | tee "$TMPDIR/test.log"
! grep -q "Failed tests:" "$TMPDIR/test.log"
'';
meta = {
description = "Software package for computing Gröbner fans and tropical varieties";
+39 -5
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
callPackage,
buildPackages,
autoreconfHook,
gitUpdater,
texinfo,
@@ -11,8 +11,8 @@
}:
let
swig = callPackage ./swig.nix { };
bootForth = callPackage ./boot-forth.nix { };
swig = buildPackages.callPackage ./swig.nix { };
bootForth = buildPackages.callPackage ./boot-forth.nix { };
lispDir = "${placeholder "out"}/share/emacs/site-lisp";
in
stdenv.mkDerivation (finalAttrs: {
@@ -32,9 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
writableTmpDirAsHomeHook
autoreconfHook
texinfo
bootForth
swig
];
]
++ (
if (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) then
[ buildPackages.gforth ]
else
[ bootForth ]
);
buildInputs = [
libffi
@@ -47,12 +52,41 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
"--build=x86_64-apple-darwin"
]
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
# Tries to run ./engine/gforth-ll
"--without-check"
# Use build-platform CC for helper programs that must run during build
"HOSTCC=${buildPackages.stdenv.cc}/bin/cc"
# Tell gforth's libcc where to find the cross compiler
"CROSS_PREFIX=${stdenv.hostPlatform.config}-"
];
env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
# Tell gforth's libcc to prefix compiler commands with the cross-compilation target
CROSS_PREFIX = "${stdenv.hostPlatform.config}-";
};
makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"DITCENGINE=${buildPackages.gforth}/bin/gforth-ditc"
"GFORTH=${buildPackages.gforth}/bin/gforth"
"ENGINE=${buildPackages.gforth}/bin/gforth" # for ./preforth
];
preConfigure = ''
mkdir -p ${lispDir}
'';
postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# Put the project-local (cross-aware) libtool first in PATH
mkdir -p .cross-bin
ln -sf "$PWD/libtool" .cross-bin/libtool
ln -sf "$PWD/libtool" ".cross-bin/${stdenv.hostPlatform.config}-libtool"
export PATH="$PWD/.cross-bin:$PATH"
# Remove 'check' from the default 'all' target (can't run cross binaries)
sed -i 's/^\(all:.*\) check/\1/' Makefile
'';
passthru.updateScript = gitUpdater { };
meta = {
+4
View File
@@ -9,6 +9,7 @@
freetype,
glib,
glslang,
gst_all_1,
gtk4-layer-shell,
harfbuzz,
libadwaita,
@@ -75,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
libadwaita
libx11
gtk4-layer-shell
gst_all_1.gstreamer # Used for playing audio, e.g. audible bells
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-base
# OpenGL renderer
glslang
@@ -8,17 +8,17 @@
buildGoModule (finalAttrs: {
pname = "gitea-actions-runner";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "act_runner";
rev = "v${finalAttrs.version}";
hash = "sha256-D3/vJUQuNAgUWNyfL9QWmByZ9A/F4+pfA6GR0SDcMpQ=";
hash = "sha256-trKp5tIhvvb6VJ04iIpFD4Q/VK/V1urkbXEpGMwaEsE=";
};
vendorHash = "sha256-XRXoChH2ApQS65xnzeGP4NIUL0RKovLWvVIAnBncT7Y=";
vendorHash = "sha256-dUUe4BbBmRP9MImq/PYTGssv3M2Zn84oCxH5BKf9btg=";
ldflags = [
"-s"
+3 -3
View File
@@ -6,17 +6,17 @@
buildGo126Module (finalAttrs: {
pname = "gitea-mcp-server";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "gitea-mcp";
tag = "v${finalAttrs.version}";
hash = "sha256-B7uB69YsQd8EeENrezFK7kFXha21XValjEAYRjeYreo=";
hash = "sha256-weJcl9Vp7mhPiaui7VGETs5t4trUDTegDoUR8gRTGIs=";
};
vendorHash = "sha256-xfhvbTcniRnkv81MIEnoy36up8O2IZ1WUrhYJrhtZ3k=";
vendorHash = "sha256-35zVDzivvO3tSi1RYvXJoLvrlvnp3JCzwC5FqDEj91M=";
subPackages = [ "." ];
+3 -6
View File
@@ -2,22 +2,19 @@
buildGoModule,
fetchFromGitHub,
lib,
gitUpdater,
}:
buildGoModule (finalAttrs: {
pname = "go-grip";
version = "0.5.6";
version = "0.9.0";
src = fetchFromGitHub {
owner = "chrishrb";
repo = "go-grip";
tag = "v${finalAttrs.version}";
hash = "sha256-c3tl5nALPqIAMSqjbbQDi6mN6M1mKJvzxxDHcj/QyuY=";
hash = "sha256-HwD/pdWEEU+Hoo4HUJeK8y40jp1byNhw/TSpa5SNRak=";
};
vendorHash = "sha256-aU6vo/uqJzctD7Q8HPFzHXVVJwMmlzQXhAA6LSkRAow=";
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU=";
meta = {
description = "Preview Markdown files locally before committing them";
+4 -4
View File
@@ -9,15 +9,15 @@
buildGoModule (finalAttrs: {
pname = "goperf";
version = "0-unstable-2026-03-11";
version = "0-unstable-2026-04-09";
src = fetchgit {
url = "https://go.googlesource.com/perf";
rev = "16a31bc5fbd0f58f2e8e2a496d8e035bdc4a2e06";
hash = "sha256-be0vWFJUXTPWKapd+rX3Stnzra9LUGNEw+4P+fWzjyk=";
rev = "8e83ce0f7b1c6c5d6eab4763f10b9322cbe4cecb";
hash = "sha256-JIR+ytMsZaiQ5w4vTmLG4JHg6tz3/sAs24C3m5//hy4=";
};
vendorHash = "sha256-oBSd0D66BGfanCADtrpyIoUit8c+yHk8Nm6o2GmKoZg=";
vendorHash = "sha256-5WnH49NE1OUaTFuan3DZYhm0uJxIf7i5pgXK1PuqhA0=";
passthru.updateScript = writeShellScript "update-goperf" ''
export UPDATE_NIX_ATTR_PATH=goperf
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "hcloud";
version = "1.61.0";
version = "1.62.2";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-Gggr/wdPzi1nqCcWzxNYr85oBRGT0rBxV24QXYDHkdc=";
hash = "sha256-OGz/f68DDYJ7s3HFjDdQPtD86929gxRehSPs9cCkPBk=";
};
vendorHash = "sha256-X/qn9mfbSBaMbi4uI7jdL98mQSq0JVfXR3nX156ySBc=";
vendorHash = "sha256-8JvqGCVFE2dSlpMzwYXKMvg3nw/wt8GxL7sM0bS6ZgM=";
ldflags = [
"-s"
+69 -46
View File
@@ -1,40 +1,55 @@
{
lib,
rustPlatform,
fetchFromGitHub,
stdenv,
buildPackages,
pkg-config,
apple-sdk,
installShellFiles,
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
notmuch,
gpgme,
buildNoDefaultFeatures ? false,
buildFeatures ? [ ],
withNoDefaultFeatures ? buildNoDefaultFeatures,
withFeatures ? buildFeatures,
}@args:
buildNoDefaultFeatures ? false,
buildPackages,
dbus,
fetchFromGitHub,
gpgme,
installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
installShellFiles,
lib,
notmuch,
pkg-config,
rustPlatform,
stdenv,
}:
let
version = "1.1.0";
hash = "sha256-gdrhzyhxRHZkALB3SG/aWOdA5iMYkel3Cjk5VBy3E4M=";
cargoHash = "sha256-ulqMjpW3UI509vs3jVHXAEQUhxU/f/hN8XiIo8UBRq8=";
version = "1.2.0";
hash = "sha256-BBzfDeNu7s010ARCYuydCyR7QWrbeI3/B4CxA6d4olw=";
cargoHash = "sha256-IkvRiU9NuD6n7aCF8J235u2LjjmLftnF1n874IWVcN0=";
noDefaultFeatures =
lib.warnIf (args ? buildNoDefaultFeatures)
"buildNoDefaultFeatures is deprecated in favour of withNoDefaultFeatures and will be removed in the next release"
withNoDefaultFeatures;
inherit (stdenv.hostPlatform)
isLinux
isWindows
isAarch64
;
emulator = stdenv.hostPlatform.emulator buildPackages;
exe = stdenv.hostPlatform.extensions.executable;
hasPgpGpgFeature = builtins.elem "pgp-gpg" buildFeatures;
hasKeyringFeature = builtins.elem "keyring" buildFeatures;
hasNotmuchFeature = builtins.elem "notmuch" buildFeatures;
dbus' = dbus.overrideAttrs (old: {
env = (old.env or { }) // {
NIX_CFLAGS_COMPILE =
(old.env.NIX_CFLAGS_COMPILE or "")
# required for D-Bus on Linux AArch64
+ lib.optionalString (isLinux && isAarch64) " -mno-outline-atomics";
};
});
features =
lib.warnIf (args ? buildFeatures)
"buildFeatures is deprecated in favour of withFeatures and will be removed in the next release"
withFeatures;
in
rustPlatform.buildRustPackage {
inherit version cargoHash;
inherit
version
cargoHash
buildNoDefaultFeatures
;
pname = "himalaya";
@@ -45,36 +60,44 @@ rustPlatform.buildRustPackage {
rev = "v${version}";
};
buildNoDefaultFeatures = noDefaultFeatures;
buildFeatures = features;
env = {
# OpenSSL should not be provided by vendors, not even on Windows
OPENSSL_NO_VENDOR = "1";
};
nativeBuildInputs = [
pkg-config
]
++ lib.optional (installManPages || installShellCompletions) installShellFiles;
nativeBuildInputs =
[ ]
++ lib.optional (hasPgpGpgFeature || hasKeyringFeature || hasNotmuchFeature) pkg-config
++ lib.optional (installManPages || installShellCompletions) installShellFiles;
buildInputs =
[ ]
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk
++ lib.optional (builtins.elem "notmuch" withFeatures) notmuch
++ lib.optional (builtins.elem "pgp-gpg" withFeatures) gpgme;
++ lib.optional hasPgpGpgFeature gpgme
++ lib.optional (hasKeyringFeature && !isWindows) dbus'
++ lib.optional hasNotmuchFeature notmuch;
buildFeatures =
buildFeatures
# D-Bus is provided by vendors on Windows
++ lib.optional (hasKeyringFeature && isWindows) "vendored";
# most of the tests are lib side
doCheck = false;
postInstall =
let
emulator = stdenv.hostPlatform.emulator buildPackages;
in
lib.optionalString (lib.hasInfix "wine" emulator) ''
export WINEPREFIX="''${WINEPREFIX:-$(mktemp -d)}"
mkdir -p $WINEPREFIX
''
+ ''
mkdir -p $out/share/{applications,completions,man}
cp assets/himalaya.desktop "$out"/share/applications/
${emulator} "$out"/bin/himalaya man "$out"/share/man
${emulator} "$out"/bin/himalaya completion bash > "$out"/share/completions/himalaya.bash
${emulator} "$out"/bin/himalaya completion elvish > "$out"/share/completions/himalaya.elvish
${emulator} "$out"/bin/himalaya completion fish > "$out"/share/completions/himalaya.fish
${emulator} "$out"/bin/himalaya completion powershell > "$out"/share/completions/himalaya.powershell
${emulator} "$out"/bin/himalaya completion zsh > "$out"/share/completions/himalaya.zsh
${emulator} "$out"/bin/himalaya${exe} man "$out"/share/man
${emulator} "$out"/bin/himalaya${exe} completion bash > "$out"/share/completions/himalaya.bash
${emulator} "$out"/bin/himalaya${exe} completion elvish > "$out"/share/completions/himalaya.elvish
${emulator} "$out"/bin/himalaya${exe} completion fish > "$out"/share/completions/himalaya.fish
${emulator} "$out"/bin/himalaya${exe} completion powershell > "$out"/share/completions/himalaya.powershell
${emulator} "$out"/bin/himalaya${exe} completion zsh > "$out"/share/completions/himalaya.zsh
''
+ lib.optionalString installManPages ''
installManPage "$out"/share/man/*
+13 -3
View File
@@ -10,7 +10,7 @@
copyDesktopItems,
desktopToDarwinBundle,
jdk,
jdk17,
jdk25,
hmclJdk ? jdk.override {
# Required by jar file
enableJavaFX = true;
@@ -21,13 +21,14 @@
},
minecraftJdks ? [
hmclJdk
jdk17
jdk25
],
libxxf86vm,
libxtst,
libxrandr,
libxext,
libxcursor,
libxkbcommon,
libx11,
xrandr,
glib,
@@ -152,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
libxxf86vm
libxext
libxcursor
libxkbcommon
libxrandr
libxtst
libpulseaudio
@@ -192,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: {
lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr)
}" \
--run 'cd $HOME' \
${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3'}/lib/libglfw.so"''} \
''${gappsWrapperArgs[@]}
'';
@@ -212,6 +213,15 @@ stdenv.mkDerivation (finalAttrs: {
Hello Minecraft! Launcher (HMCL) is a free, open-source, and cross-platform Minecraft launcher.
It provides comprehensive support for managing multiple game versions and mod loaders,
including Forge, NeoForge, Fabric, Quilt, LiteLoader, and OptiFine.
Starting with Minecraft 26.1, Wayland support can be enabled
by adding the JDK arguments -DMC_DEBUG_ENABLED and
-DMC_DEBUG_PREFER_WAYLAND. If needed, configure them in
HMCL -> Advanced Settings -> JVM Options -> JVM Arguments.
Users who are still on an older version and want to use Wayland should
enable HMCL -> Advanced Settings -> Workaround -> Use System GLFW.
Otherwise, keep it disabled.
'';
maintainers = with lib.maintainers; [
daru-san
+2 -2
View File
@@ -28,13 +28,13 @@
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprlock";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlock";
rev = "v${finalAttrs.version}";
hash = "sha256-/r7jqBLcm3NSkqVYk8AE8b/qWKo8AKgzX3y2yLZeGvg=";
hash = "sha256-VFlM1cN4jmUAbfmZbeg7vL+AN9miXEUqqpk5EkHNq2c=";
};
nativeBuildInputs = [
+2 -3
View File
@@ -3,16 +3,15 @@
buildGo126Module,
fetchFromGitHub,
}:
buildGo126Module (finalAttrs: {
pname = "hyprmon";
version = "0.0.14";
version = "0.0.15";
src = fetchFromGitHub {
owner = "erans";
repo = "hyprmon";
rev = "v${finalAttrs.version}";
hash = "sha256-ObOvC2cIoLTBaGmpTAkm2y4vzqg61z+JZotEnmef1eE=";
hash = "sha256-dcjEnxSQwXUPJ44gj7pVPQtZUkBXbqLvQgmhYvANz8o=";
};
vendorHash = "sha256-n4RZxpsrlSUD3B/GLVoM2CPckvDkbyaMyg6h4QNbuH0=";
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hyprwhspr-rs";
version = "0.3.23";
version = "0.3.24";
src = fetchFromGitHub {
owner = "better-slop";
repo = "hyprwhspr-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-O4mb7pIdhu6D9zJNm/1MKh3YO7WIGYtHM4IAPRFLDSY=";
hash = "sha256-tnscv2DYRS6BrFgshEg/X37Yh7yIBKAtUkDemg0RqgU=";
};
cargoHash = "sha256-f1aXLMzAzdUhQw6eK0wuWO19HAg2iJgo+Im9Oto+VO4=";
cargoHash = "sha256-C7gn0XJRfYaoswSJcnLNQZvYY7lxLrvKp5fUSIsZ0BY=";
nativeBuildInputs = [
pkg-config
@@ -0,0 +1,82 @@
--- a/lib/src/widgets/emoji_picker/emoji_builder.dart
+++ b/lib/src/widgets/emoji_picker/emoji_builder.dart
@@ -1,7 +1,7 @@
import 'dart:convert';
+import 'dart:io';
import 'package:build/build.dart';
-import 'package:http/http.dart' as http;
import 'package:interstellar/src/utils/trie.dart';
Builder emojiBuilder(BuilderOptions options) =>
@@ -29,15 +29,9 @@
};
Future<String> _generateContent() async {
- final dataResponse = await http.get(
- Uri.parse('$_sourcePrefix/compact.raw.json'),
- );
- final dataJson = jsonDecode(dataResponse.body);
+ final dataJson = jsonDecode(await File('@compact.raw.json@').readAsString()) as List;
- final messagesResponse = await http.get(
- Uri.parse('$_sourcePrefix/messages.raw.json'),
- );
- final messagesJson = jsonDecode(messagesResponse.body);
+ final messagesJson = jsonDecode(await File('@messages.raw.json@').readAsString()) as Map<String, dynamic>;
final s = StringBuffer()
..write('''
@@ -53,8 +47,9 @@
final emojiGroups = <String>[];
- for (var i = 0; i < (messagesJson['groups'] as List).length; i++) {
- final group = messagesJson['groups'][i];
+ final groups = messagesJson['groups'] as List;
+ for (var i = 0; i < groups.length; i++) {
+ final group = groups[i] as Map<String, dynamic>;
assert(group['order'] == i, 'Emoji group order value should match index');
@@ -61,4 +56,4 @@
- emojiGroups.add(group['message']);
+ emojiGroups.add(group['message'] as String);
}
s
@@ -72,7 +67,8 @@
{
var i = 0;
- for (final emoji in dataJson) {
+ for (final emojiItem in dataJson) {
+ final emoji = emojiItem as Map<String, dynamic>;
if (emoji['group'] == null || emoji['order'] == null) continue;
assert(emoji['order'] == i + 1, 'Emoji order value should match index');
@@ -84,9 +80,9 @@
: emoji['emoticon']),
];
- trie.addChild(Trie.normalizeTerm(emoji['label']), {i});
+ trie.addChild(Trie.normalizeTerm(emoji['label'] as String), {i});
for (final tag in tags) {
- trie.addChild(Trie.normalizeTerm(tag), {i});
+ trie.addChild(Trie.normalizeTerm(tag as String), {i});
}
s
@@ -93,9 +89,9 @@
..write('const Emoji("')
- ..write(emoji['unicode'])
+ ..write(emoji['unicode'] as String)
..write('","')
- ..write(emoji['label'])
+ ..write(emoji['label'] as String)
..write('",')
- ..write(emoji['group'])
+ ..write(emoji['group'].toString())
..write('),\n');
i++;
@@ -1,3 +1,4 @@
{
"flutter_web_auth_2": "sha256-x3SVeFIYS+UtyNKr4ohq4dvktCgS6nECGrb2vMg9aZc=",
"webcrypto": "sha256-HX8CcCRbDlVMLMbKGnqKlrkMT9XITLbQE/2OW9zO72w="
}
+30 -12
View File
@@ -1,7 +1,8 @@
{
lib,
flutter338,
flutter341,
fetchFromGitHub,
fetchurl,
imagemagick,
alsa-lib,
libass,
@@ -13,25 +14,42 @@
dart,
}:
let
flutter341.buildFlutterApplication (finalAttrs: {
pname = "interstellar";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "interstellar-app";
repo = "interstellar";
tag = "v${version}";
hash = "sha256-ZhZBy/KECz/Gs3RSuuXmTtI5pKPBMFQNG/kS8JvEaFc=";
tag = "v${finalAttrs.version}";
hash = "sha256-WprvuIN7yS5yLR4eUF/M9yG25ZU1Sf1I1myujclF4oM=";
};
in
flutter338.buildFlutterApplication {
inherit pname version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = lib.importJSON ./git-hashes.json;
patches = [ ./emoji_builder.patch ];
postPatch = ''
substituteInPlace lib/src/widgets/emoji_picker/emoji_builder.dart \
--replace-fail "@compact.raw.json@" "${
fetchurl {
url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/compact.raw.json";
hash = "sha256-OivCYjiBEooRx3zni9jAr3lR0rzpoa3HX2l/a0UwDpE=";
}
}" \
--replace-fail "@messages.raw.json@" "${
fetchurl {
url = "https://raw.githubusercontent.com/milesj/emojibase/a5fc630a91ca42cddf3f4a66492965600fd3bce8/packages/data/en/messages.raw.json";
hash = "sha256-ZQWXZJ5jXxDNQHaOAsxApAt6oanvaEwZ6VXbDA0YeMs=";
}
}"
substituteInPlace lib/src/controller/database/database.dart \
--replace-fail "const Color.from(alpha: 1, red: 1, green: 1, blue: 1).value32bit" "0xFFFFFFFF" \
--replace-fail "const Color.from(alpha: 1, red: 0, green: 0, blue: 0).value32bit" "0xFF000000"
'';
nativeBuildInputs = [ imagemagick ];
buildInputs = [
@@ -54,14 +72,14 @@ flutter338.buildFlutterApplication {
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/${pname}/lib
--prefix LD_LIBRARY_PATH : $out/app/${finalAttrs.pname}/lib
'';
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
inherit src;
inherit (finalAttrs) src;
nativeBuildInputs = [ yq-go ];
}
''
@@ -96,4 +114,4 @@ flutter338.buildFlutterApplication {
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ JollyDevelopment ];
};
}
})
+132 -51
View File
@@ -4,21 +4,31 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a",
"sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "88.0.0"
"version": "92.0.0"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f",
"sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.1.1"
"version": "9.0.0"
},
"ansicolor": {
"dependency": "transitive",
"description": {
"name": "ansicolor",
"sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.3"
},
"any_link_preview": {
"dependency": "direct main",
@@ -60,15 +70,25 @@
"source": "hosted",
"version": "2.13.0"
},
"blurhash_ffi": {
"auto_route": {
"dependency": "direct main",
"description": {
"name": "blurhash_ffi",
"sha256": "9811937f2e568aedb5630c9d901323c236414e3e882050fdf25bc42f7431d7bb",
"name": "auto_route",
"sha256": "e9acfeb3df33d188fce4ad0239ef4238f333b7aa4d95ec52af3c2b9360dcd969",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.7"
"version": "11.1.0"
},
"auto_route_generator": {
"dependency": "direct main",
"description": {
"name": "auto_route_generator",
"sha256": "04300eaf5821962aae8b5cd94f67013fd2fd326dc3be212d3ec1ae7470f09834",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.4.0"
},
"boolean_selector": {
"dependency": "transitive",
@@ -81,14 +101,14 @@
"version": "2.1.2"
},
"build": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "build",
"sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
"sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.0"
"version": "4.0.4"
},
"build_config": {
"dependency": "transitive",
@@ -111,14 +131,14 @@
"version": "4.0.4"
},
"build_runner": {
"dependency": "direct dev",
"dependency": "direct main",
"description": {
"name": "build_runner",
"sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
"sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.8.0"
"version": "2.10.5"
},
"built_collection": {
"dependency": "transitive",
@@ -264,11 +284,11 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
"sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
},
"db_viewer": {
"dependency": "transitive",
@@ -294,11 +314,11 @@
"dependency": "direct main",
"description": {
"name": "drift",
"sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1",
"sha256": "5ea2f718558c0b31d4b8c36a3d8e5b7016f1265f46ceb5a5920e16117f0c0d6a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.28.2"
"version": "2.30.1"
},
"drift_db_viewer": {
"dependency": "direct main",
@@ -311,14 +331,14 @@
"version": "2.1.0"
},
"drift_dev": {
"dependency": "direct dev",
"dependency": "direct main",
"description": {
"name": "drift_dev",
"sha256": "4db0eeedc7e8bed117a9f22d867ab7a3a294300fed5c269aac90d0b3545967ca",
"sha256": "892dfb5d69d9e604bdcd102a9376de8b41768cf7be93fd26b63cfc4d8f91ad5f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.28.3"
"version": "2.30.1"
},
"drift_flutter": {
"dependency": "direct main",
@@ -486,6 +506,16 @@
"source": "sdk",
"version": "0.0.0"
},
"flutter_blurhash": {
"dependency": "direct main",
"description": {
"name": "flutter_blurhash",
"sha256": "e97b9aff13b9930bbaa74d0d899fec76e3f320aba3190322dcc5d32104e3d25d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.1"
},
"flutter_colorpicker": {
"dependency": "direct main",
"description": {
@@ -497,7 +527,7 @@
"version": "1.1.0"
},
"flutter_launcher_icons": {
"dependency": "direct dev",
"dependency": "direct main",
"description": {
"name": "flutter_launcher_icons",
"sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
@@ -506,16 +536,6 @@
"source": "hosted",
"version": "0.14.4"
},
"flutter_lints": {
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
"sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.0"
},
"flutter_local_notifications": {
"dependency": "direct main",
"description": {
@@ -618,6 +638,27 @@
"source": "sdk",
"version": "0.0.0"
},
"flutter_web_auth_2": {
"dependency": "direct main",
"description": {
"path": "flutter_web_auth_2",
"ref": "b1af971b79160979320a4865e238dcaacf69b624",
"resolved-ref": "b1af971b79160979320a4865e238dcaacf69b624",
"url": "https://github.com/interstellar-app/flutter_web_auth_2.git"
},
"source": "git",
"version": "5.0.1"
},
"flutter_web_auth_2_platform_interface": {
"dependency": "transitive",
"description": {
"name": "flutter_web_auth_2_platform_interface",
"sha256": "ba0fbba55bffb47242025f96852ad1ffba34bc451568f56ef36e613612baffab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.0"
},
"flutter_web_plugins": {
"dependency": "transitive",
"description": "flutter",
@@ -625,14 +666,14 @@
"version": "0.0.0"
},
"freezed": {
"dependency": "direct dev",
"dependency": "direct main",
"description": {
"name": "freezed",
"sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
"sha256": "03dd9b7423ff0e31b7e01b2204593e5e1ac5ee553b6ea9d8184dff4a26b9fb07",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.3"
"version": "3.2.4"
},
"freezed_annotation": {
"dependency": "direct main",
@@ -674,6 +715,16 @@
"source": "hosted",
"version": "2.3.2"
},
"hotreloader": {
"dependency": "transitive",
"description": {
"name": "hotreloader",
"sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.0"
},
"html": {
"dependency": "transitive",
"description": {
@@ -865,14 +916,14 @@
"version": "4.9.0"
},
"json_serializable": {
"dependency": "direct dev",
"dependency": "direct main",
"description": {
"name": "json_serializable",
"sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
"sha256": "5b89c1e32ae3840bb20a1b3434e3a590173ad3cb605896fb0f60487ce2f8104e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.11.1"
"version": "6.11.4"
},
"leak_tracker": {
"dependency": "transitive",
@@ -904,15 +955,15 @@
"source": "hosted",
"version": "3.0.2"
},
"lints": {
"lean_builder": {
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
"name": "lean_builder",
"sha256": "4f3d70c34c52cc5034e8cc6f53d35aa3a32fb373b78fb4c29cf45cd1dcf06942",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.0"
"version": "0.1.5"
},
"logger": {
"dependency": "direct main",
@@ -1514,21 +1565,21 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
"sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
"sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.1"
"version": "4.2.0"
},
"source_helper": {
"dependency": "transitive",
"description": {
"name": "source_helper",
"sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
"sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.8"
"version": "1.3.10"
},
"source_span": {
"dependency": "transitive",
@@ -1574,11 +1625,11 @@
"dependency": "transitive",
"description": {
"name": "sqlparser",
"sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67",
"sha256": "f52f5d5649dcc13ed198c4176ddef74bf6851c30f4f31603f1b37788695b93e2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.41.2"
"version": "0.43.0"
},
"stack_trace": {
"dependency": "transitive",
@@ -1870,6 +1921,16 @@
"source": "hosted",
"version": "2.2.0"
},
"very_good_analysis": {
"dependency": "direct main",
"description": {
"name": "very_good_analysis",
"sha256": "96245839dbcc45dfab1af5fa551603b5c7a282028a64746c19c547d21a7f1e3a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.0"
},
"visibility_detector": {
"dependency": "direct main",
"description": {
@@ -1914,11 +1975,11 @@
"dependency": "transitive",
"description": {
"name": "watcher",
"sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
"sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.3"
"version": "1.2.0"
},
"web": {
"dependency": "transitive",
@@ -2031,6 +2092,16 @@
"source": "hosted",
"version": "0.5.1"
},
"window_to_front": {
"dependency": "transitive",
"description": {
"name": "window_to_front",
"sha256": "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.0.3"
},
"xdg_directories": {
"dependency": "transitive",
"description": {
@@ -2051,6 +2122,16 @@
"source": "hosted",
"version": "6.6.1"
},
"xxh3": {
"dependency": "transitive",
"description": {
"name": "xxh3",
"sha256": "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
},
"yaml": {
"dependency": "transitive",
"description": {
@@ -2074,6 +2155,6 @@
},
"sdks": {
"dart": ">=3.9.0 <4.0.0",
"flutter": "3.38.5"
"flutter": "3.38.9"
}
}

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